Index: mttroot/mtt/bin/trans/abg2tex
==================================================================
--- mttroot/mtt/bin/trans/abg2tex
+++ mttroot/mtt/bin/trans/abg2tex
@@ -12,10 +12,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.2  2000/11/27 17:45:00  peterg
+## Removed "System" from  heading
+##
 ## Revision 1.1  2000/11/27 15:11:15  peterg
 ## Initial revision
 ##
 ## Revision 1.7  1997/12/06 16:20:37  peterg
 ## Added another argument - the label
@@ -43,10 +46,12 @@
 #Look for a command line argument
 while [ -n "`echo $1 | grep '^-'`" ]; do
   case $1 in
 	-pdf )  pdf='-pdf'
                 ;;
+	-s )  sensitivity='-s'
+                ;;
 
 	*)
 		echo "$1 is an invalid argument - ignoring" ;;
   esac
   shift
@@ -73,11 +78,11 @@
     \label{sec:$1}
     \index{\textbf{$1} -- abg} 
 
 EOF
 else
-mtt -q -u $1 abg m # Make sure all the subsystems exist -- nasty kludge
+mtt -q -u ${sensitivity} $1 abg m # Make sure all the subsystems exist -- nasty kludge
 cat<<EOF > $filename
    % abg report for system $1 ($filename)
    % Generated by MTT at `date`
 EOF
 fi

Index: mttroot/mtt/bin/trans/cbg2ese_m2r
==================================================================
--- mttroot/mtt/bin/trans/cbg2ese_m2r
+++ mttroot/mtt/bin/trans/cbg2ese_m2r
@@ -14,10 +14,13 @@
 ## Version control history
 ###############################################################
 ## $Id$
 ##
 ## $Log$
+## Revision 1.29  2001/03/29 19:24:14  gawthrop
+## Can now use c representations of crs when using -c option
+##
 ## Revision 1.28  2001/02/05 17:19:52  gawthrop
 ## Now gives unique names to the states of multiports. Second name
 ## onwards labeled with port number
 ##
 ## Revision 1.27  2000/12/05 12:09:56  peterg
@@ -328,30 +331,36 @@
 # Sort the struc file
 mv $structurefile junk
 sort -k 1,1 -k 2,2n junk >$structurefile
 
 # Relabel states with multiple ports
-mv $structurefile junk
-awk '
-BEGIN{
-   state_index=1;  
-   oldname="";
-}
-{
-   name=$4;
-   newname=name;
-   if ($1=="state") {
-     if (name==oldname)
-       newname = sprintf("%s_%i",name, ++state_index);
-     else
-       state_index=1;
-   }
-   $4 = newname
-   for (i=1;i<NF;i++) printf("%s\t",$i);
-   printf("%s\n", $NF)
-   oldname = name;
-'} < junk > $structurefile
+relabel_multiple_definitions(){
+  mv $structurefile junk
+  awk '
+  BEGIN{
+     var_type_index=1;  
+     oldname="";
+  }
+  {
+     name=$4;
+     newname=name;
+     if ($1==var_type) {
+       if (name==oldname)
+         newname = sprintf("%s_%i",name, ++var_type_index);
+       else
+         var_type_index=1; 
+   }
+     $4 = newname
+     for (i=1;i<NF;i++) printf("%s\t",$i);
+     printf("%s\n", $NF)
+     oldname = name;
+  '} < junk var_type=$1> $structurefile
+}
+
+relabel_multiple_definitions input;
+relabel_multiple_definitions output;
+relabel_multiple_definitions state;
 
 # Now invoke the standard error handling.
 mtt_error mtt_error.txt