From f99c3713ce38055f68d417b98c0435eae346855f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 27 Feb 2021 21:42:19 +0000 Subject: babel-german (27feb21) git-svn-id: svn://tug.org/texlive/trunk@57978 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/babel-german/README | 2 +- .../doc/generic/babel-german/germanb.pdf | Bin 395190 -> 396377 bytes .../doc/generic/babel-german/ngermanb.pdf | Bin 371703 -> 372481 bytes .../source/generic/babel-german/german.ins | 6 +-- .../source/generic/babel-german/germanb.dtx | 46 +++++++++++++-------- .../source/generic/babel-german/ngermanb.dtx | 36 ++++++++-------- .../tex/generic/babel-german/austrian.ldf | 10 ++++- .../texmf-dist/tex/generic/babel-german/german.ldf | 10 ++++- .../tex/generic/babel-german/germanb.ldf | 14 ++++--- .../tex/generic/babel-german/naustrian.ldf | 9 +++- .../tex/generic/babel-german/ngerman.ldf | 9 +++- .../tex/generic/babel-german/ngermanb.ldf | 13 +++--- .../tex/generic/babel-german/nswissgerman.ldf | 9 +++- .../tex/generic/babel-german/swissgerman.ldf | 10 ++++- 14 files changed, 112 insertions(+), 62 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/generic/babel-german/README b/Master/texmf-dist/doc/generic/babel-german/README index d929351078d..6ac552b7cc4 100644 --- a/Master/texmf-dist/doc/generic/babel-german/README +++ b/Master/texmf-dist/doc/generic/babel-german/README @@ -3,7 +3,7 @@ The babel-german bundle German language support for the babel multilingual package -Copyright 1989--2018 Johannes L. Braams +Copyright 1989--2021 Johannes L. Braams Bernd Raichle Walter Schmidt, Jürgen Spitzmüller diff --git a/Master/texmf-dist/doc/generic/babel-german/germanb.pdf b/Master/texmf-dist/doc/generic/babel-german/germanb.pdf index 90180b1e1ef..972952ed63c 100644 Binary files a/Master/texmf-dist/doc/generic/babel-german/germanb.pdf and b/Master/texmf-dist/doc/generic/babel-german/germanb.pdf differ diff --git a/Master/texmf-dist/doc/generic/babel-german/ngermanb.pdf b/Master/texmf-dist/doc/generic/babel-german/ngermanb.pdf index 4b029458720..a663794b0e4 100644 Binary files a/Master/texmf-dist/doc/generic/babel-german/ngermanb.pdf and b/Master/texmf-dist/doc/generic/babel-german/ngermanb.pdf differ diff --git a/Master/texmf-dist/source/generic/babel-german/german.ins b/Master/texmf-dist/source/generic/babel-german/german.ins index 92f2142bdff..3afe75f32f2 100644 --- a/Master/texmf-dist/source/generic/babel-german/german.ins +++ b/Master/texmf-dist/source/generic/babel-german/german.ins @@ -3,7 +3,7 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1989--2018 +%% Copyright 1989--2021 %% Johannes L. Braams %% Bernd Raichle %% Walter Schmidt @@ -28,7 +28,7 @@ %% %% --------------- start of docstrip commands ------------------ %% -\def\filedate{2018/12/08} +\def\filedate{2021/02/27} \input docstrip.tex @@ -50,7 +50,7 @@ \preamble This is a generated file. -Copyright 1989--2018 +Copyright 1989--2021 Johannes L. Braams Bernd Raichle Walter Schmidt diff --git a/Master/texmf-dist/source/generic/babel-german/germanb.dtx b/Master/texmf-dist/source/generic/babel-german/germanb.dtx index 21e0c788027..35a837bf707 100644 --- a/Master/texmf-dist/source/generic/babel-german/germanb.dtx +++ b/Master/texmf-dist/source/generic/babel-german/germanb.dtx @@ -2,7 +2,7 @@ % % File `germanb.dtx' % -% Copyright 1989--2020 +% Copyright 1989--2021 % Johannes L. Braams % Bernd Raichle % Walter Schmidt @@ -25,7 +25,7 @@ % % The Current Maintainer of this work is Juergen Spitzmueller. % \fi -% \CheckSum{513} +% \CheckSum{522} % % \iffalse % Tell the \LaTeX\ system who we are and write an entry on the @@ -39,7 +39,7 @@ %\ProvidesLanguage{germanb} %\fi %\ProvidesFile{germanb.dtx} - [2020/07/21 v2.12 German support for babel (pre-1996 orthography)] + [2021/02/27 v2.13 German support for babel (pre-1996 orthography)] %\iffalse % %<*filedriver> @@ -358,9 +358,31 @@ % % \subsection{General settings} % -% First, we define some helper macros that help us to identify later on +% +% If \file{germanb.ldf} is read via the deprecated \babel\ option +% \Lopt{germanb}, we make it behave as if \Lopt{german} was specified. +% \changes{Version 2.6m}{2008/06/01}{Corrected a typo} +% \begin{macrocode} +\def\tmpa{germanb} +\let\SaveCurrentOption\CurrentOption +\ifx\CurrentOption\tmpa + \def\CurrentOption{german} +\fi +% \end{macrocode} +% +% The macro |\LdfInit| takes care of preventing that this file is +% loaded more than once with the same option, checking the category +% code of the \texttt{@} sign, etc. +% \changes{Version 2.6d}{1996/11/02}{Now use \cs{LdfInit} to perform +% initial checks} +% \begin{macrocode} +\LdfInit\CurrentOption{captions\CurrentOption} +% \end{macrocode} +% +% We define some helper macros that help us to identify later on % which variety of German we are currently dealing with. % \changes{Version 2.9a=Version 2.10}{2016/11/03}{Add helper macros to identify the current option.} +% \changes{Version 2.9d=Version 2.13}{2021/02/27}{Move option helper macros after \cs{LdfInit} to fix plain tex usage.} % \iffalse %<*germanb> % \fi @@ -371,14 +393,11 @@ \def\bbl@opt@swissgerman{swissgerman} % \end{macrocode} % -% If \file{germanb.ldf} is read via the deprecated \babel\ option -% \Lopt{germanb}, we make it behave as if \Lopt{german} was specified. +% Some more work to make germanb behave like german. % \changes{Version 2.6l}{2008/03/17}{Making germanb behave like german % needs some more work besides defining \cs{CurrentOption}} -% \changes{Version 2.6m}{2008/06/01}{Corrected a typo} % \begin{macrocode} -\ifx\CurrentOption\bbl@opt@germanb - \def\CurrentOption{german} +\ifx\SaveCurrentOption\bbl@opt@germanb \ifx\l@german\@undefined \@nopatterns{German (trad. orthography)} \adddialect\l@german0 @@ -393,15 +412,6 @@ \fi % \end{macrocode} % -% The macro |\LdfInit| takes care of preventing that this file is -% loaded more than once with the same option, checking the category -% code of the \texttt{@} sign, etc. -% \changes{Version 2.6d}{1996/11/02}{Now use \cs{LdfInit} to perform -% initial checks} -% \begin{macrocode} -\LdfInit\CurrentOption{captions\CurrentOption} -% \end{macrocode} -% % If \file{germanb.ldf} is read as an option, i.e. via |\usepackage| % command, \Lopt{german} could be an `unknown' language, so we % have to make it known. We check for the existence of diff --git a/Master/texmf-dist/source/generic/babel-german/ngermanb.dtx b/Master/texmf-dist/source/generic/babel-german/ngermanb.dtx index 5d8d045eb31..d0b638457f6 100644 --- a/Master/texmf-dist/source/generic/babel-german/ngermanb.dtx +++ b/Master/texmf-dist/source/generic/babel-german/ngermanb.dtx @@ -2,7 +2,7 @@ % % File `ngermanb.dtx' % -% Copyright 1989--2020 +% Copyright 1989--2021 % Johannes L. Braams % Bernd Raichle % Walter Schmidt @@ -29,7 +29,7 @@ % by Bernd Raichle, Hubert Partl et.al. % % \fi -% \CheckSum{407} +% \CheckSum{409} % % \iffalse % Tell the \LaTeX\ system who we are and write an entry on the @@ -43,7 +43,7 @@ %\ProvidesLanguage{ngermanb} %\fi %\ProvidesFile{ngermanb.dtx} - [2020/07/21 v2.12 German support for babel (post-1996 orthography)] + [2021/02/27 v2.13 German support for babel (post-1996 orthography)] %\iffalse % %<*filedriver> @@ -299,23 +299,11 @@ % % \subsection{General settings} % -% First, we define some helper macros that help us to identify later on -% which variety of German we are currently dealing with. -% \changes{Version 2.9a=Version 2.10}{2016/11/03}{Add helper macros to identify the current option.} -% \iffalse -%<*ngermanb> -% \fi -% \begin{macrocode} -\def\bbl@opt@ngerman{ngerman} -\def\bbl@opt@ngermanb{ngermanb} -\def\bbl@opt@naustrian{naustrian} -\def\bbl@opt@nswissgerman{nswissgerman} -% \end{macrocode} -% % If \file{ngermanb.ldf} is read via the deprecated \babel\ option % \Lopt{ngermanb}, we make it behave as if \Lopt{ngerman} was specified. % \begin{macrocode} -\ifx\CurrentOption\bbl@opt@ngermanb +\def\tmpa{ngermanb} +\ifx\CurrentOption\tmpa \def\CurrentOption{ngerman} \fi % \end{macrocode} @@ -327,6 +315,20 @@ \LdfInit\CurrentOption{captions\CurrentOption} % \end{macrocode} % +% We define some helper macros that help us to identify later on +% which variety of German we are currently dealing with. +% \changes{Version 2.9a=Version 2.10}{2016/11/03}{Add helper macros to identify the current option.} +% \changes{Version 2.9d=Version 2.13}{2021/02/27}{Move option helper macros after \cs{LdfInit} to fix plain tex usage.} +% \iffalse +%<*ngermanb> +% \fi +% \begin{macrocode} +\def\bbl@opt@ngerman{ngerman} +\def\bbl@opt@ngermanb{ngermanb} +\def\bbl@opt@naustrian{naustrian} +\def\bbl@opt@nswissgerman{nswissgerman} +% \end{macrocode} +% % If \file{ngermanb.ldf} is read as an option, i.e., by the |\usepackage| % command, \Lopt{ngerman} could be an `unknown' language, so we % have to make it known. We check for the existence of diff --git a/Master/texmf-dist/tex/generic/babel-german/austrian.ldf b/Master/texmf-dist/tex/generic/babel-german/austrian.ldf index 5ff24091de1..cf1634ce132 100644 --- a/Master/texmf-dist/tex/generic/babel-german/austrian.ldf +++ b/Master/texmf-dist/tex/generic/babel-german/austrian.ldf @@ -7,7 +7,7 @@ %% germanb.dtx (with options: `austrian') %% This is a generated file. %% -%% Copyright 1989--2018 +%% Copyright 1989--2021 %% Johannes L. Braams %% Bernd Raichle %% Walter Schmidt @@ -34,7 +34,13 @@ %% via: https://github.com/jspitz/babel-german %% \ProvidesLanguage{austrian} - [2020/07/21 v2.12 German support for babel (pre-1996 orthography)] + [2021/02/27 v2.13 German support for babel (pre-1996 orthography)] +\def\tmpa{germanb} +\let\SaveCurrentOption\CurrentOption +\ifx\CurrentOption\tmpa + \def\CurrentOption{german} +\fi +\LdfInit\CurrentOption{captions\CurrentOption} \input germanb.ldf\relax %% %% \CharacterTable diff --git a/Master/texmf-dist/tex/generic/babel-german/german.ldf b/Master/texmf-dist/tex/generic/babel-german/german.ldf index 8617903b43a..b893f91ce73 100644 --- a/Master/texmf-dist/tex/generic/babel-german/german.ldf +++ b/Master/texmf-dist/tex/generic/babel-german/german.ldf @@ -7,7 +7,7 @@ %% germanb.dtx (with options: `german') %% This is a generated file. %% -%% Copyright 1989--2018 +%% Copyright 1989--2021 %% Johannes L. Braams %% Bernd Raichle %% Walter Schmidt @@ -34,7 +34,13 @@ %% via: https://github.com/jspitz/babel-german %% \ProvidesLanguage{german} - [2020/07/21 v2.12 German support for babel (pre-1996 orthography)] + [2021/02/27 v2.13 German support for babel (pre-1996 orthography)] +\def\tmpa{germanb} +\let\SaveCurrentOption\CurrentOption +\ifx\CurrentOption\tmpa + \def\CurrentOption{german} +\fi +\LdfInit\CurrentOption{captions\CurrentOption} \input germanb.ldf\relax %% %% \CharacterTable diff --git a/Master/texmf-dist/tex/generic/babel-german/germanb.ldf b/Master/texmf-dist/tex/generic/babel-german/germanb.ldf index ca5c6d9b8b2..21deae516e6 100644 --- a/Master/texmf-dist/tex/generic/babel-german/germanb.ldf +++ b/Master/texmf-dist/tex/generic/babel-german/germanb.ldf @@ -7,7 +7,7 @@ %% germanb.dtx (with options: `germanb') %% This is a generated file. %% -%% Copyright 1989--2018 +%% Copyright 1989--2021 %% Johannes L. Braams %% Bernd Raichle %% Walter Schmidt @@ -34,13 +34,18 @@ %% via: https://github.com/jspitz/babel-german %% \ProvidesLanguage{germanb} - [2020/07/21 v2.12 German support for babel (pre-1996 orthography)] + [2021/02/27 v2.13 German support for babel (pre-1996 orthography)] +\def\tmpa{germanb} +\let\SaveCurrentOption\CurrentOption +\ifx\CurrentOption\tmpa + \def\CurrentOption{german} +\fi +\LdfInit\CurrentOption{captions\CurrentOption} \def\bbl@opt@german{german} \def\bbl@opt@germanb{germanb} \def\bbl@opt@austrian{austrian} \def\bbl@opt@swissgerman{swissgerman} -\ifx\CurrentOption\bbl@opt@germanb - \def\CurrentOption{german} +\ifx\SaveCurrentOption\bbl@opt@germanb \ifx\l@german\@undefined \@nopatterns{German (trad. orthography)} \adddialect\l@german0 @@ -53,7 +58,6 @@ \let\noextrasgermanb\noextrasgerman } \fi -\LdfInit\CurrentOption{captions\CurrentOption} \ifx\l@german\@undefined \@nopatterns{German (trad. orthography)} \adddialect\l@german0 diff --git a/Master/texmf-dist/tex/generic/babel-german/naustrian.ldf b/Master/texmf-dist/tex/generic/babel-german/naustrian.ldf index ff8d583cdaa..56da9a0153d 100644 --- a/Master/texmf-dist/tex/generic/babel-german/naustrian.ldf +++ b/Master/texmf-dist/tex/generic/babel-german/naustrian.ldf @@ -7,7 +7,7 @@ %% ngermanb.dtx (with options: `naustrian') %% This is a generated file. %% -%% Copyright 1989--2018 +%% Copyright 1989--2021 %% Johannes L. Braams %% Bernd Raichle %% Walter Schmidt @@ -34,7 +34,12 @@ %% via: https://github.com/jspitz/babel-german %% \ProvidesLanguage{naustrian} - [2020/07/21 v2.12 German support for babel (post-1996 orthography)] + [2021/02/27 v2.13 German support for babel (post-1996 orthography)] +\def\tmpa{ngermanb} +\ifx\CurrentOption\tmpa + \def\CurrentOption{ngerman} +\fi +\LdfInit\CurrentOption{captions\CurrentOption} \input ngermanb.ldf\relax %% %% \CharacterTable diff --git a/Master/texmf-dist/tex/generic/babel-german/ngerman.ldf b/Master/texmf-dist/tex/generic/babel-german/ngerman.ldf index da85b9e69a6..3b6b8987046 100644 --- a/Master/texmf-dist/tex/generic/babel-german/ngerman.ldf +++ b/Master/texmf-dist/tex/generic/babel-german/ngerman.ldf @@ -7,7 +7,7 @@ %% ngermanb.dtx (with options: `ngerman') %% This is a generated file. %% -%% Copyright 1989--2018 +%% Copyright 1989--2021 %% Johannes L. Braams %% Bernd Raichle %% Walter Schmidt @@ -34,7 +34,12 @@ %% via: https://github.com/jspitz/babel-german %% \ProvidesLanguage{ngerman} - [2020/07/21 v2.12 German support for babel (post-1996 orthography)] + [2021/02/27 v2.13 German support for babel (post-1996 orthography)] +\def\tmpa{ngermanb} +\ifx\CurrentOption\tmpa + \def\CurrentOption{ngerman} +\fi +\LdfInit\CurrentOption{captions\CurrentOption} \input ngermanb.ldf\relax %% %% \CharacterTable diff --git a/Master/texmf-dist/tex/generic/babel-german/ngermanb.ldf b/Master/texmf-dist/tex/generic/babel-german/ngermanb.ldf index ef367b9bc98..ee83d60bc6f 100644 --- a/Master/texmf-dist/tex/generic/babel-german/ngermanb.ldf +++ b/Master/texmf-dist/tex/generic/babel-german/ngermanb.ldf @@ -7,7 +7,7 @@ %% ngermanb.dtx (with options: `ngermanb') %% This is a generated file. %% -%% Copyright 1989--2018 +%% Copyright 1989--2021 %% Johannes L. Braams %% Bernd Raichle %% Walter Schmidt @@ -34,15 +34,16 @@ %% via: https://github.com/jspitz/babel-german %% \ProvidesLanguage{ngermanb} - [2020/07/21 v2.12 German support for babel (post-1996 orthography)] + [2021/02/27 v2.13 German support for babel (post-1996 orthography)] +\def\tmpa{ngermanb} +\ifx\CurrentOption\tmpa + \def\CurrentOption{ngerman} +\fi +\LdfInit\CurrentOption{captions\CurrentOption} \def\bbl@opt@ngerman{ngerman} \def\bbl@opt@ngermanb{ngermanb} \def\bbl@opt@naustrian{naustrian} \def\bbl@opt@nswissgerman{nswissgerman} -\ifx\CurrentOption\bbl@opt@ngermanb - \def\CurrentOption{ngerman} -\fi -\LdfInit\CurrentOption{captions\CurrentOption} \ifx\l@ngerman\@undefined \@nopatterns{German (new orthography)} \adddialect\l@ngerman0 diff --git a/Master/texmf-dist/tex/generic/babel-german/nswissgerman.ldf b/Master/texmf-dist/tex/generic/babel-german/nswissgerman.ldf index f16e4e69fe1..b4a335bb8cd 100644 --- a/Master/texmf-dist/tex/generic/babel-german/nswissgerman.ldf +++ b/Master/texmf-dist/tex/generic/babel-german/nswissgerman.ldf @@ -7,7 +7,7 @@ %% ngermanb.dtx (with options: `nswissgerman') %% This is a generated file. %% -%% Copyright 1989--2018 +%% Copyright 1989--2021 %% Johannes L. Braams %% Bernd Raichle %% Walter Schmidt @@ -34,7 +34,12 @@ %% via: https://github.com/jspitz/babel-german %% \ProvidesLanguage{nswissgerman} - [2020/07/21 v2.12 German support for babel (post-1996 orthography)] + [2021/02/27 v2.13 German support for babel (post-1996 orthography)] +\def\tmpa{ngermanb} +\ifx\CurrentOption\tmpa + \def\CurrentOption{ngerman} +\fi +\LdfInit\CurrentOption{captions\CurrentOption} \input ngermanb.ldf\relax %% %% \CharacterTable diff --git a/Master/texmf-dist/tex/generic/babel-german/swissgerman.ldf b/Master/texmf-dist/tex/generic/babel-german/swissgerman.ldf index 3a566711da3..d2112f67239 100644 --- a/Master/texmf-dist/tex/generic/babel-german/swissgerman.ldf +++ b/Master/texmf-dist/tex/generic/babel-german/swissgerman.ldf @@ -7,7 +7,7 @@ %% germanb.dtx (with options: `swissgerman') %% This is a generated file. %% -%% Copyright 1989--2018 +%% Copyright 1989--2021 %% Johannes L. Braams %% Bernd Raichle %% Walter Schmidt @@ -34,7 +34,13 @@ %% via: https://github.com/jspitz/babel-german %% \ProvidesLanguage{swissgerman} - [2020/07/21 v2.12 German support for babel (pre-1996 orthography)] + [2021/02/27 v2.13 German support for babel (pre-1996 orthography)] +\def\tmpa{germanb} +\let\SaveCurrentOption\CurrentOption +\ifx\CurrentOption\tmpa + \def\CurrentOption{german} +\fi +\LdfInit\CurrentOption{captions\CurrentOption} \input germanb.ldf\relax %% %% \CharacterTable -- cgit v1.2.3