summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-12-11 23:38:31 +0000
committerKarl Berry <karl@freefriends.org>2018-12-11 23:38:31 +0000
commit1887943b3802a7abd444d9054bb9442ad45f5962 (patch)
tree8eb27426b5da30bf984cc67e3b1598471ac2c678 /Master/texmf-dist/source/generic
parentb8f67cb908880c8fdf6b03eb9c4d5219d7409171 (diff)
babel-german
git-svn-id: svn://tug.org/texlive/trunk@49391 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/generic')
-rw-r--r--Master/texmf-dist/source/generic/babel-german/german.ins6
-rw-r--r--Master/texmf-dist/source/generic/babel-german/germanb.dtx23
-rw-r--r--Master/texmf-dist/source/generic/babel-german/ngermanb.dtx19
3 files changed, 27 insertions, 21 deletions
diff --git a/Master/texmf-dist/source/generic/babel-german/german.ins b/Master/texmf-dist/source/generic/babel-german/german.ins
index 937a84b8719..92f2142bdff 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--2016
+%% Copyright 1989--2018
%% Johannes L. Braams
%% Bernd Raichle
%% Walter Schmidt
@@ -28,7 +28,7 @@
%%
%% --------------- start of docstrip commands ------------------
%%
-\def\filedate{2016/11/01}
+\def\filedate{2018/12/08}
\input docstrip.tex
@@ -50,7 +50,7 @@
\preamble
This is a generated file.
-Copyright 1989--2016
+Copyright 1989--2018
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 d5c4bbe10bf..4e8a344b555 100644
--- a/Master/texmf-dist/source/generic/babel-german/germanb.dtx
+++ b/Master/texmf-dist/source/generic/babel-german/germanb.dtx
@@ -39,7 +39,7 @@
%<germanb>\ProvidesLanguage{germanb}
%\fi
%\ProvidesFile{germanb.dtx}
- [2018/03/29 v2.10 German support for babel (pre-1996 orthography)]
+ [2018/12/08 v2.11 German support for babel (pre-1996 orthography)]
%\iffalse
%
%<*filedriver>
@@ -821,12 +821,12 @@
% Now we can define the doublequote shorthands: the umlauts,
% \changes{Version 2.6c}{1996/05/30}{added the \cs{allowhyphens}}
% \begin{macrocode}
-\declare@shorthand{german}{"a}{\textormath{\"{a}\allowhyphens}{\ddot a}}
-\declare@shorthand{german}{"o}{\textormath{\"{o}\allowhyphens}{\ddot o}}
-\declare@shorthand{german}{"u}{\textormath{\"{u}\allowhyphens}{\ddot u}}
-\declare@shorthand{german}{"A}{\textormath{\"{A}\allowhyphens}{\ddot A}}
-\declare@shorthand{german}{"O}{\textormath{\"{O}\allowhyphens}{\ddot O}}
-\declare@shorthand{german}{"U}{\textormath{\"{U}\allowhyphens}{\ddot U}}
+\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}}
+\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}}
% \end{macrocode}
% tremata,
% \begin{macrocode}
@@ -881,17 +881,20 @@
\def\bbl@insertff{%
\if f\bbl@nextff
\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi
- {\relax\discretionary{ff-}{f}{ff}\allowhyphens}{f\bbl@nextff}}
+ {\relax\discretionary{ff-}{f}{ff}\bbl@allowhyphens}{f\bbl@nextff}}
\let\bbl@nextff=f
% \end{macrocode}
% and some additional commands (hyphenation, line breaking and ligature control):
% \changes{Version 2.9}{2016/11/02}{Add \texttt{"/} shortcut for breakable slash
% (taken from \file{dutch.ldf})}
+% \changes{Version 2.9b=Version 2.11}{2018/12/08}{Fix old hyphenation regression introduced with \babel\ 3.7
+% (2002) in a number of shorthands (change of meaning of \cs{allowhyphens}
+% vs. \cs{bbl@allowhyphens})}
% \begin{macrocode}
\declare@shorthand{german}{"-}{\nobreak\-\bbl@allowhyphens}
\declare@shorthand{german}{"|}{%
\textormath{\penalty\@M\discretionary{-}{}{\kern.03em}%
- \allowhyphens}{}}
+ \bbl@allowhyphens}{}}
\declare@shorthand{german}{""}{\hskip\z@skip}
\declare@shorthand{german}{"~}{\textormath{\leavevmode\hbox{-}}{-}}
\declare@shorthand{german}{"=}{\penalty\@M-\hskip\z@skip}
@@ -909,7 +912,7 @@
% \begin{macrocode}
\def\mdqon{\shorthandon{"}}
\def\mdqoff{\shorthandoff{"}}
-\def\ck{\allowhyphens\discretionary{k-}{k}{ck}\allowhyphens}
+\def\ck{\bbl@allowhyphens\discretionary{k-}{k}{ck}\bbl@allowhyphens}
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/Master/texmf-dist/source/generic/babel-german/ngermanb.dtx b/Master/texmf-dist/source/generic/babel-german/ngermanb.dtx
index 3caf2247efa..01413286b96 100644
--- a/Master/texmf-dist/source/generic/babel-german/ngermanb.dtx
+++ b/Master/texmf-dist/source/generic/babel-german/ngermanb.dtx
@@ -43,7 +43,7 @@
%<ngermanb>\ProvidesLanguage{ngermanb}
%\fi
%\ProvidesFile{ngermanb.dtx}
- [2018/03/29 v2.10 German support for babel (post-1996 orthography)]
+ [2018/12/08 v2.11 German support for babel (post-1996 orthography)]
%\iffalse
%
%<*filedriver>
@@ -675,12 +675,12 @@
%
% Now we can define the doublequote shorthands: the umlauts,
% \begin{macrocode}
-\declare@shorthand{ngerman}{"a}{\textormath{\"{a}\allowhyphens}{\ddot a}}
-\declare@shorthand{ngerman}{"o}{\textormath{\"{o}\allowhyphens}{\ddot o}}
-\declare@shorthand{ngerman}{"u}{\textormath{\"{u}\allowhyphens}{\ddot u}}
-\declare@shorthand{ngerman}{"A}{\textormath{\"{A}\allowhyphens}{\ddot A}}
-\declare@shorthand{ngerman}{"O}{\textormath{\"{O}\allowhyphens}{\ddot O}}
-\declare@shorthand{ngerman}{"U}{\textormath{\"{U}\allowhyphens}{\ddot U}}
+\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}}
+\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}}
% \end{macrocode}
% tremata,
% \begin{macrocode}
@@ -707,11 +707,14 @@
% and some additional commands (hyphenation, line breaking and ligature control):
% \changes{Version 2.9}{2016/11/02}{Add \texttt{"/} shortcut for breakable slash
% (taken from \file{dutch.ldf})}
+% \changes{Version 2.9b=Version 2.11}{2018/12/08}{Fix old hyphenation regression introduced with \babel\ 3.7
+% (2002) in a number of shorthands (change of meaning of \cs{allowhyphens}
+% vs. \cs{bbl@allowhyphens})}
% \begin{macrocode}
\declare@shorthand{ngerman}{"-}{\nobreak\-\bbl@allowhyphens}
\declare@shorthand{ngerman}{"|}{%
\textormath{\penalty\@M\discretionary{-}{}{\kern.03em}%
- \allowhyphens}{}}
+ \bbl@allowhyphens}{}}
\declare@shorthand{ngerman}{""}{\hskip\z@skip}
\declare@shorthand{ngerman}{"~}{\textormath{\leavevmode\hbox{-}}{-}}
\declare@shorthand{ngerman}{"=}{\penalty\@M-\hskip\z@skip}