Index: mttroot/mtt/bin/mtt ================================================================== --- mttroot/mtt/bin/mtt +++ mttroot/mtt/bin/mtt @@ -15,10 +15,13 @@ ############################################################### ## Version control history ############################################################### ## $Header$ ## $Log$ +## Revision 1.408 2005/02/18 16:59:02 gawthrop +## Don't check files when using -s +## ## Revision 1.407 2005/02/17 18:36:38 geraint ## Removed a bash-ism: replaced [[ conditional ]] with [ conditional ] ## ## Revision 1.406 2005/01/06 15:36:06 geraint ## Tidied output of options. @@ -1908,10 +1911,11 @@ if [ "$1" = "Clean" ] && [ "$2" = "" ]; then echo 'Removing all generated files for all systems' rm -f *.log mtt_info.txt warning.txt rm -f *_abg.ps *_args.* *_cr.txt *_abg.tex rm -f *_sabg.fig *_sabg.ps *_head.fig *_bnd.fig + rm -f *_labg.fig *_lcbg.fig rm -f *_sympar.r *_sympar.c *_sympar.h *_sympar.txt? *_sympar.tex rm -f *_rbg.* *_cmp.* *_fig.fig *_*cbg.* *_ese.* *_def.* *_alias.* rm -f *_sub.* *_type.sh rm -f *_dae*.* *_cse.* *_ode.* rm -f *_obs.* *_rfe.* *_ss.* @@ -1952,10 +1956,11 @@ 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.ps $1_args.* $1_cr.txt $1_abg.tex rm -f $1_sabg.fig $1_sabg.ps $1_head.fig $1_bnd.fig + rm -f $1_labg.fig $1_lcbg.fig rm -f $1_sympar.r $1_sympar.c $1_sympar.h $1_sympar.txt? $1_sympar.tex rm -f $1_rbg.* $1_cmp.* $1_fig.fig $1*_*cbg.* $1*_ese.* $1_def.* $1_alias.* rm -f $1_sub.* $1_type.sh rm -f $1_dae*.* $1_cse.* $1_ode.* $1_obs.* $1_rfe.* $1_ss.* rm -f $1_dm.* $1_csm.* $1_tf.* $1_sr*.* $1_ir*.* $1_*fr.* @@ -2968,10 +2973,13 @@ #SUMMARY sabg stripped acausal bond graph (fig) #SUMMARY sabg stripped acausal bond graph (ps) #SUMMARY sabg stripped acausal bond graph (view) $1_sabg.fig: $1_rbg.m + +#SUMMARY labg latex-ready acausal bond graph (fig) +$1_labg.fig: $1_rbg.m #Subsystem creation commands #SUMMARY sub Executable subsystem list (sh) ifeq ($start_at_abg,yes) Index: mttroot/mtt/bin/trans/rbg_fig2m ================================================================== --- mttroot/mtt/bin/trans/rbg_fig2m +++ mttroot/mtt/bin/trans/rbg_fig2m @@ -13,10 +13,14 @@ ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ +## Revision 1.10 2002/04/28 18:55:03 geraint +## Fixed [ 549658 ] awk should be gawk. +## Replaced calls to awk with call to gawk. +## ## Revision 1.9 2002/01/11 03:44:19 geraint ## Breaks compounds objects into individual components. Eliminates "incorrect object code error" in cbg.ps when component is not causally complete. ## ## Revision 1.8 2001/10/15 14:25:44 gawthrop ## Now handles white space at the end of component names @@ -43,10 +47,34 @@ ## Revision 1.1 1996/08/05 20:13:33 peter ## Initial revision ## ############################################################### +cmp2latex() { + gawk '{ + ## Zap trailing null + split($0,A,"\\"); + + ## Find before and after: + N=split(A[1],B,":"); + + ## Split into fields + M=split(B[1],C); + + ## Set special flag + FlagCol = 9 + C[FlagCol] = 6; + + ## Write out modified version + for (i=1;i $1_sabg.fig +#Create the latexed abg file +cmp2latex<$1_cmp.fig >$1_lcmp.fig +cat $1_head.fig $1_bnd.fig $1_lcmp.fig > $1_labg.fig +strip_comments < $1_art.fig >> $1_labg.fig Index: mttroot/mtt/doc/mtt.texi ================================================================== --- mttroot/mtt/doc/mtt.texi +++ mttroot/mtt/doc/mtt.texi @@ -14,10 +14,13 @@ @comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @comment Version control history @comment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @comment $Id$ @comment $Log$ +@comment Revision 1.29 2005/01/19 09:45:15 geraint +@comment Fixed whitespace. +@comment @comment Revision 1.28 2005/01/06 16:03:55 geraint @comment Updated options list. @comment @comment Revision 1.27 2005/01/06 14:42:33 geraint @comment Fixed explicit/implicit descriptions of forward/backward Euler. @@ -520,10 +523,11 @@ * Representation summary:: * Defining representations:: * Verbal description (desc):: * Acausal bond graph (abg):: +* Acausal bond graph - LaTeX ready (labg):: * Stripped acausal bond graph (sabg):: * Labels (lbl):: * Structure (struc):: * Constitutive Relationship (cr):: * Parameters:: @@ -535,10 +539,17 @@ * Descriptor matrices:: * Report:: Acausal bond graph (abg) +* Language fig (abg.fig):: +* Language m (rbg.m):: +* Language m (abg.m):: +* Language tex (abg.tex):: + +Acausal bond graph - LaTeX ready (labg) + * Language fig (abg.fig):: * Language m (rbg.m):: * Language m (abg.m):: * Language tex (abg.tex):: @@ -2693,10 +2704,11 @@ @menu * Representation summary:: * Defining representations:: * Verbal description (desc):: * Acausal bond graph (abg):: +* Acausal bond graph - LaTeX ready (labg):: * Stripped acausal bond graph (sabg):: * Labels (lbl):: * Structure (struc):: * Constitutive Relationship (cr):: * Parameters:: @@ -2866,11 +2878,11 @@ is included in the rep.txt file. As usual, @strong{MTT} provides a default text file to be edited by the user (@pxref{Text editors}). @c node next prev up -@node Acausal bond graph (abg), Stripped acausal bond graph (sabg), Verbal description (desc), Representations +@node Acausal bond graph (abg), Acausal bond graph - LaTeX ready (labg), Verbal description (desc), Representations @section Acausal bond graph (abg) @cindex Acausal bond graph (abg) @pindex Acausal bond graph (abg) The acausal bond graph is the main input to @strong{MTT}. It is up to you, as a @@ -2899,11 +2911,26 @@ * Language m (rbg.m):: * Language m (abg.m):: * Language tex (abg.tex):: @end menu -@node Language fig (abg.fig), Language m (rbg.m), Acausal bond graph (abg), Acausal bond graph (abg) +@node Acausal bond graph - LaTeX ready (labg), Stripped acausal bond graph (sabg), Acausal bond graph (abg), Representations +@section Acausal bond graph - LaTeX ready (labg) +@cindex Acausal bond graph - LaTeX ready (labg) +@pindex Acausal bond graph - LaTeX ready (labg) +This representation exists in the fig (@pxref{Language fig (abg.fig)}) +only. It is used for high-quality figures generated using fig2dev with +the -Lpstex option. + +@menu +* Language fig (abg.fig):: +* Language m (rbg.m):: +* Language m (abg.m):: +* Language tex (abg.tex):: +@end menu + +@node Language fig (abg.fig), Language m (rbg.m), Acausal bond graph - LaTeX ready (labg), Acausal bond graph - LaTeX ready (labg) @subsection Language fig (abg.fig) @cindex Language fig (abg.fig) @pindex Language fig (abg.fig) A bond graph is made up of: @@ -3403,11 +3430,11 @@ @end example -@node Language m (rbg.m), Language m (abg.m), Language fig (abg.fig), Acausal bond graph (abg) +@node Language m (rbg.m), Language m (abg.m), Language fig (abg.fig), Acausal bond graph - LaTeX ready (labg) @comment node-name, next, previous, up @subsection Language m (rbg.m) The raw bond graph of system `sys' is represented as an m file with heading: @example @@ -3498,11 +3525,11 @@ label file. It also generates a file sys_fig.fig containing details of the bond graph with the components removed. -@node Language m (abg.m), Language tex (abg.tex), Language m (rbg.m), Acausal bond graph (abg) +@node Language m (abg.m), Language tex (abg.tex), Language m (rbg.m), Acausal bond graph - LaTeX ready (labg) @comment node-name, next, previous, up @subsection Language m (abg.m) @cindex Language m (abg.m) @cindex bonds @cindex components @@ -3602,11 +3629,11 @@ @cindex Transformation rbg2abg_m This transformation takes the raw bond graph and, by doing some geometrical computation, determines the topology of the bond graph -- ie what is close to what. -@node Language tex (abg.tex), , Language m (abg.m), Acausal bond graph (abg) +@node Language tex (abg.tex), , Language m (abg.m), Acausal bond graph - LaTeX ready (labg) @comment node-name, next, previous, up @subsection Language tex (abg.tex) @cindex Language tex (abg.tex) For the purpose of producing a report (@pxref{Report}), @strong{MTT} @@ -3613,11 +3640,11 @@ generates a LaTeX (@pxref{LaTeX}) file describing the bond graph and its subsystems. Additional information may be supplied using the description representation (@pxref{Detailed}). @c node next prev up -@node Stripped acausal bond graph (sabg), Labels (lbl), Acausal bond graph (abg), Representations +@node Stripped acausal bond graph (sabg), Labels (lbl), Acausal bond graph - LaTeX ready (labg), Representations @section Stripped acausal bond graph (sabg) @cindex Stripped acausal bond graph (sabg) @pindex Stripped acausal bond graph (sabg) The stripped acausal bond graph is the acausal bond graph representation (@pxref{Acausal bond graph (abg)}) without the artwork @@ -4760,10 +4787,13 @@ # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% # %% Version control history # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% # %% $Id$ # %% $Log$ +# %% Revision 1.29 2005/01/19 09:45:15 geraint +# %% Fixed whitespace. +# %% # %% Revision 1.28 2005/01/06 16:03:55 geraint # %% Updated options list. # %% # %% Revision 1.27 2005/01/06 14:42:33 geraint # %% Fixed explicit/implicit descriptions of forward/backward Euler.