Index: mttroot/mtt/bin/trans/rbg_fig2m
==================================================================
--- mttroot/mtt/bin/trans/rbg_fig2m
+++ mttroot/mtt/bin/trans/rbg_fig2m
@@ -13,10 +13,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.13  2005/03/15 15:03:55  gawthrop
+## Now works for Hierarchical systems
+##
 ## Revision 1.12  2005/03/15 12:49:28  gawthrop
 ## Handle descriptive (inc maths) text as well
 ##
 ## Revision 1.11  2005/03/15 12:03:48  gawthrop
 ## New labg.fig rep - pretty LaTeX figures.
@@ -55,23 +58,27 @@
 ##
 ###############################################################
 
 cmp2latex() {
   gawk '{
-  ## Zap trailing null
-  split($0,A,"\\");
+  ## 
+  ## Zap trailing \001
+  A = substr($0,1,length($0)-4);
 
   ## Find before and after:
-  N=split(A[1],B,":");
+  N=split(A,B,":");
 
   ## Split into fields
   M=split(B[1],C);
 
-  ## Dont modify port labels
+  ## Dont modify port labels (except for _ -> \_)
   if(index(C[M],"[")==1){
-       for (i=1;i<M;i++)
+       for (i=1;i<M;i++){
+         if (C[i]=="_")
+           C[i] = "\\\\_";
          printf("%s ",C[i]);
+       }
        printf("%s\\001\n",C[M]);
    }
   else{
      ## Set special flag
      FlagCol = 9
@@ -82,12 +89,14 @@
        printf("%s ",C[i]);
 
     if (N==1)
       printf("\\\\B{%s}\\001\n",C[M]);
     if (N==2)
-      if(index(B[2],"[")==1)
+      if(index(B[2],"[")==1){
+        gsub(/_/,"\\\\_",B[2]);
         printf("\\\\B{%s}:%s\\001\n",C[M],B[2]);
+      }
       else
         printf("\\\\BB{%s}{%s}\\001\n",C[M],B[2]);
    }
   }'  
 }
@@ -98,15 +107,15 @@
   is_text="4";
   if ($1!=is_text)
     print $0
   else
   {
-  ## Zap trailing null
-  split($0,B,"\\");
+  ## Zap trailing \001
+  B = substr($0,1,length($0)-4);
 
   ## Split into fields
-  M=split(B[1],C);
+  M=split(B,C);
 
   ## Set special flag
   FlagCol = 9
   C[FlagCol] = 6;
 
@@ -189,13 +198,13 @@
 
 #Create the latexed abg file
 ##latex_tidy $1_art.fig
 art2latex< $1_art.fig  >$1_lart.fig
 cmp2latex<$1_cmp.fig  >$1_lcmp.fig
-cat $1_head.fig $1_bnd.fig $1_lcmp.fig  > $1_labg.fig
-strip_comments < $1_lart.fig >> $1_labg.fig
+cat $1_head.fig $1_bnd.fig $1_lcmp.fig | sed 's/---- /	/' > $1_labg.fig
+strip_comments < $1_lart.fig | sed 's/---- /	/' >> $1_labg.fig