From 14d2653fc014c2663e17017f23e79306e070a04c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 1 Nov 2016 20:14:41 +0000 Subject: babel-german (1nov16) git-svn-id: svn://tug.org/texlive/trunk@42417 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/babel-german/austrian.ldf | 10 +-- .../texmf-dist/tex/generic/babel-german/german.ldf | 10 +-- .../tex/generic/babel-german/germanb.ldf | 76 +++++++++++++------ .../tex/generic/babel-german/naustrian.ldf | 10 +-- .../tex/generic/babel-german/ngerman.ldf | 10 +-- .../tex/generic/babel-german/ngermanb.ldf | 85 ++++++++++++++++------ .../tex/generic/babel-german/nswissgerman.ldf | 10 +-- .../tex/generic/babel-german/swissgerman.ldf | 10 +-- 8 files changed, 148 insertions(+), 73 deletions(-) (limited to 'Master/texmf-dist/tex/generic/babel-german') diff --git a/Master/texmf-dist/tex/generic/babel-german/austrian.ldf b/Master/texmf-dist/tex/generic/babel-german/austrian.ldf index c2383540754..ec3bc329d9c 100644 --- a/Master/texmf-dist/tex/generic/babel-german/austrian.ldf +++ b/Master/texmf-dist/tex/generic/babel-german/austrian.ldf @@ -7,10 +7,10 @@ %% germanb.dtx (with options: `austrian') %% This is a generated file. %% -%% Copyright 1989--2014 Johannes L. Braams -%% Bernd Raichle -%% Walter Schmidt, -%% Juergen Spitzmueller +%% Copyright 1989--2016 Johannes L. Braams +%% Bernd Raichle +%% Walter Schmidt, +%% Juergen Spitzmueller %% All rights reserved. %% %% This file is part of the babel-german bundle, @@ -33,7 +33,7 @@ %% juergen at spitzmueller dot org %% \ProvidesLanguage{austrian} - [2014/10/10 v2.7b German support for babel (traditional orthography)] + [2016/11/01 v2.8 German support for babel (traditional orthography)] \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 c3db084c838..6ebc3253e20 100644 --- a/Master/texmf-dist/tex/generic/babel-german/german.ldf +++ b/Master/texmf-dist/tex/generic/babel-german/german.ldf @@ -7,10 +7,10 @@ %% germanb.dtx (with options: `german') %% This is a generated file. %% -%% Copyright 1989--2014 Johannes L. Braams -%% Bernd Raichle -%% Walter Schmidt, -%% Juergen Spitzmueller +%% Copyright 1989--2016 Johannes L. Braams +%% Bernd Raichle +%% Walter Schmidt, +%% Juergen Spitzmueller %% All rights reserved. %% %% This file is part of the babel-german bundle, @@ -33,7 +33,7 @@ %% juergen at spitzmueller dot org %% \ProvidesLanguage{german} - [2014/10/10 v2.7b German support for babel (traditional orthography)] + [2016/11/01 v2.8 German support for babel (traditional orthography)] \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 ebf2c31e76e..cc5283ebecd 100644 --- a/Master/texmf-dist/tex/generic/babel-german/germanb.ldf +++ b/Master/texmf-dist/tex/generic/babel-german/germanb.ldf @@ -7,10 +7,10 @@ %% germanb.dtx (with options: `germanb') %% This is a generated file. %% -%% Copyright 1989--2014 Johannes L. Braams -%% Bernd Raichle -%% Walter Schmidt, -%% Juergen Spitzmueller +%% Copyright 1989--2016 Johannes L. Braams +%% Bernd Raichle +%% Walter Schmidt, +%% Juergen Spitzmueller %% All rights reserved. %% %% This file is part of the babel-german bundle, @@ -33,7 +33,7 @@ %% juergen at spitzmueller dot org %% \ProvidesLanguage{germanb} - [2014/10/10 v2.7b German support for babel (traditional orthography)] + [2016/11/01 v2.8 German support for babel (traditional orthography)] \def\bbl@tempa{germanb} \ifx\CurrentOption\bbl@tempa \def\CurrentOption{german} @@ -51,23 +51,34 @@ \fi \LdfInit\CurrentOption{captions\CurrentOption} \ifx\l@german\@undefined - \@nopatterns{German} + \@nopatterns{German (trad. orthography)} \adddialect\l@german0 \fi -\adddialect\l@austrian\l@german +\def\bbl@tempa{austrian} +\ifx\CurrentOption\bbl@tempa + \ifx\l@austrian\@undefined + \ifx\l@german\@undefined + \@nopatterns{Austrian (trad. orthography) and German (trad. orthography)} + \adddialect\l@austrian0 + \else + \@nopatterns{Austrian (trad. orthography)} + \adddialect\l@austrian\l@german + \fi + \fi +\fi \def\bbl@tempa{swissgerman} \ifx\CurrentOption\bbl@tempa \ifx\l@swissgerman\@undefined \ifx\l@german\@undefined - \@nopatterns{swissgerman and german} + \@nopatterns{Swiss German (trad. orthography) and German (trad. orthography)} \adddialect\l@swissgerman0 \else - \@nopatterns{swissgerman} + \@nopatterns{Swiss German (trad. orthography)} \adddialect\l@swissgerman\l@german \fi \fi \fi -\@namedef{captionsgerman}{% +\@namedef{@captionsgerman}{% \def\prefacename{Vorwort}% \def\refname{Literatur}% \def\abstractname{Zusammenfassung}% @@ -90,23 +101,44 @@ \def\proofname{Beweis}% \def\glossaryname{Glossar}% } -\@namedef{captionsaustrian}{% - \@nameuse{captionsgerman} - \def\enclname{Beilage(n)}% +\def\bbl@tempa{german} +\ifx\CurrentOption\bbl@tempa + \@namedef{captionsgerman}{% + \@nameuse{@captionsgerman}% } -\@namedef{captionsswissgerman}{% - \@nameuse{captionsgerman} - \def\enclname{Beilage(n)}% +\fi +\def\bbl@tempa{austrian} +\ifx\CurrentOption\bbl@tempa + \@namedef{captionsaustrian}{% + \@nameuse{@captionsgerman}% + \def\enclname{Beilage(n)}% } +\fi +\def\bbl@tempa{swissgerman} +\ifx\CurrentOption\bbl@tempa + \@namedef{captionsswissgerman}{% + \@nameuse{@captionsgerman}% + \def\enclname{Beilage(n)}% + } +\fi \def\month@german{\ifcase\month\or Januar\or Februar\or M\"arz\or April\or Mai\or Juni\or Juli\or August\or September\or Oktober\or November\or Dezember\fi} -\def\dategerman{\def\today{\number\day.~\month@german - \space\number\year}} -\def\dateswissgerman{\def\today{\number\day.~\month@german - \space\number\year}} -\def\dateaustrian{\def\today{\number\day.~\ifnum1=\month - J\"anner\else \month@german\fi \space\number\year}} +\def\bbl@tempa{german} +\ifx\CurrentOption\bbl@tempa + \def\dategerman{\def\today{\number\day.~\month@german + \space\number\year}} +\fi +\def\bbl@tempa{swissgerman} +\ifx\CurrentOption\bbl@tempa + \def\dateswissgerman{\def\today{\number\day.~\month@german + \space\number\year}} +\fi +\def\bbl@tempa{austrian} +\ifx\CurrentOption\bbl@tempa + \def\dateaustrian{\def\today{\number\day.~\ifnum1=\month + J\"anner\else \month@german\fi \space\number\year}} +\fi \initiate@active@char{"} \@namedef{extras\CurrentOption}{% \languageshorthands{german}} diff --git a/Master/texmf-dist/tex/generic/babel-german/naustrian.ldf b/Master/texmf-dist/tex/generic/babel-german/naustrian.ldf index b66e2165956..35cc28d1c03 100644 --- a/Master/texmf-dist/tex/generic/babel-german/naustrian.ldf +++ b/Master/texmf-dist/tex/generic/babel-german/naustrian.ldf @@ -7,10 +7,10 @@ %% ngermanb.dtx (with options: `austrian') %% This is a generated file. %% -%% Copyright 1989--2014 Johannes L. Braams -%% Bernd Raichle -%% Walter Schmidt, -%% Juergen Spitzmueller +%% Copyright 1989--2016 Johannes L. Braams +%% Bernd Raichle +%% Walter Schmidt, +%% Juergen Spitzmueller %% All rights reserved. %% %% This file is part of the babel-german bundle, @@ -33,7 +33,7 @@ %% juergen at spitzmueller dot org %% \ProvidesLanguage{naustrian} - [2013/12/13 v2.7 German support for babel (new orthography)] + [2016/11/01 v2.8 German support for babel (new orthography)] \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 f35ad5ba096..f9d01e5b754 100644 --- a/Master/texmf-dist/tex/generic/babel-german/ngerman.ldf +++ b/Master/texmf-dist/tex/generic/babel-german/ngerman.ldf @@ -7,10 +7,10 @@ %% ngermanb.dtx (with options: `german') %% This is a generated file. %% -%% Copyright 1989--2014 Johannes L. Braams -%% Bernd Raichle -%% Walter Schmidt, -%% Juergen Spitzmueller +%% Copyright 1989--2016 Johannes L. Braams +%% Bernd Raichle +%% Walter Schmidt, +%% Juergen Spitzmueller %% All rights reserved. %% %% This file is part of the babel-german bundle, @@ -33,7 +33,7 @@ %% juergen at spitzmueller dot org %% \ProvidesLanguage{ngerman} - [2013/12/13 v2.7 German support for babel (new orthography)] + [2016/11/01 v2.8 German support for babel (new orthography)] \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 8492e4fd39e..e1a8093877c 100644 --- a/Master/texmf-dist/tex/generic/babel-german/ngermanb.ldf +++ b/Master/texmf-dist/tex/generic/babel-german/ngermanb.ldf @@ -7,10 +7,10 @@ %% ngermanb.dtx (with options: `germanb') %% This is a generated file. %% -%% Copyright 1989--2014 Johannes L. Braams -%% Bernd Raichle -%% Walter Schmidt, -%% Juergen Spitzmueller +%% Copyright 1989--2016 Johannes L. Braams +%% Bernd Raichle +%% Walter Schmidt, +%% Juergen Spitzmueller %% All rights reserved. %% %% This file is part of the babel-german bundle, @@ -33,19 +33,41 @@ %% juergen at spitzmueller dot org %% \ProvidesLanguage{ngermanb} - [2013/12/13 v2.7 German support for babel (new orthography)] + [2016/11/01 v2.8 German support for babel (new orthography)] \def\bbl@tempa{ngermanb} \ifx\CurrentOption\bbl@tempa \def\CurrentOption{ngerman} \fi \LdfInit\CurrentOption{captions\CurrentOption} \ifx\l@ngerman\@undefined - \@nopatterns{ngerman} + \@nopatterns{German (new orthography)} \adddialect\l@ngerman0 \fi -\adddialect\l@naustrian\l@ngerman -\adddialect\l@nswissgerman\l@ngerman -\@namedef{captionsngerman}{% +\def\bbl@tempa{naustrian} +\ifx\CurrentOption\bbl@tempa + \ifx\l@naustrian\@undefined + \ifx\l@ngerman\@undefined + \@nopatterns{Austrian (new orthography) and German (new orthography)} + \adddialect\l@naustrian0 + \else + \@nopatterns{Austrian} + \adddialect\l@naustrian\l@ngerman + \fi + \fi +\fi +\def\bbl@tempa{nswissgerman} +\ifx\CurrentOption\bbl@tempa + \ifx\l@nswissgerman\@undefined + \ifx\l@ngerman\@undefined + \@nopatterns{Swiss German (new orthography) and German (new orthography)} + \adddialect\l@nswissgerman0 + \else + \@nopatterns{Swiss German (new orthography)} + \adddialect\l@nswissgerman\l@ngerman + \fi + \fi +\fi +\@namedef{@captionsngerman}{% \def\prefacename{Vorwort}% \def\refname{Literatur}% \def\abstractname{Zusammenfassung}% @@ -68,23 +90,44 @@ \def\proofname{Beweis}% \def\glossaryname{Glossar}% } -\@namedef{captionsnaustrian}{% - \@nameuse{captionsngerman} - \def\enclname{Beilage(n)}% +\def\bbl@tempa{ngerman} +\ifx\CurrentOption\bbl@tempa + \@namedef{captionsngerman}{% + \@nameuse{@captionsngerman}% } -\@namedef{captionsnswissgerman}{% - \@nameuse{captionsngerman} - \def\enclname{Beilage(n)}% +\fi +\def\bbl@tempa{naustrian} +\ifx\CurrentOption\bbl@tempa + \@namedef{captionsnaustrian}{% + \@nameuse{@captionsngerman}% + \def\enclname{Beilage(n)}% } +\fi +\def\bbl@tempa{nswissgerman} +\ifx\CurrentOption\bbl@tempa + \@namedef{captionsnswissgerman}{% + \@nameuse{@captionsngerman}% + \def\enclname{Beilage(n)}% + } +\fi \def\month@ngerman{\ifcase\month\or Januar\or Februar\or M\"arz\or April\or Mai\or Juni\or Juli\or August\or September\or Oktober\or November\or Dezember\fi} -\def\datengerman{\def\today{\number\day.~\month@ngerman - \space\number\year}} -\def\datenswissgerman{\def\today{\number\day.~\month@ngerman - \space\number\year}} -\def\datenaustrian{\def\today{\number\day.~\ifnum1=\month - J\"anner\else \month@ngerman\fi \space\number\year}} +\def\bbl@tempa{ngerman} +\ifx\CurrentOption\bbl@tempa + \def\datengerman{\def\today{\number\day.~\month@ngerman + \space\number\year}} +\fi +\def\bbl@tempa{nswissgerman} +\ifx\CurrentOption\bbl@tempa + \def\datenswissgerman{\def\today{\number\day.~\month@ngerman + \space\number\year}} +\fi +\def\bbl@tempa{naustrian} +\ifx\CurrentOption\bbl@tempa + \def\datenaustrian{\def\today{\number\day.~\ifnum1=\month + J\"anner\else \month@ngerman\fi \space\number\year}} +\fi \initiate@active@char{"} \@namedef{extras\CurrentOption}{% \languageshorthands{ngerman}} diff --git a/Master/texmf-dist/tex/generic/babel-german/nswissgerman.ldf b/Master/texmf-dist/tex/generic/babel-german/nswissgerman.ldf index 397b1c90052..8c514d05831 100644 --- a/Master/texmf-dist/tex/generic/babel-german/nswissgerman.ldf +++ b/Master/texmf-dist/tex/generic/babel-german/nswissgerman.ldf @@ -7,10 +7,10 @@ %% ngermanb.dtx (with options: `swiss') %% This is a generated file. %% -%% Copyright 1989--2014 Johannes L. Braams -%% Bernd Raichle -%% Walter Schmidt, -%% Juergen Spitzmueller +%% Copyright 1989--2016 Johannes L. Braams +%% Bernd Raichle +%% Walter Schmidt, +%% Juergen Spitzmueller %% All rights reserved. %% %% This file is part of the babel-german bundle, @@ -33,7 +33,7 @@ %% juergen at spitzmueller dot org %% \ProvidesLanguage{nswissgerman} - [2013/12/13 v2.7 German support for babel (new orthography)] + [2016/11/01 v2.8 German support for babel (new orthography)] \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 23d617ed197..bdd9328c50c 100644 --- a/Master/texmf-dist/tex/generic/babel-german/swissgerman.ldf +++ b/Master/texmf-dist/tex/generic/babel-german/swissgerman.ldf @@ -7,10 +7,10 @@ %% germanb.dtx (with options: `swiss') %% This is a generated file. %% -%% Copyright 1989--2014 Johannes L. Braams -%% Bernd Raichle -%% Walter Schmidt, -%% Juergen Spitzmueller +%% Copyright 1989--2016 Johannes L. Braams +%% Bernd Raichle +%% Walter Schmidt, +%% Juergen Spitzmueller %% All rights reserved. %% %% This file is part of the babel-german bundle, @@ -33,7 +33,7 @@ %% juergen at spitzmueller dot org %% \ProvidesLanguage{swissgerman} - [2014/10/10 v2.7b German support for babel (traditional orthography)] + [2016/11/01 v2.8 German support for babel (traditional orthography)] \input germanb.ldf\relax %% %% \CharacterTable -- cgit v1.2.3