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/doc/latex/texshade/README | 2 +- Master/texmf-dist/doc/latex/texshade/texshade.pdf | Bin 1021151 -> 1026660 bytes .../texmf-dist/source/latex/texshade/texshade.dtx | 322 ++++++++++++--------- Master/texmf-dist/tex/latex/texshade/texshade.sty | 55 +++- 4 files changed, 242 insertions(+), 137 deletions(-) diff --git a/Master/texmf-dist/doc/latex/texshade/README b/Master/texmf-dist/doc/latex/texshade/README index e44157d204e..38bdbf86c1c 100644 --- a/Master/texmf-dist/doc/latex/texshade/README +++ b/Master/texmf-dist/doc/latex/texshade/README @@ -1,4 +1,4 @@ - TeXshade v1.23 + TeXshade v1.24 >> >> A LaTeX package for setting nucleotide and peptide alignments. >> diff --git a/Master/texmf-dist/doc/latex/texshade/texshade.pdf b/Master/texmf-dist/doc/latex/texshade/texshade.pdf index 677cfe1e802..e0b6d09eb5f 100644 Binary files a/Master/texmf-dist/doc/latex/texshade/texshade.pdf and b/Master/texmf-dist/doc/latex/texshade/texshade.pdf differ diff --git a/Master/texmf-dist/source/latex/texshade/texshade.dtx b/Master/texmf-dist/source/latex/texshade/texshade.dtx index f7590eea074..f399815966a 100644 --- a/Master/texmf-dist/source/latex/texshade/texshade.dtx +++ b/Master/texmf-dist/source/latex/texshade/texshade.dtx @@ -386,6 +386,13 @@ % diverse mode to condense the output to the relevant sites. % } % +% \changes{1.24}{2011-12-01}{% +% Introduction: `rulerspace' allows one to adjust the space between the +% ruler and the top or bottom sequence row; +% the textsize of the ruler numbering can now be set; +% Postscript color samples are shown in the manual. +% } +% % % \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 @@ -424,7 +431,7 @@ % for further information, updates and on-line documentation % see my homepage at % \texttt{www.pharmazie.uni-kiel.de/chem/Prof\_Beitz/biotex.html} }} -% \date{\small v1.23; 2011/05/13\\[2pt]} +% \date{\small v1.24; 2011/12/01\\[2pt]} % \maketitle % \begin{abstract} % Setting alignments of nucleotides and peptides for publication @@ -503,6 +510,17 @@ % % \subsection{Version History} % +% \textbf{v1.24 2011/12/01} +% \medskip +% +% \emph{Introductions:} +% The space between the ruler and the top or bottom sequence row +% can now be adjusted using |\rulerspace| and the textsize of the +% ruler numbering can be set with |\setsize| or |\rulerLarge| etc. +% Postscript color samples are shown in the manual next to the +% color names list. +% \medskip +% % \textbf{v1.23 2011/05/13} % \medskip % @@ -524,7 +542,6 @@ % |\changeshadingcolors| (\ref{Lchangeshadingcolors}). % \medskip % -% \newpage % % \textbf{v1.21 2010/03/01} % \medskip @@ -569,7 +586,6 @@ % |\percentidentity{|\meta{seqref1}|}{|\meta{seqref2}|}|. % \medskip % -% % \textbf{v1.19a 2009/06/11} % \medskip % @@ -582,6 +598,8 @@ % output.\footnote{Suggestion by Yun He.} % \medskip % +% \newpage +% % \textbf{v1.19 2009/03/09} % \medskip % @@ -645,9 +663,6 @@ % \bigskip % % -% \newpage -% -% % \textbf{v1.16 2007/02/18} % \medskip % @@ -872,6 +887,8 @@ % |{1,2,3,6,5,4,7}|. % \bigskip % +% \newpage +% % \textbf{v1.3a\&b 2000/7/28 \& 2000/7/30} % \medskip % @@ -935,8 +952,7 @@ % `|\Alphacount|'. All commands are described in \ref{structure}. % \bigskip % -% \newpage -% +% % \textbf{v1.1 1999/5/26} % \medskip % @@ -3172,7 +3188,7 @@ % \label{Lshowruler}\label{Lhideruler} % \label{Lrulersteps}\label{Lrulercolor} % \label{Lrotateruler}\label{Lunrotateruler} -% \label{Lnamerulerpos} +% \label{Lnamerulerpos}\label{Lrulerspace} % Another possibility to label sequence positions is to switch % on a ruler on the top or at the bottom of the sequence block % using \label{ruler} @@ -3190,7 +3206,9 @@ % |\rulercolor{|\meta{color}|}|. Also, the label and its color at individual % ruler positions can be changed by the user to a string using % |\namerulerpos{|\meta{number}|}{|\meta{text}|[|\meta{color}|]}| -% (see example on p.\ \pageref{ras}). +% (see example on p.\ \pageref{ras}). Finally, to adjust the distance +% between the ruler and the top or bottom sequence row use +% |\rulerspace{|\meta{length}|}|, e.\,g. |\rulerspace{1mm}|. % % \label{Lgapchar}\label{Lgaprule} % \label{Lgapcolors}\label{gapchar} @@ -4570,7 +4588,7 @@ % The first parameter selects the text whose style is to be % changed. Possible first parameters are % |numbering|, |names|, |residues|, |features|, |featurestyles|, -% |hideblock|, and |legend|. +% |hideblock|, |ruler|, and |legend|. % \medskip % % The style is set by the second parameter: @@ -4651,7 +4669,8 @@ % featurenames (|\featurenamesrm| etc.), % featurestylenames (|\featurestylenames| etc.), % residues (|\residuesrm| etc.), -% hideblock labels (|hideblockrm| etc.), and +% hideblock labels (|hideblockrm| etc.), +% rulers (|\rulerrm| etc.), and % legend texts (|legendrm| etc.). % % @@ -4814,87 +4833,87 @@ % % \begin{footnotesize} % \begin{tabbing} -% \emph{name}\hspace{2.5cm}\= \emph{CMYK}\hspace{1.8cm} +% \emph{name}\hspace{2.7cm}\= \emph{CMYK}\hspace{1.6cm} % \=\emph{name}\hspace{2.5cm}\= \emph{CMYK}\\ % -% GreenYellow \>{0.15,0,0.69,0}\>Yellow \>{0,0,1,0}\\ -% Goldenrod \>{0,0.10,0.84,0}\>Dandelion \>{0,0.29,0.84,0}\\ -% Apricot \>{0,0.32,0.52,0}\> Peach \>{0,0.50,0.70,0}\\ -% Melon \>{0,0.46,0.50,0}\> YellowOrange \>{0,0.42,1,0}\\ -% Orange \>{0,0.61,0.87,0}\>BurntOrange \>{0,0.51,1,0}\\ -% Bittersweet \>{0,0.75,1,0.24}\> RedOrange \>{0,0.77,0.87,0}\\ -% Mahagony \>{0,0.85,0.87,0.35}\>Maroon \>{0,0.87,0.68,0.32}\\ -% BrickRed \>{0,0.89,0.94,0.28}\> Red \>{0,1,1,0}\\ -% OrangeRed \>{0,1,0.50,0}\> RubineRed \>{0,1,0.13,0}\\ -% WildStrawberry\>{0,0.96,0.39,0}\> Salmon \>{0,0.53,0.38,0}\\ -% CarnationPink \>{0,0.63,0,0}\> Magenta \>{0,1,0,0}\\ -% VioletRed \>{0,0.81,0,0}\> Rhodamine \>{0,0.82,0,0}\\ -% Mulberry \>{0.34,0.90,0,0.02}\> RedViolet \>{0.07,0.90,0,0.34}\\ -% Fuchsia \>{0.47,0.91,0,0.08}\>Lavender \>{0,0.48,0,0}\\ -% Thistle \>{0.12,0.59,0,0}\>Orchid \>{0.32,0.64,0,0}\\ -% DarkOrchid \>{0.40,0.80,0.20,0}\> Purple \>{0.45,0.86,0,0}\\ -% Plum \>{0.50,1,0,0}\>Violet \>{0.79,0.88,0,0}\\ -% RoyalPurple \>{0.75,0.90,0,0}\>BlueViolet \>{0.86,0.91,0,0.04}\\ -% Periwinkle \>{0.57,0.55,0,0}\> CadetBlue \>{0.62,0.57,0.23,0}\\ -% CornflowerBlue\>{0.65,0.13,0,0}\>MidnightBlue \>{0.98,0.13,0,0.43}\\ -% NavyBlue \>{0.94,0.54,0,0}\>RoyalBlue \>{1,0.50,0,0}\\ -% Blue \>{1,1,0,0}\>Cerulean \>{0.94,0.11,0,0}\\ -% Cyan \>{1,0,0,0}\> ProcessBlue \>{0.96,0,0,0}\\ -% SkyBlue \>{0.62,0,0.12,0}\>Turquoise \>{0.85,0,0.20,0}\\ -% TealBlue \>{0.86,0,0.34,0.02}\>Aquamarine \>{0.82,0,0.30,0}\\ -% BlueGreen \>{0.85,0,0.33,0}\> Emerald \>{1,0,0.50,0}\\ -% JungleGreen \>{0.99,0,0.52,0}\>SeaGreen \>{0.69,0,0.50,0}\\ -% Green \>{1,0,1,0}\>ForestGreen \>{0.91,0,0.88,0.12}\\ -% PineGreen \>{0.92,0,0.59,0.25}\> LimeGreen \>{0.50,0,1,0}\\ -% YellowGreen \>{0.44,0,0.74,0}\>SpringGreen \>{0.26,0,0.76,0}\\ -% OliveGreen \>{0.64,0,0.95,0.40}\>RawSienna \>{0,0.72,1,0.45}\\ -% Sepia \>{0,0.83,1,0.70}\>Brown \>{0,0.81,1,0.60}\\ -% Tan \>{0.14,0.42,0.56,0}\>\>\\ -% White (Gray0) \>{0,0,0,0}\>Black (Gray100) \>{0,0,0,1}\\ -% Gray5 \>{0,0,0,0.05}\>Gray10 \>{0,0,0,0.10}\\ -% Gray15 \>{0,0,0,0.15}\>Gray20 \>{0,0,0,0.20}\\ -% Gray25 \>{0,0,0,0.25}\> Gray30 \>{0,0,0,0.30}\\ -% LightGray \>{0,0,0,0.33}\> Gray35 \>{0,0,0,0.35}\\ -% Gray40 \>{0,0,0,0.40}\>Gray45 \>{0,0,0,0.45}\\ -% Gray50 \>{0,0,0,0.50}\> Gray \>{0,0,0,0.50}\\ -% Gray55 \>{0,0,0,0.55}\> Gray60 \>{0,0,0,0.60}\\ -% Gray65 \>{0,0,0,0.65}\> DarkGray \>{0,0,0,0.66}\\ -% Gray70 \>{0,0,0,0.70}\> Gray75 \>{0,0,0,0.75}\\ -% Gray80 \>{0,0,0,0.80}\>Gray85 \>{0,0,0,0.85}\\ -% Gray90 \>{0,0,0,0.90}\> Gray95 \>{0,0,0,0.95}\\ -% LightGreenYellow\>{0.08,0,0.35,0}\> LightYellow \>{0,0,0.50,0}\\ -% LightGoldenrod \>{0,0.05,0.42,0}\> LightDandelion\> {0,0.15,0.42,0}\\ -% LightApricot \>{0,0.16,0.26,0}\> LightPeach \>{0,0.25,0.35,0}\\ -% LightMelon \>{0,0.23,0.25,0}\> LightYellowOrange \>{0,0.21,0.50,0}\\ -% LightOrange \>{0,0.31,0.44,0}\> LightBurntOrange \>{0,0.26,0.50,0}\\ -% LightBittersweet\>{0,0.38,0.50,0.12}\> LightRedOrange\>{0,0.39,0.44,0}\\ -% LightMahagony \>{0,0.43,0.44,0.18}\> LightMaroon \>{0,0.44,0.34,0.16}\\ -% LightBrickRed \>{0,0.45,0.47,0.14}\> LightRed \>{0,0.50,0.50,0}\\ -% LightOrangeRed \>{0,0.50,0.25,0}\> LightRubineRed \>{0,0.50,0.07,0}\\ -% LightWildStrawberry\>{0,0.48,0.20,0}\> LightSalmon \>{0,0.27,0.19,0}\\ -% LightCarnationPink \>{0,0.32,0,0} \> LightMagenta \>{0,0.50,0,0}\\ -% LightVioletRed \>{0,0.40,0,0} \> LightRhodamine \>{0,0.41,0,0}\\ -% LightMulberry \>{0.17,0.45,0,0.01}\> LightRedViolet \>{0.04,0.45,0,0.17}\\ -% LightFuchsia \>{0.24,0.46,0,0.04}\> LightLavender \> {0,0.24,0,0}\\ -% LightThistle \>{0.06,0.30,0,0} \> LightOrchid \>{0.16,0.32,0,0}\\ -% LightDarkOrchid \>{0.20,0.40,0.10,0}\> LightPurple \>{0.23,0.43,0,0}\\ -% LightPlum \>{0.25,0.50,0,0} \> LightViolet \>{0.40,0.44,0,0}\\ -% LightRoyalPurple\>{0.38,0.45,0,0} \> LightBlueViolet \>{0.43,0.46,0,0.02}\\ -% LightPeriwinkle \>{0.29,0.28,0,0} \> LightCadetBlue \> {0.31,0.29,0.12,0}\\ -% LightCornflowerBlue\>{0.33,0.07,0,0}\>LightMidnightBlue\>{0.49,0.07,0,0.22}\\ -% LightNavyBlue \>{0.47,0.27,0,0} \> LightRoyalBlue \> {0.50,0.25,0,0}\\ -% LightBlue \>{0.50,0.50,0,0} \> LightCerulean \> {0.47,0.06,0,0}\\ -% LightCyan \>{0.50,0,0,0} \> LightProcessBlue \> {0.48,0,0,0}\\ -% LightSkyBlue \>{0.31,0,0.06,0} \> LightTurquoise \>{0.43,0,0.10,0}\\ -% LightTealBlue \>{0.43,0,0.17,0.01}\> LightAquamarine \>{0.41,0,0.15,0}\\ -% LightBlueGreen \>{0.43,0,0.17,0}\> LightEmerald \>{0.50,0,0.25,0}\\ -% LightJungleGreen\>{0.50,0,0.26,0} \> LightSeaGreen \>{0.35,0,0.25,0}\\ -% LightGreen \>{0.50,0,0.50,0} \> LightForestGreen\>{0.46,0,0.44,0.06}\\ -% LightPineGreen \>{0.46,0,0.30,0.13}\> LightLimeGreen\>{0.25,0,0.50,0}\\ -% LightYellowGreen\>{0.22,0,0.37,0} \> LightSpringGreen \>{0.13,0,0.38,0}\\ -% LightOliveGreen \>{0.32,0,0.48,0.20} \> LightRawSienna\>{0,0.36,0.50,0.23}\\ -% LightSepia \>{0,0.44,0.50,0.35} \> LightBrown \>{0,0.41,0.50,0.30}\\ -% LightTan \>{0.07,0.21,0.28,0}\\ +% \textcolor{GreenYellow}{$\bullet$}GreenYellow \>{0.15,0,0.69,0}\>\textcolor{Yellow}{$\bullet$}Yellow \>{0,0,1,0}\\ +% \textcolor{Goldenrod}{$\bullet$}Goldenrod \>{0,0.10,0.84,0}\>\textcolor{Dandelion}{$\bullet$}Dandelion \>{0,0.29,0.84,0}\\ +% \textcolor{Apricot}{$\bullet$}Apricot \>{0,0.32,0.52,0}\>\textcolor{Peach}{$\bullet$}Peach \>{0,0.50,0.70,0}\\ +% \textcolor{Melon}{$\bullet$}Melon \>{0,0.46,0.50,0}\>\textcolor{YellowOrange}{$\bullet$}YellowOrange \>{0,0.42,1,0}\\ +% \textcolor{Orange}{$\bullet$}Orange \>{0,0.61,0.87,0}\>\textcolor{BurntOrange}{$\bullet$}BurntOrange \>{0,0.51,1,0}\\ +% \textcolor{Bittersweet}{$\bullet$}Bittersweet \>{0,0.75,1,0.24}\>\textcolor{RedOrange}{$\bullet$}RedOrange \>{0,0.77,0.87,0}\\ +% \textcolor{Mahagony}{$\bullet$}Mahagony \>{0,0.85,0.87,0.35}\>\textcolor{Maroon}{$\bullet$}Maroon \>{0,0.87,0.68,0.32}\\ +% \textcolor{BrickRed}{$\bullet$}BrickRed \>{0,0.89,0.94,0.28}\>\textcolor{Red}{$\bullet$}Red \>{0,1,1,0}\\ +% \textcolor{OrangeRed}{$\bullet$}OrangeRed \>{0,1,0.50,0}\>\textcolor{RubineRed}{$\bullet$}RubineRed \>{0,1,0.13,0}\\ +% \textcolor{WildStrawberry}{$\bullet$}WildStrawberry\>{0,0.96,0.39,0}\>\textcolor{Salmon}{$\bullet$}Salmon \>{0,0.53,0.38,0}\\ +% \textcolor{CarnationPink}{$\bullet$}CarnationPink \>{0,0.63,0,0}\>\textcolor{Magenta}{$\bullet$}Magenta \>{0,1,0,0}\\ +% \textcolor{VioletRed}{$\bullet$}VioletRed \>{0,0.81,0,0}\>\textcolor{Rhodamine}{$\bullet$}Rhodamine \>{0,0.82,0,0}\\ +% \textcolor{Mulberry}{$\bullet$}Mulberry \>{0.34,0.90,0,0.02}\>\textcolor{RedViolet}{$\bullet$}RedViolet \>{0.07,0.90,0,0.34}\\ +% \textcolor{Fuchsia}{$\bullet$}Fuchsia \>{0.47,0.91,0,0.08}\>\textcolor{Lavender}{$\bullet$}Lavender \>{0,0.48,0,0}\\ +% \textcolor{Thistle}{$\bullet$}Thistle \>{0.12,0.59,0,0}\>\textcolor{Orchid}{$\bullet$}Orchid \>{0.32,0.64,0,0}\\ +% \textcolor{DarkOrchid}{$\bullet$}DarkOrchid \>{0.40,0.80,0.20,0}\>\textcolor{Purple}{$\bullet$}Purple \>{0.45,0.86,0,0}\\ +% \textcolor{Plum}{$\bullet$}Plum \>{0.50,1,0,0}\>\textcolor{Violet}{$\bullet$}Violet \>{0.79,0.88,0,0}\\ +% \textcolor{RoyalPurple}{$\bullet$}RoyalPurple \>{0.75,0.90,0,0}\>\textcolor{BlueViolet}{$\bullet$}BlueViolet \>{0.86,0.91,0,0.04}\\ +% \textcolor{Periwinkle}{$\bullet$}Periwinkle \>{0.57,0.55,0,0}\>\textcolor{CadetBlue}{$\bullet$}CadetBlue \>{0.62,0.57,0.23,0}\\ +% \textcolor{CornflowerBlue}{$\bullet$}CornflowerBlue\>{0.65,0.13,0,0}\>\textcolor{MidnightBlue}{$\bullet$}MidnightBlue \>{0.98,0.13,0,0.43}\\ +% \textcolor{NavyBlue}{$\bullet$}NavyBlue \>{0.94,0.54,0,0}\>\textcolor{RoyalBlue}{$\bullet$}RoyalBlue \>{1,0.50,0,0}\\ +% \textcolor{Blue}{$\bullet$}Blue \>{1,1,0,0}\>\textcolor{Cerulean}{$\bullet$}Cerulean \>{0.94,0.11,0,0}\\ +% \textcolor{Cyan}{$\bullet$}Cyan \>{1,0,0,0}\>\textcolor{ProcessBlue}{$\bullet$}ProcessBlue \>{0.96,0,0,0}\\ +% \textcolor{SkyBlue}{$\bullet$}SkyBlue \>{0.62,0,0.12,0}\>\textcolor{Turquoise}{$\bullet$}Turquoise \>{0.85,0,0.20,0}\\ +% \textcolor{TealBlue}{$\bullet$}TealBlue \>{0.86,0,0.34,0.02}\>\textcolor{Aquamarine}{$\bullet$}Aquamarine \>{0.82,0,0.30,0}\\ +% \textcolor{BlueGreen}{$\bullet$}BlueGreen \>{0.85,0,0.33,0}\>\textcolor{Emerald}{$\bullet$}Emerald \>{1,0,0.50,0}\\ +% \textcolor{JungleGreen}{$\bullet$}JungleGreen \>{0.99,0,0.52,0}\>\textcolor{SeaGreen}{$\bullet$}SeaGreen \>{0.69,0,0.50,0}\\ +% \textcolor{Green}{$\bullet$}Green \>{1,0,1,0}\>\textcolor{ForestGreen}{$\bullet$}ForestGreen \>{0.91,0,0.88,0.12}\\ +% \textcolor{PineGreen}{$\bullet$}PineGreen \>{0.92,0,0.59,0.25}\>\textcolor{LimeGreen}{$\bullet$}LimeGreen \>{0.50,0,1,0}\\ +% \textcolor{YellowGreen}{$\bullet$}YellowGreen \>{0.44,0,0.74,0}\>\textcolor{SpringGreen}{$\bullet$}SpringGreen \>{0.26,0,0.76,0}\\ +% \textcolor{OliveGreen}{$\bullet$}OliveGreen \>{0.64,0,0.95,0.40}\>\textcolor{RawSienna}{$\bullet$}RawSienna \>{0,0.72,1,0.45}\\ +% \textcolor{Sepia}{$\bullet$}Sepia \>{0,0.83,1,0.70}\>\textcolor{Brown}{$\bullet$}Brown \>{0,0.81,1,0.60}\\ +% \textcolor{Tan}{$\bullet$}Tan \>{0.14,0.42,0.56,0}\>\>\\ +% \textcolor{White}{$\bullet$}White (Gray0) \>{0,0,0,0}\>\textcolor{Black}{$\bullet$}Black (Gray100) \>{0,0,0,1}\\ +% \textcolor{Gray5}{$\bullet$}Gray5 \>{0,0,0,0.05}\>\textcolor{Gray10}{$\bullet$}Gray10 \>{0,0,0,0.10}\\ +% \textcolor{Gray15}{$\bullet$}Gray15 \>{0,0,0,0.15}\>\textcolor{Gray20}{$\bullet$}Gray20 \>{0,0,0,0.20}\\ +% \textcolor{Gray25}{$\bullet$}Gray25 \>{0,0,0,0.25}\>\textcolor{Gray30}{$\bullet$}Gray30 \>{0,0,0,0.30}\\ +% \textcolor{LightGray}{$\bullet$}LightGray \>{0,0,0,0.33}\>\textcolor{Gray35}{$\bullet$}Gray35 \>{0,0,0,0.35}\\ +% \textcolor{Gray40}{$\bullet$}Gray40 \>{0,0,0,0.40}\>\textcolor{Gray45}{$\bullet$}Gray45 \>{0,0,0,0.45}\\ +% \textcolor{Gray50}{$\bullet$}Gray50 \>{0,0,0,0.50}\>\textcolor{Gray}{$\bullet$}Gray \>{0,0,0,0.50}\\ +% \textcolor{Gray55}{$\bullet$}Gray55 \>{0,0,0,0.55}\>\textcolor{Gray60}{$\bullet$}Gray60 \>{0,0,0,0.60}\\ +% \textcolor{Gray65}{$\bullet$}Gray65 \>{0,0,0,0.65}\>\textcolor{DarkGray}{$\bullet$}DarkGray \>{0,0,0,0.66}\\ +% \textcolor{Gray70}{$\bullet$}Gray70 \>{0,0,0,0.70}\>\textcolor{Gray75}{$\bullet$}Gray75 \>{0,0,0,0.75}\\ +% \textcolor{Gray80}{$\bullet$}Gray80 \>{0,0,0,0.80}\>\textcolor{Gray85}{$\bullet$}Gray85 \>{0,0,0,0.85}\\ +% \textcolor{Gray90}{$\bullet$}Gray90 \>{0,0,0,0.90}\>\textcolor{Gray95}{$\bullet$}Gray95 \>{0,0,0,0.95}\\ +% \textcolor{LightGreenYellow}{$\bullet$}LightGreenYellow\>{0.08,0,0.35,0}\>\textcolor{LightYellow}{$\bullet$}LightYellow \>{0,0,0.50,0}\\ +% \textcolor{LightGoldenrod}{$\bullet$}LightGoldenrod \>{0,0.05,0.42,0}\>\textcolor{LightDandelion}{$\bullet$}LightDandelion\> {0,0.15,0.42,0}\\ +% \textcolor{LightApricot}{$\bullet$}LightApricot \>{0,0.16,0.26,0}\>\textcolor{LightPeach}{$\bullet$}LightPeach \>{0,0.25,0.35,0}\\ +% \textcolor{LightMelon}{$\bullet$}LightMelon \>{0,0.23,0.25,0}\>\textcolor{LightYellowOrange}{$\bullet$}LightYellowOrange \>{0,0.21,0.50,0}\\ +% \textcolor{LightOrange}{$\bullet$}LightOrange \>{0,0.31,0.44,0}\>\textcolor{LightBurntOrange}{$\bullet$}LightBurntOrange \>{0,0.26,0.50,0}\\ +% \textcolor{LightBittersweet}{$\bullet$}LightBittersweet\>{0,0.38,0.50,0.12}\>\textcolor{LightRedOrange}{$\bullet$}LightRedOrange\>{0,0.39,0.44,0}\\ +% \textcolor{LightMahagony}{$\bullet$}LightMahagony \>{0,0.43,0.44,0.18}\>\textcolor{LightMaroon}{$\bullet$}LightMaroon \>{0,0.44,0.34,0.16}\\ +% \textcolor{LightBrickRed}{$\bullet$}LightBrickRed \>{0,0.45,0.47,0.14}\>\textcolor{LightRed}{$\bullet$}LightRed \>{0,0.50,0.50,0}\\ +% \textcolor{LightOrangeRed}{$\bullet$}LightOrangeRed \>{0,0.50,0.25,0}\>\textcolor{LightRubineRed}{$\bullet$}LightRubineRed \>{0,0.50,0.07,0}\\ +% \textcolor{LightWildStrawberry}{$\bullet$}LightWildStrawberry\>{0,0.48,0.20,0}\>\textcolor{LightSalmon}{$\bullet$}LightSalmon \>{0,0.27,0.19,0}\\ +% \textcolor{LightCarnationPink}{$\bullet$}LightCarnationPink \>{0,0.32,0,0} \>\textcolor{LightMagenta}{$\bullet$}LightMagenta \>{0,0.50,0,0}\\ +% \textcolor{LightVioletRed}{$\bullet$}LightVioletRed \>{0,0.40,0,0} \>\textcolor{LightRhodamine}{$\bullet$}LightRhodamine \>{0,0.41,0,0}\\ +% \textcolor{LightMulberry}{$\bullet$}LightMulberry \>{0.17,0.45,0,0.01}\>\textcolor{LightRedViolet}{$\bullet$}LightRedViolet \>{0.04,0.45,0,0.17}\\ +% \textcolor{LightFuchsia}{$\bullet$}LightFuchsia \>{0.24,0.46,0,0.04}\>\textcolor{LightLavender}{$\bullet$}LightLavender \> {0,0.24,0,0}\\ +% \textcolor{LightThistle}{$\bullet$}LightThistle \>{0.06,0.30,0,0} \>\textcolor{LightOrchid}{$\bullet$}LightOrchid \>{0.16,0.32,0,0}\\ +% \textcolor{LightDarkOrchid}{$\bullet$}LightDarkOrchid \>{0.20,0.40,0.10,0}\>\textcolor{LightPurple}{$\bullet$}LightPurple \>{0.23,0.43,0,0}\\ +% \textcolor{LightPlum}{$\bullet$}LightPlum \>{0.25,0.50,0,0} \>\textcolor{LightViolet}{$\bullet$}LightViolet \>{0.40,0.44,0,0}\\ +% \textcolor{LightRoyalPurple}{$\bullet$}LightRoyalPurple\>{0.38,0.45,0,0} \>\textcolor{LightBlueViolet}{$\bullet$}LightBlueViolet \>{0.43,0.46,0,0.02}\\ +% \textcolor{LightPeriwinkle}{$\bullet$}LightPeriwinkle \>{0.29,0.28,0,0} \>\textcolor{LightCadetBlue}{$\bullet$}LightCadetBlue \> {0.31,0.29,0.12,0}\\ +% \textcolor{LightCornflowerBlue}{$\bullet$}LightCornflowerBlue\>{0.33,0.07,0,0}\>\textcolor{LightMidnightBlue}{$\bullet$}LightMidnightBlue\>{0.49,0.07,0,0.22}\\ +% \textcolor{LightNavyBlue}{$\bullet$}LightNavyBlue \>{0.47,0.27,0,0} \>\textcolor{LightRoyalBlue}{$\bullet$}LightRoyalBlue \> {0.50,0.25,0,0}\\ +% \textcolor{LightBlue}{$\bullet$}LightBlue \>{0.50,0.50,0,0} \>\textcolor{LightCerulean}{$\bullet$}LightCerulean \> {0.47,0.06,0,0}\\ +% \textcolor{LightCyan}{$\bullet$}LightCyan \>{0.50,0,0,0} \>\textcolor{LightProcessBlue}{$\bullet$}LightProcessBlue \> {0.48,0,0,0}\\ +% \textcolor{LightSkyBlue}{$\bullet$}LightSkyBlue \>{0.31,0,0.06,0} \>\textcolor{LightTurquoise}{$\bullet$}LightTurquoise \>{0.43,0,0.10,0}\\ +% \textcolor{LightTealBlue}{$\bullet$}LightTealBlue \>{0.43,0,0.17,0.01}\>\textcolor{LightAquamarine}{$\bullet$}LightAquamarine \>{0.41,0,0.15,0}\\ +% \textcolor{LightBlueGreen}{$\bullet$}LightBlueGreen \>{0.43,0,0.17,0}\>\textcolor{LightEmerald}{$\bullet$}LightEmerald \>{0.50,0,0.25,0}\\ +% \textcolor{LightJungleGreen}{$\bullet$}LightJungleGreen\>{0.50,0,0.26,0} \>\textcolor{LightSeaGreen}{$\bullet$}LightSeaGreen \>{0.35,0,0.25,0}\\ +% \textcolor{LightGreen}{$\bullet$}LightGreen \>{0.50,0,0.50,0} \>\textcolor{LightForestGreen}{$\bullet$}LightForestGreen\>{0.46,0,0.44,0.06}\\ +% \textcolor{LightPineGreen}{$\bullet$}LightPineGreen \>{0.46,0,0.30,0.13}\>\textcolor{LightLimeGreen}{$\bullet$}LightLimeGreen\>{0.25,0,0.50,0}\\ +% \textcolor{LightYellowGreen}{$\bullet$}LightYellowGreen\>{0.22,0,0.37,0} \>\textcolor{LightSpringGreen}{$\bullet$}LightSpringGreen \>{0.13,0,0.38,0}\\ +% \textcolor{LightOliveGreen}{$\bullet$}LightOliveGreen \>{0.32,0,0.48,0.20} \>\textcolor{LightRawSienna}{$\bullet$}LightRawSienna\>{0,0.36,0.50,0.23}\\ +% \textcolor{LightSepia}{$\bullet$}LightSepia \>{0,0.44,0.50,0.35} \>\textcolor{LightBrown}{$\bullet$}LightBrown \>{0,0.41,0.50,0.30}\\ +% \textcolor{LightTan}{$\bullet$}LightTan \>{0.07,0.21,0.28,0}\\ % LightLight- and LightLightLight-versions were derived by dividing all values\\ % from Light-color definitions by 2 and 4, respectively. % \end{tabbing} @@ -4903,36 +4922,36 @@ % \emph{name}\hspace{2.5cm}\= \emph{RGB\quad}\hspace{1.8cm} % \=\emph{name}\hspace{2.5cm}\= \emph{RGB\quad}\\ % -% BlueRed5 \>{0.15,0.17,0.55} \> BlueRed10 \> {0.20,0.23,0.57}\\ -% BlueRed15 \> {0.24,0.29,0.60} \>BlueRed20 \> {0.33,0.35,0.64}\\ -% BlueRed25 \> {0.43,0.43,0.68} \>BlueRed30 \> {0.52,0.52,0.73}\\ -% BlueRed35 \> {0.60,0.60,0.78} \>BlueRed40 \> {0.70,0.70,0.84}\\ -% BlueRed45 \> {0.80,0.80,0.85} \>BlueRed50 \> {0.86,0.82,0.82}\\ -% BlueRed55 \> {0.87,0.73,0.73} \>BlueRed60 \> {0.89,0.64,0.64}\\ -% BlueRed65 \> {0.90,0.55,0.55} \>BlueRed70 \> {0.91,0.47,0.46}\\ -% BlueRed75 \> {0.91,0.39,0.37} \>BlueRed80 \> {0.90,0.33,0.28}\\ -% BlueRed85 \> {0.89,0.25,0.20} \>BlueRed90 \> {0.88,0.23,0.14}\\ -% BlueRed95 \> {0.87,0.21,0.09} \>BlueRed100\> {0.87,0.16,0.04}\\ -% GreenRed5 \> {0,1,0} \>GreenRed10\> {0.05,0.95,0}\\ -% GreenRed15 \> {0.10,0.90,0} \>GreenRed20\> {0.15,0.85,0}\\ -% GreenRed25 \> {0.20,0.80,0} \>GreenRed30\> {0.25,0.75,0}\\ -% GreenRed35 \> {0.30,0.70,0} \>GreenRed40\> {0.35,0.65,0}\\ -% GreenRed45 \> {0.40,0.60,0} \>GreenRed50\> {0.45,0.55,0}\\ -% GreenRed55 \> {0.50,0.50,0} \>GreenRed60\> {0.55,0.45,0}\\ -% GreenRed65 \> {0.60,0.40,0} \>GreenRed70\> {0.65,0.35,0}\\ -% GreenRed75 \> {0.70,0.30,0} \>GreenRed80\> {0.75,0.25,0}\\ -% GreenRed85 \> {0.80,0.20,0} \>GreenRed90\> {0.85,0.15,0}\\ -% GreenRed95 \> {0.90,0.10,0} \>GreenRed100\> {0.95,0.05,0}\\ -% ColdHot5 \> {0,0.08,1} \>ColdHot10 \> {0,0.29,1}\\ -% ColdHot15 \> {0,0.49,1} \>ColdHot20 \> {0,0.70,1}\\ -% ColdHot25 \> {0,0.90,1} \>ColdHot30 \> {0,1,0.87}\\ -% ColdHot35 \> {0,1,0.68} \>ColdHot40 \> {0,1,0.46}\\ -% ColdHot45 \> {0,1,0.25} \>ColdHot50 \> {0,1,0.04}\\ -% ColdHot55 \> {0.16,1,0} \>ColdHot60 \> {0.35,1,0}\\ -% ColdHot65 \> {0.56,1,0} \>ColdHot70 \> {0.79,1,0}\\ -% ColdHot75 \> {0.98,1,0} \>ColdHot80 \> {1,0.82,0}\\ -% ColdHot85 \> {1,0.60,0} \>ColdHot90 \> {1,0.40,0}\\ -% ColdHot95 \> {1,0.20,0} \>ColdHot100\> {0.91,0,0}\\ +% \textcolor{BlueRed5}{$\bullet$}BlueRed5 \>{0.15,0.17,0.55} \>\textcolor{BlueRed10}{$\bullet$}BlueRed10 \> {0.20,0.23,0.57}\\ +% \textcolor{BlueRed15}{$\bullet$}BlueRed15 \> {0.24,0.29,0.60} \>\textcolor{BlueRed20}{$\bullet$}BlueRed20 \> {0.33,0.35,0.64}\\ +% \textcolor{BlueRed25}{$\bullet$}BlueRed25 \> {0.43,0.43,0.68} \>\textcolor{BlueRed30}{$\bullet$}BlueRed30 \> {0.52,0.52,0.73}\\ +% \textcolor{BlueRed35}{$\bullet$}BlueRed35 \> {0.60,0.60,0.78} \>\textcolor{BlueRed40}{$\bullet$}BlueRed40 \> {0.70,0.70,0.84}\\ +% \textcolor{BlueRed45}{$\bullet$}BlueRed45 \> {0.80,0.80,0.85} \>\textcolor{BlueRed50}{$\bullet$}BlueRed50 \> {0.86,0.82,0.82}\\ +% \textcolor{BlueRed55}{$\bullet$}BlueRed55 \> {0.87,0.73,0.73} \>\textcolor{BlueRed60}{$\bullet$}BlueRed60 \> {0.89,0.64,0.64}\\ +% \textcolor{BlueRed65}{$\bullet$}BlueRed65 \> {0.90,0.55,0.55} \>\textcolor{BlueRed70}{$\bullet$}BlueRed70 \> {0.91,0.47,0.46}\\ +% \textcolor{BlueRed75}{$\bullet$}BlueRed75 \> {0.91,0.39,0.37} \>\textcolor{BlueRed80}{$\bullet$}BlueRed80 \> {0.90,0.33,0.28}\\ +% \textcolor{BlueRed85}{$\bullet$}BlueRed85 \> {0.89,0.25,0.20} \>\textcolor{BlueRed90}{$\bullet$}BlueRed90 \> {0.88,0.23,0.14}\\ +% \textcolor{BlueRed95}{$\bullet$}BlueRed95 \> {0.87,0.21,0.09} \>\textcolor{BlueRed100}{$\bullet$}BlueRed100\> {0.87,0.16,0.04}\\ +% \textcolor{GreenRed5}{$\bullet$}GreenRed5 \> {0,1,0} \>\textcolor{GreenRed10}{$\bullet$}GreenRed10\> {0.05,0.95,0}\\ +% \textcolor{GreenRed15}{$\bullet$}GreenRed15 \> {0.10,0.90,0} \>\textcolor{GreenRed20}{$\bullet$}GreenRed20\> {0.15,0.85,0}\\ +% \textcolor{GreenRed25}{$\bullet$}GreenRed25 \> {0.20,0.80,0} \>\textcolor{GreenRed30}{$\bullet$}GreenRed30\> {0.25,0.75,0}\\ +% \textcolor{GreenRed35}{$\bullet$}GreenRed35 \> {0.30,0.70,0} \>\textcolor{GreenRed40}{$\bullet$}GreenRed40\> {0.35,0.65,0}\\ +% \textcolor{GreenRed45}{$\bullet$}GreenRed45 \> {0.40,0.60,0} \>\textcolor{GreenRed50}{$\bullet$}GreenRed50\> {0.45,0.55,0}\\ +% \textcolor{GreenRed55}{$\bullet$}GreenRed55 \> {0.50,0.50,0} \>\textcolor{GreenRed60}{$\bullet$}GreenRed60\> {0.55,0.45,0}\\ +% \textcolor{GreenRed65}{$\bullet$}GreenRed65 \> {0.60,0.40,0} \>\textcolor{GreenRed70}{$\bullet$}GreenRed70\> {0.65,0.35,0}\\ +% \textcolor{GreenRed75}{$\bullet$}GreenRed75 \> {0.70,0.30,0} \>\textcolor{GreenRed80}{$\bullet$}GreenRed80\> {0.75,0.25,0}\\ +% \textcolor{GreenRed85}{$\bullet$}GreenRed85 \> {0.80,0.20,0} \>\textcolor{GreenRed90}{$\bullet$}GreenRed90\> {0.85,0.15,0}\\ +% \textcolor{GreenRed95}{$\bullet$}GreenRed95 \> {0.90,0.10,0} \>\textcolor{GreenRed100}{$\bullet$}GreenRed100\> {0.95,0.05,0}\\ +% \textcolor{ColdHot5}{$\bullet$}ColdHot5 \> {0,0.08,1} \>\textcolor{ColdHot10}{$\bullet$}ColdHot10 \> {0,0.29,1}\\ +% \textcolor{ColdHot15}{$\bullet$}ColdHot15 \> {0,0.49,1} \>\textcolor{ColdHot20}{$\bullet$}ColdHot20 \> {0,0.70,1}\\ +% \textcolor{ColdHot25}{$\bullet$}ColdHot25 \> {0,0.90,1} \>\textcolor{ColdHot30}{$\bullet$}ColdHot30 \> {0,1,0.87}\\ +% \textcolor{ColdHot35}{$\bullet$}ColdHot35 \> {0,1,0.68} \>\textcolor{ColdHot40}{$\bullet$}ColdHot40 \> {0,1,0.46}\\ +% \textcolor{ColdHot45}{$\bullet$}ColdHot45 \> {0,1,0.25} \>\textcolor{ColdHot50}{$\bullet$}ColdHot50 \> {0,1,0.04}\\ +% \textcolor{ColdHot55}{$\bullet$}ColdHot55 \> {0.16,1,0} \>\textcolor{ColdHot60}{$\bullet$}ColdHot60 \> {0.35,1,0}\\ +% \textcolor{ColdHot65}{$\bullet$}ColdHot65 \> {0.56,1,0} \>\textcolor{ColdHot70}{$\bullet$}ColdHot70 \> {0.79,1,0}\\ +% \textcolor{ColdHot75}{$\bullet$}ColdHot75 \> {0.98,1,0} \>\textcolor{ColdHot80}{$\bullet$}ColdHot80 \> {1,0.82,0}\\ +% \textcolor{ColdHot85}{$\bullet$}ColdHot85 \> {1,0.60,0} \>\textcolor{ColdHot90}{$\bullet$}ColdHot90 \> {1,0.40,0}\\ +% \textcolor{ColdHot95}{$\bullet$}ColdHot95 \> {1,0.20,0} \>\textcolor{ColdHot100}{$\bullet$}ColdHot100\> {0.91,0,0}\\ % and reverse definitions: |RedBlue|, |RedGreen|, |HotCold|.\\ % \end{tabbing} % \end{footnotesize} @@ -5905,6 +5924,9 @@ % \quad|\namerulerpos{|\meta{number}|}{|\meta{text}|[|\meta{color}|]}| % \hfill[\pageref{Lnamerulerpos}] % +% \quad|\rulerspace{|\meta{length}|}| +% \hfill[\pageref{Lrulerspace}] +% % \quad|\gapchar{|\meta{symbol}|}| % \qquad (incl. |rule|) \hfill [\pageref{Lgapchar}] % @@ -6348,7 +6370,8 @@ % featurenames (|\featurenamesrm| etc.), % featurestylenames (|\featurestylenames| etc.), % residues (|\residuesrm| etc.), -% hideblock labels (|hideblockrm| etc.), and +% hideblock labels (|hideblockrm| etc.), +% rulers (|\rulerrm| etc.), and % legend texts (|legendrm| etc.). % \bigskip % @@ -6463,8 +6486,8 @@ % \begin{macrocode} %<*texshade> \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} @@ -8025,7 +8048,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} @@ -12474,6 +12497,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}} @@ -12592,8 +12616,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} @@ -13285,6 +13320,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} @@ -13444,6 +13483,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@ @@ -18187,15 +18236,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}% @@ -18287,9 +18336,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}% @@ -20157,6 +20214,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 @@ -20989,6 +21052,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} 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