Index: mttroot/mtt/bin/trans/mtt_header
==================================================================
--- mttroot/mtt/bin/trans/mtt_header
+++ mttroot/mtt/bin/trans/mtt_header
@@ -10,10 +10,19 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.53  2002/06/10 23:22:16  geraint
+## Fixed problem with Matlab fsolve failing because of "user function returned Inf or Nan" (fsolve.m, line 245).
+##
+## Revision 1.52  2002/05/27 14:52:15  geraint
+## Parameters in sfun reps are now declared using sympar.h at the top of the
+## sfun*.c file instead of in individual functions. This causes the optimisation
+## variables (mtt_tmp*) to be declared correctly without causing conflicts in the
+## scope of parameter declarations.
+##
 ## Revision 1.51  2002/05/19 13:01:21  geraint
 ## Numerical solution of algebraic equations implemented for S-function target.
 ##
 ## Equation solving requires the Matlab Optimization Toolbox to be installed.
 ##
@@ -496,11 +505,10 @@
 	modeline="/* -*-c-*- Put Emacs into c-mode */";
 	Lc='/*'
 	Rc='*/'
 	Lb='['
 	Rb=']'
-	parameters=no
 	constant_declaration="const double "
 	var_declaration="double "
 	minusone="-1"
 	;;
     *)

Index: mttroot/mtt/bin/trans/mtt_txt2m
==================================================================
--- mttroot/mtt/bin/trans/mtt_txt2m
+++ mttroot/mtt/bin/trans/mtt_txt2m
@@ -13,10 +13,17 @@
 # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 # %% Version control history
 # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 # %% $Id$
 # %% $Log$
+# %% Revision 1.18  2002/06/17 08:50:00  geraint
+# %% Changed pattern to prevent 'max(' from being translated to 'mamttx('.
+# %%
+# %% Revision 1.17  2002/04/28 18:41:27  geraint
+# %% Fixed [ 549658 ] awk should be gawk.
+# %% Replaced calls to awk with call to gawk.
+# %%
 # %% Revision 1.16  2002/04/18 17:51:11  gawthrop
 # %% Put default values in _simpar.m in case of missing values in txt file
 # %%
 # %% Revision 1.15  2002/03/26 12:00:37  geraint
 # %% Escaped characters to eliminate awk warnings.
@@ -255,12 +262,12 @@
   if (NF<2) print "  " statement
   if (NF>1)  print statement " # " $2
 }' | sed\
      -e 's/\[\([0-9]*\)\]/(\1)/g' \
      -e 's/\([^a-zA-Z_0-9]\)t\([^a-zA-Z_0-9]\)/\1mttt\2/g' \
-     -e 's/x(/mttx(/g' \
-     -e 's/u(/mttu(/g' \
+     -e 's/\([^a-zA-Z_0-9]\)x(/\1mttx(/g' \
+     -e 's/\([^a-zA-Z_0-9]\)u(/\1mttu(/g' \
      -e 's/mttmtt/mtt/g' \
 | tolower >> $outfile
 
 if [ -n "$arraycode" ]; then
   new_style=`strip_comments < $1_$2.txt| grep "$name(">/dev/null; echo $?`