Index: mttroot/mtt/bin/trans/awk/rbg_fig2m.awk
==================================================================
--- mttroot/mtt/bin/trans/awk/rbg_fig2m.awk
+++ mttroot/mtt/bin/trans/awk/rbg_fig2m.awk
@@ -10,10 +10,14 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.41  2001/06/13 10:41:06  gawthrop
+## Further changes towards aouto creation of lbl files.
+## Prettified lbl files
+##
 ## Revision 1.40  2001/06/11 19:43:50  gawthrop
 ## MTT is now much more sophisticated in generating lbl files
 ## Labels can contain maths
 ## Repetative components are now broken
 ##
@@ -631,12 +635,12 @@
   delimiter = ":";
   repetition_delimiter = "*";
   repetition_regexp = "\\*";
   q = "\047";
   terminator = "\\001";
-  component_regexp = "[^0-9a-zA-Z_:\*-]";
-  port_regexp = "^\[[a-zA-Z0-9_,]*\]";
+  component_regexp = "[^0-9a-zA-Z_:*-]";
+  port_regexp = "^[[a-zA-Z0-9_,]*]";
   nonport_regexp = "[a-zA-Z]";
   PORT_regexp = "^PORT .*=";  
   port_component_regexp = "SS";
   isa_fig_file = 0;
   min_line_length = 10;

Index: mttroot/mtt/bin/trans/mtt_txt2m
==================================================================
--- mttroot/mtt/bin/trans/mtt_txt2m
+++ mttroot/mtt/bin/trans/mtt_txt2m
@@ -13,10 +13,13 @@
 # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 # %% Version control history
 # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 # %% $Id$
 # %% $Log$
+# %% Revision 1.14  2001/07/13 04:54:04  geraint
+# %% Branch merge: numerical-algebraic-solution back to main.
+# %%
 # %% Revision 1.13.4.2  2001/07/09 00:24:58  geraint
 # %% input rep: Removed input name mapping, left state name mapping.
 # %%
 # %% Revision 1.13.4.1  2001/06/26 01:01:28  geraint
 # %% Makes input and state names available for input rep.
@@ -228,11 +231,11 @@
 
   if (NF<2) print "  " statement
   if (NF>1)  print statement " # " $2
 }' | sed\
      -e 's/\[\([0-9]*\)\]/(\1)/g' \
-     -e 's/\([^a-zA-Z_]\)t\([^a-zA-Z_]\)/\1mttt\2/g' \
+     -e 's/\([^a-zA-Z_0-9]\)t\([^a-zA-Z_0-9]\)/\1mttt\2/g' \
      -e 's/x(/mttx(/g' \
      -e 's/u(/mttu(/g' \
      -e 's/mttmtt/mtt/g' \
 | tolower >> $outfile