summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/bibarts/bibarts.sty
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/bibarts/bibarts.sty')
-rw-r--r--macros/latex/contrib/bibarts/bibarts.sty1633
1 files changed, 1090 insertions, 543 deletions
diff --git a/macros/latex/contrib/bibarts/bibarts.sty b/macros/latex/contrib/bibarts/bibarts.sty
index e0ab320722..2f41c052cb 100644
--- a/macros/latex/contrib/bibarts/bibarts.sty
+++ b/macros/latex/contrib/bibarts/bibarts.sty
@@ -1,5 +1,5 @@
-%% BibArts 2.5 assists you to write LaTeX texts in arts and humanities.
-%% Copyright (C) 2022b Timo Baumann bibarts[at]gmx.de (2022/10/01)
+%% BibArts 2.6 assists you to write LaTeX texts in arts and humanities.
+%% Copyright (C) 2023 Timo Baumann bibarts[at]gmx.de (2023/06/18)
%%
%% This program is free software; you can redistribute it and/or modify
%% it under the terms of the GNU General Public License as published by
@@ -29,12 +29,13 @@
%% bibsort.c Source of bibsort.exe
%% COPYING The license of the package
+%% Octets and triplets like ‘ are used in this file.
%% COMPATIBILITY
-%% Change \DeclareRobustCommand into \def before using LaTeX 2.09.
+%% Change \DeclareRobustCommand (DRC) into \def before using LaTeX 2.09.
%% Then, you still NOT have to \protect BibArts-cmds in args of v-cmds.
-%% BibArts 2.5 ONLY has an EMULATION for 1.3 texts: Keep copies of 1.x?
+%% BibArts 2.6 ONLY has an EMULATION for 1.3 texts: Keep copies of 1.x?
@@ -73,7 +74,7 @@
\def\errmessage@ba#1{{\protectchars@active\errmessage{#1.^^J \space. . . . . . . . . . . }}}
-\typeout@ba{Style Option BibArts, Version 2.5 [2022b] ...}
+\typeout@ba{Style Option BibArts, Version 2.6 [2023] ...}
\def\msg@bafontsubst#1#2{\typeout@ba{{\string#1 ...} is unknown; I'll substitute {\string#2 ...}.}}
@@ -99,7 +100,7 @@
\def\baabkcorr{\bacorr}
\def\balistcorr{\bacorr}
\def\bakntsepcorr{\bacorr}
-%% Only \barefcorr is not yet unified in 2.5 %%
+%% \barefcorr remains un-unified
\def\setup@ba#1#2{\let\@bahdtest-{#1{%
\ifdim\fontdimen\@ne\font=\z@{\ignorespaces #2\ba@textmode\iflasthasdot@ba{\global\let\@bahdtest+}{}}\else
@@ -192,8 +193,8 @@
\newif\ifgendering\genderingfalse
\newif\iffemale\femalefalse
-\def\female{\global\genderingtrue\global\femaletrue} %% not for use in \vauthor ...
-\def\male{\global\genderingtrue\global\femalefalse} %% ... or \midvauthor!
+\def\female{\global\genderingtrue\global\femaletrue}
+\def\male{\global\genderingtrue\global\femalefalse}
\def\Ikillname{\ifgendering
\iffemale \femalename \else \malename \fi
\else \killname \fi}
@@ -310,7 +311,7 @@
\def\pnotprintlpevo{\@prnbapevofalse}
\def\notprintlongpervol{\protect\pnotprintlpevo}
-\def\if@batone#1#2{{\def\@testa{T1}\ifx\@testa\encodingdefault{#1}\else{#2}\fi}}
+\def\if@batone#1#2{\ifx\ToneName@ba\encodingdefault{#1}\else{#2}\fi}
\def\ifbatone{\protect\if@batone}
\def\ifbaibidem#1#2{\ifx\isibidem@ba+{#1}\else{#2}\fi}
\def\ifbaperiodical#1#2{\if@perba{#1}\else{#2}\fi}
@@ -466,33 +467,36 @@
\def\ibidemname@ba{\setup@ba{\edibidemph}{\cap@ba{ibidem}}}
-\def\pbaplural{\let\@testb=+}
-\def\baplural{\protect\pbaplural}
-\def\pbasingular{\let\@testb=.}
-\def\basingular{\protect\pbasingular} %% at the end of __||()[] %%
+%% \@testb into \sg@ba and DRC in 2.6
-{\catcode\grave@ba\;=12\gdef\dopassemi@ba{\ifx;\next@ba \let\@testb=+\fi}}
-{\catcode\grave@ba\;=13\gdef\doaktsemi@ba{\ifx;\next@ba \let\@testb=+\fi}}
+\def\pbaplural{\let\sg@ba=+}
+\DeclareRobustCommand\baplural{\protect\pbaplural} %% at the end of __||()[]
+
+\def\pbasingular{\let\sg@ba=.}
+\DeclareRobustCommand\basingular{\protect\pbasingular}
+
+{\catcode\grave@ba\;=12\gdef\dopassemi@ba{\ifx;\next@ba \let\sg@ba=+\fi}}
+{\catcode\grave@ba\;=13\gdef\doaktsemi@ba{\ifx;\next@ba \let\sg@ba=+\fi}}
\def\kommin@string#1{\getnext@km#1\endlist@ba}
\def\getnext@km{\afterassignment\do@ba@km\let\next@ba= }
\def\do@ba@km{%
\ifx \next@ba\endlist@ba \let\next@ba\relax
\else
- \ifx -\next@ba \let\@testb=+\fi
- \ifx ,\next@ba \let\@testb=+\fi
- \ifx \hy\next@ba \let\@testb=+\fi
- \ifx \fhy\next@ba \let\@testb=+\fi
- %\ifx \phy\next@ba \let\@testb=+\fi
- %\ifx\pfhy\next@ba \let\@testb=+\fi
- \ifx \f\next@ba \let\@testb=+\fi
- \ifx \ff\next@ba \let\@testb=+\fi
- \ifx \pf\next@ba \let\@testb=+\fi
- \ifx \pff\next@ba \let\@testb=+\fi
- \ifx \sq\next@ba \let\@testb=+\fi
- \ifx \sqq\next@ba \let\@testb=+\fi
- \ifx \psq\next@ba \let\@testb=+\fi
- \ifx\psqq\next@ba \let\@testb=+\fi
+ \ifx -\next@ba \let\sg@ba=+\fi
+ \ifx ,\next@ba \let\sg@ba=+\fi
+ \ifx \hy\next@ba \let\sg@ba=+\fi
+ \ifx \fhy\next@ba \let\sg@ba=+\fi
+ \ifx \phy\next@ba \let\sg@ba=+\fi %% Re-entered in 2.6:
+ \ifx\pfhy\next@ba \let\sg@ba=+\fi %% Needed if not DRC!
+ \ifx \f\next@ba \let\sg@ba=+\fi
+ \ifx \ff\next@ba \let\sg@ba=+\fi
+ \ifx \pf\next@ba \let\sg@ba=+\fi
+ \ifx \pff\next@ba \let\sg@ba=+\fi
+ \ifx \sq\next@ba \let\sg@ba=+\fi
+ \ifx \sqq\next@ba \let\sg@ba=+\fi
+ \ifx \psq\next@ba \let\sg@ba=+\fi
+ \ifx\psqq\next@ba \let\sg@ba=+\fi
\ifx \basingular\next@ba \basingular\fi
\ifx \baplural \next@ba \baplural \fi
\ifx\pbasingular\next@ba \basingular\fi
@@ -502,27 +506,27 @@
\let\next@ba\getnext@km
\fi \next@ba}
-\def\erripfpevo@ba#1{%{ \erri@ba}% %% outer/inner in 2.5:
+\def\erripfpevo@ba#1{%{ \erri@ba}%
\ifx#1x\type@bawarn{Empty [] or () at \if@baouter outer \else inner \fi cmd}\else
\type@bawarn{Empty || or __ at \if@baouter outer \else inner \fi cmd}\fi}
\def\printpf@ba#1#2{\if@pfvba{\errorcontextlines=-1%
\def\@testa{#2}%
- \let\@testb=.%
+ \let\sg@ba=.%
\ifx\@testa\@leer \erripfpevo@ba{x}\else
\ifx\@testa\@leerz\erripfpevo@ba{x}\else
\if@prnbapf\kommin@string{#2}\fi
- {\if@prnbapf\ifx.\@testb\cap@ba{#1}\else\cap@ba{#1p}\fi
+ {\if@prnbapf\ifx.\sg@ba\cap@ba{#1}\else\cap@ba{#1p}\fi
\else{\pagefolioshortsep}\fi
{\ignorespaces #2}\let\@testa=-\finddot@ba{#2}\ifx\@testa+\@bahasdot\fi}\fi\fi}\fi}
\def\printpevo@ba#1#2{\if@pfvba{\errorcontextlines=-1%
\def\@testa{#1}%
- \let\@testb=.%
+ \let\sg@ba=.%
\ifx\@testa\@leer \erripfpevo@ba{}\else
\ifx\@testa\@leerz\erripfpevo@ba{}\else
\if@prnbapevo\kommin@string{#1}\fi
- {\if@prnbapevo\ifx.\@testb\cap@ba{#2}\else\cap@ba{#2p}\fi
+ {\if@prnbapevo\ifx.\sg@ba\cap@ba{#2}\else\cap@ba{#2p}\fi
\else{\pervolshortsep}\fi
{\ignorespaces #1}\let\@testa=-\finddot@ba{#1}\ifx\@testa+\@bahasdot\fi\gdef\bacorr{}}\fi\fi}\fi}
@@ -556,7 +560,7 @@
\fi
\else\printpf@ba{#1}{#3}%
\global\let\lastp@ba=-%
- \global\let\pmem@ba=\pref@ba %% moved in 2.5
+ \global\let\pmem@ba=\pref@ba
\fi}%
\fi}
@@ -577,8 +581,8 @@
\ifx\isibidem@ba+\ifx\pos@ba1\else\global\let\thisvol@ba=+\fi\fi
\fi
\fi
- \global\let\lastvol@ba=-% %% moved in 2.5
- \global\let\volmem@ba=\volref@ba %% moved in 2.5
+ \global\let\lastvol@ba=-%
+ \global\let\volmem@ba=\volref@ba
\else
\printpevo@ba{#1}{#2}%
\fi}%
@@ -613,9 +617,9 @@
\def\geditorname{[\kern 0.04em Hrsg.]\kern 0.02em}
\let\geditorpname=\geditorname
\setibidem{g}{ebd\kern -0.07em}{.}
-\def\gidemname{ders\kern -0.04em.\bahasdot} %%
-\def\geademname{dies\kern -0.04em.\bahasdot} %% \bahasdot new in 2.2 %%
-\def\giidemname{diesn\kern -0.07em.\bahasdot} %%
+\def\gidemname{ders\kern -0.04em.\bahasdot}
+\def\geademname{dies\kern -0.04em.\bahasdot}
+\def\giidemname{diesn\kern -0.07em.\bahasdot}
\def\gvolname{, Bd.\,}
\def\gvolpname{, Bde.\,}
\def\gpername{\ifbaibidem{, Nr.\,}{\pernosep}}
@@ -641,7 +645,7 @@
\def\gprrtitlename{Personenregister}
\def\gsrrtitlename{Sachregister}
\def\gannouncektitname{\bastrut\ (\kern 0.015em im Folgenden \baupcorr}
- %% 2.5 auch: {\bapoint\newsentence Fortan: }
+ %%{\bapoint\newsentence Fortan: }
\def\gannouncekendname{)} %%{\bapoint\banotdot}
\def\grefvbegname{(}
\def\grefverbname{siehe}
@@ -810,131 +814,128 @@
\def\@outsavety{% %% not protect \nsep %%
- \protectchars@active%
- \def\newpage{\protect\newpage}%
- \def\frq{\protect\frq}%
- \def\flq{\protect\flq}%
- \def\frqq{\protect\frqq}%
- \def\flqq{\protect\flqq}%
- \def\"{\string\"}%
- \def\ddot{\protect\ddot}%
- \def\.{\string\.}%
- \def\dot{\protect\dot}%
- \def\={\string\=}%
- \def\bar{\protect\bar}%
- \def\vec{\protect\vec}%
- \def\^{\string\^}%
- \def\hat{\protect\hat}%
- \def\'{\string\'}%
- \def\acute{\protect\acute}%
- \def\`{\string\`}%
- \def\grave{\protect\grave}%
- \def\~{\string\~}%
- \def\tilde{\protect\tilde}%
- \def\P{\protect\P}%
- \def\S{\protect\S}%
- \def\aa{\protect\aa}%
- \def\ae{\protect\ae}%
- \def\AA{\protect\AA}%
- \def\AE{\protect\AE}%
- \def\b{\protect\b}%
- \def\c{\protect\c}%
- \def\d{\protect\d}%
- \def\H{\protect\H}%
- \def\i{\protect\i}%
- \def\j{\protect\j}%
- \def\l{\protect\l}%
- \def\L{\protect\L}%
- \def\o{\protect\o}%
- \def\O{\protect\O}%
- \def\ss{\protect\ss}%
- \def\3{\string\3}%
- \def\newhyss{\protect\newhyss}%
- \def\NEWHYSS{\protect\NEWHYSS}%
- \def\oldhyss{\protect\oldhyss}%
- \def\OLDHYSS{\protect\OLDHYSS}%
- \def\oldhyc{\protect\oldhyc}%
- \def\OLDHYC{\protect\OLDHYC}%
- \def\oldhyf{\protect\oldhyf}%
- \def\OLDHYF{\protect\OLDHYF}%
- \def\oldhyl{\protect\oldhyl}%
- \def\OLDHYL{\protect\OLDHYL}%
- \def\oldhym{\protect\oldhym}%
- \def\OLDHYM{\protect\OLDHYM}%
- \def\oldhyn{\protect\oldhyn}%
- \def\OLDHYN{\protect\OLDHYN}%
- \def\oldhyp{\protect\oldhyp}%
- \def\OLDHYP{\protect\OLDHYP}%
- \def\oldhyr{\protect\oldhyr}%
- \def\OLDHYR{\protect\OLDHYR}%
- \def\oldhyt{\protect\oldhyt}%
- \def\OLDHYT{\protect\OLDHYT}%
- \def\ck{\protect\ck}%
- \def\CK{\protect\CK}%
- \def\k{\protect\k}%
- \def\r{\protect\r}%
- \def\mathring{\protect\mathring}%
- \def\t{\protect\t}%
- \def\u{\protect\u}%
- \def\breve{\protect\breve}%
- \def\v{\protect\v}%
- \def\check{\protect\check}%
- %%\def\|{\string\|}% %% \fnsymbol ? %%
- \def\,{\string\,}%
- \def\*{\string\*}%
- \def\@{\string\@}%
- \def\-{\string\-}%
- \def\_{\string\_}%
- \def\${\string\$}%
- \def\\{\string\\}%
- \def\{{\string\{}%
- \def\}{\string\}}%
- \def\leavevmode{\protect\leavevmode}%
- \def\rlap{\protect\rlap}%
- \def\llap{\protect\llap}%
- \def\nobreak{\protect\nobreak}%
- \def\mathhexbox{\protect\mathhexbox}%
- \def\authoremph{\protect\authoremph}%
- \def\cal{\protect\cal}%
- \def\mit{\protect\mit}%
- \def\footnotesize{\protect\footnotesize}%
- \def\huge{\protect\huge}%
- \def\Huge{\protect\Huge}%
- \def\large{\protect\large}%
- \def\Large{\protect\Large}%
- \def\LARGE{\protect\LARGE}%
- \def\scriptsize{\protect\scriptsize}%
- \def\small{\protect\small}%
- \def\tiny{\protect\tiny}%
- \def\normalsize{\protect\normalsize}%
- %\def\label##1{}%
- \def\label{\protect\label}% %% 2.09/2e? %%
- \def\index{\protect\index}%
- \def\glossary{\protect\glossary}%
- \def\Alpha{\protect\Alpha}%
- \def\Beta{\protect\Beta}%
- \def\Epsilon{\protect\Epsilon}%
- \def\Zeta{\protect\Zeta}%
- \def\Eta{\protect\Eta}%
- \def\Iota{\protect\Iota}%
- \def\Kappa{\protect\Kappa}%
- \def\Mu{\protect\Mu}%
- \def\Nu{\protect\Nu}%
- \def\Rho{\protect\Rho}%
- \def\Tau{\protect\Tau}%
- \def\Chi{\protect\Chi}%
- \def\Omicron{\protect\Omicron}%
- \def\omicron{\protect\omicron}%
- \def\backslash{\protect\backslash}%
- \def\sz{\protect\sz}%
- \def\SZ{\protect\SZ}%
- \def\selectlanguage{\protect\selectlanguage}%
- \def\sethyphenation{\protect\sethyphenation}%
- \def\frac{\protect\frac}%
- \def\nosort{\protect\nosort}%
- \def\hy{\protect\hy}%
- \def\fhy{\protect\fhy}%
- \def\bastrut{\protect\bastrut}%
+ \protectchars@active%
+ \def\newpage{\protect\newpage}%
+ %% del \frq \flq \frqq \flqq in 2.6
+ \def\"{\string\"}%
+ \def\ddot{\protect\ddot}%
+ \def\.{\string\.}%
+ \def\dot{\protect\dot}%
+ \def\={\string\=}%
+ \def\bar{\protect\bar}%
+ \def\vec{\protect\vec}%
+ \def\^{\string\^}%
+ \def\hat{\protect\hat}%
+ \def\'{\string\'}%
+ \def\acute{\protect\acute}%
+ \def\`{\string\`}%
+ \def\grave{\protect\grave}%
+ \def\~{\string\~}%
+ \def\tilde{\protect\tilde}%
+ \def\P{\protect\P}%
+ \def\S{\protect\S}%
+ \def\aa{\protect\aa}%
+ \def\ae{\protect\ae}%
+ \def\AA{\protect\AA}%
+ \def\AE{\protect\AE}%
+ \def\b{\protect\b}%
+ \def\c{\protect\c}%
+ \def\d{\protect\d}%
+ \def\H{\protect\H}%
+ \def\i{\protect\i}%
+ \def\j{\protect\j}%
+ \def\l{\protect\l}%
+ \def\L{\protect\L}%
+ \def\o{\protect\o}%
+ \def\O{\protect\O}%
+ \def\ss{\protect\ss}%
+ \def\3{\string\3}%
+ \def\newhyss{\protect\newhyss}%
+ \def\NEWHYSS{\protect\NEWHYSS}%
+ \def\oldhyss{\protect\oldhyss}%
+ \def\OLDHYSS{\protect\OLDHYSS}%
+ \def\oldhyc{\protect\oldhyc}%
+ \def\OLDHYC{\protect\OLDHYC}%
+ \def\oldhyf{\protect\oldhyf}%
+ \def\OLDHYF{\protect\OLDHYF}%
+ \def\oldhyl{\protect\oldhyl}%
+ \def\OLDHYL{\protect\OLDHYL}%
+ \def\oldhym{\protect\oldhym}%
+ \def\OLDHYM{\protect\OLDHYM}%
+ \def\oldhyn{\protect\oldhyn}%
+ \def\OLDHYN{\protect\OLDHYN}%
+ \def\oldhyp{\protect\oldhyp}%
+ \def\OLDHYP{\protect\OLDHYP}%
+ \def\oldhyr{\protect\oldhyr}%
+ \def\OLDHYR{\protect\OLDHYR}%
+ \def\oldhyt{\protect\oldhyt}%
+ \def\OLDHYT{\protect\OLDHYT}%
+ \def\ck{\protect\ck}%
+ \def\CK{\protect\CK}%
+ \def\k{\protect\k}%
+ \def\r{\protect\r}%
+ \def\mathring{\protect\mathring}%
+ \def\t{\protect\t}%
+ \def\u{\protect\u}%
+ \def\breve{\protect\breve}%
+ \def\v{\protect\v}%
+ \def\check{\protect\check}%
+ %%\def\|{\string\|}% %% \fnsymbol ? %%
+ \def\,{\string\,}%
+ \def\*{\string\*}%
+ \def\@{\string\@}%
+ \def\-{\string\-}%
+ \def\_{\string\_}%
+ \def\${\string\$}%
+ \def\\{\string\\}%
+ \def\{{\string\{}%
+ \def\}{\string\}}%
+ \def\leavevmode{\protect\leavevmode}%
+ \def\rlap{\protect\rlap}%
+ \def\llap{\protect\llap}%
+ \def\nobreak{\protect\nobreak}%
+ \def\mathhexbox{\protect\mathhexbox}%
+ \def\authoremph{\protect\authoremph}%
+ \def\cal{\protect\cal}%
+ \def\mit{\protect\mit}%
+ \def\footnotesize{\protect\footnotesize}%
+ \def\huge{\protect\huge}%
+ \def\Huge{\protect\Huge}%
+ \def\large{\protect\large}%
+ \def\Large{\protect\Large}%
+ \def\LARGE{\protect\LARGE}%
+ \def\scriptsize{\protect\scriptsize}%
+ \def\small{\protect\small}%
+ \def\tiny{\protect\tiny}%
+ \def\normalsize{\protect\normalsize}%
+ %\def\label##1{}%
+ \def\label{\protect\label}% %% 2.09/2e? %%
+ \def\index{\protect\index}%
+ \def\glossary{\protect\glossary}%
+ \def\Alpha{\protect\Alpha}%
+ \def\Beta{\protect\Beta}%
+ \def\Epsilon{\protect\Epsilon}%
+ \def\Zeta{\protect\Zeta}%
+ \def\Eta{\protect\Eta}%
+ \def\Iota{\protect\Iota}%
+ \def\Kappa{\protect\Kappa}%
+ \def\Mu{\protect\Mu}%
+ \def\Nu{\protect\Nu}%
+ \def\Rho{\protect\Rho}%
+ \def\Tau{\protect\Tau}%
+ \def\Chi{\protect\Chi}%
+ \def\Omicron{\protect\Omicron}%
+ \def\omicron{\protect\omicron}%
+ \def\backslash{\protect\backslash}%
+ \def\sz{\protect\sz}%
+ \def\SZ{\protect\SZ}%
+ \def\selectlanguage{\protect\selectlanguage}%
+ \def\sethyphenation{\protect\sethyphenation}%
+ \def\frac{\protect\frac}%
+ \def\nosort{\protect\nosort}%
+ \def\hy{\protect\hy}%
+ \def\fhy{\protect\fhy}%
+ \def\bastrut{\protect\bastrut}%
}
@@ -949,77 +950,84 @@
\def\@outfunctions{%
- \errorcontextlines=-1%
- \def\protect{\noexpand\noexpand\noexpand}%
- \def\protect@onlyout{\protect}%
- \def\par{}% %% Fehlermeldungen verringen %%
- \if@unusedbib\def\setn@ba{{}{}{-}}\fi%
- \def\onlyhere{\protect\onlyhere}%
- \def\onlyout{\protect\onlyout}%
- \def\onlyvoll{\protect\onlyvoll}%
- \def\onlykurz{\protect\onlykurz}%
- \def\sechere##1##2{\onlyhere{##2}\onlyout{##1}}% %% new in 2.5
- \def\kurz{\if@baouter\protect\outkurz\else\protect\delkurz\fi}%
- \def\ktit{\protect\ktit}%
- \def\vauthor{\protect\vauthor}%
- \def\midvauthor{\protect\midvauthor}%
- \def\kauthor{\protect\kauthor}%
- \def\midkauthor{\protect\midkauthor}%
- \def\addtovli{\protect\shadowv}%
- \def\addtovqu{\protect\shadowv}%
- \def\addtokli{\protect\shadowk}%
- \def\addtokqu{\protect\shadowk}%
- \def\vli{\protect\printonlyvli}%
- \def\vqu{\protect\printonlyvqu}%
- \def\kli{\protect\printonlykli}%
- \def\kqu{\protect\printonlykqu}%
- \def\printonlyvli{\protect\printonlyvli}%
- \def\printonlyvqu{\protect\printonlyvqu}%
- \def\printonlykli{\protect\printonlykli}%
- \def\printonlykqu{\protect\printonlykqu}%
- \def\xaddtovli{\protect\shadowv}%
- \def\xaddtovqu{\protect\shadowv}%
- \def\xaddtokli{\protect\shadowk}%
- \def\xaddtokqu{\protect\shadowk}%
- \def\xvli{\protect\xprintonlyvli}%
- \def\xvqu{\protect\xprintonlyvqu}%
- \def\xkli{\protect\xprintonlykli}%
- \def\xkqu{\protect\xprintonlykqu}%
- \def\xprintonlyvli{\protect\xprintonlyvli}%
- \def\xprintonlyvqu{\protect\xprintonlyvqu}%
- \def\xprintonlykli{\protect\xprintonlykli}%
- \def\xprintonlykqu{\protect\xprintonlykqu}%
- \def\per{\protect\printonlyper}%
- \def\abkper{\protect\printonlyper}%
- \def\fillper{\protect\shadowtwo}%
- \def\arq{\protect\printonlyarq}%
- \def\fillarq{\protect\shadowtwo}%
- \def\fillgrr{\protect\shadowtwo}%
- \def\fillprr{\protect\shadowtwo}%
- \def\fillsrr{\protect\shadowtwo}%
- \def\abk{\protect\printonlyabk}%
- \def\defabk{\protect\printonlydefabk}%
- \def\abkdef{\protect\printonlyabkdef}%
- \def\addtoper{\protect\shadowo}%
- \def\addtoarq{\protect\shadowt}%
- \def\addtoabk{\protect\shadowone}%
- \def\addtodefabk{\protect\shadowtwo}%
- \def\addtoabkdef{\protect\shadowtwo}%
- \def\addtogrr{\protect\shadowone}%
- \def\addtoprr{\protect\shadowone}%
- \def\addtosrr{\protect\shadowone}%
- \def\printonlyper{\protect\printonlyper}%
- \def\printonlyarq{\protect\printonlyarq}%
- \def\printonlyabk{\protect\printonlyabk}%
- \def\printonlydefabk{\protect\printonlydefabk}%
- \def\printonlyabkdef{\protect\printonlyabkdef}%
- \def\female{\protect\female}%
- \def\male{\protect\male}%
- \def\sort{\protect\sort}%
- \def\bago{\protect\bago}%
- \def\bahasdot{\protect\bahasdot}%
- \def\bacorr{\protect\bacorr}%
- \def\verb{\errmessage{verbatim is forbidden inside BibArts args}}%
+ \errorcontextlines=-1%
+ \def\protect{\noexpand\noexpand\noexpand}%
+ \def\protect@onlyout{\protect}%
+ \def\par{}% %% reduce errmsgs
+ \if@unusedbib\def\setn@ba{{}{}{-}}\fi%
+ \def\onlyhere{\protect\onlyhere}%
+ \def\onlyout{\protect\onlyout}%
+ \def\onlyvoll{\protect\onlyvoll}%
+ \def\onlykurz{\protect\onlykurz}%
+ \def\sechere##1##2{\onlyhere{##2}\onlyout{##1}}%
+ \def\kurz{\if@baouter\protect\outkurz\else\protect\delkurz\fi}%
+ \def\ktit{\protect\ktit}%
+ \def\vauthor{\protect\vauthor}%
+ \def\midvauthor{\protect\midvauthor}%
+ \def\kauthor{\protect\kauthor}%
+ \def\midkauthor{\protect\midkauthor}%
+ \def\addtovli{\protect\shadowv}%
+ \def\addtovqu{\protect\shadowv}%
+ \def\addtokli{\protect\shadowk}%
+ \def\addtokqu{\protect\shadowk}%
+ \def\vli{\protect\printonlyvli}%
+ \def\vqu{\protect\printonlyvqu}%
+ \def\kli{\protect\printonlykli}%
+ \def\kqu{\protect\printonlykqu}%
+ \def\printonlyvli{\protect\printonlyvli}%
+ \def\printonlyvqu{\protect\printonlyvqu}%
+ \def\printonlykli{\protect\printonlykli}%
+ \def\printonlykqu{\protect\printonlykqu}%
+ \def\xaddtovli{\protect\shadowv}%
+ \def\xaddtovqu{\protect\shadowv}%
+ \def\xaddtokli{\protect\shadowk}%
+ \def\xaddtokqu{\protect\shadowk}%
+ \def\xvli{\protect\xprintonlyvli}%
+ \def\xvqu{\protect\xprintonlyvqu}%
+ \def\xkli{\protect\xprintonlykli}%
+ \def\xkqu{\protect\xprintonlykqu}%
+ \def\xprintonlyvli{\protect\xprintonlyvli}%
+ \def\xprintonlyvqu{\protect\xprintonlyvqu}%
+ \def\xprintonlykli{\protect\xprintonlykli}%
+ \def\xprintonlykqu{\protect\xprintonlykqu}%
+ \def\per{\protect\printonlyper}%
+ \def\abkper{\protect\printonlyper}%
+ \def\fillper{\protect\shadowtwo}%
+ \def\arq{\protect\printonlyarq}%
+ \def\fillarq{\protect\shadowtwo}%
+ \def\fillgrr{\protect\shadowtwo}%
+ \def\fillprr{\protect\shadowtwo}%
+ \def\fillsrr{\protect\shadowtwo}%
+ \def\abk{\protect\printonlyabk}%
+ \def\defabk{\protect\printonlydefabk}%
+ \def\abkdef{\protect\printonlyabkdef}%
+ \def\addtoper{\protect\shadowo}%
+ \def\addtoarq{\protect\shadowt}%
+ \def\addtoabk{\protect\shadowone}%
+ \def\addtodefabk{\protect\shadowtwo}%
+ \def\addtoabkdef{\protect\shadowtwo}%
+ \def\addtogrr{\protect\shadowone}%
+ \def\addtoprr{\protect\shadowone}%
+ \def\addtosrr{\protect\shadowone}%
+ \def\printonlyper{\protect\printonlyper}%
+ \def\printonlyarq{\protect\printonlyarq}%
+ \def\printonlyabk{\protect\printonlyabk}%
+ \def\printonlydefabk{\protect\printonlydefabk}%
+ \def\printonlyabkdef{\protect\printonlyabkdef}%
+ \def\female{\protect\female}%
+ \def\male{\protect\male}%
+ \def\sort{\protect\sort}%
+ \def\bago{\protect\bago}%
+ \def\bahasdot{\protect\bahasdot}%
+ \def\bacorr{\protect\bacorr}%
+ \def\verb{\errmessage{verbatim is forbidden inside BibArts args}}%
+ %% new in 2.6:
+ \def\input{\protect\input}%
+ \def\mdqon{\protect\mdqon}%
+ \def\mdqoff{\protect\mdqoff}%
+ \def\shorthandon{\protect\shorthandon}%
+ \def\shorthandoff{\protect\shorthandoff}%
+ \def\hyphenrules{\protect\hyphenrules}%
}
@@ -1027,72 +1035,72 @@
\def\@memfunctions{%
- \errorcontextlines=-1%
- \def\protect{\noexpand\noexpand\noexpand}%
- \def\kurz{\protect\kurz}%
- \def\ktit{\protect\ktit}%
- \def\addtovli{\protect\addtovli}%
- \def\addtovqu{\protect\addtovqu}%
- \def\addtokli{\protect\addtokli}%
- \def\addtokqu{\protect\addtokqu}%
- \def\printonlyvli{\protect\printonlyvli}%
- \def\printonlyvqu{\protect\printonlyvqu}%
- \def\printonlykli{\protect\printonlykli}%
- \def\printonlykqu{\protect\printonlykqu}%
- \def\vli{\protect\vli}%
- \def\vqu{\protect\vqu}%
- \def\kli{\protect\kli}%
- \def\kqu{\protect\kqu}%
- \def\xaddtovli{\protect\xaddtovli}%
- \def\xaddtovqu{\protect\xaddtovqu}%
- \def\xaddtokli{\protect\xaddtokli}%
- \def\xaddtokqu{\protect\xaddtokqu}%
- \def\xprintonlyvli{\protect\xprintonlyvli}%
- \def\xprintonlyvqu{\protect\xprintonlyvqu}%
- \def\xprintonlykli{\protect\xprintonlykli}%
- \def\xprintonlykqu{\protect\xprintonlykqu}%
- \def\xvli{\protect\xvli}%
- \def\xvqu{\protect\xvqu}%
- \def\xkli{\protect\xkli}%
- \def\xkqu{\protect\xkqu}%
- \def\per{\protect\per}%
- \def\abkper{\protect\abkper}%
- \def\fillper{\protect\fillper}%
- \def\arq{\protect\arq}%
- \def\fillarq{\protect\fillarq}%
- \def\fillgrr{\protect\fillgrr}%
- \def\fillprr{\protect\fillprr}%
- \def\fillsrr{\protect\fillsrr}%
- \def\abk{\protect\abk}%
- \def\abkdef{\protect\abkdef}%
- \def\defabk{\protect\defabk}%
- \def\addtoper{\protect\addtoper}%
- \def\addtoarq{\protect\addtoarq}%
- \def\addtoabk{\protect\addtoabk}%
- \def\addtoabkdef{\protect\addtoabkdef}%
- \def\addtodefabk{\protect\addtodefabk}%
- \def\addtogrr{\protect\addtogrr}%
- \def\addtoprr{\protect\addtoprr}%
- \def\addtosrr{\protect\addtosrr}%
- \def\printonlyper{\protect\printonlyper}%
- \def\printonlyarq{\protect\printonlyarq}%
- \def\printonlyabk{\protect\printonlyabk}%
- \def\printonlyabkdef{\protect\printonlyabkdef}%
- \def\printonlydefabk{\protect\printonlydefabk}%
- \def\onlyhere{\protect\onlyhere}%
- \def\onlyout{\protect\onlyout}%
- \def\onlyvoll{\protect\onlyvoll}%
- \def\onlykurz{\protect\onlykurz}%
- \def\vauthor{\protect\vauthor}%
- \def\midvauthor{\protect\midvauthor}%
- \def\kauthor{\protect\kauthor}%
- \def\midkauthor{\protect\midkauthor}%
- \def\female{}%
- \def\male{}%
- \def\sort{\protect\sort}% %% Nur wirksam in \protec@scr %%
- \def\bahasdot{}%
- \def\banotdot{}%
- \def\bago{}%
+ \errorcontextlines=-1%
+ \def\protect{\noexpand\noexpand\noexpand}%
+ \def\kurz{\protect\kurz}%
+ \def\ktit{\protect\ktit}%
+ \def\addtovli{\protect\addtovli}%
+ \def\addtovqu{\protect\addtovqu}%
+ \def\addtokli{\protect\addtokli}%
+ \def\addtokqu{\protect\addtokqu}%
+ \def\printonlyvli{\protect\printonlyvli}%
+ \def\printonlyvqu{\protect\printonlyvqu}%
+ \def\printonlykli{\protect\printonlykli}%
+ \def\printonlykqu{\protect\printonlykqu}%
+ \def\vli{\protect\vli}%
+ \def\vqu{\protect\vqu}%
+ \def\kli{\protect\kli}%
+ \def\kqu{\protect\kqu}%
+ \def\xaddtovli{\protect\xaddtovli}%
+ \def\xaddtovqu{\protect\xaddtovqu}%
+ \def\xaddtokli{\protect\xaddtokli}%
+ \def\xaddtokqu{\protect\xaddtokqu}%
+ \def\xprintonlyvli{\protect\xprintonlyvli}%
+ \def\xprintonlyvqu{\protect\xprintonlyvqu}%
+ \def\xprintonlykli{\protect\xprintonlykli}%
+ \def\xprintonlykqu{\protect\xprintonlykqu}%
+ \def\xvli{\protect\xvli}%
+ \def\xvqu{\protect\xvqu}%
+ \def\xkli{\protect\xkli}%
+ \def\xkqu{\protect\xkqu}%
+ \def\per{\protect\per}%
+ \def\abkper{\protect\abkper}%
+ \def\fillper{\protect\fillper}%
+ \def\arq{\protect\arq}%
+ \def\fillarq{\protect\fillarq}%
+ \def\fillgrr{\protect\fillgrr}%
+ \def\fillprr{\protect\fillprr}%
+ \def\fillsrr{\protect\fillsrr}%
+ \def\abk{\protect\abk}%
+ \def\abkdef{\protect\abkdef}%
+ \def\defabk{\protect\defabk}%
+ \def\addtoper{\protect\addtoper}%
+ \def\addtoarq{\protect\addtoarq}%
+ \def\addtoabk{\protect\addtoabk}%
+ \def\addtoabkdef{\protect\addtoabkdef}%
+ \def\addtodefabk{\protect\addtodefabk}%
+ \def\addtogrr{\protect\addtogrr}%
+ \def\addtoprr{\protect\addtoprr}%
+ \def\addtosrr{\protect\addtosrr}%
+ \def\printonlyper{\protect\printonlyper}%
+ \def\printonlyarq{\protect\printonlyarq}%
+ \def\printonlyabk{\protect\printonlyabk}%
+ \def\printonlyabkdef{\protect\printonlyabkdef}%
+ \def\printonlydefabk{\protect\printonlydefabk}%
+ \def\onlyhere{\protect\onlyhere}%
+ \def\onlyout{\protect\onlyout}%
+ \def\onlyvoll{\protect\onlyvoll}%
+ \def\onlykurz{\protect\onlykurz}%
+ \def\vauthor{\protect\vauthor}%
+ \def\midvauthor{\protect\midvauthor}%
+ \def\kauthor{\protect\kauthor}%
+ \def\midkauthor{\protect\midkauthor}%
+ \def\female{}%
+ \def\male{}%
+ \def\sort{\protect\sort}% %% Nur wirksam in \protec@scr %%
+ \def\bahasdot{}%
+ \def\banotdot{}%
+ \def\bago{}%
}
@@ -1102,7 +1110,7 @@
%% inner only-cmds are identical on lists,
%% because v-cmds are changed to k-cmds:
-\def\@reprintIfunctions{% %% new in 2.5
+\def\@reprintIfunctions{%
\def\onlyout##1{##1}%
\def\onlyhere##1{}%
\def\onlyvoll##1{}%
@@ -1117,7 +1125,7 @@
\def\onlykurz##1{##1}% %% Umgekehrt in \@herefunctions
\def\vauthor##1##2{\kauthor{##2}}% %% Vgl. \@hereFfunctions %%
\def\midvauthor##1##2{\kauthor{##2}{\nsep}\ignorespaces}%
- \def\v@uthor##1##2{\kauthor{##1}}% %% new in 2.4 %%
+ \def\v@uthor##1##2{\kauthor{##1}}%
\def\m@dvauthor##1##2{\kauthor{##1}{\nsep}\ignorespaces}%
\def\sort##1{}%
}
@@ -1163,11 +1171,11 @@
\def\outkurz#1{\unskip{} [{#1\ba@textmode}]}
\def\delkurz#1{\unskip}
-\def\starktit#1{\onlyvoll{\ktit{#1}}} %% new in 2.5
+\def\starktit#1{\onlyvoll{\ktit{#1}}}
\def\vollout#1{\onlyvoll{\onlyout{#1}}}
\def\vollhere#1{\onlyvoll{\onlyhere{#1}}}
-\def\sechere#1#2{\onlyout{#1}\onlyhere{#2}} %% new in 2.5
-\def\onlybakey#1{} %% new in 2.5
+\def\sechere#1#2{\onlyout{#1}\onlyhere{#2}}
+\def\onlybakey#1{}
\def\protmva#1#2{\dofrco@ba\@printvname{#1}{\bastrut\ }{#2}{0}{0}{\nsep}\ignorespaces}
\def\midvauthor{\protect\protmva}
@@ -1178,10 +1186,10 @@
\def\ntvauthor#1#2{\protect@onlyout\vauthor{#1}{#2}\protect\ntsepnta}
\def\protmv@#1#2{\dofrco@ba\@printvname{#1}{\listlnfnsep}{#2}{1}{1}{\nsep}\ignorespaces}
-\def\m@dvauthor{\protect\protmv@} %% new in 2.3 %%
+\def\m@dvauthor{\protect\protmv@}
\def\protv@#1#2{\dofrco@ba\@printvname{#1}{\listlnfnsep}{#2}{1}{1}}
-\def\v@uthor{\protect\protv@} %% new in 2.3 %%
+\def\v@uthor{\protect\protv@}
\def\protmka#1{\dofrco@ba\@printkname{#1}{0}{\nsep}\ignorespaces}
\def\midkauthor{\protect\protmka}
@@ -1194,8 +1202,8 @@
\def\protect@onlyout{}
\def\ntsepnta{\printntsep\ignorespaces}
-\def\printcatcode#1{\the\catcode\grave@ba#1}
- %% E.g. \printcatcode{\"} for value of " %%
+\def\printcatcode#1{\the\catcode\grave@ba #1{}} %% {} new in 2.6
+%% arg e.g. ! or \!
%%
@@ -1204,8 +1212,10 @@
%% internal %%
\expandafter\ifx\csname z@skip\endcsname\relax
+\def\allowbr@ba{{\hskip 0pt plus 0pt}}%
\def\nulskip@ba{{\nobreak \hskip 0pt plus 0pt}}%
\else
+\def\allowbr@ba{{\hskip \z@skip}}%
\def\nulskip@ba{{\nobreak \hskip \z@skip}}%
\fi
@@ -1219,9 +1229,11 @@
\def\line@ba{\the\inputlineno}
\def\lang@ba{\the\language}
-\def\catq@ba{\the\catcode\grave@ba\"}
\def\erri@ba{\ifnum\catcode\grave@ba\?=13\string?\string?\else??\fi}
\def\setn@ba{{\thepage}\if@footnote{\@thefnmark}{@}\else{}{}\fi}
+%% if new in 2.6:
+\def\catq@ba{\if@footnote\fntdqcat@ba\else\the\catcode\grave@ba\"\fi}
+\def\fntdqcat@ba{-1}
{\catcode\grave@ba\%=12\gdef\commentch@ba{%}}
@@ -1257,7 +1269,7 @@
\def\makeibid@ba{%
\if@bashowmem
- \if@footnote %% added if, msg changed in 2.5
+ \if@footnote
\protec@scr{^^J SHOWBAMEM on input line \line@ba \space in}%
\if@baminipage
\protec@scr{Minipage-FNT \thempfootnote:}\else
@@ -1324,7 +1336,7 @@
\ifx\thisti@ba+\ifx\tmemi@ba\tref@ba\else\global\let\thisti@ba=.\fi\fi
\ifx\thisti@ba-\global\let\thisti@ba=+\fi}
-\def\@bafnttextindent{0.1em} %% new in 2.5 (fnt=mpfnt)
+\def\@bafnttextindent{0.1em} %% fnt=mpfnt
\let\lastn@ba=-
\expandafter\ifx\csname @footnotetext\endcsname\relax
@@ -1339,6 +1351,7 @@
\global\let\thiss@ba=-%
\global\let\thisn@ba=-%
\global\let\pos@ba=0%
+ \edef\fntdqcat@ba{\the\catcode\grave@ba\"}% %% new in 2.6
\kern\@bafnttextindent \nulskip@ba
{\@footnotetrue\ignorespaces #1\nulskip@ba\ba@textmode}%
\global\let\lastto@ba=\thisto@ba
@@ -1347,7 +1360,7 @@
\global\let\lastvol@ba=\thisvol@ba
\global\let\lasts@ba=\thiss@ba
\global\let\lastn@ba=\thisn@ba}%
- \ifx\pos@ba0{\@footnotetrue\fillvolref@ba{}}\fi} %% new in 2.5
+ \ifx\pos@ba0{\@footnotetrue\fillvolref@ba{}}\fi}
\fi
\expandafter\ifx\csname @mpfootnotetext\endcsname\relax
@@ -1362,6 +1375,7 @@
\global\let\thiss@ba=-%
\global\let\thisn@ba=-%
\global\let\pos@ba=0%
+ \edef\fntdqcat@ba{\the\catcode\grave@ba\"}% %% new in 2.6
\kern\@bafnttextindent \nulskip@ba
{\@footnotetrue\ignorespaces #1\nulskip@ba\ba@textmode}%
\global\let\lastto@ba=\thisto@ba
@@ -1370,7 +1384,7 @@
\global\let\lastvol@ba=\thisvol@ba
\global\let\lasts@ba=\thiss@ba
\global\let\lastn@ba=\thisn@ba}%
- \ifx\pos@ba0{\@footnotetrue\fillvolref@ba{}}\fi} %% new in 2.5
+ \ifx\pos@ba0{\@footnotetrue\fillvolref@ba{}}\fi}
\fi
@@ -1483,23 +1497,21 @@
\newbox\testbox@ba
-\def\@printlastarg#1#2#3{{% %% #2 changed into new #3 in 2.5 %%
+\def\@printlastarg#1#2#3{{%
\setbox\testbox@ba=\hbox{#3{\ignorespaces #1#2\ba@textmode}}%
\ifdim\ht\testbox@ba=0pt%
\if@kxxba
- \gdef\bacorr{}% %% no \if@printhint\else in 2.2 %%
+ \gdef\bacorr{}%
\fi
\else
{\if@kxxba
- %% \iflasthasdot@ba{\not@bakntsepcorr}{\prep@bakntsepcorr}%
- %% ... changed in 2.5 into:
\prep@bakntsepcorr
\else
\not@bakntsepcorr
\fi
\ntsep
}{\unhbox\testbox@ba}%
- \if@kxxba\else \if@vxxbalist\else %% finddot new in 2.5
+ \if@kxxba\else \if@vxxbalist\else
\setbox\testbox@ba=\hbox{#3{#2}}%
\ifdim\ht\testbox@ba=0pt%
\let\@testa=-\finddot@ba{#1}\ifx\@testa+\@bahasdot\fi
@@ -1534,7 +1546,7 @@
\ifdim\ht\testbox@ba=0pt\else
\ifx\@testb\@leer\@bastrut\ \else %% space before *{...}
{#2}\fi %% #2 is \nsep at \x...
- {\unhbox\testbox@ba}% %% <= moved in 2.5 before \fi =>
+ {\unhbox\testbox@ba}%
\let\@testa=-\finddot@ba{#1}\ifx\@testa+\@bahasdot\fi
\fi}}
@@ -1551,7 +1563,6 @@
^^J\vqu, the inner full title will also be printed separately on the v..-list.)
^^JAlso \vli[p{TEXT}]{}{}*{\ktit{..}}{...} without \ktit in TEXT is forbidden.^^J}%
\errmessage@ba{Missing \string\ktit{...} in *inner* ...v#1-cmd}}\fi\fi}
- %% msgs changed in 2.5 %%
\def\@initvprintonly#1#2#3#4#5#6#7#8{{% %% #1 == li, qu %%
\resetcorr@ba
@@ -1570,7 +1581,7 @@
\def\@testa{#6}%
\def\execute@ktit{\@nobaktit{#1}}%
\@baktitfalse
- \def\ktit##1{\global\@baktittrue %% \global new in 2.5 %%
+ \def\ktit##1{\global\@baktittrue
\def\kurz{\kurz@ktit}%
\ba@varlabel{#4}{#5}{##1}%
\if@footnote
@@ -1584,7 +1595,7 @@
\ifmem@baouter
\gdef\execute@ktit{{\@kxxbatrue\@kprintonly{#1}{#2}{#4}{#5}{##1}{#7}}}%
\fi
- \else %% 2 * outer+gdef \execute@ktit new in 2.5 %%
+ \else
\ifmem@baouter
\gdef\execute@ktit{{\@firstherald\if@rheraldktit
\cap@ba{announcektit}\@rootponly{#1}{#4}*{#5}{##1}{#7}%
@@ -1593,29 +1604,28 @@
\fi ##1\ba@textmode}%
\ifreprint@ba
{\setbox\testbox@ba=\hbox{#2\relax #3\relax #4\relax #5\relax #6\relax
- \if@baktit %% #2...#5\relax new in 2.5 %%
+ \if@baktit
\global\let\gargc@ba=\execute@ktit
\else \gdef\gargc@ba{\@kxxbatrue\@kprintonly{#1}{#2}{#4}{#5}{\erri@ba}{#7}}%
- {\errorcontextlines=-1% %% warn changed to err 2.5 %%
+ {\errorcontextlines=-1%
\errhelp{See the number of the line where the error comes from ...}%
\errmessage@ba{Missing \string\ktit{...} in *inner* ...v#1-cmd}}%
\fi}%
{\@hereRfunctions\gargc@ba}% %% <-> \@rootponly %%
- %% new in 2.5: see \@reprintIfunctions %%
+ %% see \@reprintIfunctions %%
\global\let\gargc@ba=\relax
}%
\else
\ifx\@testa\@leer{\@vprintonly{#1}{#2}{#3}{#4}{#5}{}{}{#7}}\else
\ifx\@testa\@leerz{\@vprintonly{#1}{#2}{#3}{#4}{#5}{}{}{#7}}\else
{\@vprintonly{#1}{#2}{#3}{#4}{#5}{#6}{\execute@ktit}{#7}}\fi\fi
- %% 2.5: {#6\relax\execute@ktit} changed in {\execute@ktit}{#7} %%
\fi
}\if@footnote \if@baouter\makethiso@ba\else\makethisi@ba\fi \fi}
\def\clearmem@ba{{\@footnotetrue\filltmemo@ba{}{}{}{}\filltmemi@ba{}{}{}{}%
\fillpmem@ba{}{}\fillvolmem@ba{}\fillnmem@ba{}%
- \fillvolref@ba{}}} %% new in 2.5
+ \fillvolref@ba{}}}
\def\filltmemo@ba#1#2#3#4{\if@footnote
\global\edef\tmemo@ba{{#1}{#2}{#3}{#4}}\fi}
@@ -1637,7 +1647,6 @@
\global\edef\nref@ba{#1}\fi}
{\@footnotetrue\fillnref@ba{}}
- %% 2.3: change #1-cmd into #1 %%
\def\errmsg@bawarn#1#2#3{{\errorcontextlines=-1\type@bawarn{...#1}%
\protec@scr{ \space\space\space [#2] overwrites `{\nref@ba}',}%
\protec@scr{ \space\space\space but the foregoing #3.^^J^^J}}}
@@ -1660,7 +1669,7 @@
\ifwriwarn@ba{$\bullet$\penalty\@m \ }\fi
\if@baouter \type@bawarn{...#1 repeats first author's lastname}%
\else \type@bawarn{Inner ...#1 repeats author's lastname}%
- \fi %% 2.3: change #1-cmd into #1 and (first) into first %%
+ \fi
\protec@scr{ \space\space\space `{\nmem@ba}'. Change to `...#1[m,f,p]'??^^J}%
\fi\fi
\else
@@ -1708,17 +1717,14 @@
{\@footnotetrue\fillsref@ba{}}
-\def\@vprintonly#1#2#3#4#5#6#7#8{{% %% #7 changed into new #8 in 2.5 %%
+\def\@vprintonly#1#2#3#4#5#6#7#8{{%
\@herefunctions
\def\@testa{#2}%
\ifx\@testa\@leer \@printvname{#3}{\bastrut\ }{#4}{0}{1}%
\@printoptarg{#5}{#8}%
\else\oletter@ba{v#1}{#2}{\@printoptarg{#5}{#8}}%
\fi %% #1 == li, qu %%
- \@printlastarg{#6}{#7}{}\@heraldktitfalse
- %% {#6} changed into {#6}{#7} in 2.5 %%
- }}
-
+ \@printlastarg{#6}{#7}{}\@heraldktitfalse}}
\def\@initprinthint#1{\if@printhint
@@ -1734,7 +1740,7 @@
\makeibid@ba
\if@footnote\warn@baname{k#1}{#2}\fi
\ifx\isibidem@ba-{\@herefunctions
- \ifreprint@ba\@reprintIfunctions\fi %% new in 2.5
+ \ifreprint@ba\@reprintIfunctions\fi
\@kprintonly{#1}{#2}{#3}{#4}{#5}{#6}}%
\else\ibidemname@ba
\fi
@@ -1801,12 +1807,10 @@
\def\next@ba{}
-%% new in 2.5:
\def\pfilled@baon{\if@pfvba\if@footnote\global\let\pfilled@ba=+\fi\fi}
\def\@balocalvolon{\if@pfvba\if@footnote\@balocalvoltrue\fi\fi}
\def\@balocalpgon{\if@pfvba\if@footnote\@balocalpgtrue\fi\fi}
\def\pevofilled@baon{\if@pfvba\if@footnote\global\let\pevofilled@ba=+\fi\fi}
-%%
\def\getk@bapg#1]{\@bapg{#1}\bk@bapg}
\def\getxk@bapg#1]{\@baxpg{#1}\bk@bapg}
@@ -1822,7 +1826,7 @@
\else
\ifx\next@ba(\let\next@ba=\getxkf@bapg
\pfilled@baon
- \else %% else-part new in 2.5
+ \else
\if@pfvba{ \erri@ba}{\errorcontextlines-1%
\@qqertypeout{*[n]- or *(n)}{... at the end of an \if@baouter outer \else inner \fi BibArts command.}%
\errhelp{^^JThe * at the end of a BibArts cmd has to be followed
@@ -1836,7 +1840,6 @@
\def\lessinnerinfoerr@ba#1{\type@bawarn{No #1 in INNER ibidem-series}}
\def\lessouterinfoerr@ba#1#2#3#4#5{{ \erri@ba}{\errorcontextlines-1%
- %% minipage new in 2.5:
\@qqertypeout{#2}{Automatic IBIDEM-setting in \if@baminipage minipage \fi footnote:}%
\errhelp{
^^JYour last BibArts command has had a #1 as #2-number,
@@ -1845,7 +1848,6 @@
^^J`passim', or what you've forgotten, as #2-number. (Then, you
^^Jmay put your whole BibArts-\cmd in {#4\cmd...}.)
^^JOr switch off IBIDEM: Set \clearbamem in front of your BibArts command.^^J}%
- %% errmsg changed in 2.5
\errmessage@ba{Same outer title, before with :#3:, has now no #1}}}
\def\do@banohint#1{\if@printhint\else\ifba@varstring\else #1\fi\fi}
@@ -1869,13 +1871,11 @@
\let\pfilled@ba=-
\let\pevofilled@ba=-
-%% new in 2.5:
\let\@bainnernewvol=-
\let\@bainnernewpg=-
\newif\if@balocalvol\@balocalvolfalse
\newif\if@balocalpg\@balocalpgfalse
\newif\if@bapglock\@bapglockfalse
-%%
\def\ak@bapg{\afterassignment\getakch@bapg\let\next@ba= }
\def\getakch@bapg{%
@@ -1885,17 +1885,16 @@
%%%
\ifx\lockpevo@ba-\ifx\next@ba|\else\ifx\next@ba_\else
\if@pfvba
- \if@footnote %% new in 2.5
+ \if@footnote
\ifx\isibidem@ba+\ifx\pevofilled@ba+%
\ifx\volref@ba\@leer
\else
- \if@baouter %% new in 2.5
+ \if@baouter
\lessouterinfoerr@ba{vol/no}{|n|- or _n_}{{pervol}{\volref@ba}}{\notprintlongpervol}{series}%
- \fillvolref@ba{}% %% new in 2.5
+ \fillvolref@ba{}%
\fi
\fi
\fi\fi
- %% 2.5: Simple \fillvolmem@ba{} changed into
\if@baouter
\fillvolmem@ba{}%
\else
@@ -1918,7 +1917,7 @@
\else
\ifx\next@ba*%
\@balocalpgon
- \if@baouter\else %% new in 2.5
+ \if@baouter\else
\type@bawarn{Your * is at the end of an INNER cmd}%
\typeout@ba{ \space\space Use *[PageNum] or *(FolioNum) only at the end of OUTER BibArts cmds.}\fi
\let\next@ba=\xk@bapg
@@ -1940,12 +1939,11 @@
\pevofilled@baon
\else
%%%
- %% new in 2.5
\if@pfvba
- \if@footnote %% new in 2.5
+ \if@footnote
\ifx\isibidem@ba+%
\ifx\pfilled@ba+%
- \if@baouter %% new in 2.5
+ \if@baouter
\lessouterinfoerr@ba{page/folio}{[n]- or (n)}{\pref@ba}{\notprintlongpagefolio}{document}%
\fi
\ifx\lockpevo@ba-%
@@ -1954,7 +1952,6 @@
\fi
\fi
\fi
- %% 2.5: Simple \fillpmem@ba{}{} changed into
\if@baouter
\fillpref@ba{}{}%
\else
@@ -1973,13 +1970,12 @@
\fi
\else
\spacefactorM@ba \@bastrut
- \ifx\onlypevo@ba-\if@baouter\else\ifx\isibidem@ba+\if@ibidhp\@bahasdot\fi\fi\fi\fi %% new in 2.5
+ \ifx\onlypevo@ba-\if@baouter\else\ifx\isibidem@ba+\if@ibidhp\@bahasdot\fi\fi\fi\fi
\fi
\fi
%%%
\fi\fi\fi\fi\fi
%%% ONLY SCREEN-MESSAGES MAY FOLLOW HERE:
- %% new in 2.5
\if@pfvba\if@footnote
\if@baouter
\else
@@ -2073,7 +2069,6 @@
^^J \space OR set `*'-option, and type supplements and a full title as *{op}{a3}}}}}
\def\Check@ObligatoryLastvArg#1[#2]#3#4*#5#6{\csname @#1\endcsname[#2]{#3}{#4}*{#5}{#6}\pvcheck@ba}
- %% {#6\@leer} changed into {#6} in 2.5 %%
@@ -2846,13 +2841,18 @@
^^J}%
\fi}
-%% No \message without german.sty: %%
+
+%% babel-shorthand... new in 2.6:
\def\bagermanTeX#1{%
- \expandafter\ifx\csname ngermanTeX\endcsname\relax\else \ngermanTeX{#1}\message{(new)}\fi
- \expandafter\ifx\csname germanTeX\endcsname\relax\else \germanTeX{#1}\message{(old)}\fi}
+ \expandafter\ifx\csname AfterBabelLanguage\endcsname\relax
+ \expandafter\ifx\csname ngermanTeX\endcsname\relax\else \ngermanTeX{#1}\message{(new)}\fi
+ \expandafter\ifx\csname germanTeX\endcsname\relax\else \germanTeX{#1}\message{(old)}\fi
+ \else \shorthandon{"}{#1}\message{\string=\string\shorthandon{\string"}}%
+ \fi}
\def\baoriginalTeX#1{%
- \expandafter\ifx\csname originalTeX\endcsname\relax\else
- \expandafter\ifx\csname AfterBabelLanguage\endcsname\relax\originalTeX{#1}\fi %% not babel
+ \expandafter\ifx\csname AfterBabelLanguage\endcsname\relax
+ \expandafter\ifx\csname originalTeX\endcsname\relax\else \originalTeX{#1}\fi
+ \else \shorthandoff{"}{#1}\message{\string=\string\shorthandoff{\string"}}%
\fi}
@@ -2872,7 +2872,6 @@
{\reprint@batrue \@printlastarg{#4}{}{}}\if@banonum{\fromnopagevxxsep}\fi\@reportbaupfalse\ignorespaces}
\def\@vkcitentry#1#2#3#4#5#6[#7][#8](#9){\@reprintIfunctions
- %% \@reprintkfunctions changed to \@reprintIfunctions in 2.5
\addxadd@ba#5\relax\relax\relax
\language@barep{#8}{#9}%
\activech@barep{#7}{#9}%
@@ -2997,20 +2996,15 @@
\gdef\@bibsortvers{[OLD]}%
\@input{\jobname.#1}
\def\@noitemerr{\info@emptyba{#1}\gdef\@bibsortvers{-}}
- \end{description}\fussy}\checkversion@ba{#1}\message{\string>\string> }}
-
-\def\getversuf@ba#1{{\def\@testa{vli}\def\@testb{vqu}\def\@testc{vkc}\def\@testd{#1}%
- \ifx\@testd\@testa\typeversion@ba\fi
- \ifx\@testd\@testb\typeversion@ba\fi
- \ifx\@testd\@testc\typeversion@ba\fi}}
+ \end{description}\fussy}\checkversion@ba\message{\string>\string> }}
\def\typeversion@ba{{\def\@testa{[OLD]}%
\ifx\@bibsortvers\@testa\type@bawarn{Input file created by outdated bibsort}\fi
- \typeout@ba{ \space Version of bibsort is \ifx\@bibsortvers\@testa older than \else \@bibsortvers\space instead \fi 2.5 (version of bibarts.sty).}}}
+ \typeout@ba{ \space Version of bibsort is \ifx\@bibsortvers\@testa older than \else \@bibsortvers\space instead \fi 2.6 (version of bibarts.sty).}}}
-\def\checkversion@ba#1{{\def\@testa{2.5}\def\@testb{-}% %% new in 2.5
+\def\checkversion@ba{{\def\@testa{2.6}\def\@testb{-}%
\ifx\@bibsortvers\@testa\else\ifx\@bibsortvers\@testb\else
- \getversuf@ba{#1}\fi\fi}}
+ \typeversion@ba\fi\fi}}
\def\@hereUfunctions{%
\def\par{}%
@@ -3061,7 +3055,8 @@
\newcount\language
\fi
-\def\psethyphenation#1{\@bsphack\sethyphen@ba{#1}{You've called \string\sethyphenation{#1}.}\@esphack}
+\def\psethyphenation#1{\@bsphack\sethyphen@ba{#1}{You've called \string\sethyphenation{#1}.}%
+ \if@unusedbib\ignorespaces\else\@esphack\fi} %% if new in 2.6
\def\sethyphenation{\protect\psethyphenation}
\def\sethyphen@ba#1#2{%
@@ -3226,7 +3221,7 @@
\def\SS{{SS}}% %% \
\def\aa{{\r{a}}}% %% > avoid [T1] errors
\def\AA{{\r{A}}}% %% /
- \def\onlybakey{}% %% new in 2.5 (add arg to keyword)
+ \def\onlybakey{}% %% add arg to keyword
\ifba@varstring \@bains@labtrue
\getnext@baA#1\endlist@ba \@bains@labtrue
\getnext@baB#2\endlist@ba \@bains@labtrue
@@ -3328,7 +3323,6 @@
\ifx ~\next@ba \else\ifx :\next@ba \else\ifx ;\next@ba \else\ifx !\next@ba \else
\ifx ?\next@ba \else\ifx `\next@ba \else\ifx '\next@ba \else
\ifx <\next@ba \else\ifx >\next@ba \else
- %% \relax new in 2.5 to reduce errmsgs from \cmd{arg}: %%
\ifcat 1\next@ba \relax \csname savn@bavar#1\endcsname
\else \sonderz@banext{#1}%
\fi
@@ -3341,8 +3335,6 @@
\fi\fi\fi\fi}%
}
-%% Ignore first arg of: \onlyvoll, \onlyout, \vauthor, \midvauthor,
-%% and new in 2.5: \starktit, \vollout, \vollhere, \sechere, \sort:
\def\analyselabeltext@ba#1{%
\expandafter\ifx \csname next@ba\endcsname\relax \else
\ifx \onlyvoll \next@ba \@bains@labfalse \count@ba0 \else
@@ -3356,7 +3348,6 @@
\ifx \sort \next@ba \@bains@labfalse \count@ba0
\fi\fi\fi\fi\fi\fi\fi\fi\fi
\if@bains@lab
- %% \relax new in 2.5 to reduce errmsgs from \cmd{arg}: %%
\ifcat A\next@ba \relax \csname savn@bavar#1\endcsname
\else \prepnumplussonder@ba{#1}%
\fi
@@ -3717,68 +3708,260 @@
\def\next@hy{}
-\def\test@hy{}
\def\txen@hy{}
-\def\Atest@hy{A@}
+%% new in 2.6:
+\def\Foct@ba{}
+
+
+%% new in 2.6:
+\def\dokern@ba#1{\let\letr@ba\relax \baletter@arg#1\endlist@ba
+ {\let\next@hy\letr@ba \kernlttr@ba}}
+
+\def\baletter@arg{\afterassignment\do@ba@ltr\let\nltr@ba= }
+
+\def\do@ba@ltr{%
+ \ifx \nltr@ba\endlist@ba \let\nltr@ba\relax
+ \else
+ \ifx \letr@ba\relax \ifx \nltr@ba\bgroup \else \let\letr@ba\nltr@ba \fi \fi
+ \let\nltr@ba\baletter@arg
+ \fi \nltr@ba}
+
+
+{\catcode\grave@ba\<=12%
+\gdef\only@sc@ba#1{{\setbox\testbox@ba=\hbox{p}%
+ \ifdim\dp\testbox@ba<0.2ex{#1}\fi}}%
+}
+
+\def\ifdqko@ba#1#2{\if@newhyko \ifx\fromdq@ba+{#1}\else{#2}\fi \else{#2}\fi}
+
+\def\kernlttr@ba{%
+ \if@newhyko %% new in 2.6:
+ \ifx\next@hy \AE\Akern@ba\fi
+ \ifx\next@hy \ae\akern@ba\fi
+ \ifx\next@hy a\akern@ba\fi
+ \ifx\next@hy t\tkern@ba\fi
+ \fi
+ \ifx\next@hy A\Akern@ba\fi % incl {A@}
+ \ifx\next@hy V\Vkern@ba\fi
+ \ifx\next@hy W\ifdqko@ba{\Akern@ba}{\Wkern@ba}\fi %% 2.6: "W=\AA
+ \ifx\next@hy T\Tkern@ba\fi
+ \ifx\next@hy v\vkern@ba\fi
+ \ifx\next@hy w\ifdqko@ba{\akern@ba}{\wkern@ba}\fi %% 2.6: "w=\aa
+ \ifx\next@hy X\Xkern@ba\fi
+ \ifx\next@hy Y\Ykern@ba\fi
+ \ifx\next@hy y\ykern@ba\fi
+ \ifx\next@hy x\xkern@ba\fi
+}
\def\acckorr@hy#1{%
- \def\test@hy{#1}%
- \ifx#1A\kern -0.06em\fi \ifx\test@hy\Atest@hy\kern -0.06em\fi
- \ifx#1V\kern -0.1em\fi
- \ifx#1W\kern -0.1em\fi
- \ifx#1T\kern -0.1em\fi
- \ifx#1v\kern -0.04em\fi
- \ifx#1w\kern -0.04em\fi
- \ifx#1X\kern -0.06em\fi
- \ifx#1Y\kern -0.12em\fi
- \ifx#1y\kern -0.04em\fi
- \ifx#1x\kern -0.04em\fi
+ \dokern@ba{#1}%
+ \if@newhyko\nulskip@ba\fi %% new in 2.6 (err-fix)
\txen@hy{#1}}
\def\accentnum@hy#1 #2{%
- \ifx#2A\kern -0.06em\fi
- \ifx#2V\kern -0.1em\fi
- \ifx#2W\kern -0.1em\fi
- \ifx#2T\kern -0.1em\fi
- \ifx#2v\kern -0.04em\fi
- \ifx#2w\kern -0.04em\fi
- \ifx#2X\kern -0.06em\fi
- \ifx#2Y\kern -0.12em\fi
- \ifx#2y\kern -0.04em\fi
- \ifx#2x\kern -0.04em\fi
+ \dokern@ba{#2}%
+ \if@newhyko\nulskip@ba\fi %% new in 2.6 (symmetry)
\accent #1 #2}
-\def\aktacckorr@hy#1{\ifx#1\dq@prtct \else
- \message{[ HYKO: Get unexpected \string#1 ] }\fi
+\def\oldg@ba{\dq@prtct}
+
+%% changed in 2.6:
+\def\aktacckorr@hy#1{{\def\@testa{#1}%
+ \ifx \@testa\oldg@ba \else
+ \type@bawarn{\string\hy\string\active@dq: No \string\dq@prtct\space follows}\fi}%
+ \def\txen@hy{\active@dq #1}%
\acckorr@hy}
\def\getarg@hy{\afterassignment\nextarg@hy\let\txen@hy= }
-\def\nextarg@hy{\bgroup
- \ifx\txen@hy\accent
- \expandafter\accentnum@hy\else
- \expandafter\txen@hy\fi}
+%% changed in 2.6:
+\def\nextarg@hy{\ifx \txen@hy\accent \let\txen@hy\accentnum@hy \fi
+ \bgroup \txen@hy}
\def\gonext@hy{\let\txen@hy=\next@hy \let\next@hy=\acckorr@hy}
-\def\goact@hy{\let\txen@hy=\next@hy \let\next@hy=\aktacckorr@hy}
+\def\goact@hy{\let\next@hy=\aktacckorr@hy} %% changed in 2.6
+
+
+\def\UTFviiiName@ba{utf8}
+\def\ToneName@ba{T1}
+
+%% extracted in 2.6:
+\def\Akern@ba{\kern -0.06em}
+\def\ak@sc@ba{\kern -0.03em}
+\def\akern@ba{\only@sc@ba{\ak@sc@ba}}
+\def\Tkern@ba{\kern -0.1em}
+\def\tk@sc@ba{\kern -0.03em}
+\def\tkern@ba{\only@sc@ba{\tk@sc@ba}}
+\def\Vkern@ba{\kern -0.1em}
+\def\vkern@ba{\kern -0.04em}
+\def\Wkern@ba{\kern -0.1em}
+\def\wkern@ba{\kern -0.04em}
+\def\Xkern@ba{\kern -0.06em}
+\def\xkern@ba{\kern -0.04em}
+\def\Ykern@ba{\kern -0.12em}
+\def\ykern@ba{\kern -0.04em}
+\def\lqkern@ba{\kern 0.04em}
+\def\qsbkern@ba{\kern 0.04em}
+\def\glqkern@ba{\qsbkern@ba}
+\def\rqkern@ba{\kern 0.04em}
+\def\grqkern@ba{\rqkern@ba}
+\def\srbkern@ba{\kern -0.04em}
+\def\crbkern@ba{\kern -0.05em}
+
+\def\act@ba#1{\catcode\grave@ba#1=13}
+
+{\act@ba{\`}%
+ \act@ba{\'}%
+ \gdef\dohyxhk@ba{%
+ \ifx\next@hy `\lqkern@ba\fi
+ \ifx\next@hy '\rqkern@ba\fi
+ }%
+}
{\catcode\grave@ba\"=13%
\catcode\grave@ba\`=12%
\catcode\grave@ba\'=12%
+ %%% new in 2.6:
+ \catcode\grave@ba\>=12%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ %%%
+ \gdef\batriplet@hy{\let\Foct@ba\next@hy \let\next@hy\doUTFhyT@ba}%
+ \gdef\doUTFhyT@ba#1#2{%
+ \ifx\Foct@ba %
+ \ifx #1%
+ \ifx #2\Ykern@ba\fi % 1E8E \.Y
+ \ifx #2\ykern@ba\fi % 1E8F \.y
+ \fi
+ \ifx #1%
+ \ifx #2\Ykern@ba\fi % 1EF2 \`Y
+ \ifx #2\ykern@ba\fi % 1EF3 \`y
+ \fi
+ \ifx #1%
+ \ifx #2\tkern@ba\fi % 1E6D \d t
+ \fi
+ \fi
+ \ifx\Foct@ba %
+ \ifx #1%
+ \ifx #2\lqkern@ba\fi % 2018
+ \ifx #2\rqkern@ba\fi % 2019
+ \ifx #2\qsbkern@ba\fi % 201A
+ \fi
+ \fi
+ %%
+ \nulskip@ba \Foct@ba #1#2}%
+ %%%
+ \gdef\badoublet@hy{\let\Foct@ba\next@hy \let\next@hy\doUTFhyD@ba}%
+ \gdef\doUTFhyD@ba#1{%
+ \ifx\Foct@ba %
+ \ifx #1\Akern@ba\fi % 00C0 \`A
+ \ifx #1\akern@ba\fi % 00E0 \`a
+ \ifx #1\Akern@ba\fi % 00C1 \'A
+ \ifx #1\akern@ba\fi % 00E1 \'a
+ \ifx #1\Akern@ba\fi % 00C2 \^A
+ \ifx #1\akern@ba\fi % 00E2 \^a
+ \ifx #1\Akern@ba\fi % 00C3 \~A
+ \ifx #1\akern@ba\fi % 00E3 \~a
+ \ifx #1\Akern@ba\fi % 00C4 \"A
+ \ifx #1\akern@ba\fi % 00E4 \"a
+ \ifx #1\Akern@ba\fi % 00C5 \r A
+ \ifx #1\akern@ba\fi % 00E5 \r a
+ \ifx #1\Akern@ba\fi % 00C6 \AE
+ \ifx #1\akern@ba\fi % 00E6 \ae
+ \ifx #1\Ykern@ba\fi % 00DD \'Y
+ \ifx #1\ykern@ba\fi % 00FD \'y
+ \ifx #1\ykern@ba\fi % 00FF \"y
+ \fi
+ \ifx\Foct@ba %
+ \ifx #1\Akern@ba\fi % 01CD \v A
+ \ifx #1\akern@ba\fi % 01CE \v a
+ \ifx #1\Akern@ba\fi % 01E2 \=\AE
+ \ifx #1\akern@ba\fi % 01E3 \=\ae
+ \fi
+ \ifx\Foct@ba %
+ \ifx #1\Akern@ba\fi % 0100 \=A
+ \ifx #1\akern@ba\fi % 0101 \=a
+ \ifx #1\Akern@ba\fi % 0102 \u A
+ \ifx #1\akern@ba\fi % 0103 \u a
+ \ifx #1\Akern@ba\fi % 0104 \k A
+ \ifx #1\akern@ba\fi % 0105 \k a
+ \fi
+ \ifx\Foct@ba %
+ \ifx #1\Tkern@ba\fi % 021A \textcommabelow T
+ \ifx #1\tkern@ba\fi % 021B \textcommabelow t
+ \ifx #1\Ykern@ba\fi % 0232 \=Y
+ \ifx #1\ykern@ba\fi % 0233 \=y
+ \fi
+ \ifx\Foct@ba %
+ \ifx #1\Tkern@ba\fi % 0162 \c T
+ \ifx #1\tkern@ba\fi % 0163 \c t
+ \ifx #1\Tkern@ba\fi % 0164 \v T
+ \ifx #1\tkern@ba\fi % 0165 \v t
+ \ifx #1\Wkern@ba\fi % 0174 \^W
+ \ifx #1\wkern@ba\fi % 0175 \^w
+ \ifx #1\Ykern@ba\fi % 0178 \"Y
+ \ifx #1\Ykern@ba\fi % 0176 \^Y
+ \ifx #1\ykern@ba\fi % 0177 \^y
+ \fi
+ %%
+ \nulskip@ba \Foct@ba #1}%
+ %%%
\gdef\hykorr@hy{%
+ \let\fromdq@ba=-%
+ \let\ttdq@ba=-%
\if@hyko
- \ifx\next@hy A\kern -0.06em\fi
- \ifx\next@hy V\kern -0.1em\fi
- \ifx\next@hy W\kern -0.1em\fi
- \ifx\next@hy T\kern -0.1em\fi
- \ifx\next@hy v\kern -0.04em\fi
- \ifx\next@hy w\kern -0.04em\fi
- \ifx\next@hy X\kern -0.06em\fi
- \ifx\next@hy Y\kern -0.12em\fi
- \ifx\next@hy y\kern -0.04em\fi
- \ifx\next@hy x\kern -0.04em\fi
- \ifx\next@hy "\gonext@hy\fi
+ %% new in 2.6
+ \expandafter\ifx\csname next@hy\endcsname\relax
+ \if@balist\type@bawarn{Empty object after \string\hy\space or \string\fhy}\fi
+ \else
+ \if@newhyko
+ {\setbox\testbox@ba=\hbox{i}%
+ \ifdim\wd\testbox@ba>.4em\global\let\ttdq@ba=+\fi}%
+ \fi
+ \ifx\ttdq@ba-%
+ \kernlttr@ba
+ \ifx\next@hy "\let\fromdq@ba=+\gonext@hy\fi
\ifx\next@hy \newumlaut\gonext@hy\fi
\ifx\next@hy \active@dq\goact@hy \fi
\ifx\next@hy \bgroup \let\next@hy=\getarg@hy\fi
@@ -3798,12 +3981,56 @@
\ifx\next@hy \r\gonext@hy\fi
\ifx\next@hy \u\gonext@hy\fi
\ifx\next@hy \v\gonext@hy\fi
- \ifx\next@hy `\kern 0.04em\fi
- \ifx\next@hy '\kern 0.04em\fi
- \ifx\next@hy \glq\kern 0.04em\fi \ifx\next@hy \@glq\kern 0.04em\fi
- \ifx\next@hy ]\kern -0.04em\fi
+ \ifx\next@hy `\lqkern@ba\fi
+ \ifx\next@hy '\rqkern@ba\fi
+ \ifx\next@hy \glq\glqkern@ba\fi \ifx\next@hy \@glq\glqkern@ba\fi
+ \ifx\next@hy ]\srbkern@ba\fi
\ifx\next@hy )\kern -0.04em\fi
- \ifx\next@hy \}\kern -0.05em\fi \ifx\next@hy \@rb\kern -0.05em\fi
+ \ifx\next@hy \}\crbkern@ba\fi \ifx\next@hy \@rb\crbkern@ba\fi
+ %% new in 2.6:
+ \fi
+ \if@newhyko\ifx\ttdq@ba-%
+ \ifx\next@hy \AA\Akern@ba\fi
+ \ifx\next@hy \aa\akern@ba\fi
+ \ifx\next@hy \lq\lqkern@ba\fi
+ \ifx\next@hy \textquoteleft\lqkern@ba\fi
+ \ifx\next@hy \rq\rqkern@ba\fi
+ \ifx\next@hy \textquoteright\rqkern@ba\fi
+ \ifx\next@hy \grq\grqkern@ba\fi \ifx\next@hy \@grq\grqkern@ba\fi
+ \ifx\next@hy \quotesinglbase\qsbkern@ba\fi
+ \ifx\next@hy \rbrack\srbkern@ba\fi
+ \ifx\next@hy \textcommabelow\gonext@hy\fi
+ \ifx\next@hy \grmn@active@dq@\gonext@hy\fi
+ \ifx\next@hy \t\gonext@hy\fi
+ \ifx\next@hy \newtie\gonext@hy\fi
+ \ifx\next@hy \capitaltie\gonext@hy\fi
+ \ifx\next@hy \capitalnewtie\gonext@hy\fi
+ \ifx\next@hy \capitalacute\gonext@hy\fi
+ \ifx\next@hy \capitalbreve\gonext@hy\fi
+ \ifx\next@hy \capitalcaron\gonext@hy\fi
+ \ifx\next@hy \capitalcedilla\gonext@hy\fi
+ \ifx\next@hy \capitalcircumflex\gonext@hy\fi
+ \ifx\next@hy \capitaldieresis\gonext@hy\fi
+ \ifx\next@hy \capitaldotaccent\gonext@hy\fi
+ \ifx\next@hy \capitalgrave\gonext@hy\fi
+ \ifx\next@hy \capitalhungarumlaut\gonext@hy\fi
+ \ifx\next@hy \capitalmacron\gonext@hy\fi
+ \ifx\next@hy \capitalogonek\gonext@hy\fi
+ \ifx\next@hy \capitalring\gonext@hy\fi
+ \ifx\next@hy \capitaltilde\gonext@hy\fi
+ \dohyxhk@ba
+ \fi\fi
+ \fi
+ \if@newhyko\ifx\ttdq@ba-\ifx\inputencodingname\UTFviiiName@ba
+ \ifx\next@hy \badoublet@hy\fi % 195
+ \ifx\next@hy \badoublet@hy\fi % 196
+ \ifx\next@hy \badoublet@hy\fi % 197
+ \ifx\next@hy \badoublet@hy\fi % 199
+ \ifx\next@hy \badoublet@hy\fi % 200
+ \ifx\next@hy \batriplet@hy\fi % 225
+ \ifx\next@hy \batriplet@hy\fi % 226
+ \fi\fi\fi
+ %%
\fi
\nulskip@ba\next@hy}%
}
@@ -3812,19 +4039,42 @@
\newif\if@hyko\@hykotrue
-\def\phyko{\@hykotrue}%
-\def\hyko{\protect\phyko}%
+\def\phyko{\@hykotrue}
+\def\hyko{\protect\phyko}
+
+\def\pnothyko{\@hykofalse}
+\def\nothyko{\protect\pnothyko}
+
+
+%% new in 2.6:
+\typeout@ba{ **^^J 2.6 extents the kerning of \string\hy\space and \string\fhy. \space Use \string\notnewhyko\space to reject.}
+
+\newif\if@newhyko\@newhykotrue
+
+\def\pnewhyko{\@newhykotrue}
+\def\newhyko{\protect\pnewhyko}
+
+\def\pnotnewhyko{\@newhykofalse}
+\def\notnewhyko{\protect\pnotnewhyko}
+
+\typeout@ba{ 2.6 extents specials of \string\abra\space and \string\fabra. \space Use \string\notnewabra\space to reject.^^J **}
+
+\newif\if@newabra\@newabratrue
+
+\def\pnewabra{\@newabratrue}
+\def\newabra{\protect\pnewabra}
+
+\def\pnotnewabra{\@newabrafalse}
+\def\notnewabra{\protect\pnotnewabra}
-\def\pnothyko{\@hykofalse}%
-\def\nothyko{\protect\pnothyko}%
\def\phy{\leavevmode\nulskip@ba\ifmmode\hbox{-}\else\discretionary{-}{}{-}\fi\after@hy}
%\def\phy{\leavevmode\nulskip@ba\ifmmode\hbox{-}\else\discretionary{-}{}{-}\fi\nulskip@ba}
\def\pfhy{\leavevmode\nulskip@ba\hbox{-}\after@hy}
%\def\pfhy{\leavevmode\nulskip@ba\hbox{-}\nulskip@ba}
-\def\hy{\protect\phy}
-\def\fhy{\protect\pfhy}
+\DeclareRobustCommand\hy{\protect\phy} %% DRC in 2.6 for
+\DeclareRobustCommand\fhy{\protect\pfhy} %% .toc \MakeUppercase
%%
@@ -3917,14 +4167,14 @@
\def\HYVARI@BA#1#2{\expandafter\ifx\csname l@german\endcsname\relax {#1}\else \ifnum\language=\l@german \csname OLDHY#2\endcsname \else {#1}\fi \fi}
-%% "Inside-c before k": %%
+%% "Inside-c in front of k": %%
\def\oldhyc{\hycons@ba{k}{c}} %% always old: Dru\oldhyc ker
\def\OLDHYC{\HYCONS@BA{K}{C}}
\def\hyc{\hyvari@ba{c}{c}} %% spells new in ngerman, naustrian
\def\HYC{\HYVARI@BA{C}{C}}
-%% "Triple consonant before a vovel": %%
+%% "Triple consonant in front of vovel": %%
\def\oldhyl{\hycons@ba{ll}{l}} %% always old: Scha\oldhyl leistung
\def\OLDHYL{\HYCONS@BA{LL}{L}}
\def\hyl{\hyvari@ba{ll}{l}} %% spells new in ngerman, naustrian
@@ -3971,125 +4221,422 @@
\fi
-\def\escb@ba{\ifvmode\leavevmode\lower -1ex\hbox{\strut}\else\nulskip@ba\fi}
-
-\def\babbrack#1{\escb@ba{\upshape
- \lower 0.25ex\hbox{\tiny [}\hbox{#1}%
- \lower 0.25ex\hbox{\tiny ]}\kern 0.02em{}}}
-
-\def\bambrack#1{\iflasthasdot@ba{}{\@baupcorr}\escb@ba{\upshape
- \lower -0.5ex\hbox{\lower 1.5pt\hbox{\tiny [}}\hbox{#1}%
- \lower -0.5ex\hbox{\lower 1.5pt\hbox{\tiny ]}}\kern 0.02em{}}}
-
-\def\batbrack#1{\iflasthasdot@ba{}{\@baupcorr}\escb@ba{\upshape
- \lower -1.4ex\hbox{\lower 3pt\hbox{\tiny [}}\hbox{#1}%
- \lower -1.4ex\hbox{\lower 3pt\hbox{\tiny ]}}}{\@baendcorr}\kern 0.02em{}}
-
-
+%% new in 2.6:
+\def\pabrao{[} %{(}
+\def\abraopen{\protect\pabrao}
+\def\pabrac{]} %{)}
+\def\abraclose{\protect\pabrac}
+
+
+\def\escb@ba{\ifvmode\leavevmode
+ \if@newabra\else\lower -1ex\hbox{\strut}\fi %% 2.6: repro old err
+ \else\nulskip@ba\fi}
+
+%% new in 2.6:
+\newif\if@abradone
+\def\up@abra{\ifmmode\else\upshape\fi}
+\def\hm@abra#1{\ifmmode{#1}\else\hbox{#1}\fi}
+
+%% DRC in 2.6 for .toc-\uppercase:
+\def\pabra#1{\@abra{#1}\allowbr@ba}
+\DeclareRobustCommand\abra{\protect\pabra}
+
+\def\pfabra#1{\@abra{#1}\nulskip@ba}
+\DeclareRobustCommand\fabra{\protect\pfabra}
+
+%% direct use since 2.6:
+\def\pfbabbrack#1{\@babbrack{#1}\nulskip@ba}
+\def\pbabbrack#1{\@babbrack{#1}\allowbr@ba}
+\def\@babbrack#1{\escb@ba{\up@abra
+ \lower 0.25ex\hbox{\tiny \abraopen}\hm@abra{#1}%
+ \lower 0.25ex\hbox{\tiny \abraclose}\kern 0.02em{}}\global\@abradonetrue}
+\DeclareRobustCommand\fbabbrack{\protect\pfbabbrack}
+\DeclareRobustCommand\babbrack{\protect\pbabbrack}
+
+\def\pfbambrack#1{\@bambrack{#1}\nulskip@ba}
+\def\pbambrack#1{\@bambrack{#1}\allowbr@ba}
+\def\@bambrack#1{\iflasthasdot@ba{}{\@baupcorr}\escb@ba{\up@abra
+ \lower -0.5ex\hbox{\lower 1.5pt\hbox{\tiny \abraopen}}\hm@abra{#1}%
+ \lower -0.5ex\hbox{\lower 1.5pt\hbox{\tiny \abraclose}}\kern 0.02em{}}\global\@abradonetrue}
+\DeclareRobustCommand\fbambrack{\protect\pfbambrack}
+\DeclareRobustCommand\bambrack{\protect\pbambrack}
+
+\def\pfbatbrack#1{\@batbrack{#1}\nulskip@ba}
+\def\pbatbrack#1{\@batbrack{#1}\allowbr@ba}
+\def\@batbrack#1{\iflasthasdot@ba{}{\@baupcorr}\escb@ba{\up@abra
+ \lower -1.4ex\hbox{\lower 3pt\hbox{\tiny \abraopen}}\hm@abra{#1}%
+ \lower -1.4ex\hbox{\lower 3pt\hbox{\tiny \abraclose}}}{\@baendcorr}\kern 0.02em{}\global\@abradonetrue}
+\DeclareRobustCommand\fbatbrack{\protect\pfbatbrack}
+\DeclareRobustCommand\batbrack{\protect\pbatbrack}
+
+\def\pfbanbrack#1{\unk@abra{#1}\nulskip@ba}
+\def\pbanbrack#1{\unk@abra{#1}\allowbr@ba}
+\def\unk@abra#1{\iflasthasdot@ba{}{\@baupcorr}\ifvmode\leavevmode\else\nulskip@ba\fi
+ {\up@abra {\abraopen}{#1}{\abraclose}}\global\@abradonetrue}
+\DeclareRobustCommand\fbanbrack{\protect\pfbanbrack}
+\DeclareRobustCommand\banbrack{\protect\pbanbrack}
+
+%% mod in 2.6:
{\catcode\grave@ba\"=12%
+ \gdef\dqch@ba{"}%
\expandafter\ifx\csname dq\endcsname\relax
- \gdef\dq{"}% %% compatibility to 2.0 %%
- \fi
- \gdef\dq@bapas{\dq}}
+ \gdef\dq{"}\fi
+ \catcode\grave@ba\"=13%
+ \gdef\Xdqch@ba{"}%
+}
+
+\def\dq@ba{\dq}
+%% new in 2.6:
+\def\pdq@ba{\grmn@active@dq@}
+\def\lq@ba{\lq}
+\def\rq@ba{\rq}
+%% mod in 2.6:
{\catcode\grave@ba\"=13%
\catcode\grave@ba\'=12%
\catcode\grave@ba\`=12%
- \gdef\rqq@baakt{"'}%
- \gdef\lqq@baakt{"`}%
+ \gdef\c@ba{'}%
+ \gdef\cc@ba{''}%
+ \gdef\grqq@baA{"'}%
+ \gdef\grqq@baB{\grmn@active@dq@ '}%
+ \gdef\grqq@baC{\active@dq\dq@prtct{'}}%
+ \gdef\grqq@baD{\active@dq\dq@prtct{'@}}%
+ \gdef\o@ba{`}%
+ \gdef\oo@ba{``}%
+ \gdef\glqq@baA{"`}%
+ \gdef\glqq@baB{\grmn@active@dq@ `}%
+ \gdef\glqq@baC{\active@dq\dq@prtct{`}}%
+ \gdef\glqq@baD{\active@dq\dq@prtct{`@}}%
\catcode\grave@ba\'=13%
\catcode\grave@ba\`=13%
- \gdef\rqq@baaaa{"'}%
- \gdef\lqq@baaaa{"`}}
-
-{\catcode\grave@ba\'=12%
- \gdef\c@bapas{'}%
- \gdef\cc@bapas{''}%
- \gdef\cp@bapas{\active@dq\dq@prtct{'}}}
-{\catcode\grave@ba\'=13%
- \gdef\c@baakt{'}%
- \gdef\cc@baakt{''}%
- \gdef\cp@baakt{\active@dq\dq@prtct{'}}}
-
-{\catcode\grave@ba\`=12%
- \gdef\o@bapas{`}%
- \gdef\oo@bapas{``}%
- \gdef\op@bapas{\active@dq\dq@prtct{`}}}
-{\catcode\grave@ba\`=13%
- \gdef\o@baakt{`}
- \gdef\oo@baakt{``}%
- \gdef\op@baakt{\active@dq\dq@prtct{`}}}
+ \gdef\xc@ba{'}%
+ \gdef\xcc@ba{''}%
+ \gdef\xgrqq@baA{"'}%
+ \gdef\xgrqq@baB{\grmn@active@dq@ '}%
+ \gdef\xgrqq@baC{\active@dq\dq@prtct{'}}%
+ \gdef\xgrqq@baD{\active@dq\dq@prtct{'@}}%
+ \gdef\xo@ba{`}%
+ \gdef\xoo@ba{``}%
+ \gdef\xglqq@baA{"`}%
+ \gdef\xglqq@baB{\grmn@active@dq@ `}%
+ \gdef\xglqq@baC{\active@dq\dq@prtct{`}}%
+ \gdef\xglqq@baD{\active@dq\dq@prtct{`@}}%
+}
+
+%% mod in 2.6:
+{\catcode\grave@ba\"=13%
+ \catcode\grave@ba\<=12%
+ \catcode\grave@ba\>=12%
+ \gdef\ba@ds{<<}%
+ \gdef\ba@db{>>}%
+ \gdef\flqq@baA{"<}%
+ \gdef\flqq@baB{\grmn@active@dq@ <}%
+ \gdef\flqq@baC{\active@dq\dq@prtct{<}}%
+ \gdef\flqq@baD{\active@dq\dq@prtct{<@}}%
+ \gdef\frqq@baA{">}%
+ \gdef\frqq@baB{\grmn@active@dq@ >}%
+ \gdef\frqq@baC{\active@dq\dq@prtct{>}}%
+ \gdef\frqq@baD{\active@dq\dq@prtct{>@}}%
+ \catcode\grave@ba\<=13%
+ \catcode\grave@ba\>=13%
+ \gdef\xba@ds{<<}%
+ \gdef\xflqq@baA{"<}%
+ \gdef\xflqq@baB{\grmn@active@dq@ <}%
+ \gdef\xflqq@baC{\active@dq\dq@prtct{<}}%
+ \gdef\xflqq@baD{\active@dq\dq@prtct{<@}}%
+ \gdef\xba@db{>>}%
+ \gdef\xfrqq@baA{">}%
+ \gdef\xfrqq@baB{\grmn@active@dq@ >}%
+ \gdef\xfrqq@baC{\active@dq\dq@prtct{>}}%
+ \gdef\xfrqq@baD{\active@dq\dq@prtct{>@}}%
+}
+
+%% new in 2.6 (babel "X; {} for [activeacute,activegrave,catalan,ngerman]):
+{\catcode\grave@ba\>=12%
+ \gdef\isdqX@ba#1#2#3{{\setbox\testbox@ba=\hbox{#3{}}%
+ \ifdim\ht\testbox@ba>1.4ex\unk@abra{#2{}}\else{#1{#2{}}}\fi}}%
+}
+
+%% new in 2.6:
+{\act@ba{\!}\gdef\xaz@ba{!}}
+{\act@ba{\?}\gdef\xfz@ba{?}}
+{\act@ba{\;}\gdef\xsp@ba{;}}
+{\act@ba{\:}\gdef\xdp@ba{:}}
+
+%% UTF8 new in 2.6:
+{\act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \act@ba{\}%
+ \gdef\UTFlq@ba{‘}% %% 2018 \textquoteleft {`}
+ \gdef\UTFdlq@ba{‘‘}% %% 2018 2018 {``}
+ \gdef\UTFrq@ba{’}% %% 2019 \textquoteright {'}
+ \gdef\UTFdrq@ba{’’}% %% 2019 2019 {''}
+ \gdef\UTFglq@ba{‚}% %% 201A \quotesinglbase {,}
+ \gdef\UTFgrqq@ba{“}% %% 201C \textquotedblleft {``}
+ \gdef\UTFrqq@ba{”}% %% 201D \textquotedblright {''}
+ \gdef\UTFglqq@ba{„}% %% 201E \quotedblbase {,,}
+ \gdef\UTFellip@ba{…}% %% 2026 \textellipsis {\dots}
+ \gdef\UTFflqq@ba{«}% %% 00AB \guillemetleft
+ \gdef\UTFfrqq@ba{»}% %% 00BB \guillemetright
+ \gdef\UTFflq@ba{‹}% %% 2039 \guilsinglleft
+ \gdef\UTFfrq@ba{›}% %% 203A \guilsinglright
+ \gdef\UTFmin@ba{‐}% %% 2010 -
+ \gdef\UTFmm@ba{‐‐}% %% 2010 2010 {--}
+ \gdef\UTFmmm@ba{‐‐‐}% %% {---}
+ \gdef\UTFnbm@ba{‑}% %% 2011 \mbox{-}
+ \gdef\UTFena@ba{‒}% %% 2012 \textendash
+ \gdef\UTFenb@ba{–}% %% 2013 \textendash
+ \gdef\UTFema@ba{—}% %% 2014 \textemdash
+ \gdef\UTFemb@ba{―}% %% 2015 \textemdash
+}
+
+%% moved and renamed in 2.6:
+\def\ba@ok{,}
+\def\ba@op{.}
+\def\ba@mm{$-$}
+\def\ba@om{-}
+\def\ba@dm{--}
+\def\ba@tm{---}
+\def\ba@glq{\glq}
+\def\ba@@glq{\@glq} %%
+\def\ba@grq{\grq}
+\def\ba@@grq{\@grq} %% german.sty 2.4a, 12 Apr 1991
+\def\ba@glqq{\glqq}
+\def\ba@@glqq{\@glqq} %%
+\def\ba@grqq{\grqq}
+\def\ba@@grqq{\@grqq} %%
+\def\ba@gflqq{\flqq}
+\def\ba@@gflqq{\@flqq} %%
+\def\ba@gflq{\flq}
+\def\ba@@gflq{\@flq} %%
+\def\ba@gfrqq{\frqq}
+\def\ba@@gfrqq{\@frqq} %%
+\def\ba@gfrq{\frq}
+\def\ba@@gfrq{\@frq} %%
+\def\ba@tp{...}
+\def\ba@dots{\dots}
+
+%% new in 2.6:
+\def\hy@ba{\hy}
+\def\phy@ba{\phy} %% Needed if not DRC!
+\def\ba@bm{\mbox{-}}
+\def\ba@dk{,,}
+\def\ba@tflqq{\guillemetleft}
+\def\ba@oflqq{\guillemotleft}
+\def\ba@tfrqq{\guillemetright}
+\def\ba@ofrqq{\guillemotright}
+\def\ba@tflq{\guilsinglleft}
+\def\ba@tfrq{\guilsinglright}
+\def\ba@tql{\textquoteleft}
+\def\ba@tqr{\textquoteright}
+\def\ba@qsb{\quotesinglbase}
+\def\ba@tlqq{\textquotedblleft}
+\def\ba@tqrr{\textquotedblright}
+\def\ba@tgqq{\quotedblbase}
+\def\ba@ellip{\textellipsis}
+\def\ba@FBellip{\FBtextellipsis} %% babel-french
+\def\ba@endash{\textendash}
+\def\ba@emdash{\textemdash}
+
+\def\UTFabra@ba#1#2{\ifx\inputencodingname\UTFviiiName@ba #1{#2}\else
+ \unk@abra{#2}\fi}
+
+\def\UTFtabra@ba#1#2{\ifx\inputencodingname\UTFviiiName@ba
+ \ifmmode \unk@abra{#2}\else #1{#2}\fi \else
+ \unk@abra{#2}\fi}
+
+\def\tabra@ba#1#2{\ifmmode \unk@abra{#2}\else #1{#2}\fi}
+
+\def\mate@ba#1#2{\ifmmode \unk@abra{#1}\else{#2}\fi}
+
+\def\if@banewgerm#1#2{\expandafter\ifx\csname @flqq\endcsname\relax\if@batone{#1}{#2}\else{#2}\fi}
+
\def\@abra#1{{\errorcontextlines=-1%
- \def\@testa{#1}%
- \def\testk{,}%
- \def\testp{.}%
- \def\testm{$-$}%
- \def\testh{-}%
- \def\testH{--}%
- \def\testL{---}%
- \def\testl{\glq}%
- \def\teatl{\@glq}% %% commands in old versions of german.sty
- \def\testr{\grq}%
- \def\teatr{\@grq}% %%
- \def\testO{\glqq}%
- \def\teatO{\@glqq}% %%
- \def\testC{\grqq}%
- \def\teatC{\@grqq}% %%
- \def\testd{...}%
- \def\testD{\dots}%
- \ifx\@testa\oo@bapas \oo@abra{\oo@bapas}\else
- \ifx\@testa\oo@baakt \oo@abra{\oo@baakt}\else
- \ifx\@testa\cc@bapas \cc@abra{\cc@bapas}\else
- \ifx\@testa\cc@baakt \cc@abra{\cc@baakt}\else
- \ifx\@testa\cp@bapas\rqq@abra{\cp@bapas}\else
- \ifx\@testa\cp@baakt\rqq@abra{\cp@baakt}\else
- \ifx\@testa\op@bapas\lqq@abra{\op@bapas}\else
- \ifx\@testa\op@baakt\lqq@abra{\op@baakt}\else
- \ifx\@testa\o@bapas \o@abra{\o@bapas}\else
- \ifx\@testa\o@baakt \o@abra{\o@baakt}\else
- \ifx\@testa\c@bapas \c@abra{\c@bapas}\else
- \ifx\@testa\c@baakt \c@abra{\c@baakt}\else
- \ifx\@testa\testk \babbrack{\kern -0.02em{\testk}\kern -0.02em}\else
- \ifx\@testa\testp \babbrack{\kern -0.02em{\testp}\kern -0.02em}\else
- \ifx\@testa\testm \bambrack{\kern -0.03em{\testm}\kern -0.035em}\else
- \ifx\@testa\testh \bambrack{\kern -0.01em{\testh}\kern -0.05em}\else
- \ifx\@testa\testH \bambrack{\kern 0.03em{\testH}\kern 0.03em}\else
- \ifx\@testa\testL \bambrack{\kern 0.03em{\testL}\kern 0.03em}\else
- \ifx\@testa\testl \lq@abra{\testl}\else
- \ifx\@testa\teatl \lq@abra{\teatl}\else
- \ifx\@testa\testr \rq@abra{\testr}\else
- \ifx\@testa\teatr \rq@abra{\teatr}\else
- \ifx\@testa\testO \lqq@abra{\testO}\else
- \ifx\@testa\teatO \lqq@abra{\teatO}\else
- \ifx\@testa\testC \rqq@abra{\testC}\else
- \ifx\@testa\teatC \rqq@abra{\teatC}\else
- \ifx\@testa\lqq@baakt\lqq@abra{\lqq@baakt}\else
- \ifx\@testa\lqq@baaaa\lqq@abra{\lqq@baaaa}\else
- \ifx\@testa\rqq@baakt\rqq@abra{\rqq@baakt}\else
- \ifx\@testa\rqq@baaaa\rqq@abra{\rqq@baaaa}\else
- \ifx\@testa\dq \dq@abra{\dq}\else
- \ifx\@testa\dq@bapas \dq@abra{\dq@bapas}\else
- \ifx\@testa\testd \babbrack{\kern -0.01em{\testd}\kern -0.03em}\else
- \ifx\@testa\testD \babbrack{\kern 0.12em{\testD}\kern -0.08em}\else
- \iflasthasdot@ba{}{\@baupcorr}\ifhmode\nulskip@ba\fi{\upshape [{#1}]}\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
- }}
-
- \def\oo@abra#1{\batbrack{\if@batone{\kern 0.04em{#1}\kern -0.06em}{\kern -0.11em{#1}}}}
- \def\cc@abra#1{\batbrack{\if@batone{\kern 0.03em{#1}\kern -0.05em}{\kern 0.01em{#1}\kern -0.12em}}}
- \def\o@abra#1{\batbrack{\kern -0.02em{#1}\kern -0.02em}}
- \def\lq@abra#1{\babbrack{\if@batone{\kern -0.02em{#1}\kern -0.1034em}{\kern -0.02em{#1}\kern 0.02em}}}
- \def\c@abra#1{\batbrack{\kern -0.02em{#1}\kern -0.02em}}
-\def\lqq@abra#1{\babbrack{\if@batone{\kern 0.03em{#1}\kern -0.05em}{\kern 0.01em{#1}\kern -0.08em}}}
-\def\rqq@abra#1{\batbrack{\if@batone{\kern 0.04em{#1}\kern -0.06em}{\kern -0.04em{#1}\kern -0.07em}}}
- \def\dq@abra#1{\batbrack{\if@batone{\kern -0.043em{#1}\kern -0.06em}{\kern 0.01em{#1}\kern -0.12em}}}
- \def\rq@abra#1{\batbrack{\if@batone{\kern -0.02em{#1}\kern -0.02em}{\kern -0.01em{#1}\kern -0.0875em}}}
-
-\def\pabra#1{\@abra{#1}{\hskip 0pt plus 0pt}}
-\def\abra{\protect\pabra}
-
-\def\pfabra#1{\@abra{#1}{\nulskip@ba}}
-\def\fabra{\protect\pfabra}
+ \def\@testa{#1}%
+ \global\@abradonefalse %% new in 2.6
+ \ifx\@testa\oo@ba \moo@abra{\oo@ba}\fi
+ \ifx\@testa\xoo@ba\moo@abra{\xoo@ba}\fi
+ \ifx\@testa\cc@ba \mcc@abra{\cc@ba}\fi
+ \ifx\@testa\xcc@ba\mcc@abra{\xcc@ba}\fi
+ \ifx\@testa\grqq@baC \rqq@abra{\grqq@baC}\fi
+ \ifx\@testa\xgrqq@baC\rqq@abra{\xgrqq@baC}\fi
+ \ifx\@testa\glqq@baC \lqq@abra{\glqq@baC}\fi
+ \ifx\@testa\xglqq@baC\lqq@abra{\xglqq@baC}\fi
+ \ifx\@testa\o@ba \o@abra{\o@ba}\fi
+ \ifx\@testa\xo@ba \o@abra{\xo@ba{}}\fi
+ \ifx\@testa\c@ba \mc@abra{\c@ba}\fi
+ \ifx\@testa\xc@ba\mc@abra{\xc@ba{}}\fi
+ \ifx\@testa\ba@ok \dot@abra{\ba@ok}\fi
+ \ifx\@testa\ba@op \dot@abra{\ba@op}\fi
+ \ifx\@testa\ba@mm \mxm@abra{\ifmmode{-}\else{\ba@mm}\fi}\fi
+ \ifx\@testa\ba@om \m@abra{\ba@om}\fi
+ \ifx\@testa\ba@dm \tabra@ba{\mm@abra}{\ba@dm}\fi
+ \ifx\@testa\ba@tm \tabra@ba{\mmm@abra}{\ba@tm}\fi
+ \ifx\@testa\ba@glq \lq@abra{\ba@glq}\fi
+ \ifx\@testa\ba@@glq\lq@abra{\ba@@glq}\fi
+ \ifx\@testa\ba@grq \rq@abra{\ba@grq}\fi
+ \ifx\@testa\ba@@grq\rq@abra{\ba@@grq}\fi
+ \ifx\@testa\ba@glqq \lqq@abra{\ba@glqq}\fi
+ \ifx\@testa\ba@@glqq \lqq@abra{\ba@@glqq}\fi
+ \ifx\@testa\ba@grqq \rqq@abra{\ba@grqq}\fi
+ \ifx\@testa\ba@@grqq \rqq@abra{\ba@@grqq}\fi
+ \ifx\@testa\glqq@baA \isdqX@ba {\lqq@abra} {\glqq@baA} {\glqq@baA}\fi
+ \ifx\@testa\xglqq@baA\isdqX@ba {\lqq@abra} {\xglqq@baA}{\xglqq@baA}\fi
+ \ifx\@testa\grqq@baA \isdqX@ba {\rqq@abra} {\grqq@baA} {\glqq@baA}\fi
+ \ifx\@testa\xgrqq@baA\isdqX@ba {\rqq@abra} {\xgrqq@baA}{\ifnum\catcode\grave@ba\`=13\xglqq@baA\else\glqq@baA\fi}\fi
+ \ifx\@testa\dqch@ba\dq@abra{\dqch@ba}\fi
+ \ifx\@testa\dq@ba \dq@abra{\dq@ba}\fi
+ \ifx\@testa\pdq@ba \dq@abra{\pdq@ba{}}\fi
+ \ifx\@testa\ba@tp \@babbrack{\kern -0.01em{\ba@tp}\kern -0.03em}\fi
+ \ifx\@testa\ba@dots\ddd@abra{\ifmmode\kern -.0075em\fi\ba@dots}\fi
+ %% new in 2.6:
+ \if@newabra
+ \ifx\@testa\UTFlq@ba \UTFtabra@ba {\o@abra} {\UTFlq@ba}\fi
+ \ifx\@testa\ba@tql \tabra@ba{\o@abra}{\ba@tql}\fi
+ \ifx\@testa\UTFrq@ba \UTFtabra@ba {\c@abra} {\UTFrq@ba}\fi
+ \ifx\@testa\ba@tqr \tabra@ba{\c@abra}{\ba@tqr}\fi
+ \ifx\@testa\UTFglq@ba \UTFtabra@ba{\com@abra} {\UTFglq@ba}\fi
+ \ifx\@testa\ba@qsb \tabra@ba{\com@abra}{\ba@qsb}\fi
+ \ifx\@testa\UTFgrqq@ba \UTFtabra@ba {\oo@abra} {\UTFgrqq@ba}\fi
+ \ifx\@testa\ba@tlqq \tabra@ba{\oo@abra}{\ba@tlqq}\fi
+ \ifx\@testa\UTFdlq@ba \UTFtabra@ba {\oo@abra} {\UTFdlq@ba}\fi
+ \ifx\@testa\UTFrqq@ba \UTFtabra@ba {\cc@abra} {\UTFrqq@ba}\fi
+ \ifx\@testa\ba@tqrr \tabra@ba{\cc@abra}{\ba@tqrr}\fi
+ %%
+ \ifx\@testa\UTFdrq@ba \UTFtabra@ba {\cc@abra} {\UTFdrq@ba}\fi
+ \ifx\@testa\UTFglqq@ba \UTFtabra@ba{\ulqq@abra} {\UTFglqq@ba}\fi
+ \ifx\@testa\ba@tgqq \tabra@ba{\ulqq@abra}{\ba@tgqq}\fi
+ \ifx\@testa\UTFellip@ba\UTFabra@ba{\dddt@abra} {\UTFellip@ba}\fi
+ \ifx\@testa\ba@ellip \dddt@abra{\ba@ellip}\fi
+ \ifx\@testa\ba@FBellip \dddt@abra{\ba@FBellip}\fi
+ %%
+ \ifx\@testa\ba@gfrqq \smfr@abra{\ba@gfrqq}\fi
+ \ifx\@testa\ba@gfrq \smfr@abra{\ba@gfrq}\fi
+ \ifx\@testa\frqq@baA \isdqX@ba {\smfr@abra} {\frqq@baA} {\flqq@baA}\fi
+ \ifx\@testa\xfrqq@baA\isdqX@ba {\smfr@abra} {\xfrqq@baA}{\xflqq@baA}\fi
+ \ifx\@testa\frqq@baB \smfr@abra{\frqq@baB}\fi
+ \ifx\@testa\xfrqq@baB\smfr@abra{\xfrqq@baB}\fi
+ \ifx\@testa\frqq@baD \smfr@abra{\frqq@baD}\fi
+ \ifx\@testa\xfrqq@baD\smfr@abra{\xfrqq@baD}\fi
+ \ifx\@testa\frqq@baC \smfr@abra{\frqq@baC}\fi
+ \ifx\@testa\xfrqq@baC\smfr@abra{\xfrqq@baC}\fi
+ \ifx\@testa\ba@@gfrqq\smfr@abra{\ba@@gfrqq}\fi
+ \ifx\@testa\ba@@gfrq \smfr@abra{\ba@@gfrq}\fi
+ %%
+ \ifx\@testa\ba@gflqq \smfl@abra{\ba@gflqq}\fi
+ \ifx\@testa\ba@gflq \smfl@abra{\ba@gflq}\fi
+ \ifx\@testa\flqq@baA \isdqX@ba {\smfl@abra} {\flqq@baA} {\flqq@baA}\fi
+ \ifx\@testa\xflqq@baA\isdqX@ba {\smfl@abra} {\xflqq@baA}{\xflqq@baA}\fi
+ \ifx\@testa\flqq@baB \smfl@abra{\flqq@baB}\fi
+ \ifx\@testa\xflqq@baB\smfl@abra{\xflqq@baB}\fi
+ \ifx\@testa\flqq@baD \smfl@abra{\flqq@baD}\fi
+ \ifx\@testa\xflqq@baD\smfl@abra{\xflqq@baD}\fi
+ \ifx\@testa\flqq@baC \smfl@abra{\flqq@baC}\fi
+ \ifx\@testa\xflqq@baC\smfl@abra{\xflqq@baC}\fi
+ \ifx\@testa\ba@@gflqq\smfl@abra{\ba@@gflqq}\fi
+ \ifx\@testa\ba@@gflq \smfl@abra{\ba@@gflq}\fi
+ %%
+ \ifx\@testa\ba@ds \mufl@abra{\ba@ds}\fi
+ \ifx\@testa\xba@ds\mufl@abra{\xba@ds}\fi
+ \ifx\@testa\UTFflqq@ba \UTFtabra@ba {\ufl@abra} {\UTFflqq@ba}\fi
+ \ifx\@testa\ba@tflqq \tabra@ba{\ufl@abra}{\ba@tflqq}\fi
+ \ifx\@testa\ba@oflqq \tabra@ba{\ufl@abra}{\ba@oflqq}\fi
+ \ifx\@testa\UTFfrqq@ba \UTFtabra@ba {\ufr@abra} {\UTFfrqq@ba}\fi
+ \ifx\@testa\ba@tfrqq \tabra@ba{\ufr@abra}{\ba@tfrqq}\fi
+ \ifx\@testa\ba@ofrqq \tabra@ba{\ufr@abra}{\ba@ofrqq}\fi
+ \ifx\@testa\ba@db \mufr@abra{\ba@db}\fi
+ \ifx\@testa\xba@db\mufr@abra{\xba@db}\fi
+ \ifx\@testa\UTFflq@ba \UTFtabra@ba {\ufl@abra} {\UTFflq@ba}\fi
+ \ifx\@testa\ba@tflq \tabra@ba{\ufl@abra}{\ba@tflq}\fi
+ \ifx\@testa\UTFfrq@ba \UTFtabra@ba {\ufr@abra} {\UTFfrq@ba}\fi
+ \ifx\@testa\ba@tfrq \tabra@ba{\ufr@abra}{\ba@tfrq}\fi
+ %%
+ \ifx\@testa\lq@ba \c@abra{\lq@ba}\fi
+ \ifx\@testa\rq@ba \mc@abra{\rq@ba}\fi
+ \ifx\@testa\hy@ba \m@abra{\hy@ba}\fi
+ \ifx\@testa\phy@ba \m@abra{\phy@ba}\fi
+ \ifx\@testa\xaz@ba\unk@abra{\string!}\fi
+ \ifx\@testa\xfz@ba\unk@abra{\string?}\fi
+ \ifx\@testa\xsp@ba\unk@abra{\string;}\fi
+ \ifx\@testa\xdp@ba\unk@abra{\string:}\fi
+ %%
+ \ifx\@testa\UTFmin@ba \UTFabra@ba{\m@abra}{\UTFmin@ba}\fi
+ \ifx\@testa\UTFnbm@ba \UTFabra@ba{\xm@abra}{\UTFnbm@ba}\fi
+ \ifx\@testa\ba@bm \xm@abra{\ba@bm}\fi
+ \ifx\@testa\UTFmm@ba \UTFtabra@ba{\mm@abra}{\UTFmm@ba}\fi
+ \ifx\@testa\UTFena@ba \UTFtabra@ba{\mm@abra}{\UTFena@ba}\fi
+ \ifx\@testa\UTFenb@ba \UTFtabra@ba{\mm@abra}{\UTFenb@ba}\fi
+ \ifx\@testa\ba@endash \tabra@ba{\mm@abra}{\ba@endash}\fi
+ \ifx\@testa\UTFmmm@ba \UTFtabra@ba{\mmm@abra}{\UTFmmm@ba}\fi
+ \ifx\@testa\UTFema@ba \UTFtabra@ba{\mmm@abra}{\UTFema@ba}\fi
+ \ifx\@testa\UTFemb@ba \UTFtabra@ba{\mmm@abra}{\UTFemb@ba}\fi
+ \ifx\@testa\ba@emdash \tabra@ba{\mmm@abra}{\ba@emdash}\fi
+ %%
+ \ifx\@testa\ba@dk \dk@abra{\ba@dk}\fi
+ \ifx\@testa\glqq@baB \lqq@abra{\glqq@baB}\fi
+ \ifx\@testa\xglqq@baB\lqq@abra{\xglqq@baB}\fi
+ \ifx\@testa\glqq@baD \lqq@abra{\glqq@baD}\fi
+ \ifx\@testa\xglqq@baD\lqq@abra{\xglqq@baD}\fi
+ \ifx\@testa\grqq@baB \rqq@abra{\grqq@baB}\fi
+ \ifx\@testa\xgrqq@baB\rqq@abra{\xgrqq@baB}\fi
+ \ifx\@testa\grqq@baD \rqq@abra{\grqq@baD}\fi
+ \ifx\@testa\xgrqq@baD\rqq@abra{\xgrqq@baD}\fi
+ \ifx\@testa\Xdqch@ba\dq@abra{\Xdqch@ba{}}\fi
+ \fi
+ \if@abradone\else\unk@abra{{}#1{}}\fi}}
+
+%% changed in 2.6:
+ \def\oo@abra#1{\@batbrack{\if@batone{\kern 0.04em{#1}\kern -0.06em} {\kern -0.11em{#1}}}}
+ \def\cc@abra#1{\@batbrack{\if@batone{\kern 0.03em{#1}\kern -0.05em} {\kern 0.01em{#1}\kern -0.12em}}}
+ \def\o@abra#1{\@batbrack{\kern -0.02em{#1}\kern -0.02em}}
+ \def\c@abra{\o@abra}
+ \def\dq@abra#1{\mate@ba{#1}{\@batbrack{\if@batone{\kern -0.043em{#1}\kern -0.06em} {\kern 0.01em{#1}\kern -0.12em}}}}
+ \def\lq@abra#1{\mate@ba{#1}{\@babbrack{\if@batone{\kern -0.02em{#1}\if@banewgerm{\kern -0.1034em}{\kern 0.02em}}{\kern -0.02em{#1}\kern 0.02em}}}}
+ \def\rq@abra#1{\mate@ba{#1}{\@batbrack{\if@batone{\if@banewgerm{\kern -0.02em}{\kern -0.01em}{#1}\if@banewgerm{\kern -0.02em}{\kern -0.0875em}} {\kern -0.0075em{#1}\kern -0.09em}}}}
+\def\lqq@abra#1{\mate@ba{#1}{\@babbrack{\if@batone{\kern 0.03em{#1}\if@banewgerm{\kern -0.05em}{\kern -0.01em}} {\kern 0.01em{#1}\kern -0.08em}}}}
+\def\rqq@abra#1{\mate@ba{#1}{\@batbrack{\if@batone{\if@banewgerm{\kern 0.04em}{\kern 0.1075em}{#1}\if@banewgerm{\kern -0.06em}{\kern -0.1275em}} {\kern -0.04em{#1}\kern -0.07em}}}}
+%% new in 2.6:
+\def\smfr@abra#1{\mate@ba{\strut #1\strut}{\fr@abra{#1}}} %% \strut with-
+\def\smfl@abra#1{\mate@ba{\strut #1\strut}{\fl@abra{#1}}} %% out braces!
+\def\mufl@abra#1{\if@batone{\ifmmode\unk@abra{#1}\else\ufl@abra{#1}\fi}{\unk@abra{#1}}}
+\def\mufr@abra#1{\if@batone{\ifmmode\unk@abra{#1}\else\ufr@abra{#1}\fi}{\unk@abra{#1}}}
+\def\moo@abra#1{\ifmmode\@batbrack{\if@batone{\kern -0.115em}{\kern -0.11em}{#1}\if@batone{\kern 0.0125em}{}}\else\oo@abra{#1}\fi}
+\def\mc@abra#1{\ifmmode\kern -0.0025em\@batbrack{{#1}\kern -0.0025em}\else\c@abra{#1}\fi}
+\def\mcc@abra#1{\ifmmode\@batbrack{\if@batone{\kern -0.02em}{\kern -0.0275em}{#1}\kern -0.0175em}\else\cc@abra{#1}\fi}
+\def\ulqq@abra#1{\@babbrack{\if@batone{\kern 0.03em{#1}\kern -0.05em} {\kern 0.01em{#1}\kern -0.08em}}}
+\def\dk@abra#1{\mate@ba{#1}{\if@batone{\@babbrack{\kern 0.03em{#1}\kern -0.05em}}{\unk@abra{#1}}}}
+\def\ddd@abra#1{\@babbrack{\kern 0.12em{#1}\ifdim\lastkern=\z@\kern\fontdimen3\font\fi\kern -0.08em}} %% lastkern: babel-french
+\def\dddt@abra#1{\mate@ba{#1}{\ddd@abra{#1}}}
+\def\com@abra#1{\@babbrack{\if@batone{\kern -0.02em{#1}\kern -0.1034em}{\kern -0.02em{#1}\kern 0.02em}}}
+ \def\fl@abra#1{\if@banewgerm{\@bambrack{\kern -0.05125em{#1}\kern 0.0075em}}{\@bambrack{{#1}\kern 0.04em}}}
+ \def\fr@abra#1{\if@banewgerm{\@bambrack{\kern 0.025em{#1}\kern -0.07em}}{\@bambrack{\kern 0.04em{#1}}}}
+ \def\ufl@abra#1{\if@batone{\@bambrack{\kern -0.05125em{#1}\kern 0.0075em}}{\@bambrack{{#1}\kern 0.04em}}}
+ \def\ufr@abra#1{\if@batone{\@bambrack{\kern 0.025em{#1}\kern -0.07em}}{\@bambrack{\kern 0.04em{#1}}}}
+ \def\xm@abra#1{\@bambrack{\kern -0.01em{#1}\kern -0.05em}}
+\def\mxm@abra#1{\@bambrack{\kern -0.03em{#1}\kern -0.035em}}
+ \def\m@abra#1{\ifmmode\mxm@abra{#1}\else\xm@abra{#1}\fi}
+ \def\mm@abra#1{\@bambrack{\kern 0.03em{#1}\kern 0.03em}}
+\def\mmm@abra{\mm@abra}
+\def\dot@abra#1{\@babbrack{\kern -0.02em{#1}\kern -0.02em}}
+
\def\pbaromannum#1{{\romannumeral #1}}
@@ -4155,7 +4702,7 @@
\def\addtobib{\addtoarq{}}
\newif\if@oldba\@oldbafalse
\def\makebar{\typeout@ba{ \space ***** \space That is obviously a file based on BibArts 1.x \space *****
- ^^J \space ***** \space BibArts 2.5 starts compatibility mode for 1.3 \space *****}%
+ ^^J \space ***** \space BibArts 2.6 starts compatibility mode for 1.3 \space *****}%
\def\bibarts{\BibArts}%
\def\schrift{}%
\def\barschrift{}%