tikz-timing 0.7b (15jan10)

git-svn-id: svn://tug.org/texlive/trunk@16732 c570f23f-e606-0410-a88d-b1316a301751

14 files changed, 87 insertions, 68 deletions

diff --git a/Master/texmf-dist/doc/latex/tikz-timing/tikz-timing.pdf b/Master/texmf-dist/doc/latex/tikz-timing/tikz-timing.pdf
index fbd3784b570..b4c9f2db7bc 100644
--- a/Master/texmf-dist/doc/latex/tikz-timing/tikz-timing.pdf
+++ b/Master/texmf-dist/doc/latex/tikz-timing/tikz-timing.pdf
diff --git a/Master/texmf-dist/source/latex/tikz-timing/tikz-timing.dtx b/Master/texmf-dist/source/latex/tikz-timing/tikz-timing.dtx
index 0cb364529cf..329a6a199f4 100644
--- a/Master/texmf-dist/source/latex/tikz-timing/tikz-timing.dtx
+++ b/Master/texmf-dist/source/latex/tikz-timing/tikz-timing.dtx
@@ -21,7 +21,7 @@
 % This work consists of the files tikz-timing.dtx, tikz-timing.ins
 % and the derived file tikz-timing.sty.
 %
-% $Id: tikz-timing.dtx 1647 2009-12-28 14:18:14Z martin $
+% $Id: tikz-timing.dtx 1655 2010-01-14 18:33:11Z martin $
 %</copyright>
 % \fi
 %
@@ -47,8 +47,8 @@
 %<*driver>
 \ProvidesFileSVN
 %</driver>
-  {$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
 %<package>   Digital Timing Diagrams using TikZ]
 %<examplecode>   Macros to produce examples for the tikz-timing package]
 %<ydoc>   Documentation Macros for tikz-timing package]
@@ -106,6 +106,7 @@
     {\ttfamily(}\meta{#1}{\ttfamily)}}
 \fi
 
+\usepackage{atbegshi}
 \usepackage{tikz-timing}[\tikztiming@date]
 \usetikztiminglibrary{arrows,either,overlays,clockarrows,columntype}
 \usetikztiminglibrary{nicetabs,counters,advnodes,interval,ifsym}
@@ -861,7 +862,7 @@
 %<*doc>
 % \fi
 %
-% \CheckSum{5702}
+% \CheckSum{5716}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -3373,7 +3374,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{%
@@ -3390,6 +3392,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}%
@@ -4904,10 +4908,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
@@ -4927,7 +4931,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,
@@ -4936,10 +4941,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,
@@ -5212,12 +5218,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
@@ -5243,9 +5250,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
 }
@@ -7549,11 +7557,12 @@
 \newcommand*\tikztiming@nicetabs@tableheader[1][]{%
   \path [timing/table/midrules] [/utils/exec=\xdef\@gtempa{\the\pgflinewidth}];
   \path [timing/table/header,#1]
-    let \p1 = (0,\belowrulesep + \aboverulesep + \@gtempa + \arraystretch * 
-            {(\ht\strutbox + \extrarowheight)} + \arraystretch\dp\strutbox)
+    let \p1 = (0,\belowrulesep + \aboverulesep + \@gtempa 
+            + \arraystretch\ht\strutbox + \arraystretch*\extrarowheight 
+            + \arraystretch\dp\strutbox)
     in
       coordinate (diagram@header) at (0,\y1)
-      coordinate (label@header)   at (-1*{(\tikztiming@coldist)},\y1)
+      coordinate (label@header)   at ($ -1*(\tikztiming@coldist,0) + (0,\y1) $)
     ;
   \tikztiming@normal@tableheader[#1]%
 }
@@ -7579,8 +7588,8 @@
      \iftikztiming@tablehead
       let
         \p5 = (diagram@header.base),
-        \p6 = ($ (0,\y5) + (0,\arraystretch * {(\ht\strutbox + \extrarowheight 
-        )} + \belowrulesep + .5\pgflinewidth) $)
+        \p6 = ($ (0,\y5) + (0,\arraystretch\ht\strutbox + \arraystretch*\extrarowheight
+        + \belowrulesep + .5\pgflinewidth) $)
       in
         (\x1-\tabcolsep,\y6) -- (\x2+\tabcolsep,\y6)
      \fi
@@ -7590,7 +7599,7 @@
     let
       \p1 = (NW),
       \p2 = (SE),
-      \p3 = (0, \arraystretch * {( \ht\strutbox + \extrarowheight )} +
+      \p3 = (0, \arraystretch\ht\strutbox + \arraystretch*\extrarowheight +
         \belowrulesep + .5\pgflinewidth)
     in
       (\x1-\tabcolsep, \y3)
@@ -7621,7 +7630,8 @@
       \let\tikztiming@normal@rowdist\tikztiming@rowdist
     \fi
     \def\tikztiming@rowdist{%
-        \arraystretch * {(\ht\strutbox+\extrarowheight)}%
+       \arraystretch\ht\strutbox
+      +\arraystretch*\extrarowheight
       +\arraystretch\dp\strutbox
     }%
     \def\tikztiming@coldist{2\tabcolsep}%
diff --git a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-advnodes.sty b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-advnodes.sty
index 74705d4ff16..b1996af4d46 100644
--- a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-advnodes.sty
+++ b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-advnodes.sty
@@ -27,8 +27,8 @@
 %% 
 \RequirePackage{svn-prov}[2009/05/03]
 \ProvidesPackageSVN[tikz-timing-advnodes]
-  {$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
    TikZ-Timing Library for
    advanced nodes]
 \GetFileInfoSVN*%
diff --git a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-arrows.sty b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-arrows.sty
index 090cc6e5e3e..58f6135f92f 100644
--- a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-arrows.sty
+++ b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-arrows.sty
@@ -27,8 +27,8 @@
 %% 
 \RequirePackage{svn-prov}[2009/05/03]
 \ProvidesPackageSVN[tikz-timing-arrows]
-  {$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
    TikZ-Timing Library for
    timing arrows]
 \GetFileInfoSVN*%
diff --git a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-beamer.sty b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-beamer.sty
index 6ce41745797..da386d4a249 100644
--- a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-beamer.sty
+++ b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-beamer.sty
@@ -27,8 +27,8 @@
 %% 
 \RequirePackage{svn-prov}[2009/05/03]
 \ProvidesPackageSVN[tikz-timing-beamer]
-  {$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
    TikZ-Timing Library for
    beamer overlay support]
 \GetFileInfoSVN*%
diff --git a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-clockarrows.sty b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-clockarrows.sty
index f2ed31b4fa6..859d2239f78 100644
--- a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-clockarrows.sty
+++ b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-clockarrows.sty
@@ -27,8 +27,8 @@
 %% 
 \RequirePackage{svn-prov}[2009/05/03]
 \ProvidesPackageSVN[tikz-timing-clockarrows]
-  {$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
    TikZ-Timing Library for
    timing clock arrows]
 \GetFileInfoSVN*%
diff --git a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-columntype.sty b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-columntype.sty
index aa425727f2a..380738ae365 100644
--- a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-columntype.sty
+++ b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-columntype.sty
@@ -27,8 +27,8 @@
 %% 
 \RequirePackage{svn-prov}[2009/05/03]
 \ProvidesPackageSVN[tikz-timing-columntype]
-  {$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
    TikZ-Timing Library for
    timing cell types]
 \GetFileInfoSVN*%
diff --git a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-counters.sty b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-counters.sty
index ba5131cbe02..11b019dd477 100644
--- a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-counters.sty
+++ b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-counters.sty
@@ -27,8 +27,8 @@
 %% 
 \RequirePackage{svn-prov}[2009/05/03]
 \ProvidesPackageSVN[tikz-timing-counters]
-  {$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
    TikZ-Timing Library for
    counter values]
 \GetFileInfoSVN*%
diff --git a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-either.sty b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-either.sty
index 9b3cb4c2b99..99ef0178897 100644
--- a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-either.sty
+++ b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-either.sty
@@ -27,8 +27,8 @@
 %% 
 \RequirePackage{svn-prov}[2009/05/03]
 \ProvidesPackageSVN[tikz-timing-either]
-  {$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
    TikZ-Timing Library for
    uncertain transitions]
 \GetFileInfoSVN*%
diff --git a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-ifsym.sty b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-ifsym.sty
index 5f349b0d430..8c0ab4fae73 100644
--- a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-ifsym.sty
+++ b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-ifsym.sty
@@ -27,8 +27,8 @@
 %% 
 \RequirePackage{svn-prov}[2009/05/03]
 \ProvidesPackageSVN[tikz-timing-ifsym]
-  {$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
    TikZ-Timing Library for
    ifsym compatible macros]
 \GetFileInfoSVN*%
diff --git a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-interval.sty b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-interval.sty
index 8a3d1f9e6bc..15f7398ece4 100644
--- a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-interval.sty
+++ b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-interval.sty
@@ -27,8 +27,8 @@
 %% 
 \RequirePackage{svn-prov}[2009/05/03]
 \ProvidesPackageSVN[tikz-timing-interval]
-  {$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
    TikZ-Timing Library for
    alternative Z transitions]
 \GetFileInfoSVN*%
diff --git a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-nicetabs.sty b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-nicetabs.sty
index c2644419bca..9ff068c778d 100644
--- a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-nicetabs.sty
+++ b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-nicetabs.sty
@@ -27,8 +27,8 @@
 %% 
 \RequirePackage{svn-prov}[2009/05/03]
 \ProvidesPackageSVN[tikz-timing-nicetabs]
-  {$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
    TikZ-Timing Library for
    nice timing tables]
 \GetFileInfoSVN*%
@@ -40,11 +40,12 @@
 \newcommand*\tikztiming@nicetabs@tableheader[1][]{%
   \path [timing/table/midrules] [/utils/exec=\xdef\@gtempa{\the\pgflinewidth}];
   \path [timing/table/header,#1]
-    let \p1 = (0,\belowrulesep + \aboverulesep + \@gtempa + \arraystretch *
-            {(\ht\strutbox + \extrarowheight)} + \arraystretch\dp\strutbox)
+    let \p1 = (0,\belowrulesep + \aboverulesep + \@gtempa
+            + \arraystretch\ht\strutbox + \arraystretch*\extrarowheight
+            + \arraystretch\dp\strutbox)
     in
       coordinate (diagram@header) at (0,\y1)
-      coordinate (label@header)   at (-1*{(\tikztiming@coldist)},\y1)
+      coordinate (label@header)   at ($ -1*(\tikztiming@coldist,0) + (0,\y1) $)
     ;
   \tikztiming@normal@tableheader[#1]%
 }
@@ -65,8 +66,8 @@
      \iftikztiming@tablehead
       let
         \p5 = (diagram@header.base),
-        \p6 = ($ (0,\y5) + (0,\arraystretch * {(\ht\strutbox + \extrarowheight
-        )} + \belowrulesep + .5\pgflinewidth) $)
+        \p6 = ($ (0,\y5) + (0,\arraystretch\ht\strutbox + \arraystretch*\extrarowheight
+        + \belowrulesep + .5\pgflinewidth) $)
       in
         (\x1-\tabcolsep,\y6) -- (\x2+\tabcolsep,\y6)
      \fi
@@ -76,7 +77,7 @@
     let
       \p1 = (NW),
       \p2 = (SE),
-      \p3 = (0, \arraystretch * {( \ht\strutbox + \extrarowheight )} +
+      \p3 = (0, \arraystretch\ht\strutbox + \arraystretch*\extrarowheight +
         \belowrulesep + .5\pgflinewidth)
     in
       (\x1-\tabcolsep, \y3)
@@ -103,7 +104,8 @@
       \let\tikztiming@normal@rowdist\tikztiming@rowdist
     \fi
     \def\tikztiming@rowdist{%
-        \arraystretch * {(\ht\strutbox+\extrarowheight)}%
+       \arraystretch\ht\strutbox
+      +\arraystretch*\extrarowheight
       +\arraystretch\dp\strutbox
     }%
     \def\tikztiming@coldist{2\tabcolsep}%
diff --git a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-overlays.sty b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-overlays.sty
index b3e5215eab8..8dde83ee754 100644
--- a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-overlays.sty
+++ b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing-overlays.sty
@@ -27,8 +27,8 @@
 %% 
 \RequirePackage{svn-prov}[2009/05/03]
 \ProvidesPackageSVN[tikz-timing-overlays]
-  {$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
    TikZ-Timing Library for
    timing overlays]
 \GetFileInfoSVN*%
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
 }