summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/babel-german
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-11-02 20:29:17 +0000
committerKarl Berry <karl@freefriends.org>2016-11-02 20:29:17 +0000
commit22cdd18a2a6b8bfca945af635e646880edd2914e (patch)
treec32ca5b64c6714e0c701e3ecdc97a8c15409b7f2 /Master/texmf-dist/tex/generic/babel-german
parent27bf9c3c2b8fd52f3d4a8555aef8bef8f0fe95ba (diff)
babel-german (2nov16)
git-svn-id: svn://tug.org/texlive/trunk@42424 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel-german')
-rw-r--r--Master/texmf-dist/tex/generic/babel-german/austrian.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-german/german.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-german/germanb.ldf17
-rw-r--r--Master/texmf-dist/tex/generic/babel-german/naustrian.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-german/ngerman.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-german/ngermanb.ldf30
-rw-r--r--Master/texmf-dist/tex/generic/babel-german/nswissgerman.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-german/swissgerman.ldf2
8 files changed, 27 insertions, 32 deletions
diff --git a/Master/texmf-dist/tex/generic/babel-german/austrian.ldf b/Master/texmf-dist/tex/generic/babel-german/austrian.ldf
index ec3bc329d9c..38d2df9ba78 100644
--- a/Master/texmf-dist/tex/generic/babel-german/austrian.ldf
+++ b/Master/texmf-dist/tex/generic/babel-german/austrian.ldf
@@ -33,7 +33,7 @@
%% juergen at spitzmueller dot org
%%
\ProvidesLanguage{austrian}
- [2016/11/01 v2.8 German support for babel (traditional orthography)]
+ [2016/11/02 v2.9 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 6ebc3253e20..598e0856183 100644
--- a/Master/texmf-dist/tex/generic/babel-german/german.ldf
+++ b/Master/texmf-dist/tex/generic/babel-german/german.ldf
@@ -33,7 +33,7 @@
%% juergen at spitzmueller dot org
%%
\ProvidesLanguage{german}
- [2016/11/01 v2.8 German support for babel (traditional orthography)]
+ [2016/11/02 v2.9 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 cc5283ebecd..28b992174a1 100644
--- a/Master/texmf-dist/tex/generic/babel-german/germanb.ldf
+++ b/Master/texmf-dist/tex/generic/babel-german/germanb.ldf
@@ -33,7 +33,7 @@
%% juergen at spitzmueller dot org
%%
\ProvidesLanguage{germanb}
- [2016/11/01 v2.8 German support for babel (traditional orthography)]
+ [2016/11/02 v2.9 German support for babel (traditional orthography)]
\def\bbl@tempa{germanb}
\ifx\CurrentOption\bbl@tempa
\def\CurrentOption{german}
@@ -56,14 +56,11 @@
\fi
\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
+ \ifx\l@german\@undefined
+ \@nopatterns{German (trad. orthography), needed by Austrian (trad. orthography)}
+ \adddialect\l@austrian0
+ \else
+ \adddialect\l@austrian\l@german
\fi
\fi
\def\bbl@tempa{swissgerman}
@@ -212,6 +209,8 @@
\declare@shorthand{german}{""}{\hskip\z@skip}
\declare@shorthand{german}{"~}{\textormath{\leavevmode\hbox{-}}{-}}
\declare@shorthand{german}{"=}{\penalty\@M-\hskip\z@skip}
+\declare@shorthand{german}{"/}{\textormath
+ {\bbl@allowhyphens\discretionary{/}{}{/}\bbl@allowhyphens}{}}
\def\mdqon{\shorthandon{"}}
\def\mdqoff{\shorthandoff{"}}
\def\ck{\allowhyphens\discretionary{k-}{k}{ck}\allowhyphens}
diff --git a/Master/texmf-dist/tex/generic/babel-german/naustrian.ldf b/Master/texmf-dist/tex/generic/babel-german/naustrian.ldf
index 35cc28d1c03..a8af6e0e1fd 100644
--- a/Master/texmf-dist/tex/generic/babel-german/naustrian.ldf
+++ b/Master/texmf-dist/tex/generic/babel-german/naustrian.ldf
@@ -33,7 +33,7 @@
%% juergen at spitzmueller dot org
%%
\ProvidesLanguage{naustrian}
- [2016/11/01 v2.8 German support for babel (new orthography)]
+ [2016/11/02 v2.9 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 f9d01e5b754..2cbc65e1e3f 100644
--- a/Master/texmf-dist/tex/generic/babel-german/ngerman.ldf
+++ b/Master/texmf-dist/tex/generic/babel-german/ngerman.ldf
@@ -33,7 +33,7 @@
%% juergen at spitzmueller dot org
%%
\ProvidesLanguage{ngerman}
- [2016/11/01 v2.8 German support for babel (new orthography)]
+ [2016/11/02 v2.9 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 e1a8093877c..72df6ac8578 100644
--- a/Master/texmf-dist/tex/generic/babel-german/ngermanb.ldf
+++ b/Master/texmf-dist/tex/generic/babel-german/ngermanb.ldf
@@ -33,7 +33,7 @@
%% juergen at spitzmueller dot org
%%
\ProvidesLanguage{ngermanb}
- [2016/11/01 v2.8 German support for babel (new orthography)]
+ [2016/11/02 v2.9 German support for babel (new orthography)]
\def\bbl@tempa{ngermanb}
\ifx\CurrentOption\bbl@tempa
\def\CurrentOption{ngerman}
@@ -45,26 +45,20 @@
\fi
\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
+ \ifx\l@ngerman\@undefined
+ \@nopatterns{German (new orthography), needed by Austrian (new orthography)}
+ \adddialect\l@naustrian0
+ \else
+ \adddialect\l@naustrian\l@ngerman
\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
+ \ifx\l@ngerman\@undefined
+ \@nopatterns{German (new orthography), needed by Swiss German (new orthography)}
+ \adddialect\l@nswissgerman0
+ \else
+ \adddialect\l@nswissgerman\l@ngerman
\fi
\fi
\@namedef{@captionsngerman}{%
@@ -178,6 +172,8 @@
\declare@shorthand{ngerman}{""}{\hskip\z@skip}
\declare@shorthand{ngerman}{"~}{\textormath{\leavevmode\hbox{-}}{-}}
\declare@shorthand{ngerman}{"=}{\penalty\@M-\hskip\z@skip}
+\declare@shorthand{ngerman}{"/}{\textormath
+ {\bbl@allowhyphens\discretionary{/}{}{/}\bbl@allowhyphens}{}}
\def\mdqon{\shorthandon{"}}
\def\mdqoff{\shorthandoff{"}}
\ldf@finish\CurrentOption
diff --git a/Master/texmf-dist/tex/generic/babel-german/nswissgerman.ldf b/Master/texmf-dist/tex/generic/babel-german/nswissgerman.ldf
index 8c514d05831..353c0f88427 100644
--- a/Master/texmf-dist/tex/generic/babel-german/nswissgerman.ldf
+++ b/Master/texmf-dist/tex/generic/babel-german/nswissgerman.ldf
@@ -33,7 +33,7 @@
%% juergen at spitzmueller dot org
%%
\ProvidesLanguage{nswissgerman}
- [2016/11/01 v2.8 German support for babel (new orthography)]
+ [2016/11/02 v2.9 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 bdd9328c50c..7a61bd46cd6 100644
--- a/Master/texmf-dist/tex/generic/babel-german/swissgerman.ldf
+++ b/Master/texmf-dist/tex/generic/babel-german/swissgerman.ldf
@@ -33,7 +33,7 @@
%% juergen at spitzmueller dot org
%%
\ProvidesLanguage{swissgerman}
- [2016/11/01 v2.8 German support for babel (traditional orthography)]
+ [2016/11/02 v2.9 German support for babel (traditional orthography)]
\input germanb.ldf\relax
%%
%% \CharacterTable