Index: mttroot/mtt/bin/trans/mtt_m2p
==================================================================
--- mttroot/mtt/bin/trans/mtt_m2p
+++ mttroot/mtt/bin/trans/mtt_m2p
@@ -13,10 +13,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.2  1998/07/25 12:39:57  peterg
+## begin on same line as for and if
+##
 ## Revision 1.1  1998/07/25 09:42:52  peterg
 ## Initial revision
 ##
 ###############################################################
 
@@ -106,11 +109,11 @@
 sed "s/$space\($non_space\)$spaces=$spaces\($fun_name\)(\([a-zA-Z0-9,]*\))/\2(\1,\3)/" |\
 sed "s/$space\($non_space\)$spaces=$spaces\($fun_name\)/\2(\1)/"  |\
 awk '
 BEGIN{
   comment_regexp = "{"
-  doing_header = 1
+  doing_header = 0
   doing_globals = 0
   Nt = 9
   inc ="$I"
 }
 {
@@ -117,19 +120,20 @@
   if ($1=="global") 
     doing_globals = 1
   else{ 
     if (doing_globals==1){
       if (match($1,";")==0){
-        global[++i]=$1;
+        global[++i]=$1; 
       }
       else{
         doing_globals = 0
+        doing_header = 1
       }
     }
     else 
     {
-      if ((doing_header==1)&&(doing_globals==0)) {
+      if (doing_header==1){
         if (rep=="ode2odes"){
           printf("VAR ");
           for (k=1;k<i;k++) printf("%s,",global[k])
           printf("%s : REAL;\n", global[i])
           printf("VAR "); for (k=1;k<=Nx;k++) printf("mttx%i,", k)
@@ -155,17 +159,17 @@
         else
           printf("%s\n", $0)
       }
       else {
         if ($1=="if") {
-          print tolower($0) " begin"
+          printf("%s THEN BEGIN", $0)
         }
         else{ 
           if ($1=="for"){
           sub(/:/," TO ",$0)
           sub(/=/,":=",$0)
-          printf("%s DO\n", $0) " begin"
+          printf("%s DO BEGIN\n", $0) 
           }
           else {
             sub(/=/,":=",$0)
             sub(/\^/,"**",$0)
             printf("%s\n",$0)
@@ -180,17 +184,20 @@
     printf("EULER = 1,\n")
     printf("IMPLICITL = 2;\n")
     printf("IMPLICIT3 = 3;\n")
     }
     else
-      print "END;"
+      if (rep=="ode2odes")
+        print "END."
+      else
+        print "END;"
 }' sys=$sys rep=$rep Nx=$Nx Nu=$Nu |\
-sed 's/(\([0-9]*\))/\[\1\]/' \
+sed 's/(\([ijk0-9]*\))/\[\1\]/g' \
 >> $Filename
 
 # p2c doesn't like mixed case filenames!
 if [ "$Filename" != "$filename" ]; then
   echo Creating $filename
   cp -f $Filename $filename
 fi