From e5f36b0897c221814fc50224d1be73d2b549bd95 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 11 Jan 2011 00:37:47 +0000 Subject: tikz-timing 0.7d (10jan11) git-svn-id: svn://tug.org/texlive/trunk@21013 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/tikz-timing/tikz-timing-advnodes.sty | 8 +++--- .../tex/latex/tikz-timing/tikz-timing-arrows.sty | 6 ++--- .../tex/latex/tikz-timing/tikz-timing-beamer.sty | 6 ++--- .../latex/tikz-timing/tikz-timing-clockarrows.sty | 8 +++--- .../latex/tikz-timing/tikz-timing-columntype.sty | 6 ++--- .../tex/latex/tikz-timing/tikz-timing-counters.sty | 10 ++++---- .../tex/latex/tikz-timing/tikz-timing-either.sty | 6 ++--- .../tex/latex/tikz-timing/tikz-timing-ifsym.sty | 6 ++--- .../tex/latex/tikz-timing/tikz-timing-interval.sty | 6 ++--- .../tex/latex/tikz-timing/tikz-timing-nicetabs.sty | 6 ++--- .../tex/latex/tikz-timing/tikz-timing-overlays.sty | 6 ++--- .../tex/latex/tikz-timing/tikz-timing.sty | 29 ++++++++++++++-------- 12 files changed, 56 insertions(+), 47 deletions(-) (limited to 'Master/texmf-dist/tex') 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 a612a3ef939..4f4864bb319 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 @@ -6,7 +6,7 @@ %% %% tikz-timing.dtx (with options: `lib,lib-advnodes') %% -%% Copyright (C) 2009 by Martin Scharrer +%% Copyright (C) 2009-2011 by Martin Scharrer %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -27,8 +27,8 @@ %% \RequirePackage{svn-prov}[2009/05/03] \ProvidesPackageSVN[tikz-timing-advnodes] - {$Id: tikz-timing.dtx 1657 2010-01-17 13:26:00Z martin $} - [v0.7b + {$Id: tikz-timing.dtx 2038 2011-01-09 20:44:26Z martin $} + [v0.7d TikZ-Timing Library for advanced nodes] \GetFileInfoSVN*% @@ -218,7 +218,7 @@ \anchorpoints \@ifundefined{#1}% {\PackageError{tikz-timing}% - {No such anchor '#1' defined for this transition!}% + {No such anchor '#1' defined for this transition!}{}% \pgfpointorigin }% {\@nameuse{#1}}% 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 419096cf0bb..be6da815f9d 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 @@ -6,7 +6,7 @@ %% %% tikz-timing.dtx (with options: `lib,lib-arrows') %% -%% Copyright (C) 2009 by Martin Scharrer +%% Copyright (C) 2009-2011 by Martin Scharrer %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -27,8 +27,8 @@ %% \RequirePackage{svn-prov}[2009/05/03] \ProvidesPackageSVN[tikz-timing-arrows] - {$Id: tikz-timing.dtx 1657 2010-01-17 13:26:00Z martin $} - [v0.7b + {$Id: tikz-timing.dtx 2038 2011-01-09 20:44:26Z martin $} + [v0.7d 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 14eaf3912b7..ca99df7b55e 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 @@ -6,7 +6,7 @@ %% %% tikz-timing.dtx (with options: `lib,lib-beamer') %% -%% Copyright (C) 2009 by Martin Scharrer +%% Copyright (C) 2009-2011 by Martin Scharrer %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -27,8 +27,8 @@ %% \RequirePackage{svn-prov}[2009/05/03] \ProvidesPackageSVN[tikz-timing-beamer] - {$Id: tikz-timing.dtx 1657 2010-01-17 13:26:00Z martin $} - [v0.7b + {$Id: tikz-timing.dtx 2038 2011-01-09 20:44:26Z martin $} + [v0.7d 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 64f7fb11bff..1259505a55c 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 @@ -6,7 +6,7 @@ %% %% tikz-timing.dtx (with options: `lib,lib-clockarrows') %% -%% Copyright (C) 2009 by Martin Scharrer +%% Copyright (C) 2009-2011 by Martin Scharrer %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -27,8 +27,8 @@ %% \RequirePackage{svn-prov}[2009/05/03] \ProvidesPackageSVN[tikz-timing-clockarrows] - {$Id: tikz-timing.dtx 1657 2010-01-17 13:26:00Z martin $} - [v0.7b + {$Id: tikz-timing.dtx 2038 2011-01-09 20:44:26Z martin $} + [v0.7d TikZ-Timing Library for timing clock arrows] \GetFileInfoSVN*% @@ -37,7 +37,7 @@ \tikztiming@iftrans{CC}% {\let\tikztiming@trans@C@normal@C\tikztiming@trans@CC}% {\PackageError{\@currname}{No 'CC' transition defined by the main tikz-timing - package.}{}{}}% + package.}{}}% \tikztimingdef{CC}{% \code{\setcounter{tikztimingtrans}{-\value{tikztimingtrans}}} 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 0ed4ae24c1e..b7b7aa344ba 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 @@ -6,7 +6,7 @@ %% %% tikz-timing.dtx (with options: `lib,lib-columntype') %% -%% Copyright (C) 2009 by Martin Scharrer +%% Copyright (C) 2009-2011 by Martin Scharrer %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -27,8 +27,8 @@ %% \RequirePackage{svn-prov}[2009/05/03] \ProvidesPackageSVN[tikz-timing-columntype] - {$Id: tikz-timing.dtx 1657 2010-01-17 13:26:00Z martin $} - [v0.7b + {$Id: tikz-timing.dtx 2038 2011-01-09 20:44:26Z martin $} + [v0.7d 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 04a1488b15d..93a2f45c1d9 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 @@ -6,7 +6,7 @@ %% %% tikz-timing.dtx (with options: `lib,lib-counters') %% -%% Copyright (C) 2009 by Martin Scharrer +%% Copyright (C) 2009-2011 by Martin Scharrer %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -27,8 +27,8 @@ %% \RequirePackage{svn-prov}[2009/05/03] \ProvidesPackageSVN[tikz-timing-counters] - {$Id: tikz-timing.dtx 1657 2010-01-17 13:26:00Z martin $} - [v0.7b + {$Id: tikz-timing.dtx 2038 2011-01-09 20:44:26Z martin $} + [v0.7d TikZ-Timing Library for counter values] \GetFileInfoSVN*% @@ -90,7 +90,7 @@ \tikzset{timing/counter/opt/char/.get=\counterchar}% \ifx\counterchar\empty \PackageError{tikz-timing-counters}{Counter character must be given using - the 'char' key!}{}{}{}% + the 'char' key!}{}% \endgroup \else \pgfkeys{/tikz/timing/counter/opt/min value/.get=\min}% @@ -100,7 +100,7 @@ \def\min{0}% \fi \ifx\max\empty - \PackageError{tikz-timing-counters}{The option 'wraps' needs the option 'max value' to be set!}{}{}{}% + \PackageError{tikz-timing-counters}{The option 'wraps' needs the option 'max value' to be set!}{}% \fi \def\@tempb{% \noexpand\tikztiming@counter@wrap% 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 124f717c44d..14329eb349a 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 @@ -6,7 +6,7 @@ %% %% tikz-timing.dtx (with options: `lib,lib-either') %% -%% Copyright (C) 2009 by Martin Scharrer +%% Copyright (C) 2009-2011 by Martin Scharrer %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -27,8 +27,8 @@ %% \RequirePackage{svn-prov}[2009/05/03] \ProvidesPackageSVN[tikz-timing-either] - {$Id: tikz-timing.dtx 1657 2010-01-17 13:26:00Z martin $} - [v0.7b + {$Id: tikz-timing.dtx 2038 2011-01-09 20:44:26Z martin $} + [v0.7d 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 f775cd9be81..e046284c55f 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 @@ -6,7 +6,7 @@ %% %% tikz-timing.dtx (with options: `lib,lib-ifsym') %% -%% Copyright (C) 2009 by Martin Scharrer +%% Copyright (C) 2009-2011 by Martin Scharrer %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -27,8 +27,8 @@ %% \RequirePackage{svn-prov}[2009/05/03] \ProvidesPackageSVN[tikz-timing-ifsym] - {$Id: tikz-timing.dtx 1657 2010-01-17 13:26:00Z martin $} - [v0.7b + {$Id: tikz-timing.dtx 2038 2011-01-09 20:44:26Z martin $} + [v0.7d 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 fe2e8440a16..f9790779a53 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 @@ -6,7 +6,7 @@ %% %% tikz-timing.dtx (with options: `lib,lib-interval') %% -%% Copyright (C) 2009 by Martin Scharrer +%% Copyright (C) 2009-2011 by Martin Scharrer %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -27,8 +27,8 @@ %% \RequirePackage{svn-prov}[2009/05/03] \ProvidesPackageSVN[tikz-timing-interval] - {$Id: tikz-timing.dtx 1657 2010-01-17 13:26:00Z martin $} - [v0.7b + {$Id: tikz-timing.dtx 2038 2011-01-09 20:44:26Z martin $} + [v0.7d 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 c2d023ae8c4..ff80200102c 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 @@ -6,7 +6,7 @@ %% %% tikz-timing.dtx (with options: `lib,lib-nicetabs') %% -%% Copyright (C) 2009 by Martin Scharrer +%% Copyright (C) 2009-2011 by Martin Scharrer %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -27,8 +27,8 @@ %% \RequirePackage{svn-prov}[2009/05/03] \ProvidesPackageSVN[tikz-timing-nicetabs] - {$Id: tikz-timing.dtx 1657 2010-01-17 13:26:00Z martin $} - [v0.7b + {$Id: tikz-timing.dtx 2038 2011-01-09 20:44:26Z martin $} + [v0.7d TikZ-Timing Library for nice timing tables] \GetFileInfoSVN*% 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 a134480641c..300a2d15bf6 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 @@ -6,7 +6,7 @@ %% %% tikz-timing.dtx (with options: `lib,lib-overlays') %% -%% Copyright (C) 2009 by Martin Scharrer +%% Copyright (C) 2009-2011 by Martin Scharrer %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -27,8 +27,8 @@ %% \RequirePackage{svn-prov}[2009/05/03] \ProvidesPackageSVN[tikz-timing-overlays] - {$Id: tikz-timing.dtx 1657 2010-01-17 13:26:00Z martin $} - [v0.7b + {$Id: tikz-timing.dtx 2038 2011-01-09 20:44:26Z martin $} + [v0.7d 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 27e77ff483c..86b08a0a43d 100644 --- a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing.sty +++ b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing.sty @@ -6,7 +6,7 @@ %% %% tikz-timing.dtx (with options: `package') %% -%% Copyright (C) 2009 by Martin Scharrer +%% Copyright (C) 2009-2011 by Martin Scharrer %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -27,8 +27,8 @@ %% \RequirePackage{svn-prov}[2009/05/03] \ProvidesPackageSVN - {$Id: tikz-timing.dtx 1657 2010-01-17 13:26:00Z martin $} - [v0.7b + {$Id: tikz-timing.dtx 2038 2011-01-09 20:44:26Z martin $} + [v0.7d Digital Timing Diagrams using TikZ] \DefineFileInfoSVN[tikztiming] \RequirePackage{tikz} @@ -384,7 +384,7 @@ \def\tikz@timing@@@end{% \@ifnextchar{;}% {\@gobble}% - {\PackageError{tikz-package}{Can not parse timing path}{}{}{}}% + {\PackageError{tikz-package}{Can not parse timing path}{}}% } \def\tikz@timing@@@init[#1]{% \begingroup @@ -1114,13 +1114,10 @@ \@ifnextchar[{\tikztiming@oset}{}% } \def\tikztiming@endextracode{% - \@ifnextchar\@checkend - {\aftergroup\expandafter\aftergroup\tikztimingtable@checkrow}% - {\tikztimingtable@checkrow}% }% \def\tikztimingtable@checkrow{% \@ifnextchar\end - {}% + {\tikztimingtable@chkendec}% {\ifx\@let@token\extracode \let\tikztiming@next\empty \else @@ -1146,6 +1143,19 @@ \fi \tikztiming@next } +\def\tikztimingtable@chkendec\end#1{ + \begingroup + \def\@tempa{#1}% + \def\@tempb{extracode}% + \ifx\@tempa\@tempb + \endgroup + \def\tikztiming@next{\end{extracode}\tikztimingtable@row}% + \else + \endgroup + \def\tikztiming@next{\end{#1}}% + \fi + \tikztiming@next +} \def\tikztiming@oset[#1]{% \let\tikz@options\pgfutil@empty \tikzset{#1}% @@ -2293,8 +2303,7 @@ \let\zap@space\tikztiming@orig@zap@space }% {\PackageError{tikz-timing}% - {No tikz-timing library `#1' found!}% - {}{}{}{}% + {No tikz-timing library `#1' found!}{}% }% \@ifnextchar\relax{}{\tikztiming@library@}% } -- cgit v1.2.3