Index: mttroot/mtt/bin/mtt
==================================================================
--- mttroot/mtt/bin/mtt
+++ mttroot/mtt/bin/mtt
@@ -12,10 +12,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Header$
 ## $Log$
+# Revision 1.57  1997/03/10  09:24:58  peterg
+# a.out now deleted in the clean operation
+#
 # Revision 1.56  1997/03/05  08:24:09  peterg
 # Delete a.out after it has run.
 #
 # Revision 1.55  1997/02/24  19:31:10  peterg
 # Removed numpar.m requirement from .m files
@@ -294,11 +297,12 @@
 
 # Clean up 
 if [ "$1" = "clean" ] && [ "$2" = "" ]; then
   echo 'Removing all generated files for all systems'
   rm -f *.log  mtt_info.txt warning.txt
-  rm -f *_abg.m *_abg.ps *_args.* *_cr.r *_sympar.r *_sympar.c
+  rm -f *_abg.m *_abg.ps *_args.* *_cr.r
+  rm -f *_sympar.r *_sympar.c *_sympar.txt
   rm -f *_rbg.* *_cmp.* *_fig.fig *_*cbg.* *_ese.* *_def.* 
   rm -f *_sub.sh *_type.sh
   rm -f *_dae*.* *_cse.* *_ode*.c *_ode*.m *_obs.* *_rfe.* *_ss.*
   rm -f *_dm.* *_csm.* *_sm.* *_tf.* *_sr*.* *_ir*.* *_*fr.*
   rm -f  *_numpar.m *_numpar.c
@@ -308,11 +312,12 @@
 
 # Clean up named system
 if [ "$2" = "clean" ] && [ "$3" = "" ]; then
   echo 'Removing all generated files for system ' $1
   rm -f *.log  mtt_info.txt warning.txt
-  rm -f $1_abg.m $1_abg.ps $1_args.* $1_cr.r $1_sympar.r $1_sympar.c
+  rm -f $1_abg.m $1_abg.ps $1_args.* $1_cr.r 
+  rm -f $1_sympar.r $1_sympar.c $1_sympar.txt
   rm -f $1_rbg.* $1_cmp.* $1_fig.fig $1*_*cbg.* $1*_ese.* $1_def.* 
   rm -f $1_sub.sh $1_type.sh
   rm -f $1_dae*.* $1_cse.* $1_ode*.c $1_ode*.m $1_obs.* $1_rfe.* $1_ss.*
   rm -f $1_dm.* $1_csm.* $1_sm.* $1_tf.* $1_sr*.* $1_ir*.* $1_*fr.*
   rm -f $1_numpar.m $1_numpar.c
@@ -450,41 +455,71 @@
 	touch $1_args.m
 
 #Create empty files (with titles) if not already there
 #SUMMARY lbl	label file (txt)
 $1_lbl.txt:
-	echo Creating $1_lbl.txt
-	( \
-	echo "%SUMMARY $1: <brief description here>"; \
-	echo "%DESCRIPTION <Detailed description here>"; \
-	echo "%% Label file for system $1 ($1_lbl.txt)"; \
-	cat $MTTPATH/trans/m/rcs_header.txt; \
-	echo "%% Each line should be of one of the following forms:"; \
-	echo "%	a comment (ie starting with %)"; \
-	echo "%	Component-name	CR_name	arg1,arg2,..argn"; \
-	echo "%	blank"; \
-        )> $1_lbl.txt
+	abg2lbl_fig2txt $1
 
 #SUMMARY cr	constitutive relationship for each subsystem (r)
 $1_cr.r: $1_sub.sh
+	echo Creating $1_cr.r
 	lbl2cr_txt2r $1
-
+ 
 	if [ "$level" = "0" ]; then \
 	  mv $1_cr.r MTT_cr.r; \
 	else \
 	  echo >>  MTT_cr.r; \
 	  echo "%% CRs for subsystem $1" >>  MTT_cr.r; \
 	  cat $1_cr.r >> MTT_cr.r; rm -f $1_cr.r; \
 	fi
-
+ 
 	sh $1_sub.sh "mtt -q -l $level+1 " ' cr r'
-
-
+ 
+ 
 	if [ "$level" = "0" ]; then \
 	  mv MTT_cr.r $1_cr.r; \
 	  echo 'END;' >> $1_cr.r; \
 	fi
+
+# Temporary fix - just copy everything here
+# ## $1_cr.r: $1_sub.sh
+# ## 	echo Creating $1_cr.r
+# ## 	cat $MTTPATH/lib/cr/r/*.cr > $1_cr.r
+
+#SUMMARY sympar	symbolic parameters (txt)
+# Lbl to sympar conversion
+$1_sympar.txt: $1_sub.sh
+	lbl2sympar_txt2txt $1
+ 
+	if [ "$level" = "0" ]; then \
+	  mv $1_sympar.txt MTT_sympar.txt; \
+	else \
+	  cat $1_sympar.txt >> MTT_sympar.txt; \
+	fi
+ 
+	sh $1_sub.sh "mtt -q -l $level+1 " ' sympar txt'
+ 
+ 
+	if [ "$level" = "0" ]; then \
+	  sort -u MTT_sympar.txt> $1_sympar.txt; \
+	fi
+
+# ## Old version -- just looks on top level
+# ## $1_sympar.r: $1_lbl.txt $1_params.r
+# ## 	lbl2sympar_txt2r $1
+# ## 	echo "IN \"$1_params.r\";" >> $1_sympar.r
+# ## 	echo 'END;' >> $1_sympar.r
+
+#SUMMARY sympar	symbolic parameters (r)
+$1_sympar.r: $1_sympar.txt
+	sympar_txt2r $1
+
+#SUMMARY sympar	symbolic parameters (c)
+# r to c sympar conversion -- its part of the ode_r2c tool
+$1_sympar.c: $1_sympar.r
+	sympar_r2c $1
+
 
 #SUMMARY simp	simplification information (r)
 $1_simp.r:
 	echo Creating $1_simp.r
 	( \
@@ -613,22 +648,10 @@
 
 #Subsystem creation commands
 $1_sub.sh: $1_cmp.m
 	cmp2sub_m2sh $1
 
-#SUMMARY sympar	symbolic parameters (r)
-# Lbl to sympar conversion
-$1_sympar.r: $1_lbl.txt $1_params.r
-	lbl2sympar_txt2r $1
-	echo "IN \"$1_params.r\";" >> $1_sympar.r
-	echo 'END;' >> $1_sympar.r
-
-#SUMMARY sympar	symbolic parameters (c)
-# r to c sympar conversion -- its part of the ode_r2c tool
-$1_sympar.c: $1_sympar.r
-	sympar_r2c $1
-
 #SUMMARY abg	acausal bond graph (m)
 #Raw bond graph to acausal bond graph: mfile
 $1_abg.m: $1_rbg.m $1_sub.sh
 	sh $1_sub.sh "mtt -q -l $level+1 " ' abg m'
 	rbg2abg_m $1