Index: mttroot/mtt/bin/mtt ================================================================== --- mttroot/mtt/bin/mtt +++ mttroot/mtt/bin/mtt @@ -15,10 +15,13 @@ ############################################################### ## Version control history ############################################################### ## $Header$ ## $Log$ +## Revision 1.409 2005/03/15 12:03:17 gawthrop +## New labg.fig rep - pretty LaTeX figures. +## ## 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 ] @@ -2976,11 +2979,13 @@ #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 - +$1_labg.tex: $1_labg.fig + fig2dev -L pstex_t -p $1_labg.eps $1_labg.fig $1_labg.tex + fig2dev -L pstex $1_labg.fig $1_labg.eps #Subsystem creation commands #SUMMARY sub Executable subsystem list (sh) ifeq ($start_at_abg,yes) $1_sub.sh: $1_abg.m @@ -3956,11 +3961,11 @@ $1_rep.tex: $1_rep.txt $1_reps_made rep_txt2tex $1 "$documenttype" "$directory" "$mtt_switches"; #SUMMARY abg Acausal bond graph report (tex) -$1_abg.tex: $1_sub.sh +$1_abg.tex: $1_sub.sh $1_labg.tex abg2tex $pdf ${sensitivity_switch} $1 #SUMMARY tf Transfer function (mml) $1_$2.mml: $1_$2.r mtt_r2mml $1 $2 Index: mttroot/mtt/bin/trans/abg2tex ================================================================== --- mttroot/mtt/bin/trans/abg2tex +++ mttroot/mtt/bin/trans/abg2tex @@ -12,10 +12,13 @@ ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ +## Revision 1.7 2004/08/26 16:11:48 geraint +## Fixed ignore() and pipe so that subsystems are included in reports again. +## ## Revision 1.6 2004/02/11 10:10:04 gawthrop ## Includes a _pic.fig file (schematic) if such exists ## ## Revision 1.5 2004/02/10 16:12:21 gawthrop ## Don't give details of Se De Sf Df INTF @@ -116,11 +119,12 @@ # Figure ##echo mtt -q -u $pdf $1 abg ps mtt -q -u $pdf $1 abg ps cat <> $filename - \fig{`pwd`/$1_abg}{$1_abg.ps}{0.9}{System \textbf{$1}: acausal bond graph} +%% \fig{`pwd`/$1_labg}{$1_abg}{0.9}{System \textbf{$1}: acausal bond graph} + \tfig{`pwd`/$1_labg}{$1_abg}{0.9}{System \textbf{$1}: acausal bond graph} EOF ## Put a schematic if exists (_pic.fig) if [ -e "$1_pic.fig" ]; then Index: mttroot/mtt/bin/trans/mtt.sty ================================================================== --- mttroot/mtt/bin/trans/mtt.sty +++ mttroot/mtt/bin/trans/mtt.sty @@ -10,10 +10,13 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% Version control history % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% $Id$ % %% $Log$ +% %% Revision 1.9 2003/05/08 18:43:02 gawthrop +% %% Generate pdf from ps (using hyperref package for links etc) +% %% % %% Revision 1.8 2000/12/01 14:15:16 peterg % %% Removed hyperref stuff to mtt_pdf.sty % %% % %% Revision 1.7 2000/11/28 18:28:29 peterg % %% Removed fancy box - messes up TOC @@ -73,5 +76,9 @@ } % Page refs as well. \newcommand{\Ref}[1]{\ref{#1} (on page \pageref{#1})} + +%% Latex in figures etc +\newcommand{\B}[1]{\text{\sffamily\textbf{#1}}} +\newcommand{\BB}[2]{$\B{#1}$:$\mathbf{#2}$} Index: mttroot/mtt/bin/trans/mtt_ps.sty ================================================================== --- mttroot/mtt/bin/trans/mtt_ps.sty +++ mttroot/mtt/bin/trans/mtt_ps.sty @@ -1,11 +1,11 @@ %% Style file for postscript document %%\usepackage{mtt} % Common stuff (Needs to be explicit now) %Postscript figures -\usepackage{graphicx} +\usepackage{graphicx,color} % Figure definition \newcommand{\fig}[4]{ \begin{figure}[htbp] \begin{center} @@ -15,14 +15,26 @@ \caption{#4} \label{fig:#2} \end{center} \end{figure} } + + \newcommand{\tfig}[4]{ + \begin{figure}[htbp] + \begin{center} + \fbox{ + \resizebox{#3\linewidth}{!}{\input{#1}} + } + \caption{#4} + \label{fig:#2} + \end{center} + \end{figure} + } % Hyper stuff \usepackage[implicit=true, bookmarks=true, pdfauthor={MTT}, pdftitle={MTT report}, pdfsubject={MTT}, pdfkeywords={MTT, bond graphs}]{hyperref}