summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/texshade
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-06-22 17:44:35 +0000
committerKarl Berry <karl@freefriends.org>2007-06-22 17:44:35 +0000
commite3813f8109b2a1a704ec02898a96bb15aef566ab (patch)
tree6f8ec1547e619fb275d4567b200f0b9eaf4cb309 /Master/texmf-dist/tex/latex/texshade
parent65691274214fec460e3f715ebe76e0fba75f0d3f (diff)
texshade update
git-svn-id: svn://tug.org/texlive/trunk@4493 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/texshade')
-rw-r--r--Master/texmf-dist/tex/latex/texshade/texshade.def10
-rw-r--r--Master/texmf-dist/tex/latex/texshade/texshade.sty352
2 files changed, 332 insertions, 30 deletions
diff --git a/Master/texmf-dist/tex/latex/texshade/texshade.def b/Master/texmf-dist/tex/latex/texshade/texshade.def
index b9c55582a77..2de06346a09 100644
--- a/Master/texmf-dist/tex/latex/texshade/texshade.def
+++ b/Master/texmf-dist/tex/latex/texshade/texshade.def
@@ -35,6 +35,8 @@
\numberingcolor{Black} % Numbering color is `Black'
\shownumbering{right} % Show sequence numbering on the left
\namescolor{Black} % Names' color is `Black'
+\featurenamescolor{Black} % Feature names' color is `Black'
+\featurestylenamescolor{Black} % Feature names' color is `Black'
\shownames{left} % Show sequence names on the right
\consensuscolors{Black}{White} % All consensus symbols/letters
{Black}{White} % appear `Black on White'
@@ -75,6 +77,14 @@
\setseries{names}{md} % Use normal series for names
\setshape {names}{up} % Use upright shape for names
\setsize {names}{normalsize} % Use normal size for names
+\setfamily{featurenames}{tt} % Use typewriter family for feature names
+\setseries{featurenames}{md} % Use normal series for feature names
+\setshape {featurenames}{up} % Use upright shape for feature names
+\setsize {featurenames}{normalsize}% Use normal size for feature names
+\setfamily{featurestylenames}{tt} % Use typewriter family for feature style names
+\setseries{featurestylenames}{md} % Use normal series for feature style names
+\setshape {featurestylenames}{up} % Use upright shape for feature style names
+\setsize {featurestylenames}{normalsize}% Use normal size for feature style names
\setfamily{features}{rm} % Use roman family for feature texts
\setseries{features}{md} % Use normal series for feature texts
\setshape {features}{it} % Use italics shape for feature texts
diff --git a/Master/texmf-dist/tex/latex/texshade/texshade.sty b/Master/texmf-dist/tex/latex/texshade/texshade.sty
index 792807ef473..77a390d1fc3 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}[2007/02/18 LaTeX TeXshade (v1.16)]
-\message{Package `texshade', Version 1.16 of 2007/02/18.}
+\ProvidesPackage{texshade}[2007/06/19 LaTeX TeXshade (v1.17)]
+\message{Package `texshade', Version 1.17 of 2007/06/19.}
\PassOptionsToPackage{dvips}{color}
\PassOptionsToPackage{dvips}{graphicx}
@@ -4027,6 +4027,12 @@
\fi\fi\fi
\fi
}
+\def\showfeaturename#1#2{\expandafter\xdef\csname featuretextn@me#1\endcsname{#2}}
+\def\showfeaturestylename#1#2{\expandafter\xdef\csname featurestylesn@me#1\endcsname{#2}}
+\def\hidefeaturename#1{\expandafter\xdef\csname featuretextn@me#1\endcsname{}}
+\def\hidefeaturenames{\xdef\featuretextn@mettop{}\xdef\featuretextn@metop{}\xdef\featuretextn@mebottom{}\xdef\featuretextn@mebbottom{}}
+\def\hidefeaturestylename#1{\expandafter\xdef\csname featurestylesn@me#1\endcsname{}}
+\def\hidefeaturestylenames{\xdef\featurestylesn@mettop{}\xdef\featurestylesn@metop{}\xdef\featurestylesn@mebottom{}\xdef\featurestylesn@mebbottom{}}
\def\seqtype#1{\xdef\seq@type{#1}
\if\seq@type P \xdef\prefix@{pep}
\else \if\seq@type p \xdef\seq@type{P} \xdef\prefix@{pep}
@@ -4036,7 +4042,21 @@
\xdef\first@{#1} \ifletter \get@name@number \fi
\expandafter\xdef\csname newseqname\first@\endcsname{#2}
}
-\def\threshold#1{\xdef\thresh@ld{#1}}
+\newcommand\threshold[2][n]{%
+ \xdef\first@{#1}
+ \ifx\first@\n@
+ \xdef\thresh@ld{#2}
+ \else
+ \all@shadetrue
+ \ifnum\first@>#2
+ \xdef\thresh@ld{#2}
+ \xdef\all@thresh@ld{#1}
+ \else
+ \xdef\thresh@ld{#1}
+ \xdef\all@thresh@ld{#2}
+ \fi
+ \fi
+}
\def\constosingleseq#1{%
\xdef\first@{#1 @} \expandafter\check@letter\first@
\xdef\first@{#1} \ifletter \get@name@number \fi
@@ -4096,20 +4116,45 @@
\xdef\seq@gap@num{\the\loopcount}
\fi
\fi}
-\newcommand{\shadingmode}[2][1]{%
+\newcommand{\shadingmode}[2][-1]{%
\xdef\last@{#2}
\xdef\first@{identical}
- \all@shadefalse
\ifx\first@\last@
\simmodefalse \funcmodefalse
- \xdef\last@{#1} \xdef\second@{allmatchspecial}
- \ifx\second@\last@ \all@shadetrue \fi
+ \xdef\second@{#1 @} \expandafter\check@letter\second@
+ \ifnumber \all@shadetrue
+ \ifnum#1<0 \all@shadefalse
+ \else
+ \ifnum#1>100 \xdef\all@thresh@ld{100}
+ \else
+ \xdef\all@thresh@ld{#1}
+ \fi\fi
+ \else
+ \xdef\last@{#1}
+ \xdef\first@{allmatchspecial}
+ \ifx\last@\first@
+ \xdef\all@thresh@ld{100} \all@shadetrue
+ \fi
+ \fi
\else
\xdef\first@{similar}
\ifx\first@\last@
\simmodetrue \funcmodefalse
- \xdef\last@{#1} \xdef\second@{allmatchspecial}
- \ifx\second@\last@ \all@shadetrue \fi
+ \xdef\second@{#1 @} \expandafter\check@letter\second@
+ \ifnumber \all@shadetrue
+ \ifnum#1<0 \all@shadefalse
+ \else
+ \ifnum#1>100 \xdef\all@thresh@ld{100}
+ \else
+ \xdef\all@thresh@ld{#1}
+ \fi\fi
+ \else
+ \xdef\last@{#1}
+ \xdef\first@{allmatchspecial}
+ \ifx\last@\first@
+ \xdef\all@thresh@ld{100} \all@shadetrue
+ \fi
+ \fi
\else
\xdef\first@{functional}
\ifx\first@\last@
@@ -4136,7 +4181,16 @@
\message{<Unknown shading mode - using `similar'>}
\simmodetrue \funcmodefalse
\fi\fi\fi\fi}
-\def\allmatchspecial{\all@shadetrue}
+\newcommand\allmatchspecial[1][100]{%
+ \ifnum#1<0
+ \xdef\all@thresh@ld{0}
+ \else
+ \ifnum#1>100
+ \xdef\all@thresh@ld{100}
+ \else
+ \xdef\all@thresh@ld{#1}
+ \fi\fi
+ \all@shadetrue}
\def\allmatchspecialoff{\all@shadefalse}
\def\gapchar#1{%
\xdef\first@{rule}\xdef\second@{#1}
@@ -4589,6 +4643,12 @@
\else
\xdef\third@{\second@}
\fi\fi\fi
+ \xdef\temp@{featurenames}
+ \ifx\first@\temp@ \xdef\ftext@family{\third@}
+ \else
+ \xdef\temp@{featurestylenames}
+ \ifx\first@\temp@ \xdef\fstyles@family{\third@}
+ \else
\xdef\temp@{features}
\ifx\first@\temp@ \xdef\featuretext@family{\third@}
\else
@@ -4618,6 +4678,8 @@
\else
\xdef\temp@{all}
\ifx\first@\temp@
+ \xdef\ftext@family{\third@}
+ \xdef\fstyles@family{\third@}
\xdef\featuretext@family{\third@}
\xdef\featurestyles@family{\third@}
\xdef\numbertext@family{\third@}
@@ -4627,7 +4689,7 @@
\xdef\label@family{\third@}
\xdef\hideblock@family{\third@}
\xdef\ruler@family{\second@}
- \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
\fi
}
\def\setseries#1#2{%
@@ -4646,6 +4708,12 @@
\else
\xdef\third@{\second@}
\fi\fi
+ \xdef\temp@{featurenames}
+ \ifx\first@\temp@ \xdef\ftext@series{\third@}
+ \else
+ \xdef\temp@{featurestylenames}
+ \ifx\first@\temp@ \xdef\fstyles@series{\third@}
+ \else
\xdef\temp@{features}
\ifx\first@\temp@ \xdef\featuretext@series{\third@}
\else
@@ -4672,6 +4740,8 @@
\else
\xdef\temp@{all}
\ifx\first@\temp@
+ \xdef\ftext@series{\third@}
+ \xdef\fstyles@series{\third@}
\xdef\featuretext@series{\third@}
\xdef\featurestyles@series{\third@}
\xdef\numbertext@series{\third@}
@@ -4680,7 +4750,7 @@
\xdef\legend@series{\third@}
\xdef\hideblock@series{\third@}
\xdef\label@series{\third@}
- \fi\fi\fi\fi\fi\fi\fi\fi\fi
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
\fi
}
\def\setshape#1#2{%
@@ -4707,6 +4777,12 @@
\else
\xdef\third@{\second@}
\fi\fi\fi\fi
+ \xdef\temp@{featurenames}
+ \ifx\first@\temp@ \xdef\ftext@shape{\third@}
+ \else
+ \xdef\temp@{featurestylenames}
+ \ifx\first@\temp@ \xdef\fstyles@shape{\third@}
+ \else
\xdef\temp@{features}
\ifx\first@\temp@ \xdef\featuretext@shape{\third@}
\else
@@ -4733,6 +4809,8 @@
\else
\xdef\temp@{all}
\ifx\first@\temp@
+ \xdef\ftext@shape{\third@}
+ \xdef\fstyles@shape{\third@}
\xdef\featuretext@shape{\third@}
\xdef\featurestyles@shape{\third@}
\xdef\numbertext@shape{\third@}
@@ -4741,7 +4819,7 @@
\xdef\legend@shape{\third@}
\xdef\hideblock@shape{\third@}
\xdef\label@shape{\third@}
- \fi\fi\fi\fi\fi\fi\fi\fi\fi
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
\fi
}
\def\setsize#1#2{%
@@ -4757,6 +4835,14 @@
\ifx\first@\temp@
\def\featurestyles@size{\csname #2\endcsname}
\else
+ \xdef\temp@{featurenames}
+ \ifx\first@\temp@
+ \def\ftext@size{\csname #2\endcsname}
+ \else
+ \xdef\temp@{featurestylenames}
+ \ifx\first@\temp@
+ \def\fstyles@size{\csname #2\endcsname}
+ \else
\xdef\temp@{numbering}
\ifx\first@\temp@
\def\numbertext@size{\csname #2\endcsname}
@@ -4796,6 +4882,8 @@
\ifx\first@\temp@
\def\featuretext@size{\csname #2\endcsname}
\def\featurestyles@size{\csname #2\endcsname}
+ \def\ftext@size{\csname #2\endcsname}
+ \def\fstyles@size{\csname #2\endcsname}
\def\numbertext@size{\csname #2\endcsname}
\def\namestext@size{\csname #2\endcsname}
\def\legend@size{\csname #2\endcsname}
@@ -4803,7 +4891,7 @@
\def\label@size{\csname #2\endcsname}
\def\residues@size{\csname #2\endcsname}
\xdef\res@size{#2}
- \fi\fi\fi\fi\fi\fi\fi\fi\fi
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
\xdef\temp@{Huge}
\ifx\temp@\res@size
\def\bottomruler@size{\csname Large\endcsname}
@@ -4835,6 +4923,44 @@
\def\setfont#1#2#3#4#5{%
\setfamily{#1}{#2}\setseries{#1}{#3}
\setshape{#1}{#4}\setsize{#1}{#5}}
+\def\featurenamesrm{\setfamily{featurenames}{rm}}
+\def\featurenamessf{\setfamily{featurenames}{sf}}
+\def\featurenamestt{\setfamily{featurenames}{tt}}
+\def\featurenamesmd{\setseries{featurenames}{md}}
+\def\featurenamesbf{\setseries{featurenames}{bf}}
+\def\featurenamesup{\setshape {featurenames}{up}}
+\def\featurenamesit{\setshape {featurenames}{it}}
+\def\featurenamessl{\setshape {featurenames}{sl}}
+\def\featurenamessc{\setshape {featurenames}{sc}}
+\def\featurenamestiny {\setsize{featurenames}{tiny}}
+\def\featurenamesscriptsize {\setsize{featurenames}{scriptsize}}
+\def\featurenamesfootnotesize{\setsize{featurenames}{footnotesize}}
+\def\featurenamessmall {\setsize{featurenames}{small}}
+\def\featurenamesnormalsize {\setsize{featurenames}{normalsize}}
+\def\featurenameslarge {\setsize{featurenames}{large}}
+\def\featurenamesLarge {\setsize{featurenames}{Large}}
+\def\featurenamesLARGE {\setsize{featurenames}{LARGE}}
+\def\featurenameshuge {\setsize{featurenames}{huge}}
+\def\featurenamesHuge {\setsize{featurenames}{Huge}}
+\def\featurestylenamesrm{\setfamily{featurestylenames}{rm}}
+\def\featurestylenamessf{\setfamily{featurestylenames}{sf}}
+\def\featurestylenamestt{\setfamily{featurestylenames}{tt}}
+\def\featurestylenamesmd{\setseries{featurestylenames}{md}}
+\def\featurestylenamesbf{\setseries{featurestylenames}{bf}}
+\def\featurestylenamesup{\setshape {featurestylenames}{up}}
+\def\featurestylenamesit{\setshape {featurestylenames}{it}}
+\def\featurestylenamessl{\setshape {featurestylenames}{sl}}
+\def\featurestylenamessc{\setshape {featurestylenames}{sc}}
+\def\featurestylenamestiny {\setsize{featurestylenames}{tiny}}
+\def\featurestylenamesscriptsize {\setsize{featurestylenames}{scriptsize}}
+\def\featurestylenamesfootnotesize{\setsize{featurestylenames}{footnotesize}}
+\def\featurestylenamessmall {\setsize{featurestylenames}{small}}
+\def\featurestylenamesnormalsize {\setsize{featurestylenames}{normalsize}}
+\def\featurestylenameslarge {\setsize{featurestylenames}{large}}
+\def\featurestylenamesLarge {\setsize{featurestylenames}{Large}}
+\def\featurestylenamesLARGE {\setsize{featurestylenames}{LARGE}}
+\def\featurestylenameshuge {\setsize{featurestylenames}{huge}}
+\def\featurestylenamesHuge {\setsize{featurestylenames}{Huge}}
\def\featuresrm{\setfamily{features}{rm}}
\def\featuressf{\setfamily{features}{sf}}
\def\featurestt{\setfamily{features}{tt}}
@@ -5081,14 +5207,36 @@
\else
\ifx\third@\first@\white@box\else\textcolor{\third@}{\box@rule}\fi
\fi\fi\fi\fi}
+\def\featurenamescolor#1{%
+ \expandafter\xdef\csname ftext@fg@ttop\endcsname{#1}
+ \expandafter\xdef\csname ftext@fg@top\endcsname{#1}
+ \expandafter\xdef\csname ftext@fg@bottom\endcsname{#1}
+ \expandafter\xdef\csname ftext@fg@bbottom\endcsname{#1}
+}
+\def\featurestylenamescolor#1{%
+ \expandafter\xdef\csname fstyles@fg@ttop\endcsname{#1}
+ \expandafter\xdef\csname fstyles@fg@top\endcsname{#1}
+ \expandafter\xdef\csname fstyles@fg@bottom\endcsname{#1}
+ \expandafter\xdef\csname fstyles@fg@bbottom\endcsname{#1}
+}
+\def\featurenamecolor#1#2{\expandafter\xdef\csname ftext@fg@#1\endcsname{#2}}
+\def\featurestylenamecolor#1#2{\expandafter\xdef\csname fstyles@fg@#1\endcsname{#2}}
\def\namescolor#1{\xdef\names@fg{#1}}
\def\namecolor#1#2{%
\xdef\first@{consensus} \xdef\second@{#1}
\ifx\first@\second@
\expandafter\xdef\csname name@col0\endcsname{#2}
\else
+ \xdef\first@{featurenames} \xdef\second@{#1}
+ \ifx\first@\second@
+ \xdef\ftext@fg{#2}
+ \else
+ \xdef\first@{featurestylenames} \xdef\second@{#1}
+ \ifx\first@\second@
+ \xdef\fstyles@fg{#2}
+ \else
\xdef\first@{#1,&,@} \xdef\third@{#2} \namecolor@
- \fi
+ \fi\fi\fi
}
\def\numberingcolor#1{\xdef\numbering@fg{#1}}
\def\numbercolor#1#2{%
@@ -5586,7 +5734,11 @@
\else
\expandafter\ifnum\csname pos\the\loopcount\endcsname>\m@x
\xdef\m@x{\csname pos\the\loopcount\endcsname}
- \xdef\cons@seq{\the\loopcount} \xdef\match@case{1}
+ \expandafter\ifnum\csname pos\the\loopcount\endcsname<\all@thresh@ld
+ \xdef\cons@seq{\the\loopcount} \xdef\match@case{1}
+ \else
+ \xdef\cons@seq{\the\loopcount} \xdef\match@case{2}
+ \fi
\else
\expandafter\ifnum\csname pos\the\loopcount\endcsname=\m@x
\xdef\match@case{0}
@@ -6017,13 +6169,14 @@
\xdef\constopo{\constopo 2}}
\def\allm@tch{%
- \ifall@shade \xdef\third@{0} \else \xdef\third@{1} \fi
+ \xdef\tmp@{\csname res\cons@seq\endcsname}
\loopcount=0
\loop
\advance\loopcount by 1
\xdef\first@{noshade}
\expandafter\ifx\csname hide@seq\the\loopcount\endcsname\first@
\xdef\first@{\csname res\the\loopcount\endcsname}
+ \ifx\first@\d@t\def\first@{\gap@char}\fi
\expandafter\ifx\csname tint@seq\the\loopcount\endcsname\y@
\expandafter\xdef\csname tint@seq\the\loopcount\endcsname{n}
\xdef\first@{=\first@}\fi
@@ -6034,11 +6187,60 @@
\csname seq\the\loopcount\endcsname%
3\first@}
\else
+ \xdef\second@{\csname res\the\loopcount\endcsname}
+ \ifx\tmp@\second@
+ \ifall@shade \xdef\third@{0} \else \xdef\third@{1} \fi
+ \else
+ \xdef\third@{3}
+ \ifsimmode
+ \xdef\last@{\csname \prefix@ sim\tmp@\endcsname &@}
+ \expandafter\get@count\last@
+ \innerloopcount=0 \getsim@char
+ \fi
+ \fi
\xdef\first@{\csname res\the\loopcount\endcsname}
+ \ifcase\third@
+ \ifnum\divref@=\loopcount\else
+ \xdef\low@up{lower} \ifx\res@llm@tch\low@up \make@lower \else
+ \xdef\low@up{upper} \ifx\res@llm@tch\low@up
+ \else \xdef\first@{\res@llm@tch} \fi\fi\fi
+ \or
\ifnum\divref@=\loopcount\else
\xdef\low@up{lower} \ifx\res@llm@tch\low@up \make@lower \else
\xdef\low@up{upper} \ifx\res@llm@tch\low@up
\else \xdef\first@{\res@llm@tch} \fi\fi\fi
+ \or
+ \ifnum\divref@=\loopcount\else
+ \xdef\low@up{lower} \ifx\ressimm@tch\low@up \make@lower \else
+ \xdef\low@up{upper} \ifx\ressimm@tch\low@up
+ \else \xdef\first@{\ressimm@tch} \fi\fi\fi
+ \else
+ \ifnum\divref@=\loopcount\else
+ \xdef\low@up{lower} \ifx\resn@m@tch\low@up \make@lower \else
+ \xdef\low@up{upper} \ifx\resn@m@tch\low@up
+ \else \xdef\first@{\resn@m@tch} \fi\fi\fi
+ \fi
+ \ifx\first@\d@t
+ \expandafter\ifnum\csname res@count\the\loopcount\endcsname%
+ <\csname seq@start\the\loopcount\endcsname
+ \ifsh@wg@ps
+ \def\first@{\gap@char}\def\third@{7}
+ \else
+ \def\first@{{}} \def\third@{8}
+ \fi
+ \else
+ \expandafter\ifnum\csname res@count\the\loopcount\endcsname%
+ <\csname seq@len\the\loopcount\endcsname
+ \def\third@{7}\def\first@{\gap@char}
+ \else
+ \ifsh@wg@ps
+ \def\first@{\gap@char}\def\third@{7}
+ \else
+ \def\first@{{}} \def\third@{8}
+ \fi
+ \fi
+ \fi
+ \fi
\expandafter\ifx\csname tint@seq\the\loopcount\endcsname\y@
\expandafter\xdef\csname tint@seq\the\loopcount\endcsname{n}
\xdef\first@{=\first@}\fi
@@ -6046,7 +6248,7 @@
\expandafter\xdef\csname emph@seq\the\loopcount\endcsname{n}
\xdef\first@{,\first@}\fi
\expandafter\xdef\csname seq\the\loopcount\endcsname{%
- \csname seq\the\loopcount\endcsname\third@\first@}
+ \csname seq\the\loopcount\endcsname\third@\first@}
\fi
\ifnum\loopcount<\seq@count \repeat
\xdef\first@{\csname res\cons@seq\endcsname}
@@ -8115,7 +8317,7 @@
\def\temp@{x}\fi%
\ifhidechar\xdef\temp@{}\fi%
\kern-\box@width\textcolor{\third@}{\hbox to \box@width{%
- \res@@style{\hss\temp@\hss}}}%
+ \legend@size{\res@@style{\hss\temp@\hss}}}}%
\kern2ex\textcolor{\legend@fg}{%
\legend@size{\csname fgroup@name\the\loopcount\endcsname}}
\newline\hbox{}%
@@ -8131,7 +8333,7 @@
\def\temp@{X}\xdef\low@up{lower}\ifx\resn@m@tch\low@up\def\temp@{x}\fi%
\ifhidechar\xdef\temp@{}\fi%
\kern-\box@width\textcolor{\TextNomatch}{\hbox to \box@width{%
- \res@@style{\hss\temp@\hss}}}%
+ \legend@size{\res@@style{\hss\temp@\hss}}}}%
\textcolor{\legend@fg}{%
\ifgerm@n\kern2ex\legend@size{nicht konserviert}%
\else\ifsp@nish\kern2ex\legend@size{no conservado}%
@@ -8146,7 +8348,7 @@
\def\temp@{X}\xdef\low@up{lower}\ifx\ressimm@tch\low@up\def\temp@{x}\fi%
\ifhidechar\xdef\temp@{}\fi%
\kern-\box@width\textcolor{\TextSimilar}{\hbox to \box@width{%
- \res@@style{\hss\temp@\hss}}}%
+ \legend@size{\res@@style{\hss\temp@\hss}}}}%
\textcolor{\legend@fg}{%
\ifgerm@n\kern2ex\legend@size{\"ahnlich}%
\else\ifsp@nish\kern2ex\legend@size{similar}%
@@ -8161,11 +8363,11 @@
\def\temp@{X}\xdef\low@up{lower}\ifx\resm@tch\low@up\def\temp@{x}\fi%
\ifhidechar\xdef\temp@{}\fi%
\kern-\box@width\textcolor{\TextIdentical}{\hbox to \box@width{%
- \res@@style{\hss\temp@\hss}}}%
+ \legend@size{\res@@style{\hss\temp@\hss}}}}%
\textcolor{\legend@fg}{%
- \ifgerm@n\kern2ex\legend@size{konserviert}%
- \else\ifsp@nish\kern2ex\legend@size{conservado}%
- \else\kern2ex\legend@size{conserved}\fi\fi}
+ \ifgerm@n\kern2ex\legend@size{$\ge$\,\thresh@ld\% konserviert}%
+ \else\ifsp@nish\kern2ex\legend@size{$\ge$\,\thresh@ld\% conservado}%
+ \else\kern2ex\legend@size{$\ge$\,\thresh@ld\% conserved}\fi\fi}
\newline\hbox{}\noindent%
\ifall@shade%
\ifnames@\ifnames@right\else\hbox to \name@width{\hss}\fi\fi
@@ -8176,11 +8378,18 @@
\def\temp@{X}\xdef\low@up{lower}\ifx\res@llm@tch\low@up\def\temp@{x}\fi%
\ifhidechar\xdef\temp@{}\fi%
\kern-\box@width\textcolor{\TextAllmatch}{\hbox to \box@width{%
- \res@@style{\hss\temp@\hss}}}%
+ \legend@size{\res@@style{\hss\temp@\hss}}}}%
+ \ifnum\all@thresh@ld=100
\textcolor{\legend@fg}{%
\ifgerm@n\kern2ex\legend@size{alle identisch}%
\else\ifsp@nish\kern2ex\legend@size{todos id\'enticos}%
\else\kern2ex\legend@size{all match}\fi\fi}
+ \else
+ \textcolor{\legend@fg}{%
+ \ifgerm@n\kern2ex\legend@size{$\ge$\,\all@thresh@ld\% konserviert}%
+ \else\ifsp@nish\kern2ex\legend@size{$\ge$\,\all@thresh@ld\% conservado}%
+ \else\kern2ex\legend@size{$\ge$\,\all@thresh@ld\% conserved}\fi\fi}
+ \fi
\newline\hbox{}\noindent
\fi
\fi
@@ -9042,6 +9251,7 @@
\textcolor{\f@color}{%
\hbox to #1\box@width{\hss\featuretext@size{\strut\fourth@}\hss}}%
\fi%
+ \advance\loopcount by -#1%
}
\def\put@featuretext{%
\if\first@ @%
@@ -9057,6 +9267,7 @@
\hbox to \second@\box@width%
{\hss\expandafter\putfeature@style{\first@}\hss}\fi%
\xdef\first@{#3@}%
+ \advance\loopcount by -\second@%
}
\def\put@featurestyle{%
\if\first@ @%
@@ -9068,35 +9279,104 @@
\def\put@feature{%
\vspace{-\baselineskip}%
\newline\hbox{}%
- \ifnames@right\else\ifnames@\hbox to \name@width{\hss}\fi\fi%
- \ifnumbers@left\ifnumbers@\hbox to \number@width{\hss}\fi\fi%
\xdef\temp@{ttop}%
\ifx\temp@\bottop@%
+ \ifnames@right\else\ifnames@%
+ \fontfamily{\ftext@family}\fontseries{\ftext@series}\fontshape{\ftext@shape}%
+ \selectfont%
+ \textcolor{\csname ftext@fg@\bottop@\endcsname}{\hbox to \name@width{\csname featuretextn@me\bottop@\endcsname\hss}}\fi\fi%
+ \ifnumbers@left\ifnumbers@\hbox to \number@width{\hss}\fi\fi%
\xdef\first@{\csname textfeature\bottop@\endcsname @}%
+ \loopcount=\res@perline%
\put@featuretext%
+ \ifnumbers@right\ifnumbers@\hbox to \number@width{\hss}\fi\fi%
+ \ifnames@right\ifnames@%
+ \fontfamily{\ftext@family}\fontseries{\ftext@series}\fontshape{\ftext@shape}%
+ \selectfont%
+ \kern1em\hbox to \loopcount\box@width{\hss}%
+ \textcolor{\csname ftext@fg@\bottop@\endcsname}{\hbox to \name@width{\csname featuretextn@me\bottop@\endcsname\hss}}\fi\fi%
\else%
\xdef\temp@{top}%
\ifx\temp@\bottop@%
+ \ifnames@right\else\ifnames@%
+ \fontfamily{\ftext@family}\fontseries{\ftext@series}\fontshape{\ftext@shape}%
+ \selectfont%
+ \textcolor{\csname ftext@fg@\bottop@\endcsname}{\hbox to \name@width{\csname featuretextn@me\bottop@\endcsname\hss}}\fi\fi%
+ \ifnumbers@left\ifnumbers@\hbox to \number@width{\hss}\fi\fi%
\xdef\first@{\csname textfeature\bottop@\endcsname @}%
+ \loopcount=\res@perline%
\put@featuretext%
+ \ifnumbers@right\ifnumbers@\hbox to \number@width{\hss}\fi\fi%
+ \ifnames@right\ifnames@%
+ \fontfamily{\ftext@family}\fontseries{\ftext@series}\fontshape{\ftext@shape}%
+ \selectfont%
+ \kern1em\hbox to \loopcount\box@width{\hss}%
+ \textcolor{\csname ftext@fg@\bottop@\endcsname}{\hbox to \name@width{\csname featuretextn@me\bottop@\endcsname\hss}}\fi\fi%
\else
+ \ifnames@right\else\ifnames@%
+ \fontfamily{\fstyles@family}\fontseries{\fstyles@series}\fontshape{\fstyles@shape}%
+ \selectfont%
+ \textcolor{\csname fstyles@fg@\bottop@\endcsname}{\hbox to \name@width{\csname featurestylesn@me\bottop@\endcsname\hss}}\fi\fi%
+ \ifnumbers@left\ifnumbers@\hbox to \number@width{\hss}\fi\fi%
\xdef\first@{\csname stylefeature\bottop@\endcsname @}%
+ \loopcount=\res@perline%
\put@featurestyle%
+ \ifnumbers@right\ifnumbers@\hbox to \number@width{\hss}\fi\fi%
+ \ifnames@right\ifnames@%
+ \fontfamily{\fstyles@family}\fontseries{\fstyles@series}\fontshape{\fstyles@shape}%
+ \selectfont%
+ \kern1em\hbox to \loopcount\box@width{\hss}%
+ \textcolor{\csname fstyles@fg@\bottop@\endcsname}{\hbox to \name@width{\csname featurestylesn@me\bottop@\endcsname\hss}}\fi\fi%
\fi\fi%
\newline\hbox{}%
- \ifnames@right\else\ifnames@\hbox to \name@width{\hss}\fi\fi%
- \ifnumbers@left\ifnumbers@\hbox to \number@width{\hss}\fi\fi%
\ifx\temp@\bottop@%
+ \ifnames@right\else\ifnames@%
+ \fontfamily{\fstyles@family}\fontseries{\fstyles@series}\fontshape{\fstyles@shape}%
+ \selectfont%
+ \textcolor{\csname fstyles@fg@\bottop@\endcsname}{\hbox to \name@width{\csname featurestylesn@me\bottop@\endcsname\hss}}\fi\fi%
+ \ifnumbers@left\ifnumbers@\hbox to \number@width{\hss}\fi\fi%
\xdef\first@{\csname stylefeature\bottop@\endcsname @}%
+ \loopcount=\res@perline%
\put@featurestyle%
+ \ifnumbers@right\ifnumbers@\hbox to \number@width{\hss}\fi\fi%
+ \ifnames@right\ifnames@%
+ \fontfamily{\fstyles@family}\fontseries{\fstyles@series}\fontshape{\fstyles@shape}%
+ \selectfont%
+ \kern1em\hbox to \loopcount\box@width{\hss}%
+ \textcolor{\csname fstyles@fg@\bottop@\endcsname}{\hbox to \name@width{\csname featurestylesn@me\bottop@\endcsname\hss}}\fi\fi%
\else%
\xdef\temp@{ttop}%
\ifx\temp@\bottop@%
+ \ifnames@right\else\ifnames@%
+ \fontfamily{\fstyles@family}\fontseries{\fstyles@series}\fontshape{\fstyles@shape}%
+ \selectfont%
+ \textcolor{\csname fstyles@fg@\bottop@\endcsname}{\hbox to \name@width{\csname featurestylesn@me\bottop@\endcsname\hss}}\fi\fi%
+ \ifnumbers@left\ifnumbers@\hbox to \number@width{\hss}\fi\fi%
\xdef\first@{\csname stylefeature\bottop@\endcsname @}%
+ \loopcount=\res@perline%
\put@featurestyle%
+ \ifnumbers@right\ifnumbers@\hbox to \number@width{\hss}\fi\fi%
+ \ifnames@right\ifnames@%
+ \fontfamily{\fstyles@family}\fontseries{\fstyles@series}\fontshape{\fstyles@shape}%
+ \selectfont%
+ \kern1em\hbox to \loopcount\box@width{\hss}%
+ \textcolor{\csname fstyles@fg@\bottop@\endcsname}{\hbox to \name@width{\csname featurestylesn@me\bottop@\endcsname\hss}}\fi\fi%
\else
+ \ifnames@right\else\ifnames@%
+ \fontfamily{\ftext@family}\fontseries{\ftext@series}\fontshape{\ftext@shape}%
+ \selectfont%
+ \textcolor{\csname ftext@fg@\bottop@\endcsname}{\hbox to \name@width{\csname featuretextn@me\bottop@\endcsname\hss}}\fi\fi%
+ \ifnumbers@left\ifnumbers@\hbox to \number@width{\hss}\fi\fi%
+ \xdef\first@{\csname textfeature\bottop@\endcsname @}%
\xdef\first@{\csname textfeature\bottop@\endcsname @}%
+ \loopcount=\res@perline%
\put@featuretext%
+ \ifnumbers@right\ifnumbers@\hbox to \number@width{\hss}\fi\fi%
+ \ifnames@right\ifnames@%
+ \fontfamily{\ftext@family}\fontseries{\ftext@series}\fontshape{\ftext@shape}%
+ \selectfont%
+ \kern1em\hbox to \loopcount\box@width{\hss}%
+ \textcolor{\csname ftext@fg@\bottop@\endcsname}{\hbox to \name@width{\csname featuretextn@me\bottop@\endcsname\hss}}\fi\fi%
\fi\fi%
\newline\hbox{}%
}
@@ -10711,6 +10991,8 @@
\xdef\hide@true{n} \xdef\hide@now{n}
\xdef\hide@label{circ}
\xdef\divref@{0}
+\xdef\all@thresh@ld{100} \all@shadefalse
+\hidefeaturenames \hidefeaturestylenames
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%% %%%%%
@@ -10746,6 +11028,8 @@
\numberingcolor{Black} % Numbering color is `Black'
\shownumbering{right} % Show sequence numbering on the left
\namescolor{Black} % Names' color is `Black'
+\featurenamescolor{Black} % Feature names' color is `Black'
+\featurestylenamescolor{Black} % Feature names' color is `Black'
\shownames{left} % Show sequence names on the right
\consensuscolors{Black}{White} % All consensus symbols/letters
{Black}{White} % appear `Black on White'
@@ -10786,6 +11070,14 @@
\setseries{names}{md} % Use normal series for names
\setshape {names}{up} % Use upright shape for names
\setsize {names}{normalsize} % Use normal size for names
+\setfamily{featurenames}{tt} % Use typewriter family for feature names
+\setseries{featurenames}{md} % Use normal series for feature names
+\setshape {featurenames}{up} % Use upright shape for feature names
+\setsize {featurenames}{normalsize}% Use normal size for feature names
+\setfamily{featurestylenames}{tt} % Use typewriter family for feature style names
+\setseries{featurestylenames}{md} % Use normal series for feature style names
+\setshape {featurestylenames}{up} % Use upright shape for feature style names
+\setsize {featurestylenames}{normalsize}% Use normal size for feature style names
\setfamily{features}{rm} % Use roman family for feature texts
\setseries{features}{md} % Use normal series for feature texts
\setshape {features}{it} % Use italics shape for feature texts