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.11  2000/09/19 11:14:30  peterg
+## Now writes the first component type header correctely
+##
 ## Revision 1.10  2000/01/26 10:11:10  peterg
 ## Added I component
 ##
 ## Revision 1.9  1999/11/10 00:47:08  peterg
 ## Replaced ifs by a table of cr/arg information
@@ -142,10 +145,12 @@
     cr["TF"] = "lin";  arg["TF"]  = sprintf("flow,%s%s", $2, s_arg);
     cr["GY"] = "lin";  arg["GY"]  = sprintf("flow,%s%s", $2, s_arg);
 
     cr["AE"] = "lin";  arg["AE"]  = sprintf("%s%s", $2, s_arg);
     cr["AF"] = "lin";  arg["AF"]  = sprintf("%s%s", $2, s_arg);
+
+    cr["CDx"] = "lin";  arg["CDx"]  = sprintf("%s%s", $2, s_arg);
 
   ## Heading
   if (Component !~ OldComponent) print "\n% Component type", Component
 
   ## Component

Index: mttroot/mtt/bin/trans/abg2sympar_m2txt
==================================================================
--- mttroot/mtt/bin/trans/abg2sympar_m2txt
+++ mttroot/mtt/bin/trans/abg2sympar_m2txt
@@ -37,11 +37,15 @@
 }
 
 BEGIN {
   var = "[%|#][PAR|VAR]";
   not_an_arg = "effort flow state internal external zero unknown\
-                mtt_e mtt_f sqrt exp log sign none abs";
+                mtt_e mtt_f\
+		sqrt exp log sign sin asin cos acos tan atan \
+		sin asin cos acos tan atan \
+		sinh asinh cosh acosh tanh atanh \
+                none abs";
   arg_line = "arg = ";
 }
 {
   ## Explicit VAR declarations
   if (match($1,var)>0) print $2 "\t" system_name;

Index: mttroot/mtt/bin/trans/m/figfig.m
==================================================================
--- mttroot/mtt/bin/trans/m/figfig.m
+++ mttroot/mtt/bin/trans/m/figfig.m
@@ -1,26 +1,34 @@
-function figfig(filename,language)
-  ## Usage: figfig(filename[,language])
+function figfig(filename,language,boxed)
+  ## Usage: figfig(filename[,language,boxed])
   ## Puts octave figure into fig file (filename.fig)
   ## If second argument, converts to filename.language using fig2dev
   ## eg:
   ##    figfig("foo");
   ##    figfig("foo","eps");
   ##    figfig("foo","pdf");
+  ## Boxed=1 gives a box aroundd the figure
 
   ###############################################################
   ## Version control history
   ###############################################################
   ## $Id$
   ## $Log$
+  ## Revision 1.3  2001/04/10 12:54:50  gawthrop
+  ## Minor fixes for sensitivity versions
+  ##
   ## Revision 1.2  2000/12/27 16:06:02  peterg
   ## *** empty log message ***
   ##
   ## Revision 1.1  2000/11/03 10:43:10  peterg
   ## Initial revision
   ###############################################################
 
+  if nargin<3
+    boxed=1
+  endif
+  
   figfilename = sprintf("%s.fig",filename);
   
   eval(sprintf("gset output \"%s\" ",figfilename));
 
   gset term fig color portrait fontsize 16 size 20 10 metric
@@ -27,18 +35,21 @@
   replot;
   gset term x11
   gset output 
   replot;
 
-  ## Add a box - makes a visible bounding box
-  fid = fopen(figfilename,"a+");
-  fprintf(fid,"2 4 0 2 31 7 50 0 -1 0.000 0 0 7 0 0 5\n");
-  fprintf(fid,"\t9675 5310 9675 270 225 270 225 5310 9675 5310\n");
-  fclose(fid);
+
+  if boxed # Add a box - makes a visible bounding box
+    fid = fopen(figfilename,"a+");
+    fprintf(fid,"2 4 0 2 31 7 50 0 -1 0.000 0 0 7 0 0 5\n");
+    fprintf(fid,"\t9675 5310 9675 270 225 270 225 5310 9675 5310\n");
+    fclose(fid);
+  endif
+  
 
   if nargin>1			# Do a ps file
     psfilename = sprintf("%s.%s",filename,language);
     convert = sprintf("fig2dev -L%s %s > %s", language, figfilename, psfilename);
     system(convert);
   endif
   
 endfunction

Index: mttroot/mtt/bin/trans/makesubs
==================================================================
--- mttroot/mtt/bin/trans/makesubs
+++ mttroot/mtt/bin/trans/makesubs
@@ -13,10 +13,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.1  2000/12/28 09:09:52  peterg
+## Initial revision
+##
 ##
 ###############################################################
 
 #Inform user
 echo Creating $1_subs.r
@@ -30,11 +33,11 @@
 
 cat $MTTPATH/trans/m/rcs_header.txt	>> $1_subs.r
 
 cat >> $1_subs.r <<EOF
 % Put algebraic substitution commands here
-
+FOR ALL i LET arbint(i) = 0; % Zap arbitary constants
 END;
 EOF
 
 
 exit

Index: mttroot/mtt/bin/trans/mtt_strip_args
==================================================================
--- mttroot/mtt/bin/trans/mtt_strip_args
+++ mttroot/mtt/bin/trans/mtt_strip_args
@@ -9,10 +9,13 @@
 # Label file to symbolic parameters conversion
 # Copyright (C) 2000 by Peter J. Gawthrop
 
 ## $Id$  ##
 ## $Log$
+## Revision 1.3  2000/10/17 12:33:13  peterg
+## Added mtt_mod to the zapped list
+##
 ## Revision 1.2  2000/10/16 09:06:26  peterg
 ## Write out the system as a second columns as well
 ##
 ## Revision 1.1  2000/10/16 09:04:04  peterg
 ## Initial revision
@@ -43,12 +46,16 @@
   }
   return matched;
 }
 
 BEGIN {
-  not_an_arg = "effort flow state internal external zero unknown\
-                mtt_e mtt_f mtt_mod sqrt exp log sign none abs";
+ not_an_arg = "effort flow state internal external zero unknown\
+                mtt_e mtt_f\
+		sqrt exp log sign sin asin cos acos tan atan \
+		sin asin cos acos tan atan \
+		sinh asinh cosh acosh tanh atanh \
+                none abs";
 }
 {
     args=$1
     sys=$2
     N=split(args, arg, ",");

Index: mttroot/mtt/bin/trans/rdae2dae_r
==================================================================
--- mttroot/mtt/bin/trans/rdae2dae_r
+++ mttroot/mtt/bin/trans/rdae2dae_r
@@ -12,10 +12,15 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.7  2001/04/11 09:44:26  gawthrop
+## Fixed cc and c problems to do with pow(x,y) and integers
+## mtt/lib/reduce/fix_c.r is included in rdae2dae and cse2smx_lang for
+## -c, -cc and -oct options
+##
 ## Revision 1.6  2001/02/03 13:40:45  gawthrop
 ## Added explicit MTTNu
 ##
 ## Revision 1.5  2000/12/28 12:39:02  peterg
 ## Put under RCS
@@ -127,13 +132,10 @@
 rm -f $logname
 
 # Use symbolic algebra to accomplish the transformation
 $SYMBOLIC >$logname  << EOF
 
-% Fix c code if required
-$include
-
 %Read the formatting function
 in "$MTTPATH/trans/reduce_matrix.r";
 
 % CRs
 in "$crname";
@@ -141,10 +143,14 @@
 % Raw dae
 in "$rdaename";
 
 % Substitution
 in "$subsname";
+
+% Fix c code if required
+$include
+
 
 OFF Echo;
 OFF Nat;
 
 %Create the output file