summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-07-29 21:35:19 +0000
committerKarl Berry <karl@freefriends.org>2020-07-29 21:35:19 +0000
commit33d8c2aa32b64714e3786297d233ca8c6f9b712b (patch)
treea7c654fa64f63ceb2af33d2e3bbc693895c7b787
parentaa5fb438d7967358b1b4f55df2bff028fdc564ad (diff)
babel-german (29jul20)
git-svn-id: svn://tug.org/texlive/trunk@55989 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/babel-german/README2
-rw-r--r--Master/texmf-dist/doc/generic/babel-german/germanb.pdfbin394468 -> 395190 bytes
-rw-r--r--Master/texmf-dist/doc/generic/babel-german/ngermanb.pdfbin371070 -> 371703 bytes
-rw-r--r--Master/texmf-dist/source/generic/babel-german/germanb.dtx48
-rw-r--r--Master/texmf-dist/source/generic/babel-german/ngermanb.dtx37
-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.ldf22
-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.ldf15
-rw-r--r--Master/texmf-dist/tex/generic/babel-german/nswissgerman.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-german/swissgerman.ldf2
13 files changed, 87 insertions, 49 deletions
diff --git a/Master/texmf-dist/doc/generic/babel-german/README b/Master/texmf-dist/doc/generic/babel-german/README
index f9189ba339f..d929351078d 100644
--- a/Master/texmf-dist/doc/generic/babel-german/README
+++ b/Master/texmf-dist/doc/generic/babel-german/README
@@ -21,7 +21,7 @@ This bundle is an extension to the babel package for multilingual
typesetting. It provides all necessary macros, definitions and settings
to typeset German documents. The bundle includes support for the
traditional and reformed German orthography as well as for the Austrian
-and Swiss varieties of German.
+and Swiss (standard) varieties of German.
== CONTENTS ==
diff --git a/Master/texmf-dist/doc/generic/babel-german/germanb.pdf b/Master/texmf-dist/doc/generic/babel-german/germanb.pdf
index e52056aa870..90180b1e1ef 100644
--- a/Master/texmf-dist/doc/generic/babel-german/germanb.pdf
+++ b/Master/texmf-dist/doc/generic/babel-german/germanb.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/babel-german/ngermanb.pdf b/Master/texmf-dist/doc/generic/babel-german/ngermanb.pdf
index 1bb41c513d0..4b029458720 100644
--- a/Master/texmf-dist/doc/generic/babel-german/ngermanb.pdf
+++ b/Master/texmf-dist/doc/generic/babel-german/ngermanb.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/generic/babel-german/germanb.dtx b/Master/texmf-dist/source/generic/babel-german/germanb.dtx
index 4e8a344b555..21e0c788027 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--2016
+% Copyright 1989--2020
% Johannes L. Braams
% Bernd Raichle
% Walter Schmidt
@@ -25,7 +25,7 @@
%
% The Current Maintainer of this work is Juergen Spitzmueller.
% \fi
-% \CheckSum{508}
+% \CheckSum{513}
%
% \iffalse
% Tell the \LaTeX\ system who we are and write an entry on the
@@ -39,7 +39,7 @@
%<germanb>\ProvidesLanguage{germanb}
%\fi
%\ProvidesFile{germanb.dtx}
- [2018/12/08 v2.11 German support for babel (pre-1996 orthography)]
+ [2020/07/21 v2.12 German support for babel (pre-1996 orthography)]
%\iffalse
%
%<*filedriver>
@@ -146,7 +146,7 @@
%
% \begin{abstract}
% \noindent This manual documents \babel\ language support for German (pre-1996 orthography),
-% including support for the Austrian and Swiss varieties of German.
+% including support for the Austrian and Swiss (standard) varieties of German.
% The manual is part of the \textsf{babel-german} bundle.
% \end{abstract}
%
@@ -154,7 +154,7 @@
%
% The \babel\ `language definition file' \file{germanb.ldf} documented in this manual provides
% the \babel\ package with all language specific strings, settings and commands needed for writing
-% German texts, including texts in the Austrian and Swiss varieties of German, in \emph{traditional
+% German texts, including texts in the Austrian and Swiss (standard) varieties of German, in \emph{traditional
% (1901--1996) spelling}.\footnote{%
% The file \file{germanb.ldf} started as a re-implementation of the
% package \file{german.sty} (v.\,2.5b), which was originally
@@ -286,7 +286,7 @@
% Modern engines (i.\,e., \texttt{xetex} and \texttt{luatex}) have already embraced those new patterns, i.\,e., they are activated on these engines by default.
% The classic \TeX\ engines (\texttt{tex}\slash\texttt{pdftex}), however, haven't: they continue to use the old patterns. The reason for this is one
% of \TeX's quality standards: refrain, if ever possible, from changing the output of user's documents in the wake of software updates.
-% An exception is (pre-1996) Swiss German: here, the classic engines use the `experimental' patterns by default (since there were no patterns available
+% An exception is (pre-1996) Swiss Standard German: here, the classic engines use the `experimental' patterns by default (since there were no patterns available
% previously anyway).
%
% So you need to explicitly activate the new patterns for a given document (except for \Lopt{swissgerman}) with the classic engines, should you
@@ -344,7 +344,7 @@
% \end{tabular}
% \end{table}
%
-% \noindent One further note related to the use of \graph{ss} in Swiss German. As opposed to other consonantial letters, the \graph{s}
+% \noindent One further note related to the use of \graph{ss} in Swiss Standard German. As opposed to other consonantial letters, the \graph{s}
% is excluded from the three consonant rule (\emph{Dreikonsonantenregel}) of traditional German spelling which prescribes
% that one of three identical consonants has to be omitted if a vowel follows the three consonants (i.\,e., \emph{Schiffahrt},
% not \emph{Schifffahrt}), except if the word is hyphenated (\emph{Schiff-fahrt}); the shorthands |"ff| etc. account for that.
@@ -450,10 +450,10 @@
\ifx\CurrentOption\bbl@opt@swissgerman
\ifx\l@swissgerman\@undefined
\ifx\l@german\@undefined
- \@nopatterns{Swiss German (trad. orthography) and German (trad. orthography)}
+ \@nopatterns{Swiss Standard German (trad. orthography) and German (trad. orthography)}
\adddialect\l@swissgerman0
\else
- \@nopatterns{Swiss German (trad. orthography)}
+ \@nopatterns{Swiss Standard German (trad. orthography)}
\adddialect\l@swissgerman\l@german
\fi
\fi
@@ -595,7 +595,7 @@
%
% \begin{macro}{\dateswissgerman}
% \changes{Version 2.7}{2013/12/13}{Added \cs{dateswissgerman}.}
-% The macro |\dateswissgerman| does the same for Swiss German dates. It
+% The macro |\dateswissgerman| does the same for Swiss Standard German dates. It
% is only defined if \Lopt{swissgerman} is requested.
% The result is identical to German.
% \changes{Version 2.8}{2016/11/01}{Only define \cs{dateswissgerman} if
@@ -676,13 +676,13 @@
%
% \changes{Version 2.9a=Version 2.10}{2018/03/28}{Implement boolean switch
% \cs{tosstrue}\slash\cs{tossfalse} to customize \graph{\ss}-related
-% shorthands in Swiss German context.}
+% shorthands in Swiss Standard German context.}
% \changes{Version 2.9a=Version 2.10}{2018/03/28}{Implement modifier \Lopt{toss}
-% to customize \graph{\ss}-related shorthands in Swiss German context.}
+% to customize \graph{\ss}-related shorthands in Swiss Standard German context.}
% \begin{macro}{toss}
% \begin{macro}{\tosstrue}
% \begin{macro}{\tossfalse}
-% For Swiss German, we allow optionally to expand the \graph{\ss}-related
+% For Swiss Standard German, we allow optionally to expand the \graph{\ss}-related
% shorthands the Swiss way, i.\,e. as \graph{ss} (globally, if the modifier \Lopt{toss}
% is used or locally if |\tosstrue|.).
% \begin{macrocode}
@@ -818,6 +818,13 @@
% \changes{Version 2.6a}{1995/02/15}{Use \cs{ddot} instead of
% \cs{@MATHUMLAUT}}
%
+% Since we need to add special cases for hyperref which needs hyperref's |\texorpdfstring|,
+% we provide a dummy command for the case that hyperref is not loaded.
+% \changes{Version 2.9c=Version 2.12}{2020/07/21}{Properly handle shorthands in hyperref pdf strings}
+% \begin{macrocode}
+\providecommand\texorpdfstring[2]{#1}
+% \end{macrocode}
+%
% Now we can define the doublequote shorthands: the umlauts,
% \changes{Version 2.6c}{1996/05/30}{added the \cs{allowhyphens}}
% \begin{macrocode}
@@ -875,7 +882,10 @@
% \changes{Version 2.6f}{1998/06/15}{Copied the coding for \texttt{"f}
% from german.dtx version 2.5d}
% \begin{macrocode}
-\declare@shorthand{german}{"f}{\textormath{\bbl@discff}{f}}
+\declare@shorthand{german}{"f}{%
+ \texorpdfstring{\textormath{\bbl@discff}{f}}% TeX string
+ {f}% PDF string
+}
\def\bbl@discff{\penalty\@M
\afterassignment\bbl@insertff \let\bbl@nextff= }
\def\bbl@insertff{%
@@ -893,10 +903,14 @@
% \begin{macrocode}
\declare@shorthand{german}{"-}{\nobreak\-\bbl@allowhyphens}
\declare@shorthand{german}{"|}{%
- \textormath{\penalty\@M\discretionary{-}{}{\kern.03em}%
- \bbl@allowhyphens}{}}
+ \texorpdfstring{\textormath{\penalty\@M\discretionary{-}{}{\kern.03em}\bbl@allowhyphens}{}}% TeX string
+ {}% PDF string
+}
\declare@shorthand{german}{""}{\hskip\z@skip}
-\declare@shorthand{german}{"~}{\textormath{\leavevmode\hbox{-}}{-}}
+\declare@shorthand{german}{"~}{%
+ \texorpdfstring{\textormath{\leavevmode\hbox{-}}{-}}% tex string
+ {-}% PDF string
+}
\declare@shorthand{german}{"=}{\penalty\@M-\hskip\z@skip}
\declare@shorthand{german}{"/}{\textormath
{\bbl@allowhyphens\discretionary{/}{}{/}\bbl@allowhyphens}{}}
diff --git a/Master/texmf-dist/source/generic/babel-german/ngermanb.dtx b/Master/texmf-dist/source/generic/babel-german/ngermanb.dtx
index 01413286b96..5d8d045eb31 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--2016
+% Copyright 1989--2020
% Johannes L. Braams
% Bernd Raichle
% Walter Schmidt
@@ -29,7 +29,7 @@
% by Bernd Raichle, Hubert Partl et.al.
%
% \fi
-% \CheckSum{403}
+% \CheckSum{407}
%
% \iffalse
% Tell the \LaTeX\ system who we are and write an entry on the
@@ -43,7 +43,7 @@
%<ngermanb>\ProvidesLanguage{ngermanb}
%\fi
%\ProvidesFile{ngermanb.dtx}
- [2018/12/08 v2.11 German support for babel (post-1996 orthography)]
+ [2020/07/21 v2.12 German support for babel (post-1996 orthography)]
%\iffalse
%
%<*filedriver>
@@ -103,7 +103,7 @@
%
% \begin{abstract}
% \noindent This manual documents \babel\ language support for German (post-1996 orthography),
-% including support for the Austrian and Swiss varieties of German.
+% including support for the Austrian and Swiss (standard) varieties of German.
% The manual is part of the \textsf{babel-german} bundle.
% \end{abstract}
%
@@ -111,7 +111,7 @@
%
% The \babel\ `language definition file' \file{ngermanb.ldf} documented in this manual provides
% the \babel\ package with all language specific strings, settings and commands needed for writing
-% German texts, including texts in the Austrian and Swiss varieties of German.\footnote{%
+% German texts, including texts in the Austrian and Swiss (standard) varieties of German.\footnote{%
% The file \file{ngermanb.ldf} started as a re-implementation of the
% package \file{ngerman.sty} by Bernd Raichle (cf.\,\cite{gerdoc}),
% which itself builds on \file{german.sty}, originally developed by
@@ -358,7 +358,7 @@
\fi
\ifx\CurrentOption\bbl@opt@nswissgerman
\ifx\l@ngerman\@undefined
- \@nopatterns{German (new orthography), needed by Swiss German (new orthography)}
+ \@nopatterns{German (new orthography), needed by Swiss Standard German (new orthography)}
\adddialect\l@nswissgerman0
\else
\adddialect\l@nswissgerman\l@ngerman
@@ -487,7 +487,7 @@
%
% \begin{macro}{\datenswissgerman}
% \changes{Version 2.7}{2013/12/13}{Added \cs{datenswissgerman}.}
-% The macro |\datenswissgerman| does the same for Swiss German dates.
+% The macro |\datenswissgerman| does the same for Swiss Standard German dates.
% The result is identical to German. This macro is only defined if
% \Lopt{nswissgerman} is requested.
% \changes{Version 2.8}{2016/11/01}{Only define \cs{datenswissgerman} if
@@ -554,13 +554,13 @@
%
% \changes{Version 2.9a=Version 2.10}{2018/03/28}{Implement boolean switch
% \cs{ntosstrue}\slash\cs{ntossfalse} to customize \graph{\ss}-related
-% shorthands in Swiss German context.}
+% shorthands in Swiss Standard German context.}
% \changes{Version 2.9a=Version 2.10}{2018/03/28}{Implement modifier \Lopt{toss}
-% to customize \graph{\ss}-related shorthands in Swiss German context.}
+% to customize \graph{\ss}-related shorthands in Swiss Standard German context.}
% \begin{macro}{toss}
% \begin{macro}{\ntosstrue}
% \begin{macro}{\ntossfalse}
-% For Swiss German, we allow optionally to expand the \graph{\ss}-related
+% For Swiss Standard German, we allow optionally to expand the \graph{\ss}-related
% shorthands the Swiss way, i.\,e. as \graph{ss} (globally, if the modifier \Lopt{toss}
% is used or locally if |\ntosstrue|.).
% \begin{macrocode}
@@ -673,6 +673,13 @@
% \end{macrocode}
% \end{macro}
%
+% Since we need to add special cases for hyperref which needs hyperref's |\texorpdfstring|,
+% we provide a dummy command for the case that hyperref is not loaded.
+% \changes{Version 2.9c=Version 2.12}{2020/07/21}{Properly handle shorthands in hyperref pdf strings}
+% \begin{macrocode}
+\providecommand\texorpdfstring[2]{#1}
+% \end{macrocode}
+%
% Now we can define the doublequote shorthands: the umlauts,
% \begin{macrocode}
\declare@shorthand{ngerman}{"a}{\textormath{\"{a}\bbl@allowhyphens}{\ddot a}}
@@ -713,10 +720,14 @@
% \begin{macrocode}
\declare@shorthand{ngerman}{"-}{\nobreak\-\bbl@allowhyphens}
\declare@shorthand{ngerman}{"|}{%
- \textormath{\penalty\@M\discretionary{-}{}{\kern.03em}%
- \bbl@allowhyphens}{}}
+ \texorpdfstring{\textormath{\penalty\@M\discretionary{-}{}{\kern.03em}\bbl@allowhyphens}{}}% TeX string
+ {}% PDF string
+}
\declare@shorthand{ngerman}{""}{\hskip\z@skip}
-\declare@shorthand{ngerman}{"~}{\textormath{\leavevmode\hbox{-}}{-}}
+\declare@shorthand{ngerman}{"~}{%
+ \texorpdfstring{\textormath{\leavevmode\hbox{-}}{-}}% tex string
+ {-}% PDF string
+}
\declare@shorthand{ngerman}{"=}{\penalty\@M-\hskip\z@skip}
\declare@shorthand{ngerman}{"/}{\textormath
{\bbl@allowhyphens\discretionary{/}{}{/}\bbl@allowhyphens}{}}
diff --git a/Master/texmf-dist/tex/generic/babel-german/austrian.ldf b/Master/texmf-dist/tex/generic/babel-german/austrian.ldf
index 670d393b5e7..5ff24091de1 100644
--- a/Master/texmf-dist/tex/generic/babel-german/austrian.ldf
+++ b/Master/texmf-dist/tex/generic/babel-german/austrian.ldf
@@ -34,7 +34,7 @@
%% via: https://github.com/jspitz/babel-german
%%
\ProvidesLanguage{austrian}
- [2018/12/08 v2.11 German support for babel (pre-1996 orthography)]
+ [2020/07/21 v2.12 German support for babel (pre-1996 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 f7c646d1035..8617903b43a 100644
--- a/Master/texmf-dist/tex/generic/babel-german/german.ldf
+++ b/Master/texmf-dist/tex/generic/babel-german/german.ldf
@@ -34,7 +34,7 @@
%% via: https://github.com/jspitz/babel-german
%%
\ProvidesLanguage{german}
- [2018/12/08 v2.11 German support for babel (pre-1996 orthography)]
+ [2020/07/21 v2.12 German support for babel (pre-1996 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 6f5586803a9..ca5c6d9b8b2 100644
--- a/Master/texmf-dist/tex/generic/babel-german/germanb.ldf
+++ b/Master/texmf-dist/tex/generic/babel-german/germanb.ldf
@@ -34,7 +34,7 @@
%% via: https://github.com/jspitz/babel-german
%%
\ProvidesLanguage{germanb}
- [2018/12/08 v2.11 German support for babel (pre-1996 orthography)]
+ [2020/07/21 v2.12 German support for babel (pre-1996 orthography)]
\def\bbl@opt@german{german}
\def\bbl@opt@germanb{germanb}
\def\bbl@opt@austrian{austrian}
@@ -69,10 +69,10 @@
\ifx\CurrentOption\bbl@opt@swissgerman
\ifx\l@swissgerman\@undefined
\ifx\l@german\@undefined
- \@nopatterns{Swiss German (trad. orthography) and German (trad. orthography)}
+ \@nopatterns{Swiss Standard German (trad. orthography) and German (trad. orthography)}
\adddialect\l@swissgerman0
\else
- \@nopatterns{Swiss German (trad. orthography)}
+ \@nopatterns{Swiss Standard German (trad. orthography)}
\adddialect\l@swissgerman\l@german
\fi
\fi
@@ -174,6 +174,7 @@
\def\bbl@SZ{SZ}
}
\x
+\providecommand\texorpdfstring[2]{#1}
\declare@shorthand{german}{"a}{\textormath{\"{a}\bbl@allowhyphens}{\ddot a}}
\declare@shorthand{german}{"o}{\textormath{\"{o}\bbl@allowhyphens}{\ddot o}}
\declare@shorthand{german}{"u}{\textormath{\"{u}\bbl@allowhyphens}{\ddot u}}
@@ -208,7 +209,10 @@
\declare@shorthand{german}{"R}{\textormath{\bbl@disc R{RR}}{R}}
\declare@shorthand{german}{"t}{\textormath{\bbl@disc t{tt}}{t}}
\declare@shorthand{german}{"T}{\textormath{\bbl@disc T{TT}}{T}}
-\declare@shorthand{german}{"f}{\textormath{\bbl@discff}{f}}
+\declare@shorthand{german}{"f}{%
+ \texorpdfstring{\textormath{\bbl@discff}{f}}% TeX string
+ {f}% PDF string
+}
\def\bbl@discff{\penalty\@M
\afterassignment\bbl@insertff \let\bbl@nextff= }
\def\bbl@insertff{%
@@ -218,10 +222,14 @@
\let\bbl@nextff=f
\declare@shorthand{german}{"-}{\nobreak\-\bbl@allowhyphens}
\declare@shorthand{german}{"|}{%
- \textormath{\penalty\@M\discretionary{-}{}{\kern.03em}%
- \bbl@allowhyphens}{}}
+ \texorpdfstring{\textormath{\penalty\@M\discretionary{-}{}{\kern.03em}\bbl@allowhyphens}{}}% TeX string
+ {}% PDF string
+}
\declare@shorthand{german}{""}{\hskip\z@skip}
-\declare@shorthand{german}{"~}{\textormath{\leavevmode\hbox{-}}{-}}
+\declare@shorthand{german}{"~}{%
+ \texorpdfstring{\textormath{\leavevmode\hbox{-}}{-}}% tex string
+ {-}% PDF string
+}
\declare@shorthand{german}{"=}{\penalty\@M-\hskip\z@skip}
\declare@shorthand{german}{"/}{\textormath
{\bbl@allowhyphens\discretionary{/}{}{/}\bbl@allowhyphens}{}}
diff --git a/Master/texmf-dist/tex/generic/babel-german/naustrian.ldf b/Master/texmf-dist/tex/generic/babel-german/naustrian.ldf
index 85df10760de..ff8d583cdaa 100644
--- a/Master/texmf-dist/tex/generic/babel-german/naustrian.ldf
+++ b/Master/texmf-dist/tex/generic/babel-german/naustrian.ldf
@@ -34,7 +34,7 @@
%% via: https://github.com/jspitz/babel-german
%%
\ProvidesLanguage{naustrian}
- [2018/12/08 v2.11 German support for babel (post-1996 orthography)]
+ [2020/07/21 v2.12 German support for babel (post-1996 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 d1194e4e185..da85b9e69a6 100644
--- a/Master/texmf-dist/tex/generic/babel-german/ngerman.ldf
+++ b/Master/texmf-dist/tex/generic/babel-german/ngerman.ldf
@@ -34,7 +34,7 @@
%% via: https://github.com/jspitz/babel-german
%%
\ProvidesLanguage{ngerman}
- [2018/12/08 v2.11 German support for babel (post-1996 orthography)]
+ [2020/07/21 v2.12 German support for babel (post-1996 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 01bfe6a437f..ef367b9bc98 100644
--- a/Master/texmf-dist/tex/generic/babel-german/ngermanb.ldf
+++ b/Master/texmf-dist/tex/generic/babel-german/ngermanb.ldf
@@ -34,7 +34,7 @@
%% via: https://github.com/jspitz/babel-german
%%
\ProvidesLanguage{ngermanb}
- [2018/12/08 v2.11 German support for babel (post-1996 orthography)]
+ [2020/07/21 v2.12 German support for babel (post-1996 orthography)]
\def\bbl@opt@ngerman{ngerman}
\def\bbl@opt@ngermanb{ngermanb}
\def\bbl@opt@naustrian{naustrian}
@@ -57,7 +57,7 @@
\fi
\ifx\CurrentOption\bbl@opt@nswissgerman
\ifx\l@ngerman\@undefined
- \@nopatterns{German (new orthography), needed by Swiss German (new orthography)}
+ \@nopatterns{German (new orthography), needed by Swiss Standard German (new orthography)}
\adddialect\l@nswissgerman0
\else
\adddialect\l@nswissgerman\l@ngerman
@@ -161,6 +161,7 @@
\def\bbl@SZ{SZ}
}
\x
+\providecommand\texorpdfstring[2]{#1}
\declare@shorthand{ngerman}{"a}{\textormath{\"{a}\bbl@allowhyphens}{\ddot a}}
\declare@shorthand{ngerman}{"o}{\textormath{\"{o}\bbl@allowhyphens}{\ddot o}}
\declare@shorthand{ngerman}{"u}{\textormath{\"{u}\bbl@allowhyphens}{\ddot u}}
@@ -182,10 +183,14 @@
\declare@shorthand{ngerman}{">}{\frqq}
\declare@shorthand{ngerman}{"-}{\nobreak\-\bbl@allowhyphens}
\declare@shorthand{ngerman}{"|}{%
- \textormath{\penalty\@M\discretionary{-}{}{\kern.03em}%
- \bbl@allowhyphens}{}}
+ \texorpdfstring{\textormath{\penalty\@M\discretionary{-}{}{\kern.03em}\bbl@allowhyphens}{}}% TeX string
+ {}% PDF string
+}
\declare@shorthand{ngerman}{""}{\hskip\z@skip}
-\declare@shorthand{ngerman}{"~}{\textormath{\leavevmode\hbox{-}}{-}}
+\declare@shorthand{ngerman}{"~}{%
+ \texorpdfstring{\textormath{\leavevmode\hbox{-}}{-}}% tex string
+ {-}% PDF string
+}
\declare@shorthand{ngerman}{"=}{\penalty\@M-\hskip\z@skip}
\declare@shorthand{ngerman}{"/}{\textormath
{\bbl@allowhyphens\discretionary{/}{}{/}\bbl@allowhyphens}{}}
diff --git a/Master/texmf-dist/tex/generic/babel-german/nswissgerman.ldf b/Master/texmf-dist/tex/generic/babel-german/nswissgerman.ldf
index e531c4211b6..f16e4e69fe1 100644
--- a/Master/texmf-dist/tex/generic/babel-german/nswissgerman.ldf
+++ b/Master/texmf-dist/tex/generic/babel-german/nswissgerman.ldf
@@ -34,7 +34,7 @@
%% via: https://github.com/jspitz/babel-german
%%
\ProvidesLanguage{nswissgerman}
- [2018/12/08 v2.11 German support for babel (post-1996 orthography)]
+ [2020/07/21 v2.12 German support for babel (post-1996 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 d3befa7acfe..3a566711da3 100644
--- a/Master/texmf-dist/tex/generic/babel-german/swissgerman.ldf
+++ b/Master/texmf-dist/tex/generic/babel-german/swissgerman.ldf
@@ -34,7 +34,7 @@
%% via: https://github.com/jspitz/babel-german
%%
\ProvidesLanguage{swissgerman}
- [2018/12/08 v2.11 German support for babel (pre-1996 orthography)]
+ [2020/07/21 v2.12 German support for babel (pre-1996 orthography)]
\input germanb.ldf\relax
%%
%% \CharacterTable