From b1bedc77891ff84f8ed4615d86eb7175405b921b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 1 Dec 2011 23:53:14 +0000 Subject: texshade (1dec11) git-svn-id: svn://tug.org/texlive/trunk@24716 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/texshade/texshade.sty | 55 ++++++++++++++++++++--- 1 file changed, 48 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/tex/latex/texshade/texshade.sty') diff --git a/Master/texmf-dist/tex/latex/texshade/texshade.sty b/Master/texmf-dist/tex/latex/texshade/texshade.sty index f447d59ef2f..e22dae05130 100644 --- a/Master/texmf-dist/tex/latex/texshade/texshade.sty +++ b/Master/texmf-dist/tex/latex/texshade/texshade.sty @@ -13,8 +13,8 @@ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{texshade}[2011/05/13 LaTeX TeXshade (v1.23)] -\message{Package `texshade', Version 1.23 of 2011/05/13.} +\ProvidesPackage{texshade}[2011/05/13 LaTeX TeXshade (v1.24)] +\message{Package `texshade', Version 1.24 of 2011/12/01.} \PassOptionsToPackage{dvips}{color} \PassOptionsToPackage{dvips}{graphicx} @@ -1567,7 +1567,7 @@ \definecolor{Cyan} {cmyk}{1,0,0,0} \definecolor{ProcessBlue} {cmyk}{0.96,0,0,0} \definecolor{SkyBlue} {cmyk}{0.62,0,0.12,0} -\definecolor{TurquoisQ} {cmyk}{0.85,0,0.20,0} +\definecolor{Turquoise} {cmyk}{0.85,0,0.20,0} \definecolor{TealBlue} {cmyk}{0.86,0,0.34,0.02} \definecolor{Aquamarine} {cmyk}{0.82,0,0.30,0} \definecolor{BlueGreen} {cmyk}{0.85,0,0.33,0} @@ -6010,6 +6010,7 @@ \def\bbottomspace#1{\def\bb@sp@ce{#1}} \def\bbbottomspace#1{\def\bbb@sp@ce{#1}} \def\bbbbottomspace#1{\def\bbbb@sp@ce{#1}} +\def\rulerspace#1{\def\ruler@sp@ce{#1}} \def\fixblockspace{\fix@true} \def\flexblockspace{\fix@false} \def\nosepline{\def\seq@skip{\relax}} @@ -6128,8 +6129,19 @@ \xdef\start@seq{#2} \xdef\temp@{consensus} \ifx\start@seq\temp@ - \message{<\noexpand\setends does not accept `consensus'>} +%%% \message{<\noexpand\setends does not accept `consensus'>} \xdef\start@seq{0} +%%%%%%%%%% + \xdef\second@{#3@} \expandafter\get@nums\second@ + \xdef\start@num{\first@} \xdef\end@num{\second@} + \ifnum\start@num<1 \xdef\start@num{1}\fi + \ifnum\end@num<\start@num \xdef\end@num{\start@num}\fi + \loopcount=\end@num + \advance\loopcount by 1 + \advance\loopcount by -\start@num + \xdef\end@num{\the\loopcount} + \start@false +%%%%%%%%%% \else \xdef\first@{\start@seq @} \expandafter\check@letter\first@ \xdef\first@{\start@seq} @@ -6821,6 +6833,10 @@ \def\bottomruler@size{\csname tiny\endcsname} \fi\fi\fi\fi\fi\fi \fi + \xdef\temp@{ruler} + \ifx\first@\temp@ + \def\bottomruler@size{\csname #2\endcsname} + \fi } \def\setfont#1#2#3#4#5{% \setfamily{#1}{#2}\setseries{#1}{#3} @@ -6980,6 +6996,16 @@ \def\rulerrm{\setfamily{ruler}{rm}} \def\rulersf{\setfamily{ruler}{sf}} \def\rulertt{\setfamily{ruler}{tt}} +\def\rulertiny {\setsize{ruler}{tiny}} +\def\rulerscriptsize {\setsize{ruler}{scriptsize}} +\def\rulerfootnotesize{\setsize{ruler}{footnotesize}} +\def\rulersmall {\setsize{ruler}{small}} +\def\rulernormalsize {\setsize{ruler}{normalsize}} +\def\rulerlarge {\setsize{ruler}{large}} +\def\rulerLarge {\setsize{ruler}{Large}} +\def\rulerLARGE {\setsize{ruler}{LARGE}} +\def\rulerhuge {\setsize{ruler}{huge}} +\def\rulerHuge {\setsize{ruler}{Huge}} \def\funcshadingstyle#1#2#3#4#5{% \xdef\temp@{nomatch} \xdef\first@{#1} \ifx\temp@\first@ @@ -11713,15 +11739,15 @@ \ifnum\ruler@rot=0 % \xdef\temp@{tt}% \ifx\ruler@family\temp@% - \def\third@{\ensuremath{\,\stackrel{\mathtt{\fourth@}}{\textcolor{\ruler@fg}{.}}}}% + \def\third@{\bottomruler@size\ensuremath{\,\stackrel{\mathtt{\fourth@}}{\textcolor{\ruler@fg}{.}}}}% \else \xdef\temp@{sf}% \ifx\ruler@family\temp@% - \def\third@{\ensuremath{\,\stackrel{\mathsf{\fourth@}}{\textcolor{\ruler@fg}{.}}}}% + \def\third@{\bottomruler@size\ensuremath{\,\stackrel{\mathsf{\fourth@}}{\textcolor{\ruler@fg}{.}}}}% \else \xdef\temp@{rm}% \ifx\ruler@family\temp@% - \def\third@{\ensuremath{\,\stackrel{\mathrm{\fourth@}}{\textcolor{\ruler@fg}{.}}}}% + \def\third@{\bottomruler@size\ensuremath{\,\stackrel{\mathrm{\fourth@}}{\textcolor{\ruler@fg}{.}}}}% \fi\fi\fi \else \xdef\temp@{tt}% @@ -11813,9 +11839,17 @@ \fi% \fi% \xdef\first@{\ruler@ @}% + \ifnum\rule@top=1% + \vspace{\ruler@sp@ce}% + \vspace{-\baselineskip}% + \newline\hbox{}% + \fi% \ifnames@right\else\def\@kern{\kern0em}\expandafter\put@name\first@\fi% \ifnumbers@left\def\@kern{\kern1em}\expandafter\put@number\first@\fi% \vspace{-0.25\baselineskip}% + \ifnum\rule@top=0% + \vspace{\ruler@sp@ce}% + \fi% \fontfamily{\ruler@family}% \fontseries{m}% \fontshape{n}% @@ -13683,6 +13717,12 @@ \ifstart@ \advance\res@count by 1 \fi \ifnum\start@seq=0 \advance\end@count by 1 +%%%%%%%%%% + \ifnum\end@count=\start@num\relax + \xdef\start@number{\the\innerloopcount} + \start@true \res@count=1 + \fi +%%%%%%%%%% \else \expandafter\check@char\first@ \ifletter @@ -14514,6 +14554,7 @@ \xdef\ttt@sp@ce{0mm} \xdef\tttt@sp@ce{0mm} \xdef\b@sp@ce{0mm} \xdef\bb@sp@ce{0mm} \xdef\bbb@sp@ce{0mm} \xdef\bbbb@sp@ce{0mm} +\xdef\ruler@sp@ce{0mm} \xdef\seq@gap@num{0} \xdef\h@ndalign{no} \xdef\sep@space{0pt} \xdef\c@pshort{n} -- cgit v1.2.3