From e7aee4bfa14043c116c840d9222abd76825f501c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 10 Oct 2014 22:04:55 +0000 Subject: babel-german (10oct14) git-svn-id: svn://tug.org/texlive/trunk@35349 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/babel-german/README | 2 +- .../doc/generic/babel-german/germanb.pdf | Bin 96723 -> 96859 bytes .../doc/generic/babel-german/ngermanb.pdf | Bin 83513 -> 83491 bytes .../source/generic/babel-german/german.ins | 6 ++--- .../source/generic/babel-german/germanb.dtx | 25 ++++++++++++--------- .../source/generic/babel-german/ngermanb.dtx | 2 +- .../tex/generic/babel-german/austrian.ldf | 4 ++-- .../texmf-dist/tex/generic/babel-german/german.ldf | 4 ++-- .../tex/generic/babel-german/germanb.ldf | 21 +++++++++-------- .../tex/generic/babel-german/naustrian.ldf | 2 +- .../tex/generic/babel-german/ngerman.ldf | 2 +- .../tex/generic/babel-german/ngermanb.ldf | 2 +- .../tex/generic/babel-german/nswissgerman.ldf | 2 +- .../tex/generic/babel-german/swissgerman.ldf | 4 ++-- 14 files changed, 42 insertions(+), 34 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 98c20f36a9a..ab8c9f50308 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--2013 Johannes L. Braams +Copyright 1989--2014 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 f2014a5ef77..afc6bc2e46c 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 acd23c7f3cd..141fb319083 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 d51996a5210..de1f756e94d 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--2013 Johannes L. Braams +%% Copyright 1989--2014 Johannes L. Braams %% Bernd Raichle %% Walter Schmidt, %% Juergen Spitzmueller @@ -27,7 +27,7 @@ %% %% --------------- start of docstrip commands ------------------ %% -\def\filedate{2013/12/13} +\def\filedate{2014/10/10} \input docstrip.tex @@ -49,7 +49,7 @@ \preamble This is a generated file. -Copyright 1989--2013 Johannes L. Braams +Copyright 1989--2014 Johannes L. Braams Bernd Raichle Walter Schmidt, Juergen Spitzmueller diff --git a/Master/texmf-dist/source/generic/babel-german/germanb.dtx b/Master/texmf-dist/source/generic/babel-german/germanb.dtx index 396ea5b9a0b..8c367c5d6e2 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--2013 Johannes L. Braams +% Copyright 1989--2014 Johannes L. Braams % Bernd Raichle % Walter Schmidt, % Juergen Spitzmueller @@ -24,7 +24,7 @@ % % The Current Maintainer of this work is Juergen Spitzmueller. % \fi -% \CheckSum{407} +% \CheckSum{413} % % \iffalse % Tell the \LaTeX\ system who we are and write an entry on the @@ -38,7 +38,7 @@ %\ProvidesLanguage{germanb} %\fi %\ProvidesFile{germanb.dtx} - [2013/12/13 v2.7 German support for babel (traditional orthography)] + [2014/10/10 v2.7b German support for babel (traditional orthography)] %\iffalse % %<*filedriver> @@ -287,14 +287,19 @@ % For the Swiss variety, we attempt to load the specific % \texttt{swissgerman} hyphenation patterns and fall back to % \texttt{german} if those are not available. +% \changes{germanb-2.7b}{2014/10/10}{Do not warn about missing swissgerman patterns +% if swissgerman is not loaded} % \begin{macrocode} -\ifx\l@swissgerman\@undefined - \ifx\l@german\@undefined - \@nopatterns{swissgerman and german} - \adddialect\l@swissgerman0 - \else - \@nopatterns{swissgerman} - \adddialect\l@swissgerman\l@german +\def\bbl@tempa{swissgerman} +\ifx\CurrentOption\bbl@tempa + \ifx\l@swissgerman\@undefined + \ifx\l@german\@undefined + \@nopatterns{swissgerman and german} + \adddialect\l@swissgerman0 + \else + \@nopatterns{swissgerman} + \adddialect\l@swissgerman\l@german + \fi \fi \fi % \end{macrocode} diff --git a/Master/texmf-dist/source/generic/babel-german/ngermanb.dtx b/Master/texmf-dist/source/generic/babel-german/ngermanb.dtx index 80b61927ff4..26288125ae9 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--2013 Johannes L. Braams +% Copyright 1989--2014 Johannes L. Braams % Bernd Raichle % Walter Schmidt, % Juergen Spitzmueller diff --git a/Master/texmf-dist/tex/generic/babel-german/austrian.ldf b/Master/texmf-dist/tex/generic/babel-german/austrian.ldf index 04364316fc8..c2383540754 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--2013 Johannes L. Braams +%% Copyright 1989--2014 Johannes L. Braams %% Bernd Raichle %% Walter Schmidt, %% Juergen Spitzmueller @@ -33,7 +33,7 @@ %% juergen at spitzmueller dot org %% \ProvidesLanguage{austrian} - [2013/12/13 v2.7 German support for babel (traditional orthography)] + [2014/10/10 v2.7b 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 0b33a397df0..c3db084c838 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--2013 Johannes L. Braams +%% Copyright 1989--2014 Johannes L. Braams %% Bernd Raichle %% Walter Schmidt, %% Juergen Spitzmueller @@ -33,7 +33,7 @@ %% juergen at spitzmueller dot org %% \ProvidesLanguage{german} - [2013/12/13 v2.7 German support for babel (traditional orthography)] + [2014/10/10 v2.7b 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 e177870efbb..ebf2c31e76e 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--2013 Johannes L. Braams +%% Copyright 1989--2014 Johannes L. Braams %% Bernd Raichle %% Walter Schmidt, %% Juergen Spitzmueller @@ -33,7 +33,7 @@ %% juergen at spitzmueller dot org %% \ProvidesLanguage{germanb} - [2013/12/13 v2.7 German support for babel (traditional orthography)] + [2014/10/10 v2.7b German support for babel (traditional orthography)] \def\bbl@tempa{germanb} \ifx\CurrentOption\bbl@tempa \def\CurrentOption{german} @@ -55,13 +55,16 @@ \adddialect\l@german0 \fi \adddialect\l@austrian\l@german -\ifx\l@swissgerman\@undefined - \ifx\l@german\@undefined - \@nopatterns{swissgerman and german} - \adddialect\l@swissgerman0 - \else - \@nopatterns{swissgerman} - \adddialect\l@swissgerman\l@german +\def\bbl@tempa{swissgerman} +\ifx\CurrentOption\bbl@tempa + \ifx\l@swissgerman\@undefined + \ifx\l@german\@undefined + \@nopatterns{swissgerman and german} + \adddialect\l@swissgerman0 + \else + \@nopatterns{swissgerman} + \adddialect\l@swissgerman\l@german + \fi \fi \fi \@namedef{captionsgerman}{% diff --git a/Master/texmf-dist/tex/generic/babel-german/naustrian.ldf b/Master/texmf-dist/tex/generic/babel-german/naustrian.ldf index aef34579d0f..b66e2165956 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: `austrian') %% This is a generated file. %% -%% Copyright 1989--2013 Johannes L. Braams +%% Copyright 1989--2014 Johannes L. Braams %% Bernd Raichle %% Walter Schmidt, %% Juergen Spitzmueller diff --git a/Master/texmf-dist/tex/generic/babel-german/ngerman.ldf b/Master/texmf-dist/tex/generic/babel-german/ngerman.ldf index 861b287d6dd..f35ad5ba096 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: `german') %% This is a generated file. %% -%% Copyright 1989--2013 Johannes L. Braams +%% Copyright 1989--2014 Johannes L. Braams %% Bernd Raichle %% Walter Schmidt, %% Juergen Spitzmueller diff --git a/Master/texmf-dist/tex/generic/babel-german/ngermanb.ldf b/Master/texmf-dist/tex/generic/babel-german/ngermanb.ldf index 3b68fc01e49..8492e4fd39e 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: `germanb') %% This is a generated file. %% -%% Copyright 1989--2013 Johannes L. Braams +%% Copyright 1989--2014 Johannes L. Braams %% Bernd Raichle %% Walter Schmidt, %% Juergen Spitzmueller diff --git a/Master/texmf-dist/tex/generic/babel-german/nswissgerman.ldf b/Master/texmf-dist/tex/generic/babel-german/nswissgerman.ldf index 7312663dd2b..397b1c90052 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: `swiss') %% This is a generated file. %% -%% Copyright 1989--2013 Johannes L. Braams +%% Copyright 1989--2014 Johannes L. Braams %% Bernd Raichle %% Walter Schmidt, %% Juergen Spitzmueller diff --git a/Master/texmf-dist/tex/generic/babel-german/swissgerman.ldf b/Master/texmf-dist/tex/generic/babel-german/swissgerman.ldf index c98f0129fbb..23d617ed197 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: `swiss') %% This is a generated file. %% -%% Copyright 1989--2013 Johannes L. Braams +%% Copyright 1989--2014 Johannes L. Braams %% Bernd Raichle %% Walter Schmidt, %% Juergen Spitzmueller @@ -33,7 +33,7 @@ %% juergen at spitzmueller dot org %% \ProvidesLanguage{swissgerman} - [2013/12/13 v2.7 German support for babel (traditional orthography)] + [2014/10/10 v2.7b German support for babel (traditional orthography)] \input germanb.ldf\relax %% %% \CharacterTable -- cgit v1.2.3