summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/bibarts
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-03-04 22:11:44 +0000
committerKarl Berry <karl@freefriends.org>2019-03-04 22:11:44 +0000
commit6f09c23604d01bfecf6c820a6097dd5174c18f21 (patch)
treeb633bd744c84adcb00db6290176256b8af494847 /Master/texmf-dist/tex/latex/bibarts
parent32e1fe3fb2e87465d7aa2afd713dcb95bbcf3092 (diff)
bibarts (4mar19)
git-svn-id: svn://tug.org/texlive/trunk@50226 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/bibarts')
-rw-r--r--Master/texmf-dist/tex/latex/bibarts/bibarts.sty815
1 files changed, 496 insertions, 319 deletions
diff --git a/Master/texmf-dist/tex/latex/bibarts/bibarts.sty b/Master/texmf-dist/tex/latex/bibarts/bibarts.sty
index a43b1127c53..72a6cb5613a 100644
--- a/Master/texmf-dist/tex/latex/bibarts/bibarts.sty
+++ b/Master/texmf-dist/tex/latex/bibarts/bibarts.sty
@@ -1,5 +1,5 @@
-%% BibArts 2.1 assists you to write LaTeX texts in arts and humanities.
-%% Copyright (C) 2016 Timo Baumann bibarts[at]gmx.de (2016/03/19)
+%% BibArts 2.2 assists you to write LaTeX texts in arts and humanities.
+%% Copyright (C) 2019 Timo Baumann bibarts[at]gmx.de (2019/03/03)
%%
%% 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
@@ -33,14 +33,14 @@
%% COMPATIBILITY
%% Change \DeclareRobustCommand into \def before using LaTeX 2.09.
%% Then, you still NOT have to \protect BibArts-cmds in args of v-cmds.
-%% BibArts 2.1 ONLY has an EMULATION for 1.3 texts: Keep copies of 1.x?
+%% BibArts 2.2 ONLY has an EMULATION for 1.3 texts: Keep copies of 1.x?
%% INTERNE MINIMALIA %%
-%% ~"<`'>:;!? could be active:
+%% ~"<`'>:;!? may be active:
\def\grave@ba{\string`}
{\catcode\grave@ba\~=13%
@@ -72,7 +72,7 @@
\def\errmessage@ba#1{{\protectchars@active\errmessage{#1.^^J \space. . . . . . . . . . . }}}
-\typeout@ba{Style Option BibArts, Version 2.1 [2016] ...}
+\typeout@ba{Style Option BibArts, Version 2.2 [2019] ...}
\def\msg@bafontsubst#1#2{\typeout@ba{{\string#1 ...} is unknown; I'll substitute {\string#2 ...}.}}
@@ -86,20 +86,25 @@
\def\pupshape{\ifdim\fontdimen\@ne\font=\z@\else\rm\relax\fi}%
\def\upshape{\protect\pupshape}\msg@bafontsubst{\upshape}{\rm[if it/sl]}\fi
-%%%%%%
- %% Korrekturen fuer Schraegschriften %%
+ %% corr for slanted fonts %%
-\def\undefcorr@ba{\type@bawarn{Ignore misplaced corr-cmd}}
-\def\undefcorrpba{\protect\undefcorr@ba}
-\def\resetcorr@ba{\gdef\baabkcorr{\protect\undefcorrpba}\gdef\bakxxcorr{\protect\undefcorrpba}\gdef\balistcorr{\protect\undefcorrpba}\gdef\barefcorr{\protect\undefcorrpba}}
+\def\resetcorr@ba{\gdef\bacorr{}\gdef\barefcorr{}}
\resetcorr@ba
-\def\setup@ba#1#2{{#1{\ifdim\fontdimen\@ne\font=\z@{\ignorespaces #2\ba@textmode}\else
+\def\bakxxcorr{\bacorr}
+\def\baabkcorr{\bacorr}
+\def\balistcorr{\bacorr}
+\def\bakntsepcorr{\bacorr}
+%% Only \barefcorr not yet unified in 2.2 %%
+
+\def\setup@ba#1#2{\let\@bahdtest-{#1{%
+ \ifdim\fontdimen\@ne\font=\z@{\ignorespaces #2\ba@textmode\iflasthasdot@ba{\global\let\@bahdtest+}{}}\else
\if@reportbaup\type@bawarn{Add \string\upshape \space to \string#1}\fi
- {\upshape{\ignorespaces #2\ba@textmode}}\fi}}}
+ {\upshape{\ignorespaces #2\ba@textmode\iflasthasdot@ba{\global\let\@bahdtest+}{}}}\fi}}%
+ \iflasthasdot@ba{}{\ifx\@bahdtest+\@bahasdot\fi}}
\def\init@bacorr#1#2#3{\ifdim\lastskip=\hasdotcode@ba\gdef#3{}\else
{\let\@testa=-\bagetnext@arg#1\endlist@ba
@@ -114,7 +119,7 @@
\def\corrrrule@ba{\vrule width 0.1pt height 3pt depth 1pt\kern -0.1pt}
\let\TeXitcorr@ba=\/
-\def\dofrco@ba@abk{% %% \ba@textmode ist bereits gesetzt %%
+\def\dofrco@ba@abk{%
\if@bafrontcorr\ifhmode
\TeXitcorr@ba \if@showbacorr\ifdim\lastkern=\z@\else\corrrrule@ba\fi\fi
\fi\fi}
@@ -171,11 +176,9 @@
%% types %%
-\def\originalquotetype{\small}
-%\def\originalquotetype{\small\itshape}
+\def\originalquotetype{\small} %{\small\itshape}
-\def\balisttype{}
-%\def\balisttype{\slshape}
+\def\balisttype{} %{\slshape}
@@ -196,26 +199,29 @@
\def\Pkillname{\cap@ba{iidem}}
-\def\bakntsepcorr{\ifdim\fontdimen\@ne\font=\z@\else{\kxxemph{\ifdim\fontdimen\@ne\font=\z@\@bacorrkern\nulskip@ba\fi}}\fi}
-\def\ntsep{: \ifbashortcite{\bakntsepcorr}{}}
-
+\def\prep@bakntsepcorr{\def\bacorr{\ifdim\fontdimen\@ne\font=\z@\else{\kxxemph{\ifdim\fontdimen\@ne\font=\z@\@bacorrkern\nulskip@ba\fi}}\fi}}
+\def\not@bakntsepcorr{\def\bacorr{}}
+\def\ntsep{: \bacorr} %{\ifbashortcite{:\hskip0pt plus 0pt\bacorr}{: }}
+\def\ppntsep{{\@kxxbafalse\not@bakntsepcorr\ntsep}}
+\def\printntsep{\protect\ppntsep}
-\def\nsep{\baslash}
-%\def\nsep{, }
-%\def\nsep{ / \baupcorr}
-%\def\nsep{\upshape{\protect\nolinebreak[3] /\protect\linebreak[3] }}
+\def\nsep{\baslash} %{, } %{ / \baupcorr} %{\upshape{\protect\nolinebreak[3] /\protect\linebreak[3] }}
\def\listlnfnsep{, }
-\def\arqsep{, } %{; } %{: }
-%\def\arqsep{\bapoint\newsentence} %{\@\bapoint\space} %{\bapoint\space} %{\bapoint\ }
+\def\arqsep{, } %{: } %{\bapoint\newsentence}
%% switches %%
+\def\pnotaffixhints{\@affixhintsfalse}
+\def\notaffixhints{\protect\pnotaffixhints}
+
+\def\paffixhints{\@affixhintstrue}
+\def\affixhints{\protect\paffixhints}
\def\pannouncektit{\@heraldktittrue}
\def\announcektit{\protect\pannouncektit}
@@ -334,12 +340,9 @@
\ifdim\lastskip=\z@\nobreak\else\ifdim\lastskip=\hasdotcode@ba\nobreak\else\ifdim\lastskip=\notdotcode@ba\nobreak\else\hskip-\lastskip\fi\fi\fi\fi}
\def\badelspacebefore{\protect\pbadelsb}
-\def\pernosep{\ifbashortcite{\bakxxcorr}{}\nobreak\ }
-%\def\pernosep{\ifbashortcite{\bastrut\bakxxcorr}{}\ }
-\def\pervolshortsep{\ifbaperiodical{\ifbaibidem{, }{\pernosep}}{, }}
-\def\pagefolioshortsep{\ifbaperiodical{\ifbaibidem{: }{\ifbahaspervol{: }{: }}}{%
- \ifbashortcite{\ifbaibidem{: }{\ifbahaspervol{: }{\ifbaprinthints{: }{\bakxxcorr : }}}}{: }}}
-
+\def\pernosep{\bacorr\nobreak\ } %{\bastrut\ \bacorr}
+\def\pervolshortsep{\ifbaperiodical{\ifbaibidem{, }{\pernosep}}{, }} %{\bastrut\ \bacorr}
+\def\pagefolioshortsep{\bacorr : } %{\bastrut\ \bacorr}
\def\pwnsn{\@wnsntrue}
\def\warnsamename{\protect\pwnsn}
@@ -350,10 +353,7 @@
\def\@bastrut{\iflasthasdot@ba{\strut}{}\iflastnotdot@ba{\strut}{}}
\def\pbastrut{\protect\@bastrut}
\def\bastrut{\protect\pbastrut}
-\def\frompagesep{\bastrut\hskip 1.25em minus 0.25em\balistcorr}
-%\def\frompagesep{, }
-%\def\frompagesep{\balistcorr; }
-%\def\frompagesep{\bapoint\space ---\nobreak\ }
+\def\frompagesep{\bastrut\hskip 1.25em minus 0.25em\bacorr} %{, } %{\bacorr; } %{\bapoint\space ---\nobreak\ }
\def\fromnopagevxxsep{\bapoint}
\def\fromnopagevkcsep{} %{\bapoint}
@@ -363,21 +363,21 @@
\def\fromnopageabksep{} %{\bapoint}
\def\fromnopagepersep{\bapoint}
- \def\pxrrlo{\bastrut\ \balistcorr(}
+ \def\pxrrlo{\bastrut\ \bacorr(}
\def\pxrrlc{)}
\def\xrrlistopen{\protect\pxrrlo}
\def\xrrlistclose{\protect\pxrrlc}
- \def\parqlo{\bastrut\hskip 1em minus 0.3em\balistcorr}
+ \def\parqlo{\bastrut\hskip 1em minus 0.3em\bacorr}
\def\parqlc{}
\def\arqlistopen{\protect\parqlo}
\def\arqlistclose{\protect\parqlc}
-\def\arqsectionopen{\bastrut\ \balistcorr $-$ }
+\def\arqsectionopen{\bastrut\ \bacorr $-$ }
\def\arqsectionclose{\bahasdot}
-\def\arqsubsectionopen{\bastrut\ \balistcorr $-$ }
+\def\arqsubsectionopen{\bastrut\ \bacorr $-$ }
\def\arqsubsectionclose{\bahasdot}
-\def\arqsubsubsectionopen{\bastrut\ \balistcorr $-$ }
+\def\arqsubsubsectionopen{\bastrut\ \bacorr $-$ }
\def\arqsubsubsectionclose{\bahasdot}
\def\arqsectionbegin{\vskip 4ex plus 1ex minus 1ex\pagebreak[3]\normalsize\bfseries}
@@ -387,20 +387,20 @@
\def\arqsubsectionend{\nopagebreak[3]\vspace{0.5ex}\nopagebreak[3]}
\def\arqsubsubsectionend{\nopagebreak[3]\vspace{0.5ex}\nopagebreak[3]}
- \def\pperlo{\bastrut\ \balistcorr $-$ }
+ \def\pperlo{\bastrut\ \bacorr $-$ }
\def\pperlc{}
\def\perlistopen{\protect\pperlo}
\def\perlistclose{\protect\pperlc}
- \def\pabklo{\bastrut\hskip 1.2em minus 0.3em\balistcorr}
+ \def\pabklo{\bastrut\hskip 1.2em minus 0.3em\bacorr}
\def\pabklc{}
\def\abklistopen{\protect\pabklo}
\def\abklistclose{\protect\pabklc}
-\def\abkdefopen{\baabkcorr\ (}
+\def\abkdefopen{\bacorr\ (}
\def\abkdefclose{)}
-\def\defabkopen{\bastrut\ (\baabkcorr}
-\def\defabkclose{\baabkcorr)}
+\def\defabkopen{\bastrut\ (\bacorr}
+\def\defabkclose{\bacorr)}
\def\xrrlistemph{} %{\itshape}
\def\arqlistemph{\arqemph\relax\normalsize}
@@ -445,7 +445,7 @@
\expandafter\ifx\csname fup\endcsname\relax
\def\pfup#1{\iflasthasdot@ba{}{\@baupcorr}\escb@ba
- \lower-0.75ex\hbox{\scriptsize\textup{\ignorespaces #1\ba@textmode}}{\@baendcorr}{\kern 0.01pt}}%
+ \lower-0.75ex\hbox{\scriptsize{\upshape\ignorespaces #1\ba@textmode}}{\@baendcorr}{\kern 0.01pt}}%
\def\fup{\protect\pfup}%
\else
\typeout{\string\fup-command used. I do not redefine.}%
@@ -486,8 +486,8 @@
\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 \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
@@ -515,8 +515,8 @@
\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
- \else\pagefolioshortsep\fi
- {\ignorespaces #2}}\fi\fi}\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}%
@@ -525,8 +525,8 @@
\ifx\@testa\@leerz\erripfpevo@ba{}\else
\if@prnbapevo\kommin@string{#1}\fi
{\if@prnbapevo\ifx.\@testb\cap@ba{#2}\else\cap@ba{#2p}\fi
- \else\pervolshortsep\fi
- {\ignorespaces #1}}\fi\fi}\fi}
+ \else{\pervolshortsep}\fi
+ {\ignorespaces #1}\let\@testa=-\finddot@ba{#1}\ifx\@testa+\@bahasdot\fi\gdef\bacorr{}}\fi\fi}\fi}
\def\prints@ba#1#2{{\@herefunctions
\def\@testa{#2}%
@@ -602,40 +602,40 @@
\def\@baxfolio#1{\initprintpf@ba{isonxfolio}{f}{#1}}
-\bacaptionsgerman %% Voreinstellung = deutsch
+\bacaptionsgerman %% default
%% German:
\def\ganonymousname{[Anonym]}
\def\geditorname{[\kern 0.04em Hrsg.]\kern 0.02em}
\let\geditorpname=\geditorname
\setibidem{g}{ebd\kern -0.07em}{.}
-\def\gidemname{ders\kern -0.04em.}
-\def\geademname{dies\kern -0.04em.}
-\def\giidemname{diesn\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\gvolname{, Bd.\,}
-\def\gvolpname{, Bde.\,} %%
+\def\gvolpname{, Bde.\,}
\def\gpername{\ifbaibidem{, Nr.\,}{\pernosep}}
-\def\gperpname{\ifbaibidem{, Nr.\,}{\pernosep}} %%
+\def\gperpname{\ifbaibidem{, Nr.\,}{\pernosep}}
\def\gisonfolioname{, Bl.\,}
-\def\gisonfoliopname{, Bl.\,} %% , - ; \hy \fhy \f \ff
+\def\gisonfoliopname{, Bl.\,}
\def\gisonxfolioname{, dort: Bl.\,}
-\def\gisonxfoliopname{, dort: Bl.\,} %% oder \baplural im
+\def\gisonxfoliopname{, dort: Bl.\,}
\def\gisonpagename{, S.\,}
-\def\gisonpagepname{, S.\,} %% \print[pf/pv]@ba-Argument.
+\def\gisonpagepname{, S.\,}
\def\gisonxpagename{, dort: S.\,}
-\def\gisonxpagepname{, dort: S.\,} %%
+\def\gisonxpagepname{, dort: S.\,}
\def\gabktitlename{Ab\-k\"ur\-zungen}
\def\gbibtitlename{Quellen und Literatur} %% (Bibliographie:)
\def\gvlititlename{Literatur} %% <- [L] (Sekundaerliteratur)
\def\gvqutitlename{Gedruckte Quellen} %% <- [Q] (Primaerliteratur)
\def\ghinttovliname{[L]} %% -> [L] Literatur
\def\ghinttovquname{[Q]} %% -> [Q] Gedruckte Quellen
-\def\gpertitlename{Zeitschriften} %%
-\def\garqtitlename{Ungedruckte Quellen} %%
-\def\gvkctitlename{Verwendete Kurztitel} %%
-\def\ggrrtitlename{Ortsregister} %%
-\def\gprrtitlename{Personenregister} %%
-\def\gsrrtitlename{Sachregister} %%
-\def\gannouncektitname{\bastrut\ (\kern 0.015em im Folgenden \baupcorr} %% changed in 2.1
+\def\gpertitlename{Zeitschriften}
+\def\garqtitlename{Ungedruckte Quellen}
+\def\gvkctitlename{Verwendete Kurztitel}
+\def\ggrrtitlename{Ortsregister}
+\def\gprrtitlename{Personenregister}
+\def\gsrrtitlename{Sachregister}
+\def\gannouncektitname{\bastrut\ (\kern 0.015em im Folgenden \baupcorr} %at:fortan
\def\gannouncekendname{)}
\def\grefvbegname{(}
\def\grefverbname{siehe}
@@ -643,7 +643,7 @@
\def\grefvfntname{, Anm.\,}
\def\grefvendname{\barefcorr)}
\def\gconfername{\kern -0.03em wie}
-\def\gerscheditionname{\teskip Auf{\kern.03em}l.,}
+\def\gerscheditionname{\teskip Auf{\kern.03em}l.,} %{\teskip Aufl.,}
\def\gerschvolumename{Bd.,}
\def\gerschvolumepname{Bde.,}
\def\gerschnohousename{\oO,} %{ohne Ort,}
@@ -691,30 +691,30 @@
\def\feademname{la m\^e\-me}
\def\fiidemname{les m\^e\-mes}
\def\fvolname{, vol.\,}
-\def\fvolpname{, vol.\,} %%
+\def\fvolpname{, vol.\,}
\def\fpername{\ifbaibidem{, n\fup{o}\,}{\pernosep}}
-\def\fperpname{\ifbaibidem{, n\fup{os}\,}{\pernosep}} %%
+\def\fperpname{\ifbaibidem{, n\fup{os}\,}{\pernosep}}
\def\fisonfolioname{, folio\nobreak \ }
-\def\fisonfoliopname{, folii\nobreak \ } %% , - ; \hy \fhy \sq \sqq
+\def\fisonfoliopname{, folii\nobreak \ }
\def\fisonxfolioname{, l\`a: Folio\nobreak \ }
-\def\fisonxfoliopname{, l\`a: Folii\nobreak \ } %% oder \baplural im
+\def\fisonxfoliopname{, l\`a: Folii\nobreak \ }
\def\fisonpagename{, p.\,}
-\def\fisonpagepname{, p.\,} %% \print[pf/pv]@ba-Argument.
+\def\fisonpagepname{, p.\,}
\def\fisonxpagename{, l\`a: p.\,}
-\def\fisonxpagepname{, l\`a: p.\,} %%
+\def\fisonxpagepname{, l\`a: p.\,}
\def\fabktitlename{Ab\-r\'e\-viations}
\def\fbibtitlename{Bibliographie} %% (Travaux+Sources:)
\def\fvlititlename{Travaux} %% <- [T]
\def\fvqutitlename{Sources im\-pri\-m\'ees} %% <- [S]
\def\fhinttovliname{[T]} %% -> [T] Travaux
\def\fhinttovquname{[S]} %% -> [S] Sources imprim\'ees
-\def\fpertitlename{P\'e\-riodiques} %%
-\def\farqtitlename{Sources in\-\'edi\-tes} %%
-\def\fvkctitlename{Titres ab\-r\'e\-g\'ees} %%
-\def\fgrrtitlename{Registre g\'eo\-graphique} %%
-\def\fprrtitlename{Registre des personnes} %%
-\def\fsrrtitlename{Registre des sujets} %%
-\def\fannouncektitname{\bastrut\ (\kern 0.02em par la suite \baupcorr} %% 2.1: \bastrut\
+\def\fpertitlename{P\'e\-riodiques}
+\def\farqtitlename{Sources in\-\'edi\-tes}
+\def\fvkctitlename{Titres ab\-r\'e\-g\'ees}
+\def\fgrrtitlename{Registre g\'eo\-graphique}
+\def\fprrtitlename{Registre des personnes}
+\def\fsrrtitlename{Registre des sujets}
+\def\fannouncektitname{\bastrut\ (\kern 0.02em par la suite \baupcorr}
\def\fannouncekendname{)}
\def\frefvbegname{(}
\def\frefverbname{voir}
@@ -725,8 +725,8 @@
\def\ferscheditionname{\fupskip \'edi\-tion,} %% -> \fordinal=\fordinalf
\def\ferschvolumename{vol.,}
\def\ferschvolumepname{vol.,}
-\def\ferschnohousename{s.\kern 0.15em l\kern 0.02em.,} %% sans lieu new in 2.1
-\def\ferschnoyearname{s.\kern 0.13em d.\bahasdot} %% sans date new in 2.1
+\def\ferschnohousename{s.\kern 0.15em l\kern 0.02em.,} %% sans lieu
+\def\ferschnoyearname{s.\kern 0.13em d.\bahasdot} %% sans date
\def\ffolpagename{\badelspacebefore\ sq.\bahasdot}
\def\fxfolpagename{\badelspacebefore\ sqq.\bahasdot}
@@ -739,30 +739,30 @@
\def\eeademname{eadem}
\def\eiidemname{iidem}
\def\evolname{, vol.\,}
-\def\evolpname{, vols.\,} %%
+\def\evolpname{, vols.\,}
\def\epername{\ifbaibidem{, no.\,}{\pernosep}}
-\def\eperpname{\ifbaibidem{, no.\,}{\pernosep}} %%
+\def\eperpname{\ifbaibidem{, no.\,}{\pernosep}}
\def\eisonfolioname{, folio\nobreak \ }%{, f.\,}
-\def\eisonfoliopname{, folii\nobreak \ } %% , - ; \hy \fhy \f \ff
+\def\eisonfoliopname{, folii\nobreak \ }
\def\eisonxfolioname{, there: Folio\nobreak \ }
-\def\eisonxfoliopname{, there: Folii\nobreak \ } %% oder \baplural im
+\def\eisonxfoliopname{, there: Folii\nobreak \ }
\def\eisonpagename{, p.\,}
-\def\eisonpagepname{, pp.\,} %% \print[pf/pv]@ba-Argument.
+\def\eisonpagepname{, pp.\,}
\def\eisonxpagename{, there: p.\,}
-\def\eisonxpagepname{, there: pp.\,} %%
+\def\eisonxpagepname{, there: pp.\,}
\def\eabktitlename{Abbreviations}
\def\ebibtitlename{Bibliography} %% (Literature+Sources:)
\def\evlititlename{Literature} %% <- [L] (Secondary Literature)
\def\evqutitlename{Published Documents} %% <- [D] (Primary Literature)
\def\ehinttovliname{[L]} %% -> [L] Literature
\def\ehinttovquname{[D]} %% -> [D] Printed Sources
-\def\epertitlename{Periodicals} %%
-\def\earqtitlename{Unpublished Documents} %%
-\def\evkctitlename{Shortened References} %% changed in 2.1
-\def\egrrtitlename{Geographical index} %%
-\def\eprrtitlename{Person index} %%
-\def\esrrtitlename{Subject index} %%
-\def\eannouncektitname{\bastrut\ (\kern -0.02em cited as \baupcorr} %% 2.1: \bastrut\
+\def\epertitlename{Periodicals}
+\def\earqtitlename{Unpublished Documents}
+\def\evkctitlename{Shortened References}
+\def\egrrtitlename{Geographical index}
+\def\eprrtitlename{Person index}
+\def\esrrtitlename{Subject index}
+\def\eannouncektitname{\bastrut\ (\kern -0.02em cited as \baupcorr} %henceforth
\def\eannouncekendname{)}
\def\erefvbegname{[\nobreak \hskip 1pt plus 0pt}
\def\erefverbname{see}
@@ -773,8 +773,8 @@
\def\eerscheditionname{\fupskip edition,}
\def\eerschvolumename{vol.,}
\def\eerschvolumepname{vols.,}
-\def\eerschnohousename{n.\kern 0.15em p.,} %% no place new in 2.1
-\def\eerschnoyearname{n.\kern 0.13em d.\bahasdot} %% no date new in 2.1
+\def\eerschnohousename{n.\kern 0.15em p.,} %% no place
+\def\eerschnoyearname{n.\kern 0.13em d.\bahasdot} %% no date
\def\efolpagename{\badelspacebefore\,f\kern -0.1pt.\bahasdot}
\def\exfolpagename{\badelspacebefore\,ff\kern -0.1pt.\bahasdot}
@@ -783,7 +783,7 @@
\def\spacefactorMMM@ba{\if@unusedbib\else\ifhmode\ifnum\sfcode\grave@ba\.=3000\spacefactor3000\fi\fi\fi}
\def\spacefactorM@ba{\if@unusedbib\else\ifhmode\ifnum\sfcode\grave@ba\.=3000\spacefactor1000\fi\fi\fi}
-%%%%%%
+%%
\def\ba@textmode{\ifmmode $\type@bawarn{Set forgotten \string$}\fi}
@@ -795,14 +795,15 @@
\def\onlyvoll##1{##1}% %% Umgekehrt in \@hereRfunctions.
\def\onlykurz##1{}% %% Dito.
\def\sort##1{}%
+ \def\bago{}%
\def\verb{\errmessage{verbatim is forbidden inside BibArts args}}%
}
-%%%%%%
+%%
-\def\@outsavety{% %% \nsep nicht schuetzen! %%
+\def\@outsavety{% %% not protect \nsep %%
\protectchars@active%
\def\newpage{\protect\newpage}%
\def\frq{\protect\frq}%
@@ -840,16 +841,39 @@
\def\L{\protect\L}%
\def\o{\protect\o}%
\def\O{\protect\O}%
- \def\ss{\protect\ss}%
- \def\3{\string\3}%
+ \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}% %% new in 2.1 %%
+ \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\@}%
@@ -878,10 +902,10 @@
\def\tiny{\protect\tiny}%
\def\normalsize{\protect\normalsize}%
%\def\label##1{}%
- \def\label{\protect\label}% %% 2.09 und 2e wohl unterschiedlich %%
+ \def\label{\protect\label}% %% 2.09/2e? %%
\def\index{\protect\index}%
\def\glossary{\protect\glossary}%
- \def\Alpha{\protect\Alpha}% %% Missing big Greek letters new in 2.1 %%
+ \def\Alpha{\protect\Alpha}%
\def\Beta{\protect\Beta}%
\def\Epsilon{\protect\Epsilon}%
\def\Zeta{\protect\Zeta}%
@@ -894,21 +918,24 @@
\def\Tau{\protect\Tau}%
\def\Chi{\protect\Chi}%
\def\Omicron{\protect\Omicron}%
- \def\omicron{\protect\omicron}% %% 2.0 %%
- \def\backslash{\protect\backslash}% %% new in 2.1 %%
- \def\sz{\protect\sz}% %% new in 2.1 %%
- \def\SZ{\protect\SZ}% %% new in 2.1 %%
+ \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}%
}
-%%%%%%
+%%
-%% In 2.09 mehrzeilige Eintraege ins .AUX-File verhindern:
+%% Only single-line-eintries in .AUX-Files (LaTeX 2.09):
\expandafter\ifx\csname GenericError\endcsname\relax
\typeout@ba{* Redefine \string\@ctrerr \space to get single-line entries in .aux-file.}%
\def\@ctrerr{{\errorcontextlines=-1\errmessage{Counter too large (alph/Alph/fnsymbol)}}}%
@@ -982,13 +1009,14 @@
\def\female{\protect\female}%
\def\male{\protect\male}%
\def\sort{\protect\sort}%
+ \def\bago{\protect\bago}%
\def\bahasdot{\protect\bahasdot}%
- \def\balistcorr{\protect\balistcorr}%
+ \def\bacorr{\protect\bacorr}%
\def\verb{\errmessage{verbatim is forbidden inside BibArts args}}%
}
-%%%%%%
+%%
\def\@memfunctions{%
@@ -1057,10 +1085,11 @@
\def\sort{\protect\sort}% %% Nur wirksam in \protec@scr %%
\def\bahasdot{}%
\def\banotdot{}%
+ \def\bago{}%
}
-%%%%%%
+%%
\def\@hereRfunctions{%
@@ -1080,7 +1109,7 @@
}
-%%%%%%
+%%
%% commands for users %%
@@ -1089,6 +1118,7 @@
\def\pBibArts{{\upshape{B\kern -.7pt\lower .5ex\hbox{i}\kern -1.45pt\lower -.285ex\hbox{\itshape{b}}\kern -2.5pt\lower .5ex\hbox{A}\kern -2.6pt\lower -.6ex\hbox{r}\kern -1.4pt\lower .2ex\hbox{t}\kern -1.4pt\lower -.303ex\hbox{s}}}}
\def\BibArts{\protect\pBibArts}
+\def\bago{\command@misplace{\bago}}
\def\onlyhere{\command@misplace{\onlyhere}}
\def\onlyout{\command@misplace{\onlyout}}
@@ -1116,36 +1146,39 @@
\def\vollout#1{\onlyvoll{\onlyout{#1}}}
\def\vollhere#1{\onlyvoll{\onlyhere{#1}}}
-\def\protmva#1#2{\dofrco@ba\@printvname{#1}{\bastrut\ }{#2}{0}{\nsep}\ignorespaces}
+\def\protmva#1#2{\dofrco@ba\@printvname{#1}{\bastrut\ }{#2}{0}{0}{\nsep}\ignorespaces}
\def\midvauthor{\protect\protmva}
-\def\protva#1#2{\dofrco@ba\@printvname{#1}{\bastrut\ }{#2}{0}}
+\def\protva#1#2{\dofrco@ba\@printvname{#1}{\bastrut\ }{#2}{0}{0}}
\def\vauthor{\protect\protva}
\def\ntvauthor#1#2{\protect@onlyout\vauthor{#1}{#2}\protect\ntsepnta}
-\def\protmka#1{\dofrco@ba\@printkname{#1}{\nsep}\ignorespaces}
+\def\protmka#1{\dofrco@ba\@printkname{#1}{0}{\nsep}\ignorespaces}
\def\midkauthor{\protect\protmka}
-\def\protka#1{\dofrco@ba\@printkname{#1}}
+\def\protka#1{\dofrco@ba\@printkname{#1}{0}}
\def\kauthor{\protect\protka}
\def\ntkauthor#1{\protect@onlyout\kauthor{#1}\protect\ntsepnta}
\def\protect@onlyout{}
-\def\ntsepnta{{\ntsep}\ignorespaces}
+\def\ntsepnta{\printntsep\ignorespaces}
\def\printcatcode#1{\the\catcode\grave@ba#1}
- %% use e. g. \printcatcode{\"} to get the value of " %%
+ %% E.g. \printcatcode{\"} for value of " %%
-%%%%%%
+%%
%% internal %%
-
-\def\nulskip@ba{{\nobreak \hskip 0pt plus 0pt}}
+\expandafter\ifx\csname z@skip\endcsname\relax
+\def\nulskip@ba{{\nobreak \hskip 0pt plus 0pt}}%
+\else
+\def\nulskip@ba{{\nobreak \hskip \z@skip}}%
+\fi
\def\pbaslash{{\nobreak \hskip 0.24em plus 0.08em\lower -0.26ex\hbox{%
\normalfont\scriptsize /}\penalty-\@m\hskip .2em plus 0.08em}}
@@ -1166,6 +1199,7 @@
\def\@leer{}
\def\@leerz{ } %% \ifx %%
+\newif\if@affixhints\@affixhintsfalse
\newif\if@kurztoarq\@kurztoarqtrue
\newif\if@reportbaup\@reportbauptrue
\newif\if@bafrontcorr\@bafrontcorrtrue
@@ -1188,6 +1222,7 @@
\newif\if@perba
\newif\if@kxxba
\newif\if@vxxbalist\@vxxbalistfalse
+\newif\if@balist\@balistfalse
\newif\if@wnsn\@wnsntrue
@@ -1235,7 +1270,7 @@
\fi}
-%%% Kosmetik fuer Fussnotennummer im Text koennte von hier ...
+%%% You may comment out changes to footnote numbers from here ...
\expandafter\ifx\csname @footnotemark\endcsname\relax
\else
@@ -1243,7 +1278,7 @@
\def\@footnotemark{\ifhmode{\nobreak \hskip 0.04em plus 0.01em}\else\leavevmode\fi\ba@footnmark}%
\fi
-%%% ... bis hier auskommentiert werden.
+%%% ... up to here.
\let\lastto@ba=+ %% \vli{A}{B+}{\ktit{C}} and \kli{B+}{C} in first fnt %%
@@ -1372,33 +1407,39 @@
\def\anon@ba{\nulskip@ba\setup@ba{\authoremph}{\cap@ba{anonymous}}}
-\def\@printvname#1#2#3#4{{\upshape
- \def\@testa{#1}%
+\def\@printvname#1#2#3#4#5{{\upshape
+ \let\@testa=-%
+ \def\@testd{#1}%
\def\@testb{#3}%
\def\@testc{\male}%
- \ifx\@testa\@testc\def\@testa{}\fi
+ \ifx\@testd\@testc\def\@testd{}\fi
\ifx\@testb\@testc\def\@testb{}\fi
\def\@testc{\female}%
- \ifx\@testa\@testc\def\@testa{}\fi
+ \ifx\@testd\@testc\def\@testd{}\fi
\ifx\@testb\@testc\def\@testb{}\fi
- \ifx\@testa\@leer\ifx\@testb\@leer\anon@ba\fi\fi
- \ifx\@testa\@leerz\ifx\@testb\@leer\anon@ba\fi\fi
- \ifx\@testa\@leer\ifx\@testb\@leerz\anon@ba\fi\fi
- \ifx\@testa\@leerz\ifx\@testb\@leerz\anon@ba\fi\fi
- \ifx\@testa\@leer\else\ifx\@testa\@leerz\else
+ \ifx\@testd\@leer\ifx\@testb\@leer\anon@ba\fi\fi
+ \ifx\@testd\@leerz\ifx\@testb\@leer\anon@ba\fi\fi
+ \ifx\@testd\@leer\ifx\@testb\@leerz\anon@ba\fi\fi
+ \ifx\@testd\@leerz\ifx\@testb\@leerz\anon@ba\fi\fi
+ \ifx\@testd\@leer\else\ifx\@testd\@leerz\else
\ifnum #4=1%
- \ifx\@testb\@leer\setup@ba{\authoremph}{#1}\else\ifx\@testb\@leerz\setup@ba{\authoremph}{#1}\else\setup@ba{\authoremph}{#1}{#2}\fi\fi %% kein \underline{#1#2}
- \else\ifx\@testb\@leer{\ignorespaces #1\ba@textmode}\else\ifx\@testb\@leerz{\ignorespaces #1\ba@textmode}\else
+ \ifx\@testb\@leer\setup@ba{\authoremph}{#1}\ifnum #5=1\finddot@ba{#1}\fi\else\ifx\@testb\@leerz\setup@ba{\authoremph}{#1}\ifnum #5=1\finddot@ba{#1}\fi\else\setup@ba{\authoremph}{#1}{#2}\fi\fi %% no \underline{#1#2}
+ \else\ifx\@testb\@leer{\ignorespaces #1\ba@textmode}\ifnum #5=1\finddot@ba{#1}\fi\else\ifx\@testb\@leerz{\ignorespaces #1\ba@textmode}\ifnum #5=1\finddot@ba{#1}\fi\else
{\ignorespaces #1#2\ba@textmode}\fi\fi
\fi
\fi\fi
- \ifnum #4=0\setup@ba{\authoremph}{#3}\else{\ignorespaces #3\ba@textmode}\fi}}
+ \ifx\@testb\@leer\else\ifx\@testb\@leerz\else
+ \ifnum #4=0\setup@ba{\authoremph}{#3}\ifnum #5=1\finddot@ba{#3}\fi\else{\ignorespaces #3\ba@textmode}\ifnum #5=1\finddot@ba{#3}\fi\fi
+ \fi\fi
+ \ifx\@testa+\@bahasdot\fi}}
-\def\@printkname#1{{%
- \def\@testa{#1}%
- \ifx\@testa\@leer\anon@ba\else
- \ifx\@testa\@leerz\anon@ba\else
- \setup@ba{\authoremph}{#1}\fi\fi}}
+\def\@printkname#1#2{{%
+ \let\@testa=-%
+ \def\@testd{#1}%
+ \ifx\@testd\@leer\anon@ba\else
+ \ifx\@testd\@leerz\anon@ba\else
+ \setup@ba{\authoremph}{#1}\ifnum #2=1\finddot@ba{#1}\fi\fi\fi
+ \ifx\@testa+\@bahasdot\fi}}
\newbox\testbox@ba
@@ -1407,43 +1448,43 @@
\setbox\testbox@ba=\hbox{#2{\ignorespaces #1\ba@textmode}}%
\ifdim\ht\testbox@ba=0pt%
\if@kxxba
- \if@printhint
- \else
- \gdef\bakxxcorr{}%
- \gdef\balistcorr{}%
- \fi
+ \gdef\bacorr{}% %% no \if@printhint\else in 2.2 %%
\fi
\else
- {\ntsep}{\unhbox\testbox@ba}%
+ {\if@kxxba\iflasthasdot@ba{\not@bakntsepcorr}{\prep@bakntsepcorr}\else
+ \not@bakntsepcorr\fi\ntsep}{\unhbox\testbox@ba}%
\if@kxxba
\let\@testa=-\finddot@ba{#1}%
- \ifx\@testa+\@bahasdot\fi
+ \ifx\@testa+\@bahasdot\gdef\bacorr{}\fi
\let\@testb+%
\do@banohint{\let\@testb-}%
\ifx\@testb+%
\@bastrut
- \ifx\@testa-{\bakxxcorr}\fi
- \makecorrcmd@ba{}{\balistcorr}%
+ \ifx\@testa-{\bacorr}\fi
+ \makecorrcmd@ba{}{\bacorr}%
\else
- \ifx\@testa+\gdef\bakxxcorr{}\fi
- \ifx\@testa-\makecorrcmd@ba{\kxxemph}{\balistcorr}\else
- \gdef\balistcorr{}\fi
+ \ifx\@testa-\makecorrcmd@ba{\kxxemph}{\bacorr}\else
+ \gdef\bacorr{}\fi
\fi
\else
\if@vxxbalist
- \init@bacorr{#1}{}{\balistcorr}%
+ \init@bacorr{#1}{}{\bacorr}%
+ \else
+ \gdef\bacorr{}%
\fi
\fi
\fi}}
\def\@printoptarg#1#2{{%
- \def\@testa{#2}%
+ \def\@testb{#2}%
\setbox\testbox@ba=\hbox{\ignorespaces #1\ba@textmode}%
\ifdim\ht\testbox@ba=0pt\else
- \ifx\@testa\@leer{\@leerz}\else %% space before *{...} %%
- {#2}\fi\fi %% #2 is \nsep at \x... %%
- {\unhbox\testbox@ba}}}
+ \ifx\@testb\@leer\@bastrut\ \else %% space before *{...} %%
+ {#2}\fi\fi %% #2 is \nsep at \x... %%
+ {\unhbox\testbox@ba}%
+ \let\@testa=-\finddot@ba{#1}%
+ \ifx\@testa+\@bahasdot\fi}}
\newif\ifreprint@ba\reprint@bafalse
@@ -1456,7 +1497,7 @@
^^Jon the v#1-list, I transform inner full titles into short titles. For that
^^Jlist, I've inserted `??' as inner short title. (In case of an inner \vli, or
^^J\vqu, the inner full title will also be printed separately on the v..-list.)^^J}%
- \errmessage@ba{Missing \string\ktit{...} in last arg}}\fi\fi}
+ \errmessage@ba{Missing \string\ktit{...} or shadowed {\string\ktit{...}} in last arg}}\fi\fi}
\def\@initvprintonly#1#2#3#4#5#6#7#8{{% %% #1 == li, qu %%
\resetcorr@ba
@@ -1486,7 +1527,7 @@
\ifreprint@ba \def\execute@ktit{{\@kxxbatrue\@kprintonly{#1}{#2}{#4}{#5}{##1}{#7}}}%
\else \def\execute@ktit{{\@firstherald\if@rheraldktit
\cap@ba{announcektit}\@rootponly{#1}{#4}*{#5}{##1}{#7}%
- \do@banohint{{\bakxxcorr}}\cap@ba{announcekend}\fi\fi}}%
+ \do@banohint{{\bacorr}}\cap@ba{announcekend}\fi\fi}}%
\fi ##1\ba@textmode}%
\ifreprint@ba
{\setbox\testbox@ba=\hbox{#6\relax
@@ -1601,7 +1642,7 @@
\def\@vprintonly#1#2#3#4#5#6#7{{%
\@herefunctions
\def\@testa{#2}%
- \ifx\@testa\@leer \@printvname{#3}{\bastrut\ }{#4}{0}%
+ \ifx\@testa\@leer \@printvname{#3}{\bastrut\ }{#4}{0}{1}%
\@printoptarg{#5}{#7}%
\else\oletter@ba{v#1}{#2}{\@printoptarg{#5}{#7}}%
\fi %% #1 == li, qu %%
@@ -1611,9 +1652,9 @@
\def\@initprinthint#1{\if@printhint
{\setbox\testbox@ba=\hbox{\cap@ba{hinttov#1}}%
- \ifdim\ht\testbox@ba=0pt{ []}\else
- \ifx\bakxxcorr\@leer \penalty\@m \ \else \ \fi
- \unhbox\testbox@ba\fi}\fi}
+ \if@affixhints \nobreak\ \else \ \fi
+ \ifdim\ht\testbox@ba=0pt{[]}\else
+ \unhbox\testbox@ba\fi}\fi}
%% \cap@ba{hinttovli} \cap@ba{hinttovqu} %%
\def\@initkprintonly#1#2#3#4#5#6{\if@ibidemize\else\clearmem@ba\fi
@@ -1645,7 +1686,13 @@
\def\setoa@ba#1{\global\def\oarga@ba{\setup@ba{\edibidemph}{\cap@ba{#1}}}}
-\def\geto@ba#1#2{\setoa@ba{#1}\global\def\oargb@ba{#2}}
+\def\geto@ba#1#2{\setoa@ba{#1}%
+ {\def\@testa{#2}%
+ \ifx\@testa\@leer
+ \global\def\oargb@ba{#2}%
+ \else
+ \global\def\oargb@ba{\@bastrut #2}%
+ \fi}}
\def\getom@ba m{\@ifnextchar\bgroup{\geto@ba{idem}}{\setoa@ba{idem}}}
\def\getof@ba f{\@ifnextchar\bgroup{\geto@ba{eadem}}{\setoa@ba{eadem}}}
@@ -1653,9 +1700,9 @@
\def\@kprintonly#1#2#3#4#5#6{{%
- \makeXcorrcmd@ba{\kxxemph}{\bakxxcorr}%
+ \makeXcorrcmd@ba{\kxxemph}{\bacorr}%
\def\@testa{#2}%
- \ifx\@testa\@leer \@printkname{#3}\@printoptarg{#4}{#6}%
+ \ifx\@testa\@leer \@printkname{#3}{1}\@printoptarg{#4}{#6}%
\else \oletter@ba{k#1}{#2}{\@printoptarg{#4}{#6}}%
\fi}%
\@printlastarg{#5}{\kxxemph}%
@@ -1668,15 +1715,15 @@
\def\@rootponly#1#2*#3#4#5{{%
- \makeXcorrcmd@ba{\kxxemph}{\bakxxcorr}%
+ \makeXcorrcmd@ba{\kxxemph}{\bacorr}%
\@hereRfunctions
- \@printkname{#2}%
+ \@printkname{#2}{1}%
\@printoptarg{#3}{#5}%
{\@kxxbatrue\@printlastarg{#4}{\kxxemph}}%
\@initprinthint{#1}}} %% #1 == li, qu %%
-%%%%%
+%%
\def\next@ba{}
@@ -1714,12 +1761,12 @@
\def\makeendcorr@ba{\ifx\isibidem@ba-%
\ifx\next@ba,\else\ifx\next@ba.\else\ifx\next@ba\strut\else
\ifx\next@ba[\else\ifx\next@ba(\else\ifx\next@ba*\else\ifx\next@ba|\else\ifx\next@ba_\else
- \if@kxxba\do@banohint{{\bakxxcorr}}\fi
+ \if@kxxba\do@banohint{{\bacorr}}\fi
\fi\fi\fi\fi\fi
\fi\fi\fi
\ifx\next@ba.%
\ifdim\lastskip=\notdotcode@ba
- \if@kxxba\if@printhint\else{\bakxxcorr}\@banotdot\fi\fi
+ \if@kxxba\if@printhint\else{\bacorr}\@banotdot\fi\fi
\fi
\fi
\fi
@@ -1783,7 +1830,9 @@
\def\getbkch@bapg{%
\ifx\next@ba.\if@ibidhp
\ifx\lookpage@ba+\let\next@ba=\relax\spacefactorMMM@ba\fi
- \fi \else \spacefactorM@ba \@bastrut \fi
+ \fi \else \spacefactorM@ba
+ \if@balist\else\@bastrut\fi
+ \fi
\pknext@ba} %% []()*[]*() %%
\def\pknext@ba{%
@@ -1810,7 +1859,7 @@
\pkcheck@ba}
-%%%%%
+%%
\def\checkNvrun@AbcDe#1{\@kxxbafalse\@perbafalse\@ifnextchar[{\Check@LocalvArg{#1}}{\Check@LocalvArg{#1}[]}}
@@ -1865,7 +1914,7 @@
\def\Check@ObligatoryLastkArg#1[#2]#3*#4#5{\csname @#1\endcsname[#2]{#3}*{#4}{#5}\pkcheck@ba}
-%%%%%%
+%%
\def\type@bawarn#1{\typeout@ba{ \space BibArts Warning: #1 on input line \line@ba.}}
@@ -1916,12 +1965,10 @@
\def\@fqerrmsg#1{\@fqerrhlp{#1}\@qqertypeout{#1}{...}}
-%%%%%%
-
+%%
- %% VOLLZITATE: LITERATUR, GEDRUCKTE QUELLEN %%
- %% Benutzeranwendungen %%
+ %% full citations (v-cmds) %%
\def\shadowv{\@bsphack\@pfvbafalse\checkNvrun@AbcDe{shadowv}} %% ... \@shadowv
@@ -1960,7 +2007,7 @@
- %% Interna %%
+ %% Internal %%
\def\@shadowv[#1]#2#3*#4#5{}
@@ -2014,12 +2061,10 @@
\def\quellentry#1#2#3#4#5#6[#7][#8](#9){}
-%%%%%%
-
+%%
- %% KURZZITATE: LITERATUR, GEDRUCKTE QUELLEN %%
- %% Benutzeranwendungen %%
+ %% shortened citations %%
\def\shadowk{\@bsphack\@pfvbafalse\checkNkrun@AbCd{shadowk}} %% ... \@shadowk
@@ -2058,7 +2103,7 @@
- %% Interna %%
+ %% Internal %%
\def\@shadowk[#1]#2*#3#4{}
@@ -2103,12 +2148,11 @@
\def\vkcitentry#1#2#3#4#5#6[#7][#8](#9){}
-%%%%%%
+%%
- %% ZEITSCHRIFTEN und ARCHIVQUELLEN %%
+ %% periodicals and archive sources %%
- %% Benutzeranwendungen %%
\def\checkNonerun@a#1{\@kxxbafalse\@perbatrue\@ifnextchar\bgroup{\Check@perArg{#1}}{%
{\errorcontextlines=-1\@qqerrmsg{#1}{...}%
@@ -2164,7 +2208,7 @@
\DeclareRobustCommand\addtoarq{\@bsphack\@pfvbafalse\checkNtworun@ab{addtoarq}} %% \@addtoarq
- %% Interna %%
+ %% Internal %%
\def\@shadowo#1{}
\def\@shadowt[#1]#2#3{}
@@ -2267,10 +2311,10 @@
\def\archqentry#1#2#3#4[#5][#6](#7){}
-%%%%%%
+%%
- %% ABKUERZUNGEN %%
+ %% abbreviations %%
\def\abkemph{\sffamily}
\def\dofrco@baabk{\ba@textmode
@@ -2280,11 +2324,11 @@
\def\@makeendabk{\ifx\next@ba,%
\else\ifx\next@ba.%
\iflasthasdot@ba{\strut\let\next@ba\relax}{}%
- \iflastnotdot@ba{\strut\let\next@ba\relax\baabkcorr}{}%
+ \iflastnotdot@ba{\strut\let\next@ba\relax\bacorr}{}%
\spacefactorMMM@ba
\else\ifx\next@ba\strut
\nulskip@ba\strut\let\next@ba\relax
- \else\nulskip@ba\strut\baabkcorr\fi\fi\fi
+ \else\nulskip@ba\strut\bacorr\fi\fi\fi
\next@ba}
\def\@abk#1{\@initaddtoabk{#1}\@printonlyabk{#1}%
\let\@testa=-\finddot@ba{#1}%
@@ -2293,7 +2337,7 @@
\DeclareRobustCommand\abk{\dofrco@baabk\leavevmode\resetcorr@ba\checkNrun@one{abk}} %% \@abk %%
\def\@printonlyabk#1{{\@herefunctions\printfirstarg@ba{\abkemph}{#1}{abk...}}%
- \init@baXcorr{#1}{\abkemph}{\baabkcorr}}
+ \init@baXcorr{#1}{\abkemph}{\bacorr}}
\def\@cprintonlyabk#1{\@printonlyabk{#1}%
\let\@testa=-\finddot@ba{#1}%
@@ -2322,21 +2366,21 @@
\def\notnegcorrdefabk{\protect\pnndefabk}
\def\@printonlydefabk#1#2{{\@herefunctions\ignorespaces #1}\nulskip@ba\strut
- {\abkemph{\ifdim\fontdimen\@ne\font=\z@\gdef\baabkcorr{\@baupcorr}\else
- \if@ba@newLTX\gdef\baabkcorr{}\else\gdef\baabkcorr{\@badowncorr}\fi\fi}}%
+ {\abkemph{\ifdim\fontdimen\@ne\font=\z@\gdef\bacorr{\@baupcorr}\else
+ \if@ba@newLTX\gdef\bacorr{}\else\gdef\bacorr{\@badowncorr}\fi\fi}}%
{\let\@testa=-\finddot@ba{#1}%
\ifx\@testa+\@bahasdot\fi
}%
{\defabkopen}\@printonlyabk{#2}%
{\let\@testa=-\finddot@ba{#2}%
\ifx\@testa+\@bahasdot
- {\defabkclose}\gdef\baabkcorr{}%
+ {\defabkclose}\gdef\bacorr{}%
\else
\setbox\testbox@ba=\hbox{\def\corrrrule@ba{}\defabkclose}%
\ifdim\ht\testbox@ba=0pt%
- \def\baabkcorr{}{\defabkclose}%
+ \def\bacorr{}{\defabkclose}%
\else
- {\defabkclose}\gdef\baabkcorr{}%
+ {\defabkclose}\gdef\bacorr{}%
\fi
\fi
}\spacefactorM@ba\next@printabk}
@@ -2352,7 +2396,6 @@
\def\@initabkdef#1#2{\if@unusedbib\else\@bsphack\fi
\if@filesw {\let\thepage\relax
\@outsavety\@outfunctions
- \def\baabkcorr{\balistcorr}%
\edef\@tempa{\write\@auxout{\commentch@ba\string
\abkrzentry{#1}{#2}{{\abklistopen}{\abklistclose}{}{}}{\setn@ba}[\catq@ba][\lang@ba](line \line@ba)}}%
\expandafter}\@tempa
@@ -2409,7 +2452,7 @@
\def\persrentry#1#2#3#4[#5][#6](#7){}
\def\subjrentry#1#2#3#4[#5][#6](#7){}
-%%%%%%
+%%
%% lists %%
@@ -2512,13 +2555,10 @@
\def\@printvkclist#1{\resetcorr@ba{\@kxxbatrue\@banonumtrue\def\vkcitentry{\@vkcitentry}%
- \makeXcorrcmd@ba{\kxxemph}{\bakxxcorr}%
\@balist{vkc}{#1}}}
\def\printvkclist{\ba@textmode\@printvkclist{\@baitemdefs}}
\def\@printnumvkclist#1{\resetcorr@ba{\@kxxbatrue\def\vkcitentry{\@vkcitentry}%
- \makeXcorrcmd@ba{\kxxemph}{\bakxxcorr}%
- \makecorrcmd@ba{}{\balistcorr}% %% new in 2.1 (always corr at hints) %%
\@baindexlist
\@balist{vkc}{#1}}}
\def\printnumvkclist{\ba@textmode\@printnumvkclist{\@baitemdefs}}
@@ -2596,11 +2636,11 @@
\def\onlyvoll##1{##1}%
\def\onlykurz##1{}%
\def\ktit##1{##1\ba@textmode}%
- \@fileswfalse% %% has no influence on \label, \index, \glossary! %%
+ \@fileswfalse% %% not influences \label, \index, \glossary %%
\def\sort##1{}%
}
-\def\@reprintkfunctions{% %% when bibsort is not used %%
+\def\@reprintkfunctions{% %% if bibsort is not used %%
\def\onlyhere##1{}%
\def\onlyout##1{##1}%
\def\onlyvoll##1{}%
@@ -2630,7 +2670,9 @@
\expandafter\ifx\csname ngermanTeX\endcsname\relax\else \ngermanTeX{#1}\message{(new)}\fi
\expandafter\ifx\csname germanTeX\endcsname\relax\else \germanTeX{#1}\message{(old)}\fi}
\def\baoriginalTeX#1{%
- \expandafter\ifx\csname originalTeX\endcsname\relax\else\originalTeX{#1}\fi}
+ \expandafter\ifx\csname originalTeX\endcsname\relax\else
+ \expandafter\ifx\csname AfterBabelLanguage\endcsname\relax\originalTeX{#1}\fi %% not babel
+ \fi}
\newif\if@baaddx\@baaddxfalse
@@ -2643,8 +2685,8 @@
\addxadd@ba#5\relax\relax\relax
\language@barep{#8}{#9}%
\activech@barep{#7}{#9}%
- \gdef\balistcorr{}% %% new in 2.1 (filled *arg and empty title) %%
- \item{}\@printvname{#1}{\listlnfnsep}{#2}{1}%
+ \gdef\bacorr{}%
+ \item{}\@printvname{#1}{\listlnfnsep}{#2}{1}{1}%
\if@baaddx\@printoptarg{#3}{\nsep}\else\@printoptarg{#3}{}\fi
{\reprint@batrue \@printlastarg{#4}{}}\if@banonum{\fromnopagevxxsep}\fi\@reportbaupfalse\ignorespaces}
@@ -2652,12 +2694,8 @@
\addxadd@ba#5\relax\relax\relax
\language@barep{#8}{#9}%
\activech@barep{#7}{#9}%
- \if@printhint
- %% see (always corr at hints)
- \else
- \gdef\balistcorr{}% %% new in 2.1 (filled *arg and empty title) %%
- \fi
- \item{}\@printkname{#1}%
+ \makeXcorrcmd@ba{\kxxemph}{\bacorr}%
+ \item{}\@printkname{#1}{1}%
\if@baaddx\@printoptarg{#2}{\nsep}\else\@printoptarg{#2}{}\fi
\@printlastarg{#3}{\kxxemph}\@initprinthint{#4}%
\if@banonum{\fromnopagevkcsep}\fi
@@ -2670,14 +2708,13 @@
\def\printsecondarg@ba#1#2#3#4{{%
\setbox\testbox@ba=\hbox{\ignorespaces #2\ba@textmode}%
- \ifdim\ht\testbox@ba=0pt{#4{\ifdim\fontdimen\@ne\font=\z@\gdef\balistcorr{}\fi}}\else
+ \ifdim\ht\testbox@ba=0pt{#4{\ifdim\fontdimen\@ne\font=\z@\gdef\bacorr{}\fi}}\else
{#1}{\unhbox\testbox@ba}%
- \init@bacorr{#2}{}{\balistcorr}%
- \gdef\baabkcorr{\balistcorr}%
+ \init@bacorr{#2}{}{\bacorr}%
{#3}\if@banonum\spacefactorM@ba\else
\setbox\testbox@ba=\hbox{#3}%
\ifdim\ht\testbox@ba=0pt\else
- \init@bacorr{#3}{}{\balistcorr}%
+ \init@bacorr{#3}{}{\bacorr}%
\fi
\fi
\fi}}
@@ -2698,7 +2735,7 @@
\language@barep{#6}{#7}%
\activech@barep{#5}{#7}%
\item{}\printfirstarg@ba{\xrrlistemph}{#1}{.rr}%
- \init@bacorr{#1}{\xrrlistemph}{\balistcorr}%
+ \init@bacorr{#1}{\xrrlistemph}{\bacorr}%
\printsecondarg@ba{\@baopen}{#2}{\@baclose}{\xrrlistemph}%
\if@banonum{\fromnopagexrrsep}\fi \@reportbaupfalse\ignorespaces}
@@ -2707,7 +2744,7 @@
\language@barep{#6}{#7}%
\activech@barep{#5}{#7}%
\item{}\printfirstarg@ba{\arqlistemph}{#1}{arq}%
- \init@bacorr{#1}{\arqlistemph}{\balistcorr}%
+ \init@bacorr{#1}{\arqlistemph}{\bacorr}%
\printsecondarg@ba{\@baopen}{#2}{\@baclose}{\arqlistemph}%
\if@banonum{\fromnopagearqsep}\addBadd@ba#3\relax\else
\ifdim\lastskip=\hasdotcode@ba\addBadd@ba#3\relax\@bahasdot\else
@@ -2720,7 +2757,7 @@
\language@barep{#6}{#7}%
\activech@barep{#5}{#7}%
\item{}\printfirstarg@ba{\perlistemph}{#1}{per}%
- \init@bacorr{#1}{\perlistemph}{\balistcorr}%
+ \init@bacorr{#1}{\perlistemph}{\bacorr}%
\printsecondarg@ba{\@baopen}{#2}{\@baclose}{\perlistemph}%
\if@banonum{\fromnopagepersep}\fi \@reportbaupfalse\ignorespaces}
@@ -2729,7 +2766,7 @@
\language@barep{#6}{#7}%
\activech@barep{#5}{#7}%
\item{}\printfirstarg@ba{\abklistemph}{#1}{abk...}%
- \init@bacorr{#1}{\abklistemph}{\balistcorr}%
+ \init@bacorr{#1}{\abklistemph}{\bacorr}%
\printsecondarg@ba{\@baopen}{#2}{\@baclose}{\abklistemph}%
\if@banonum{\fromnopageabksep}\fi \@reportbaupfalse\ignorespaces}
@@ -2745,7 +2782,7 @@
\def\@balist#1#2{\message{ \string<\string< #1\string:}%
{\errorcontextlines=-1\catcode\grave@ba\@=11\balisttype{}%
\@herefunctions\@reprintfunctions\@rheraldktitfalse
- \@allowconferizefalse \genderingfalse
+ \@allowconferizefalse \genderingfalse \@balisttrue
%%%
\gdef\listparm@ba{#2}%
%%%
@@ -2819,10 +2856,10 @@
\else\newenvironment{unused}{\@unusedbibtrue\@hereUfunctions\ignorespaces}{}\fi
-%%%%%%
+%%
- %% TRENNSATZ-EINSTELLUNG %%
+ %% hyphenation setting %%
\expandafter\ifx\csname language\endcsname\relax
@@ -2865,10 +2902,11 @@
\fi
-%%%%%%%%%%
+%%
+
+ %% cross-references %%
- %% Querverweise %%
%% No italics-corr on 2.09: %%
\expandafter\ifx\csname ba@its\endcsname\relax
@@ -2915,28 +2953,23 @@
\def\ba@varlabel#1#2#3{\ifba@varstring\if@filesw\if@allowconferize
\makevarstring@ba{#1}{#2}{#3}\ba@label{\insvarstring@ba}\fi\fi\fi}
- %% BA-Codes fuer Sonderzeichen innerhalb von \newlabel:
- %% ------------------------------------------------------
- %% /X \l \L \o \O [X = l, L, o, O].
- %% *V \"V (und "V falls "=\active) [V = Vokal]
- %% *s \ss \3 (und "s falls "=\active)
- %% [ \`
- %% ] \'
- %% | \^
- %% = \= <ueberstrichen>
- %% @ \b <unterstrichen>
- %% + \c
- %% - \~
- %% ( \. <ueberpunktet>
- %% ) \d <unterpunktet>
- %% oe \oe
- %% OE \OE
- %% ae \ae
- %% AE \AE
- %% aa \aa
- %% AA \AA
- %% i \i
- %% j \j
+ %% \newlabel at \conferize
+ %% ------------------------
+ %% (X \l \L \o \O \ss's [X = l, L, o, O, ss]
+ %% ) \^
+ %% * \"
+ %% [ \`
+ %% ] \'
+ %% + \c
+ %% - \~
+ %% oe \oe
+ %% OE \OE
+ %% ae \ae
+ %% AE \AE
+ %% a \aa
+ %% A \AA
+ %% i \i
+ %% j \j
\newif\if@bains@lab
@@ -2996,6 +3029,9 @@
\def\makevarstring@ba#1#2#3{%
\reset@allbalabvars
{\@hereRfunctions
+ \def\SS{{SS}}% %% \
+ \def\aa{{\r{a}}}% %% > avoid [T1] errors
+ \def\AA{{\r{A}}}% %% /
\ifba@varstring \@bains@labtrue
\getnext@baA#1\endlist@ba \@bains@labtrue
\getnext@baB#2\endlist@ba \@bains@labtrue
@@ -3007,34 +3043,75 @@
\def\getnext@baB{\afterassignment\doba@labB\let\next@ba= }
\def\getnext@baC{\afterassignment\doba@labC\let\next@ba= }
-{\catcode\grave@ba\"=13%
-\global\def\sonderz@banext#1{%
- \ifx\ss\next@ba \let\next@ba=*\csname savn@bavar#1\endcsname \let\next@ba=s\csname savn@bavar#1\endcsname\fi
- \ifx \3\next@ba \let\next@ba=*\csname savn@bavar#1\endcsname \let\next@ba=s\csname savn@bavar#1\endcsname\fi
- \ifx\oe\next@ba \let\next@ba=o\csname savn@bavar#1\endcsname \let\next@ba=e\csname savn@bavar#1\endcsname\fi
- \ifx\OE\next@ba \let\next@ba=O\csname savn@bavar#1\endcsname \let\next@ba=E\csname savn@bavar#1\endcsname\fi
- \ifx\ae\next@ba \let\next@ba=a\csname savn@bavar#1\endcsname \let\next@ba=e\csname savn@bavar#1\endcsname\fi
- \ifx\AE\next@ba \let\next@ba=A\csname savn@bavar#1\endcsname \let\next@ba=E\csname savn@bavar#1\endcsname\fi
- \ifx\aa\next@ba \let\next@ba=a\csname savn@bavar#1\endcsname \let\next@ba=a\csname savn@bavar#1\endcsname\fi
- \ifx\AA\next@ba \let\next@ba=A\csname savn@bavar#1\endcsname \let\next@ba=A\csname savn@bavar#1\endcsname\fi
- \ifx \o\next@ba \let\next@ba=/\csname savn@bavar#1\endcsname \let\next@ba=o\csname savn@bavar#1\endcsname\fi
- \ifx \O\next@ba \let\next@ba=/\csname savn@bavar#1\endcsname \let\next@ba=O\csname savn@bavar#1\endcsname\fi
- \ifx \l\next@ba \let\next@ba=/\csname savn@bavar#1\endcsname \let\next@ba=l\csname savn@bavar#1\endcsname\fi
- \ifx \L\next@ba \let\next@ba=/\csname savn@bavar#1\endcsname \let\next@ba=L\csname savn@bavar#1\endcsname\fi
- \ifx \i\next@ba \let\next@ba=i\csname savn@bavar#1\endcsname\fi
- \ifx \j\next@ba \let\next@ba=j\csname savn@bavar#1\endcsname\fi
- \ifx \"\next@ba \let\next@ba=*\csname savn@bavar#1\endcsname\fi
- \ifx "\next@ba \let\next@ba=*\csname savn@bavar#1\endcsname\fi
- \ifx \`\next@ba \let\next@ba=[\csname savn@bavar#1\endcsname\fi
- \ifx \'\next@ba \let\next@ba=]\csname savn@bavar#1\endcsname\fi
- \ifx \^\next@ba \let\next@ba=|\csname savn@bavar#1\endcsname\fi
- \ifx \~\next@ba \let\next@ba=-\csname savn@bavar#1\endcsname\fi
- \ifx \=\next@ba \let\next@ba==\csname savn@bavar#1\endcsname\fi
- \ifx \.\next@ba \let\next@ba=(\csname savn@bavar#1\endcsname\fi
- \ifx \b\next@ba \let\next@ba=@\csname savn@bavar#1\endcsname\fi
- \ifx \d\next@ba \let\next@ba=)\csname savn@bavar#1\endcsname\fi
- \ifx \c\next@ba \let\next@ba=+\csname savn@bavar#1\endcsname\fi
-}%
+
+\def\refch@ba#1#2{\let\next@ba=#2\csname savn@bavar#1\endcsname}
+\def\refop@ba#1{\refch@ba{#1}{(}}
+
+
+\def\sonderz@banext#1{%
+ \ifx \ck\next@ba \refch@ba{#1}{c}\refch@ba{#1}{k}\fi
+ \ifx \CK\next@ba \refch@ba{#1}{C}\refch@ba{#1}{K}\fi
+ \ifx \hyc\next@ba \refch@ba{#1}{c}\fi
+ \ifx \oldhyc\next@ba \refch@ba{#1}{c}\fi
+ \ifx \HYC\next@ba \refch@ba{#1}{C}\fi
+ \ifx \OLDHYC\next@ba \refch@ba{#1}{C}\fi
+ \ifx \hyl\next@ba \refch@ba{#1}{l}\fi
+ \ifx \oldhyl\next@ba \refch@ba{#1}{l}\fi
+ \ifx \HYL\next@ba \refch@ba{#1}{L}\fi
+ \ifx \OLDHYL\next@ba \refch@ba{#1}{L}\fi
+ \ifx \hym\next@ba \refch@ba{#1}{m}\fi
+ \ifx \oldhym\next@ba \refch@ba{#1}{m}\fi
+ \ifx \HYM\next@ba \refch@ba{#1}{M}\fi
+ \ifx \OLDHYM\next@ba \refch@ba{#1}{M}\fi
+ \ifx \hyn\next@ba \refch@ba{#1}{n}\fi
+ \ifx \oldhyn\next@ba \refch@ba{#1}{n}\fi
+ \ifx \HYN\next@ba \refch@ba{#1}{N}\fi
+ \ifx \OLDHYN\next@ba \refch@ba{#1}{N}\fi
+ \ifx \hyp\next@ba \refch@ba{#1}{p}\fi
+ \ifx \oldhyp\next@ba \refch@ba{#1}{p}\fi
+ \ifx \HYP\next@ba \refch@ba{#1}{P}\fi
+ \ifx \OLDHYP\next@ba \refch@ba{#1}{P}\fi
+ \ifx \hyr\next@ba \refch@ba{#1}{r}\fi
+ \ifx \oldhyr\next@ba \refch@ba{#1}{r}\fi
+ \ifx \HYR\next@ba \refch@ba{#1}{R}\fi
+ \ifx \OLDHYR\next@ba \refch@ba{#1}{R}\fi
+ \ifx \hyt\next@ba \refch@ba{#1}{t}\fi
+ \ifx \oldhyt\next@ba \refch@ba{#1}{t}\fi
+ \ifx \HYT\next@ba \refch@ba{#1}{T}\fi
+ \ifx \OLDHYT\next@ba \refch@ba{#1}{T}\fi
+ \ifx \hyf\next@ba \refch@ba{#1}{f}\fi
+ \ifx \oldhyf\next@ba \refch@ba{#1}{f}\fi
+ \ifx \HYF\next@ba \refch@ba{#1}{F}\fi
+ \ifx \OLDHYF\next@ba \refch@ba{#1}{F}\fi
+ \ifx\oldhyss\next@ba \refop@ba{#1}\refch@ba{#1}{s}\refch@ba{#1}{s}\fi
+ \ifx\OLDHYSS\next@ba \refch@ba{#1}{S}\refch@ba{#1}{S}\fi
+ \ifx\newhyss\next@ba \refop@ba{#1}\refch@ba{#1}{s}\refch@ba{#1}{s}\fi
+ \ifx\NEWHYSS\next@ba \refch@ba{#1}{S}\refch@ba{#1}{S}\fi
+ \ifx \hyss\next@ba \refop@ba{#1}\refch@ba{#1}{s}\refch@ba{#1}{s}\fi
+ \ifx \HYSS\next@ba \refch@ba{#1}{S}\refch@ba{#1}{S}\fi
+ \ifx \ss\next@ba \refop@ba{#1}\refch@ba{#1}{s}\refch@ba{#1}{s}\fi
+ \ifx \SS\next@ba \refch@ba{#1}{S}\refch@ba{#1}{S}\fi
+ \ifx \sz\next@ba \refop@ba{#1}\refch@ba{#1}{s}\refch@ba{#1}{z}\fi
+ \ifx \SZ\next@ba \refch@ba{#1}{S}\refch@ba{#1}{Z}\fi
+ \ifx \3\next@ba \refop@ba{#1}\refch@ba{#1}{s}\refch@ba{#1}{s}\fi
+ \ifx\oe\next@ba \refch@ba{#1}{o}\refch@ba{#1}{e}\fi
+ \ifx\OE\next@ba \refch@ba{#1}{O}\refch@ba{#1}{E}\fi
+ \ifx\ae\next@ba \refch@ba{#1}{a}\refch@ba{#1}{e}\fi
+ \ifx\AE\next@ba \refch@ba{#1}{A}\refch@ba{#1}{E}\fi
+ \ifx\aa\next@ba \refch@ba{#1}{a}\fi
+ \ifx\AA\next@ba \refch@ba{#1}{A}\fi
+ \ifx \o\next@ba \refop@ba{#1}\refch@ba{#1}{o}\fi
+ \ifx \O\next@ba \refop@ba{#1}\refch@ba{#1}{O}\fi
+ \ifx \l\next@ba \refop@ba{#1}\refch@ba{#1}{l}\fi
+ \ifx \L\next@ba \refop@ba{#1}\refch@ba{#1}{L}\fi
+ \ifx \i\next@ba \refch@ba{#1}{i}\fi
+ \ifx \j\next@ba \refch@ba{#1}{j}\fi
+ \ifx \"\next@ba \refch@ba{#1}{*}\fi
+ \ifx \`\next@ba \refch@ba{#1}{[}\fi
+ \ifx \'\next@ba \refch@ba{#1}{]}\fi
+ \ifx \^\next@ba \refch@ba{#1}{)}\fi
+ \ifx \~\next@ba \ifnum\catcode\grave@ba\-=12\refch@ba{#1}{-}\fi \fi
+ \ifx \c\next@ba \ifnum\catcode\grave@ba\+=12\refch@ba{#1}{+}\fi \fi
}
@@ -3069,6 +3146,7 @@
}
\def\analyselabeltext@ba#1{%
+ \expandafter\ifx \csname next@ba\endcsname\relax\else
\ifx \onlyvoll\next@ba \@bains@labfalse \count@ba0 \else
\ifx \onlyout \next@ba \@bains@labfalse \count@ba0 \else
\ifx \vauthor \next@ba \@bains@labfalse \count@ba0 \else
@@ -3083,7 +3161,8 @@
\ifx \egroup\next@ba \advance\count@ba by -1
\ifnum 0=\count@ba \@bains@labtrue
\fi\fi\fi
- \fi}
+ \fi
+ \fi}
\def\doba@labA{%
\ifx\next@ba\endlist@ba \let\next@ba\@leer
@@ -3173,15 +3252,11 @@
\ifx 0#10\fi
\ifx [#1[\fi %% \` %%
\ifx ]#1]\fi %% \' %%
- \ifx |#1|\fi %% \^ %%
- \ifx @#1@\fi %% \b %%
- \ifx (#1(\fi %% \. %%
- \ifx )#1)\fi %% \d %%
- \ifx *#1*\fi %% \" " %%
+ \ifx (#1(\fi %% \o \O \l \L \ss \hyss ... %%
+ \ifx )#1)\fi %% \^ %%
+ \ifx *#1*\fi %% \" %%
\ifx +#1+\fi %% \c %%
\ifx -#1-\fi %% \~ %%
- \ifx /#1/\fi %% \o \O \l \L %%
- \ifx =#1=\fi %% \= %%
}%
\def\spendletter@ba#1{%
@@ -3346,10 +3421,10 @@
}
-%%%%%%
+%%
- %% Hilfsbefehle %%
+ %% ... %%
\def\ncn@ersch#1{{\csname #1erschnohousename\endcsname}}
@@ -3433,7 +3508,9 @@
\fi
\def\fupskip{\protect\pfupskip}
-%%%
+
+%%
+
\def\next@hy{}
\def\test@hy{}
@@ -3537,15 +3614,17 @@
\def\pnothyko{\@hykofalse}%
\def\nothyko{\protect\pnothyko}%
-\def\phy{\nulskip@ba\ifmmode\hbox{-}\else\discretionary{-}{}{-}\fi\after@hy}
-%\def\phy{\nulskip@ba\ifmmode\hbox{-}\else\discretionary{-}{}{-}\fi\nulskip@ba}
-\def\pfhy{\nulskip@ba\hbox{-}\after@hy}
-%\def\pfhy{\nulskip@ba\hbox{-}\nulskip@ba}
+\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}
-%%%
+
+%%
+
\def\te{.\protect\pteskip}
@@ -3555,7 +3634,6 @@
\expandafter\ifx\csname omicron\endcsname\relax\def\omicron{o}\fi
-%% new in 2.1 %%
\def\pbasimgl{\normalfont} %{\normalfont\rule[.3ex]{.02em}{.5ex}\kern-.02em}
\def\basimgreeklatin{\protect\pbasimgl}
\expandafter\ifx\csname Alpha\endcsname\relax\def\Alpha{\mbox{\basimgreeklatin A}}\fi
@@ -3573,18 +3651,115 @@
\expandafter\ifx\csname Chi\endcsname\relax\def\Chi{\mbox{\basimgreeklatin X}}\fi
+%%
+
+
+ %% German word division %%
+
+
+%% A very old replacement for \ss, IF no sharp S exists, e.g. in \scshape: %%
\expandafter\ifx\csname sz\endcsname\relax
-\def\sz{sz}% %% new in 2.1 %%
+\def\sz{{sz}}%
\else
\typeout{\string\sz-command used. I do not redefine.}%
\fi
\expandafter\ifx\csname SZ\endcsname\relax
-\def\SZ{SZ}% %% new in 2.1 %%
+\def\SZ{{SZ}}%
\else
\typeout{\string\SZ-command used. I do not redefine.}%
\fi
+%%
+
+%% A sharp S which ALWAYS splits s-s (to be used between vovels, e.g. %%
+%% au\oldhyss er). Use YOUR sharp S at OTHER positions (e.g. da\ss): %%
+\def\oldhyss{\penalty\@M\discretionary{s-}{s}{\ss}\protect\nulskip@ba}
+\def\OLDHYSS{\penalty\@M\discretionary{S-}{S}{\SS}\protect\nulskip@ba}
+
+
+{\catcode\grave@ba\>=12%
+\gdef\@newhyss#1{{%
+ \def\@testa{#1}%
+ \def\@testb{\SS}%
+ \ifx\@testa\@testb
+ {\OLDHYSS}%
+ \else
+ \setbox\testbox@ba=\hbox{#1}%
+ \ifdim\ht\testbox@ba>1.4ex
+ {\ss}% %% split as def in \language %%
+ \else
+ {\oldhyss}% %% INVISIBLE in \showhyphens %%
+ \fi
+ \fi}}%
+}
+
+%% A sharp S which splits s-s ONLY in small caps; ELSE %%
+%% as \language says (-\ss ?). For use between vovels: %%
+\def\newhyss{\protect\@newhyss{\ss}}
+\def\NEWHYSS{\protect\@newhyss{\SS}}
+
+
+%% In Old German (=Old Austrian ?) hyphenation, %%
+%% \hyss splits as \oldhyss; ELSE as \newhyss: %%
+\def\hyss{\expandafter\ifx\csname l@german\endcsname\relax \newhyss\else \ifnum\language=\l@german\oldhyss\else\newhyss\fi \fi}
+\def\HYSS{\expandafter\ifx\csname l@german\endcsname\relax \NEWHYSS\else \ifnum\language=\l@german\OLDHYSS\else\NEWHYSS\fi \fi}
+
+%%
+
+\def\hycons@ba#1#2{\penalty\@M\discretionary{#1-}{}{#2}\protect\nulskip@ba}
+\def\HYCONS@BA#1#2{\penalty\@M\discretionary{#1-}{}{#2}\protect\nulskip@ba}
+
+\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}
+\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": %%
+\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": %%
+\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
+ \def\HYL{\HYVARI@BA{LL}{L}}
+
+\def\oldhym{\hycons@ba{mm}{m}} %% Sta\oldhym mutter
+\def\OLDHYM{\HYCONS@BA{MM}{M}}
+ \def\hym{\hyvari@ba{mm}{m}}
+ \def\HYM{\HYVARI@BA{MM}{M}}
+
+\def\oldhyn{\hycons@ba{nn}{n}} %% Ke\oldhyn nummer
+\def\OLDHYN{\HYCONS@BA{NN}{N}}
+ \def\hyn{\hyvari@ba{nn}{n}}
+ \def\HYN{\HYVARI@BA{NN}{N}}
+
+\def\oldhyp{\hycons@ba{pp}{p}} %% Ste\oldhyp pullover
+\def\OLDHYP{\HYCONS@BA{PP}{P}}
+ \def\hyp{\hyvari@ba{pp}{p}}
+ \def\HYP{\HYVARI@BA{PP}{P}}
+
+\def\oldhyr{\hycons@ba{rr}{r}} %% Sta\oldhyr rahmen
+\def\OLDHYR{\HYCONS@BA{RR}{R}}
+ \def\hyr{\hyvari@ba{rr}{r}}
+ \def\HYR{\HYVARI@BA{RR}{R}}
+
+\def\oldhyt{\hycons@ba{tt}{t}} %% Schri\oldhyt tempo
+\def\OLDHYT{\HYCONS@BA{TT}{T}}
+ \def\hyt{\hyvari@ba{tt}{t}}
+ \def\HYT{\HYVARI@BA{TT}{T}}
+
+\def\oldhyf{\hycons@ba{ff}{f}} %% Sto\oldhyf figur
+\def\OLDHYF{\HYCONS@BA{FF}{F}}
+ \def\hyf{\hyvari@ba{ff}{f}}
+ \def\HYF{\HYVARI@BA{FF}{F}}
+
+
+%%
+
%% Dummy for systems with parameter stack size=60 %%
\expandafter\ifx\csname footnotetext\endcsname\relax
@@ -3595,22 +3770,22 @@
\def\escb@ba{\ifvmode\leavevmode\lower -1ex\hbox{\strut}\else\nulskip@ba\fi}
-\def\babbrack#1{\escb@ba\textup{%
+\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\textup{%
+\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\textup{%
+\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{}}
{\catcode\grave@ba\"=12%
\expandafter\ifx\csname dq\endcsname\relax
- \gdef\dq{"}% %% Compatibility to BibArts 2.0 %%
+ \gdef\dq{"}% %% compatibility to 2.0 %%
\fi
\gdef\dq@bapas{\dq}}
@@ -3651,13 +3826,13 @@
\def\testH{--}%
\def\testL{---}%
\def\testl{\glq}%
- \def\teatl{\@glq}% %% Those commands did appear in old versions of german.sty,
+ \def\teatl{\@glq}% %% commands in old versions of german.sty
\def\testr{\grq}%
- \def\teatr{\@grq}% %% but you can not use german.sty 2.4a (released 92/04/12),
+ \def\teatr{\@grq}% %%
\def\testO{\glqq}%
- \def\teatO{\@glqq}% %% because BibArts there does not center the marks
+ \def\teatO{\@glqq}% %%
\def\testC{\grqq}%
- \def\teatC{\@grqq}% %% appropriate into the angular brackets.
+ \def\teatC{\@grqq}% %%
\def\testd{...}%
\def\testD{\dots}%
\ifx\@testa\oo@bapas \oo@abra{\oo@bapas}\else
@@ -3694,7 +3869,7 @@
\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\textup{[{#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
+ \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}}}}
@@ -3720,10 +3895,11 @@
\def\pbaRomannum#1{\uppercase\expandafter{\romannumeral #1}}
\def\baRomannum{\protect\pbaRomannum}
-%%%%%
+
+%%
- %% Layout %%
+ %% Layout %%
\def\bakorr@fnr{} %%{originalquote}%%
@@ -3731,7 +3907,7 @@
\def\footnoterule{\bakorr@fnr\vfill\fnrbasave}
%% \vfill INSTEAD OF \flushbottom %%
-%\footnotesep=2ex %% new in 2.1 %%
+%\footnotesep=2ex
\def\bibsortargs{unknown (no BibArts list printed yet)}
@@ -3744,13 +3920,14 @@
\item{}\rule{5pt}{0pt}\nopagebreak
\@baposvskip\rule{5pt}{0pt}\pagebreak[3]%
\item{}\@banegvskip\@banegvskip\@banegvskip
- {\normalfont\large\bfseries\sffamily{#1}}\nopagebreak
+ {\@baheademph{#1}}\nopagebreak
}
\def\do@onecolumnbsh#1{%
- \nopagebreak\@baposvskip\@baposvskip\pagebreak[3]\@banegvskip\item{}{\large\bfseries\sffamily{#1}}\nopagebreak
+ \nopagebreak\@baposvskip\@baposvskip\pagebreak[3]\@banegvskip\item{}{\@baheademph{#1}}\nopagebreak
}
\def\do@nobibsortspace{}
\def\do@nobibsorthead#1{}
+\def\@baheademph{\normalfont\large\bfseries\sffamily}
\let\bibsortpreparespace\do@nobibsortspace
\let\bibsortpreparexspace\do@nobibsortspace
@@ -3775,7 +3952,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.1 starts compatibility mode for 1.3 \space *****}%
+ ^^J \space ***** \space BibArts 2.2 starts compatibility mode for 1.3 \space *****}%
\def\bibarts{\BibArts}%
\def\schrift{}%
\def\barschrift{}%
@@ -3796,7 +3973,7 @@
\def\pstressing#1{\@bsphack\def\authoremph{\upshape\csname #1\endcsname}\@esphack}
\def\stressing{\protect\pstressing}
-\def\gbibmarkname{im Folgenden: } %% changed in 2.1
+\def\gbibmarkname{im Folgenden: }
\def\fbibmarkname{par la suite: }
\def\ebibmarkname{cited as: }
\def\pbibref#1{{#1} {\ba@varstringtrue\ba@varref{}{BIB}{#1}}}