From 036676ef7916ae35aa73e59c91f81ae9272c6ef4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 5 Aug 2009 13:31:52 +0000 Subject: tikz-timing update (27jul09) git-svn-id: svn://tug.org/texlive/trunk@14540 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/tikz-timing/tikz-timing.sty | 62 ++++++++++++++++++++-- 1 file changed, 58 insertions(+), 4 deletions(-) (limited to 'Master/texmf-dist/tex/latex/tikz-timing/tikz-timing.sty') 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 afdbd67a7de..1328131562c 100644 --- a/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing.sty +++ b/Master/texmf-dist/tex/latex/tikz-timing/tikz-timing.sty @@ -27,12 +27,13 @@ %% \RequirePackage{svn-prov}[2009/05/03] \ProvidesPackageSVN - {$Id: tikz-timing.dtx 1132 2009-05-15 15:23:50Z martin $} - [v0.5 + {$Id: tikz-timing.dtx 1158 2009-07-28 09:14:00Z martin $} + [v0.6a Digital Timing Diagrams using TikZ] \DefineFileInfoSVN[tikztiming] \RequirePackage{tikz} + \usetikzlibrary{calc} \usetikzlibrary{backgrounds} \usetikzlibrary{decorations.pathmorphing} @@ -42,6 +43,28 @@ {\RequirePackage{amsmath}} \fi +\newcommand*\usetikztiminglibrary[2][]{% + \edef\tikztiming@library@options{#1}% + \@ifnextchar{[}%] + {\tikztiming@library{#2}}% + {\tikztiming@library{#2}[]}% +} +\def\tikztiming@library#1[#2]{% + \edef\tikztiming@library@date{#2}% + \tikztiming@library@#1,\relax +} + +\def\tikztiming@library@#1,{% + \IfFileExists{tikz-timing-#1.sty}% + {\RequirePackage[\tikztiming@library@options]{tikz-timing-#1}% + [\tikztiming@library@date]}% + {\PackageError{tikz-timing}% + {No tikz-timing library `#1' found!}% + {}{}{}{}% + }% + \@ifnextchar\relax{}{\tikztiming@library@}% +} + \def\tikztimingwidth{0.0} \newcount\tikztiming@numint \newcount\tikztiming@numfrac @@ -73,8 +96,8 @@ intext/.style={timing,line width=0.15ex}, inline node/.style={shape=coordinate}, table/.style={timing,line width=0.15ex,font=\sffamily}, - coord/.style={inner sep=0pt,outer sep=0pt}, - save/.style={inner sep=0pt,outer sep=0pt,/utils/exec=\tikztiming@savesettings}, + coord/.style={coordinate}, + save/.style={coordinate,/utils/exec=\tikztiming@savesettings}, restore/.style={/utils/exec=\tikztiming@restoresettings}, name/.style={inner sep=0pt,outer sep=0pt}, d/text/.style={timing,scale=0.6,font=\sffamily}, @@ -82,6 +105,10 @@ h/.style={}, l/.style={}, d/.style={}, + e/.style={}, + e/background/.style={}, + a/.style={->}, + w/.style={<-}, m/.style={black!40!brown}, m/decoration/.style={decorate,decoration={zigzag,segment length=.25\tikztiming@xunit,amplitude=.225\tikztiming@yunit}}, @@ -157,6 +184,7 @@ \let\settings\empty \def\tikztimingwidth{0.0}% \setcounter{tikztimingtrans}{-1}% + \setcounter{tikztimingtranspos}{0}% \def\tikztiming@str{\draw (0,0) coordinate (timing/start base) }% } \def\timing{% @@ -479,6 +507,11 @@ {\tikztiming@addnode@getoptions}% {\tikztiming@addnode@getoptions[]}% } +\tikztiming@defcode{n}{% + \@ifnextchar[%] + {\tikztiming@addnode@getoptions}% + {\tikztiming@addnode@getoptions[]}% +} \def\tikztiming@addnode@getoptions[#1]{% \@ifnextchar(%) {\tikztiming@addnode@getname{#1}}% @@ -525,6 +558,21 @@ \let\tikztiming@back\pgfmathresult \tikztiming@ } +\tikztiming@defcode{b}{% + \pgfmathparse{\tikztiming@back+\tikztiming@num/2}% + \let\tikztiming@back\pgfmathresult + \tikztiming@ +} +\tikztiming@defcode{F}{% + \pgfmathparse{\tikztiming@back-\tikztiming@num}% + \let\tikztiming@back\pgfmathresult + \tikztiming@ +} +\tikztiming@defcode{f}{% + \pgfmathparse{\tikztiming@back-\tikztiming@num/2}% + \let\tikztiming@back\pgfmathresult + \tikztiming@ +} \def\tikztiming@handlecode#1{% \tikztiming@output@flush \tikztiming@addtostr{ #1 }% @@ -1350,6 +1398,9 @@ -- ++($ (-1/8,0) + (#1,0) $) } +\let\tikztiming@chars@default\tikztiming@chars + + \tikztimingecopy{C}{T} \def\tikztiming@nocombine@T{}% \def\tikztiming@nocombine@C{}% @@ -1357,12 +1408,15 @@ \def\tikztiming@nocombine@c{}% \def\tikztiming@nocombine@M{}% \def\tikztiming@nocombine@m{}% +\def\tikztiming@nocombine@W{}% +\def\tikztiming@nocombine@w{}% \tikztimingecopy{U}{D} \tikztimingdef{UD}{\tikztiminguse{D@edge@D}{#1}} \tikztimingdef{DU}{\tikztiminguse{D@edge@D}{#1}} \tikztimingecopy{X}{Z} + \endinput %% %% End of file `tikz-timing.sty'. -- cgit v1.2.3