Index: mttroot/mtt/bin/mtt
==================================================================
--- mttroot/mtt/bin/mtt
+++ mttroot/mtt/bin/mtt
@@ -14,10 +14,16 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Header$
 ## $Log$
+## Revision 1.311  2001/05/26 18:36:43  gawthrop
+## Further modifications. Now works on rcPPP
+##  -- next jobs:
+##     add identification to ppp_nlin_sim
+##     create real-time ppp_nlin_run
+##
 ## Revision 1.310  2001/05/08 08:30:12  gawthrop
 ## Added line to reverse the x^y --> pow(x,y) in default  _simp file to
 ## prettyfy LaTeX
 ##
 ## Revision 1.309  2001/04/28 03:15:03  geraint
@@ -1971,11 +1977,11 @@
 #SUMMARY lbl	label file (txt)
 #SUMMARY lbl*	label file (view)
 #SUMMARY lbl	label file (view)
 #SUMMARY lbl*	label file (tex)
 #SUMMARY lbl	label file (tex)
-$1_lbl.txt:
+$1_lbl.txt: $1_abg.fig
 	abg2lbl_fig2txt $1 $sensitivity
 
 $1_lbl.tex: $1_lbl.txt
 	lbl_txt2tex $1
 
@@ -2297,11 +2303,11 @@
 	makerep_txt $1;
 endif
 
 #SUMMARY rbg	raw bond graph (m)
 #Raw bond graph: fig file to mfile
-$1_rbg.m: $1_abg.fig $1_lbl.txt
+$1_rbg.m: $1_abg.fig  $1_lbl.txt
 	lbl2component $1 | sh || exit 1 # Grab specified components now
 	rbg_fig2m $1
 $1_cmp.m: $1_rbg.m
 $1_fig.fig: $1_rbg.m
 
@@ -2311,12 +2317,17 @@
 $1_sabg.fig: $1_rbg.m
 
 
 #Subsystem creation commands
 #SUMMARY sub Executable subsystem list (sh)
+ifeq ($start_at_abg,yes)
 $1_sub.sh: $1_abg.m
 	abg2sub_m2sh $1
+else
+$1_sub.sh: $1_abg.fig
+	abg2sub_fig2sh $1
+endif
 
 #SUMMARY sub LaTeX subsystem list (tex)
 #SUMMARY sub subsystem list (ps)
 #SUMMARY sub subsystem list (view)
 $1_sub.tex: $1_sub.sh

Index: mttroot/mtt/bin/trans/abg2lbl_fig2txt
==================================================================
--- mttroot/mtt/bin/trans/abg2lbl_fig2txt
+++ mttroot/mtt/bin/trans/abg2lbl_fig2txt
@@ -11,10 +11,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.15  2001/06/11 16:53:49  gawthrop
+## Now uses abg2sympar_m2txt to get the arguments
+##
 ## Revision 1.14  2001/06/11 15:06:58  gawthrop
 ## Now handles user-defined components
 ##
 ## Revision 1.13  2001/06/04 08:13:37  gawthrop
 ## Various changes to support PPP
@@ -75,13 +78,23 @@
 rm -f $1_cbg.m
 rm -f $typefile
 rm -f $infofile
 rm -f mtt_junk*
 
-#Inform user
+
+## Create lbl files beneath this one
+mtt -q -u -l 1 $1 sub sh # Create the list
+sh $1_sub.sh "abg2lbl_fig2txt "
+
+if [ -f "$1_lbl.txt" ]; then
+  ##echo "$1_lbl.txt exists in `pwd` - no action taken"
+  exit
+##else 
+  ##echo "$1_lbl.txt dosn not exist in `pwd` "
+fi
 
-
+#Inform user
 if [ -n "$sensitivity" ]; then
     echo "Creating $1_lbl.txt (sensitivity version)"
 else
     echo "Creating $1_lbl.txt"
 fi
@@ -120,11 +133,13 @@
     OldComponent="None";
  }
  { 
   Component = $1;
   Name = $2;
-  
+  name = Name;
+  gsub(/[()-+*/]/,"",name); # Remove maths
+
 ##Aliases
   if (Component == "SS") {
     port_alias[++j] = Name;
   }
   else {
@@ -173,11 +188,11 @@
 
   ## Heading
   if (Component !~ OldComponent) print "\n% Component type", Component
 
   ## Component
-    printf("\t%s\t", Name);
+    printf("\t%s\t", name);
     if (Component in cr)
       printf("%s\t\t", cr[Component])
     else 
       printf("none\t\t");
 

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,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.39  2001/05/09 08:50:02  gawthrop
+## Uses _art.fig to transmit the art work to the cbg.fig rep.
+##
 ## Revision 1.38  2001/03/23 14:57:31  gawthrop
 ## Now puts space after header fields + writes _port.fig
 ##
 ## Revision 1.37  2000/09/14 08:43:32  peterg
 ## Add additional directional informatiuon to rbonds:
@@ -240,10 +243,11 @@
     { 
       i_label++;
       name = $1;
       CR   = $2;
       args = $3;
+
       label[i_label,1] = name; 
       label[i_label,2] = CR;
       label[i_label,3] = args;
 	}
 }
@@ -266,10 +270,13 @@
   depth = modulo10($4);
 
 # It is terminated by \001 - so delete this termination
   str = substr(str,1,length(str)-4);
 
+# Zap maths
+  gsub(/[()-+*/]/,"",str); 
+
 # A component string contains only alphanumeric  _ and :
   isa_plain_component = match(str, component_regexp)==0;
 # It must also be specified at depth 0 (modulo 10)
   isa_plain_component = isa_plain_component && (depth==0);
 
@@ -343,11 +350,11 @@
       type = a[1];
       name = a[2];
 # Check  if name is in label file and if used already
       found = 0; name_used = 0;
       for (i=1; i<=i_label; i++) {
-	lname = label[i,1];
+	  lname = label[i,1];
 	if ( lname==name ) {
 	  found = 1;
 	  if (name in used) {
 	    name_used = 1;
 	    CR = label[i,2];

Index: mttroot/mtt/bin/trans/latex_tidy
==================================================================
--- mttroot/mtt/bin/trans/latex_tidy
+++ mttroot/mtt/bin/trans/latex_tidy
@@ -12,10 +12,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.17  2000/12/28 12:31:15  peterg
+## *** empty log message ***
+##
 ## Revision 1.16  2000/10/10 21:03:20  peterg
 ## *** empty log message ***
 ##
 ## Revision 1.15  1998/04/07 08:44:11  peterg
 ## zapped eta - it messes up theta
@@ -124,10 +127,11 @@
     -e "s/alpha/\\\alpha/g" \
     -e "s/beta/\\\beta/g" \
     -e "s/gamma/\\\gamma/g" \
     -e "s/delta/\\\delta/g" \
     -e "s/epsilon/\\\epsilon/g" \
+    -e "s/eta/\\\eta/g" \
     -e "s/kappa/\\\kappa/g" \
     -e "s/lambd/\\lambda/g" \
     -e "s/lambda/\\\lambda/g" \
     -e "s/mu/\\\mu/g" \
     -e "s/phi/\\\phi/g" \