Index: mttroot/mtt/bin/mtt
==================================================================
--- mttroot/mtt/bin/mtt
+++ mttroot/mtt/bin/mtt
@@ -12,10 +12,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Header$
 ## $Log$
+## Revision 1.198  1998/11/20 16:12:30  peterg
+## Now copies aliased systems BEFORE generating rgb etc.
+##
 ## Revision 1.197  1998/11/20 09:00:45  peterg
 ## Number of changes to underlying tools
 ##
 ## Revision 1.196  1998/11/10 11:55:40  peterg
 ## Added $info_switch to abg2cbg invocation
@@ -674,11 +677,11 @@
 
 #Check $MTTPATH has been set
 mtt_check_var "$MTTPATH" "MTTPATH"
 
 #Version
-version='3.3'
+version='3.4'
 
 # MTT recursion level is zero unless explicitly set
 level=0
 
 #Computation mode is octave by default
@@ -749,11 +752,11 @@
 	-l )
                 mtt_switches="$mtt_switches $1 $2";
 		level=$2; shift ;;
 	-A )
                 mtt_switches="$mtt_switches $1";
-                Solving='Solving';;
+                Solve='-A';;
 	-abg )
                 mtt_switches="$mtt_switches $1";
                 start_at_abg='yes';;
         --version)                
                   echo 'MTT (Model Transformation Tools) version' $version; exit;;
@@ -1716,12 +1719,12 @@
 #SUMMARY cse	constrained-state equations (m)
 #SUMMARY cse	constrained-state equations (tex)
 #SUMMARY cse	constrained-state equations (view)
 #SUMMARY cse	constrained-state equations (ps)
 #Constrained-state equations
-$1_cse.r: $1_dae.r $1_def.r $1_sympar.r
-	dae2cse_r $1 "$Solving" ; tidy $1_cse.r
+$1_cse.r: $1_dae.r $1_def.r $1_sympar.r 
+	dae2cse_r $Solve $1; tidy $1_cse.r $1_subs.r
 $1_cse.m: $1_def.r $1_cse.r $1_sympar.r 
 	cse_r2m $1; matlab_tidy $1_cse.m
 $1_cse.tex: $1_cse.r  $1_sympar.r $1_simp.r
 	cse_r2tex $1; latex_tidy $1_cse.tex
 
@@ -1731,11 +1734,11 @@
 #SUMMARY ode	ordinary differential equations (tex)
 #SUMMARY ode	ordinary differential equations (view)
 #SUMMARY ode	ordinary differential equations (ps)
 #Ordinary differential equations
 ifeq ($dae_is_ode,0)
-$1_ode.r: $1_cse.r $1_def.r $1_sympar.r
+$1_ode.r: $1_cse.r $1_def.r $1_sympar.r $1_subs.r
 	cse2ode_r $1; tidy $1_ode.r
 endif
 ifeq ($dae_is_ode,1)
 $1_ode.r: $1_dae.r
 	echo Copying $1_dae.r to $1_ode.r
@@ -1875,11 +1878,11 @@
 
 #SUMMARY smx	state matrices with variable state x (r)
 #SUMMARY smx	state matrices with variable state x (m)
 #SUMMARY smxx	Sparse computation of Ax (m)
 #SUMMARY smxtx	Sparse computation of ATx (m)
-$1_smx.r: $1_def.r $1_def.m $1_ode.r 
+$1_smx.r: $1_def.r $1_def.m $1_ode.r $1_subs.r
 		ode2smx_lang $1 r; tidy $1_smx.r
 $1_smx.m: $1_def.r $1_def.m $1_ode.r $1_sympars.txt
 		ode2smx_lang $1 m;
 $1_smxx.m: $1_smx.m
 		touch $1_smxx.m
@@ -2163,11 +2166,11 @@
 $1_$2.doc: $1_$2.tex
 	makedoc "$mtt_switches" "$1" "$2" "$3" "$4" "$documenttype"
 
 #Generic conversion of LaTeX doc to dvi
 $1_$2.dvi: $1_$2.doc
-	doc2dvi $1_$2
+	doc2dvi $1_$2 "$documenttype"
 
 #Create PostScript version of fig files
 ifeq ($REPTYPE,bg)
 $1_$2.ps : $1_$2.fig
 	echo Creating $1_$2.ps