diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/tikz-timing/tikz-timing.sty')
| -rw-r--r-- | Master/texmf-dist/tex/latex/tikz-timing/tikz-timing.sty | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing.sty b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing.sty index 3e947a5e3a5..aa4b1c10139 100644 --- a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing.sty +++ b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing.sty @@ -27,8 +27,8 @@ %% \RequirePackage{svn-prov}[2009/05/03] \ProvidesPackageSVN - {$Id: tikz-timing.dtx 1647 2009-12-28 14:18:14Z martin $} - [v0.7a + {$Id: tikz-timing.dtx 1655 2010-01-14 18:33:11Z martin $} + [v0.7b Digital Timing Diagrams using TikZ] \DefineFileInfoSVN[tikztiming] \RequirePackage{tikz} @@ -84,7 +84,8 @@ \tikzset{% timing/.style={/tikz, line cap=round, line join=round, - timing/adjust@xy + timing/adjust@xy, + every path/.append code={\tikz@expandcount=\tikztiming@expandcount\relax}, },% } \tikzset{% @@ -101,6 +102,8 @@ },% /tikz/x=\tikztiming@xunit, /tikz/y=\tikztiming@yunit, }, + expand count/.store in={\tikztiming@expandcount}, + expand count=1000, unit/.style={% /utils/exec={% \def\tikztiming@@xunit{#1}% @@ -1070,10 +1073,10 @@ \def\twidth{\tikztiming@maxwidth}% \tikzpicture[timing/table,#1]% \coordinate (@last row) at (0,\rowdist); - \coordinate (label@header) at (-1*{(\tikztiming@coldist)},1.5*{(\tikztiming@rowdist)}); - \coordinate (diagram@header) at (0,1.5*{(\tikztiming@rowdist)}); + \coordinate (label@header) at ($ -1*(\tikztiming@coldist,0) + 1.5*(0,\tikztiming@rowdist) $); + \coordinate (diagram@header) at ($ 1.5*(0,\tikztiming@rowdist) $); \coordinate (timing@table@bottom right) at (0,0); - \coordinate (timing@table@bottom left) at (-1*{(\tikztiming@coldist)},0); + \coordinate (timing@table@bottom left) at ($ -1*(\tikztiming@coldist,0) $); \tikztiming@picinit \tikzset{timing/before table}% \tikztimingtable@checkrow @@ -1087,7 +1090,8 @@ let \p1 = (row1.north west), \p2 = (timing@table@bottom right), - \p3 = (\pgf@pt@aa * {(\x2-\x1)},\pgf@pt@bb * {(\y1-\y2)}) + \p3 = (1,1) + %\p3 = ($ \pgf@pt@aa * (\x2-\x1,0) + \pgf@pt@bb * (0,\y1-\y2) $) in node [shape=rectangle,anchor=north west, minimum width=\x3,minimum height=\y3, @@ -1096,10 +1100,11 @@ ; \path let - \p0 = (-1*{(\tikztiming@coldist)},1), + \p0 = ($ -1*(\tikztiming@coldist,0) + (0,1) $), \p1 = (label1.north east), \p2 = (timing@table@bottom left), - \p3 = (\pgf@pt@aa * {(\x0-\x2)},\pgf@pt@bb * {(\y1-\y2)}) + \p3 = (1,1) + %\p3 = ($ \pgf@pt@aa * (\x0-\x2,0) + \pgf@pt@bb * (0,\y1-\y2) $) in node [shape=rectangle,anchor=north east, minimum width=\x3,minimum height=\y3, @@ -1280,12 +1285,13 @@ let \p1 = (NW), \p2 = (SE), - \p3 = (@last row) + \p3 = (@last row), + \p4 = (0,\rowdist) in - ($ (\x1-\tabcolsep,\y3) - (0,.5*{(\rowdist)}) $) -- - ($ (\x2+\tabcolsep,\y3) - (0,.5*{(\rowdist)}) $) + ($ (\x1-\tabcolsep,\y3) - (0,.5*\y4) $) -- + ($ (\x2+\tabcolsep,\y3) - (0,.5*\y4) $) \iftikztiming@tablehead - (\x1-\tabcolsep,2.5*{(\rowdist)}) -- (\x2+\tabcolsep,2.5*{(\rowdist)}) + (\x1-\tabcolsep,2.5*\y4) -- (\x2+\tabcolsep,2.5*\y4) \fi ; \draw @@ -1306,9 +1312,10 @@ \fi \foreach \row in \list {% \draw [timing/table/lines,#1] let - \p1 = (all rows.south east) + \p1 = (all rows.south east), + \p2 = (0,\rowdist) in - ($ (0,\rowdist) - (0,\row * {(\rowdist)}) $) -- +(\x1,0); + ($ (0,\y2) - (0,\row * \y2) $) -- +(\x1,0); }% \endgroup } |