Index: mttroot/mtt/bin/mtt
==================================================================
--- mttroot/mtt/bin/mtt
+++ mttroot/mtt/bin/mtt
@@ -15,10 +15,14 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Header$
 ## $Log$
+## Revision 1.313  2001/06/13 14:53:59  gawthrop
+## MTT now gas the double-colon option in the abg.fig file
+## eg R:r:a^2+3*b
+##
 ## Revision 1.312  2001/06/11 19:43:49  gawthrop
 ## MTT is now much more sophisticated in generating lbl files
 ## Labels can contain maths
 ## Repetative components are now broken
 ##
@@ -1142,10 +1146,14 @@
 	-cc )
                 fixcc='-fixcc'
                 mtt_switches="$mtt_switches $1";
                 matrix_smxa="-matrix";
 		computation=cc ;;
+	-cr )
+                mtt_switches="$mtt_switches $1";
+		rdae_is_dae=1 ;
+                cr_first='-cr';;
 	-o )
                 mtt_switches="$mtt_switches $1";
 		dae_is_ode=1 ;;
 	-nocr )
                 mtt_switches="$mtt_switches $1";
@@ -1169,10 +1177,11 @@
 		    *)
 			echo $1 is an unknown integration method - use euler, rk4 or implicit;
                         exit;;
 		esac;;
 	-s )
+                sensitivity_switch='-s';
                 mtt_switches="$mtt_switches $1";
 		sensitivity=sensitivity ;;
 	-ss )
                 mtt_switches="$mtt_switches $1";
 		steadystate_computation=yes ;;
@@ -1300,10 +1309,11 @@
     echo '         -A  solve algebraic equations symbolically'
     echo '         -D  debug -- leave log files etc'
     echo '         -I  prints more information'
     echo '         -abg start at abg.m representation'
     echo '         -c  c-code generation'
+    echo '         -cr Use cr before resolving equations'
     echo '         -d  <dir>  use directory <dir>'
     echo '         -dc Maximise derivative (not integral) causality'
     echo '         -dc Maximise derivative (not integral) causality'
     echo '         -i <implicit|euler|rk4>   Use implicit, euler or rk4 integration'
     echo '         -o ode is same as dae'
@@ -2399,17 +2409,17 @@
 #SUMMARY dae	differential-algebraic equations (tex)
 #SUMMARY dae*	differential-algebraic equations (view)
 #SUMMARY dae	differential-algebraic equations (ps)
 #Differential-algebraic equations
 
-${sys}_rdae.r: ${sys}_ese.r ${sys}_def.r $1_modpar.r
+${sys}_rdae.r: ${sys}_ese.r ${sys}_def.r $1_modpar.r ${Subsystem}_cr.r ${Subsystem}_subs.r
 ifneq ($partition,)
 	echo Doing subsystems
 	mtt_make_subsystems  ${sys} rdae r
 endif
 	mtt_prepend.sh -p $1_modpar.r $1_ese.r # Add modulated parameters to start
-	ese2rdae_r ${Subsystem}; tidy ${Subsystem}_rdae.r
+	ese2rdae_r ${cr_first} ${Subsystem}; tidy ${Subsystem}_rdae.r
 
 ${sys}_dae.r: ${Subsystem}_rdae.r ${Subsystem}_def.r ${Subsystem}_subs.r ${Subsystem}_cr.r
 ifneq ($partition,)
 	echo Doing subsystems
 	mtt_make_subsystems  ${sys} dae r
@@ -3188,11 +3198,11 @@
 $1_rep.tex: $1_rep.txt $1_reps_made
 	rep_txt2tex $1 "$documenttype" "$directory";
 
 #SUMMARY abg Acausal bond graph report (tex)
 $1_abg.tex: $1_sub.sh
-	abg2tex $pdf $1
+	abg2tex $pdf ${sensitivity_switch} $1
 
 #SUMMARY tf Transfer function (mml)
 $1_$2.mml: $1_$2.r
 	mtt_r2mml $1 $2