diff options
-rw-r--r-- | Master/texmf-dist/doc/latex/bondgraphs/bondgraphs.pdf | bin | 363830 -> 363644 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/bondgraphs/bondgraphs.dtx | 15 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bondgraphs/bondgraphs.sty | 10 |
3 files changed, 13 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/latex/bondgraphs/bondgraphs.pdf b/Master/texmf-dist/doc/latex/bondgraphs/bondgraphs.pdf Binary files differindex b05e176afb3..a3b4a8f62a7 100644 --- a/Master/texmf-dist/doc/latex/bondgraphs/bondgraphs.pdf +++ b/Master/texmf-dist/doc/latex/bondgraphs/bondgraphs.pdf diff --git a/Master/texmf-dist/source/latex/bondgraphs/bondgraphs.dtx b/Master/texmf-dist/source/latex/bondgraphs/bondgraphs.dtx index 84ff435c33a..b97a3170827 100644 --- a/Master/texmf-dist/source/latex/bondgraphs/bondgraphs.dtx +++ b/Master/texmf-dist/source/latex/bondgraphs/bondgraphs.dtx @@ -603,7 +603,7 @@ % \begin{macrocode} %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bondgraphs}[2014/11/27 v1.0 TikZ-based Bond graphs formatting package] +\ProvidesPackage{bondgraphs}[2015/03/23 v1.0.1 TikZ-based Bond graphs formatting package] % \end{macrocode} % \begin{macro}{TikZ} % \tkz does all the drawing for the \bgspkg{}, using a number of libraries: the bond half-arrow is from |arrows|/|arrows.meta| and is drawn using |pathreplacing|; |positioning| isn't really required, but very useful when aligning bondgraph elements; |shapes| is used for the ellipse around word-bondgraph elements. @@ -655,12 +655,12 @@ % \subsection{Bonds}\label{sec:implementation-bonds} % \begin{macro}{bonds} % All bonds are drawn as a (straight or curly) half-arrow with TikZ. The switch/case statement makes sure that the half-arrow stroke always points down (credits to Mark Wibrow at \url{http://tex.stackexchange.com/questions/208313/tikz-pgf-half-arrow-stroke-always-down-left}). This orientation can be changed to make the stroke always go left or down, never right, by changing the |-1| in |\pgfdecoratedangle-1| to a |+45|. TODO: make this a package option. The argument to this TikZ stile is passed to the draw command, to allow different colour/line width/etc. +% \changes{v1.0.1}{2015/03/23}{Better bond and bond label drawing} % \begin{macrocode} \tikzset{bond/.style args={#1}{ - thick, decoration={show path construction, lineto code={ - \draw[#1,shorten <=1pt] + \draw[#1,thick] \pgfextra{% +45 i.s.o. -1 for to left or to under, always \pgfmathparse{int((\pgfdecoratedangle-1)/90)} \ifcase\pgfmathresult @@ -697,9 +697,9 @@ bond/.default={} } % \end{macrocode} % \begin{macro}{mbond} -% A multi-bond is simply a bond with a double draw, and lengthened a bit for better-looking result +% A multi-bond is simply a bond with a double draw % \begin{macrocode} -\tikzset{mbond/.style={bond={double,shorten >=-1pt}}} +\tikzset{mbond/.style={bond={double,#1}}} % \end{macrocode} % \end{macro} % \begin{macro}{draw[bonds]} @@ -710,12 +710,13 @@ bond/.default={} % \end{macro} % \begin{macro}{bond labels} % Provide labelling for effort (above) and flow (below) the bond. -% TODO: What happens when bond is vertical? +% Labels are sloped, so ``above'' is always defined from bond point-of-view % \begin{macrocode} \tikzset{ bondlabel/.style={ font=\small, - color=\bondgraphs@bondlabelcolour + color=\bondgraphs@bondlabelcolour, + sloped, }, effort/.style args={#1}{ edge node={node [bondlabel,above]{#1}} diff --git a/Master/texmf-dist/tex/latex/bondgraphs/bondgraphs.sty b/Master/texmf-dist/tex/latex/bondgraphs/bondgraphs.sty index 69c464cebba..0fcf4c50015 100644 --- a/Master/texmf-dist/tex/latex/bondgraphs/bondgraphs.sty +++ b/Master/texmf-dist/tex/latex/bondgraphs/bondgraphs.sty @@ -17,7 +17,7 @@ %% LaTeX version 2008/05/04 or later. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bondgraphs}[2014/11/27 v1.0 TikZ-based Bond graphs formatting package] +\ProvidesPackage{bondgraphs}[2015/03/23 v1.0.1 TikZ-based Bond graphs formatting package] \RequirePackage{tikz}[2013/12/13] \usetikzlibrary{arrows,arrows.meta,decorations.pathreplacing} \usetikzlibrary{positioning} @@ -45,10 +45,9 @@ \colorlet{error}{red} \fi \tikzset{bond/.style args={#1}{ - thick, decoration={show path construction, lineto code={ - \draw[#1,shorten <=1pt] + \draw[#1,thick] \pgfextra{% +45 i.s.o. -1 for to left or to under, always \pgfmathparse{int((\pgfdecoratedangle-1)/90)} \ifcase\pgfmathresult @@ -83,12 +82,13 @@ }, bond/.default={} } -\tikzset{mbond/.style={bond={double,shorten >=-1pt}}} +\tikzset{mbond/.style={bond={double,#1}}} \tikzset{bonds/.style={every edge/.append style={bond}}} \tikzset{ bondlabel/.style={ font=\small, - color=\bondgraphs@bondlabelcolour + color=\bondgraphs@bondlabelcolour, + sloped, }, effort/.style args={#1}{ edge node={node [bondlabel,above]{#1}} |