shipunov with -shipunov postfix for new .sty (8oct19)

git-svn-id: svn://tug.org/texlive/trunk@52334 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 34 insertions, 29 deletions

diff --git a/Master/texmf-dist/tex/latex/shipunov/biokey.sty b/Master/texmf-dist/tex/latex/shipunov/biokey.sty
index ef88da239e2..f34f79bb152 100644
--- a/Master/texmf-dist/tex/latex/shipunov/biokey.sty
+++ b/Master/texmf-dist/tex/latex/shipunov/biokey.sty
@@ -1,7 +1,14 @@
-% Author: Alexey B. Shipunov (plantago@herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza@gmail.com
 
 \ProvidesPackage{biokey}%
-        [2008/02/11 v3.1 Typesetting biological identification keys]
+    [2019/10/02 v.3.11 Typesetting biological identification keys]
+
+% 20191002 \ZZZ updated, \DD added
+% 20150911 \Ver@T added to make keys more readable
+% 20150912 Alien stuff removed, \FK supplied with the short vertical space
+% 20150913 Antitheses aligned better now, comments' breaks adjusted
+% 20150916 Better aligment for backtrack links
+% 20150920 'biokey' environment resets theses counter (if hyperref is used, specify 'hypertexnames=false')
 
 \newlength\TML@a
 \newlength\TML@b
@@ -29,7 +36,8 @@
         \penalty800\dbox@fill\penalty400%
         \vadjust{}\penalty10000\dbox@fil}
 \def\T#1\par{{\dot@leaders\SHRIFTN{#1}\par}\par}
-% `Automatically' paragraph aligment
+\def\TT#1\par{{\dot@leaders\SHRIFTN{#1}\par}\par}
+% `Automatic' paragraph aligment
 \def\TTTT#1\par{{\tolerance 9999 \dot@leaders\SHRIFTN{#1}\par}\par}
 
 % Old style reference
@@ -58,10 +66,6 @@
 \def\NNN#1\par{{\nopagebreak\par%
         \Indent@C\SHRIFTN{#1}\par}\par}
 
-% PUNCTS
-% Common punct
-\let\TT=\T
-
 % Hanging punct
 \def\VT{\@ifstar{\H@P}{\H@@P}}
 % Leaders stopped on right margin of text
@@ -78,22 +82,24 @@
 
 % Lengths (hang = 2em)
 \settowidth{\TML@b}{\SHRIFTZ{.}}
-\TML@a=1.5em
+\TML@a=1.6em % found visually
 \addtolength{\TML@a}{-\TML@b}
-\addtolength{\TML@b}{0.5em}
+\addtolength{\TML@b}{0.6em} % found visually
+\def\Ver@T{\vspace{.5\baselineskip}}
 \def\Indent@T{\hangindent2em\noindent}
 \def\OTSTUP{2em}
 \def\Indent@C{\parindent\OTSTUP\hangindent\parindent}
 
 % Common thesa
-\def\Z#1. {\Indent@T\makebox[1.5em][r]%
+\def\Z#1. {\Ver@T\Indent@T\makebox[1.5em][r]%
         {\SHRIFTZ{#1.}}\hspace{0.5em}}
 % Thesa with back reference
-\def\ZZ#1(#2).{\Indent@T\makebox[\TML@a][r]%
+\def\ZZ#1(#2).{\Ver@T\Indent@T\makebox[\TML@a][r]%
         {\SHRIFTZ{#1}}\hspace{0.45em}\SHRIFTZ{(#2).}}
 % Antitheses
-\def\ZZZ#1{\Indent@T\makebox[\TML@a][r]%
-        {#1}\hspace{\TML@b}}
+\def\ZZZ#1{\Indent@T\makebox[1.5em][r]{#1}% older variant: \makebox[\TML@a][r]
+        \hspace{0.5em}} % to make exactly 2em box like in \TE and \SE
+
 % First
 \def\AN{\ZZZ{$-$}}
 % You can replace it to $+$
@@ -104,21 +110,21 @@
 \def\AAAN{\ZZZ{$\equiv$}}
 
 % COMMENTS
-\def\FK#1\par{{\nopagebreak\smallskip%
+\def\FK#1\par{{\nopagebreak\vspace{.1\baselineskip}\nopagebreak%
         \Indent@C%
         \footnotesize#1\par\smallskip}}
 % You can use it as `numberless thesa'
-\def\KOM#1\par{{\nopagebreak\smallskip%
+\def\KOM#1\par{{\nopagebreak\Ver@T%
         \Indent@C#1\par\smallskip}}
-% Comment for object
-\def\VPRAVO#1 \par{{\nopagebreak\vskip-\parskip
+% Comment for the object
+\def\VPRAVO#1 \par{{\nopagebreak\vskip-\parskip\nopagebreak%
         \hbox to \linewidth {\hfil #1}\par}}
 
-% AUTOMATICAL KEYS
-\def\TEZA#1{\refstepcounter{TMC@Ba}\label{#1}%
+% AUTOMATIC KEYS
+\def\TEZA#1{\Ver@T\refstepcounter{TMC@Ba}\label{#1}%
         \Indent@T\makebox[1.5em][r]%
         {\SHRIFTZ{\arabic{TMC@Ba}.}}\hspace{0.5em}\ignorespaces}
-\def\STEZA#1#2{\refstepcounter{TMC@Ba}\label{#1}%
+\def\STEZA#1#2{\Ver@T\refstepcounter{TMC@Ba}\label{#1}%
         \Indent@T\makebox[\TML@a][r]%
         {\SHRIFTZ{\arabic{TMC@Ba}}}\hspace{0.45em}\SHRIFTZ{(\ref{#2}).}}
 \def\SSYLKA#1{\T\ref{#1}.}
@@ -126,8 +132,9 @@
 \let\TE\TEZA
 \let\SE\STEZA
 \let\SS\SSYLKA
+\def\DD#1{\T\ref{#1}.} % this is fo the case when \SS does not work
 
-% LEVELED KEYS
+% IDENTED KEYS
 \newenvironment{SDVIG}[1][1]
        {\TML@c=#1em \let\TML@@c\TML@c
         \def\Indent@T{\hangindent=2em\parindent=0em
@@ -140,8 +147,7 @@
 \let\LE\SDVIG
 \let\endLE\endSDVIG
 
-% KEYS WITH MARKERS ON LEFT PAGE MARGIN
-
+% KEYS WITH MARKERS ON THE LEFT PAGE MARGIN
 \if@MARG
 \def\Indent@C{\relax}%
 \def\Z#1. {\noindent\makebox[0em][r]%
@@ -154,11 +160,10 @@
 \else\relax
 \fi
 
-% Some useful stuff
-\let\K=\textit
-\let\J=\textbf
-\def\KN#1 {\textit{#1 }}
-\def\NN#1 #2 {\textit{#1 #2 }}
-\def\IN#1.#2.{#1.\,#2.~\ignorespaces}
+% ENVIRONMENT WHICH RESETS THESES COUNTER
+% If hyperref used, requires option "hypertexnames=false"
+\newenvironment{biokey}{%
+        \setcounter{TMC@Ba}{0}%
+        \relax}
 
 \endinput