diff options
author | Karl Berry <karl@freefriends.org> | 2024-01-20 21:07:08 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-01-20 21:07:08 +0000 |
commit | c8b42075d5f74f3232b4eba6ad9dac481e7031b2 (patch) | |
tree | 6b78e6c3c6f326c22dc916cea59557bce836facc /Master | |
parent | fef205d26857e15f9e47723651193a6b6e90c978 (diff) |
babel-german (20jan24)
git-svn-id: svn://tug.org/texlive/trunk@69506 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/generic/babel-german/README | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/babel-german/germanb.pdf | bin | 396377 -> 410715 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/generic/babel-german/ngermanb.pdf | bin | 372481 -> 388947 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/generic/babel-german/german.ins | 2 | ||||
-rw-r--r-- | Master/texmf-dist/source/generic/babel-german/germanb.dtx | 45 | ||||
-rw-r--r-- | Master/texmf-dist/source/generic/babel-german/ngermanb.dtx | 122 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-german/austrian.ldf | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-german/german.ldf | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-german/germanb.ldf | 9 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-german/naustrian.ldf | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-german/ngerman.ldf | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-german/ngermanb.ldf | 42 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-german/nswissgerman.ldf | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-german/swissgerman.ldf | 4 |
14 files changed, 185 insertions, 61 deletions
diff --git a/Master/texmf-dist/doc/generic/babel-german/README b/Master/texmf-dist/doc/generic/babel-german/README index 6ac552b7cc4..1150edfdc70 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--2021 Johannes L. Braams +Copyright 1989--2024 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 Binary files differindex 972952ed63c..5ca9a0fcad6 100644 --- a/Master/texmf-dist/doc/generic/babel-german/germanb.pdf +++ b/Master/texmf-dist/doc/generic/babel-german/germanb.pdf diff --git a/Master/texmf-dist/doc/generic/babel-german/ngermanb.pdf b/Master/texmf-dist/doc/generic/babel-german/ngermanb.pdf Binary files differindex a663794b0e4..5de8fa8cf21 100644 --- a/Master/texmf-dist/doc/generic/babel-german/ngermanb.pdf +++ b/Master/texmf-dist/doc/generic/babel-german/ngermanb.pdf diff --git a/Master/texmf-dist/source/generic/babel-german/german.ins b/Master/texmf-dist/source/generic/babel-german/german.ins index 3afe75f32f2..ec06e29ce51 100644 --- a/Master/texmf-dist/source/generic/babel-german/german.ins +++ b/Master/texmf-dist/source/generic/babel-german/german.ins @@ -50,7 +50,7 @@ \preamble This is a generated file. -Copyright 1989--2021 +Copyright 1989--2024 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 35a837bf707..ef510a14fcc 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--2021 +% Copyright 1989--2024 % Johannes L. Braams % Bernd Raichle % Walter Schmidt @@ -25,7 +25,7 @@ % % The Current Maintainer of this work is Juergen Spitzmueller. % \fi -% \CheckSum{522} +% \CheckSum{538} % % \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} - [2021/02/27 v2.13 German support for babel (pre-1996 orthography)] + [2024/01/19 v2.14 German support for babel (pre-1996 orthography)] %\iffalse % %<*filedriver> @@ -241,6 +241,16 @@ % |"/| & \newfeature{2.9}A slash that allows for a linebreak. % As opposed to |\slash{}|, hyphenation at the breakpoints % preset in the hyphenation patterns is still allowed. \tabularnewline +% |"*| & \newfeature{2.14}An asterisk which assures the word can +% still be hyphenated at its defined breakpoints. +% Useful if you want to employ gender-sensitive writing +% (,gender star`). +% Similar shorthands are available for the alternative +% gender-sensitive spellings, |":| and |"_|. \tabularnewline +% |"x| & \newfeature{2.14}Inserts a gender mark which assures +% the word can still be hyphenated at its defined breakpoints. +% This is predefined to |*| but can be globally redefined +% by redefining the macro |\def\mkgender{*}|. \tabularnewline % |"`| & German left double quotes \graph{,,}. \tabularnewline % |"'| & German right double quotes \graph{``}. \tabularnewline % |"<| & French/Swiss left double quotes \graph{<<}. \tabularnewline @@ -291,21 +301,11 @@ % % So you need to explicitly activate the new patterns for a given document (except for \Lopt{swissgerman}) with the classic engines, should you % want to use them instead of the old ones. -% With \Babel, this can be done quite easily by means of the \textsf{hyphsubst} \cite{hyphsubst} package: +% With \Babel, this can be done easily by means of the \cs{babelprovide} command and the \textsf{hyphenrules} option: % \begin{verbatim} -% \usepackage[german=german-x-latest]{hyphsubst} -% \usepackage[german]{babel} -% \end{verbatim}\vspace{-\baselineskip} -% Since \Lopt{austrian} uses the same patterns as \Lopt{german}, the given \textsf{hyphsubst} option activates -% the new patterns for this variety as well; but note that \textsf{hyphsubst} must be loaded before \babel\ (please refer to \cite{exptl} and -% \cite{hyphsubst} for details). -% -% If you only want to use experimental patterns for one variety, you can do like so: -% \begin{verbatim} -% \usepackage{hyphsubst} -% \usepackage[german,austrian]{babel} -% \HyphSubstLet{austrian}{german-x-latest} +% \babelprovide[hyphenrules=german-x-latest]{german} % \end{verbatim}\vspace{-\baselineskip} +% For \Lopt{austrian}, use a respectively adapted version of the above. % % % \section{Variety-specific options}\label{sec:toss} @@ -925,6 +925,16 @@ \declare@shorthand{german}{"/}{\textormath {\bbl@allowhyphens\discretionary{/}{}{/}\bbl@allowhyphens}{}} % \end{macrocode} +% and some shorthands to support gender-sensitive spelling: +% \changes{Version 2.9e=Version 2.14}{2024/01/19}{Add \texttt{"*}, \texttt{":}, \texttt{"\_}, and \texttt{"x} +% shorthands to support gender-sensitive writing} +% \begin{macrocode} +\def\mkgender{*} +\declare@shorthand{german}{":}{\nobreak:\bbl@allowhyphens} +\declare@shorthand{german}{"*}{\nobreak*\bbl@allowhyphens} +\declare@shorthand{german}{"_}{\nobreak\_\bbl@allowhyphens} +\declare@shorthand{german}{"x}{\nobreak\mkgender\bbl@allowhyphens} +% \end{macrocode} % % \begin{macro}{\mdqon} % \begin{macro}{\mdqoff} @@ -994,9 +1004,6 @@ % \bibitem{exptl} Deutschsprachige Trennmustermannschaft: % \emph{dehyph-exptl -- Experimental hyphenation patterns for the German language}. % \url{https://ctan.org/pkg/dehyph-exptl}. -% \bibitem{hyphsubst} Heiko Oberdiek: -% \emph{hyphsubst -- Substitute hyphenation patterns}. -% \url{https://ctan.org/pkg/hyphsubst}. % \bibitem{HP} Partl, Hubert: % \emph{German \TeX}, \emph{TUGboat} 9/1 (1988), p.~70--72. % \bibitem{gerdoc} Raichle, Bernd: diff --git a/Master/texmf-dist/source/generic/babel-german/ngermanb.dtx b/Master/texmf-dist/source/generic/babel-german/ngermanb.dtx index d0b638457f6..98b9d2063a0 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--2021 +% Copyright 1989--2024 % Johannes L. Braams % Bernd Raichle % Walter Schmidt @@ -29,7 +29,7 @@ % by Bernd Raichle, Hubert Partl et.al. % % \fi -% \CheckSum{409} +% \CheckSum{505} % % \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} - [2021/02/27 v2.13 German support for babel (post-1996 orthography)] + [2024/01/19 v2.14 German support for babel (post-1996 orthography)] %\iffalse % %<*filedriver> @@ -134,6 +134,9 @@ % \setlength{\itemsep}{0pt} % \item |\usepackage[ngerman]{babel}| % \item |\usepackage[naustrian]{babel}| +% \item |\usepackage[ngerman.capsz]{babel}|\newfeature{2.14}\footnote{% +% See sec.~\ref{sec:capsz} on the \Lopt{capsz} modifier.} +% \item |\usepackage[naustrian.capsz]{babel}| % \item |\usepackage[nswissgerman]{babel}| % \item |\usepackage[nswissgerman.toss]{babel}|\newfeature{2.10}\footnote{% % See sec.~\ref{sec:toss} on the \Lopt{toss} modifier.} @@ -167,7 +170,8 @@ % Differs to |"s| in uppercase version; % but cf. sec.~\ref{sec:toss}. \tabularnewline % |"S| & |\uppercase{"s}|, typeset as \graph{SS}(\graph{\ss} -% must be written as \graph{SS} in uppercase writing). \tabularnewline +% is traditonally written as \graph{SS} in uppercase writing, +% but cf. sec.~\ref{sec:capsz} if you prefer a capital eszett). \tabularnewline % |"Z| & |\uppercase{"z}|, typeset as \graph{SZ}. In traditional % spelling, \graph{\ss} could also be written as \graph{SZ} % instead of \graph{SS} in uppercase writing. Note that, @@ -192,6 +196,16 @@ % |"/| & \newfeature{2.9}A slash that allows for a linebreak. % As opposed to |\slash{}|, hyphenation at the breakpoints % preset in the hyphenation patterns is still allowed. \tabularnewline +% |"*| & \newfeature{2.14}An asterisk which assures the word can +% still be hyphenated at its defined breakpoints. +% Useful if you want to employ gender-sensitive writing +% (,gender star`). +% Similar shorthands are available for the alternative +% gender-sensitive spellings, |":| and |"_|. \tabularnewline +% |"x| & \newfeature{2.14}Inserts a gender mark which assures +% the word can still be hyphenated at its defined breakpoints. +% This is predefined to |*| but can be globally redefined +% by redefining the macro |\def\mkngender{*}| \tabularnewline % |"`| & German left double quotes \graph{,,}. \tabularnewline % |"'| & German right double quotes \graph{``}. \tabularnewline % |"<| & French/Swiss left double quotes \graph{<<}. \tabularnewline @@ -241,23 +255,32 @@ % of software updates. % % This means that you need to explicitly activate the new patterns for a given document with the classic engines, should you want to use them -% instead of the old ones. With \Babel, this can be done quite easily by means of the \textsf{hyphsubst} \cite{hyphsubst} package: +% instead of the old ones. With \Babel, this can be done easily by means of the \cs{babelprovide} command and the \textsf{hyphenrules} option: % \begin{verbatim} -% \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -% \usepackage[ngerman]{babel} +% \babelprovide[hyphenrules=ngerman-x-latest]{ngerman} % \end{verbatim}\vspace{-\baselineskip} -% Since \Lopt{naustrian} and \Lopt{nswissgerman} use the same patterns as \Lopt{ngerman}, the given \textsf{hyphsubst} option activates -% the new patterns for all varieties; but note that \textsf{hyphsubst} must be loaded before \babel\ (please refer to \cite{exptl} and -% \cite{hyphsubst} for details). +% For \Lopt{naustrian} and \Lopt{nswissgerman}, use a respectively adapted version of the above. % -% If you only want to use experimental patterns for one variety, you can do like so: -% \begin{verbatim} -% \usepackage{hyphsubst} -% \usepackage[ngerman,naustrian]{babel} -% \HyphSubstLet{naustrian}{ngerman-x-latest} -% \end{verbatim}\vspace{-\baselineskip} +% \section{Variety-specific options}% +% +% \subsection{Capital eszett letter}\label{sec:capsz} +% +% In\newfeature{2.14} 2008, a capital variant of the letter \graph{\ss} has been included to the Unicode standard +% (U+1E9E), and in 2017, the capital eszett letter has been acknowledged in German orthography as a valid alternative +% to \graph{SS} in uppercase writing of \graph{\ss}. The letter differs from its miniscule counterpart in that it is +% usually more wide to match the form of uppercase letters. % -% \section{Variety-specific options}\label{sec:toss} +% If you want to use this letter, you can do so by using the \Babel\ modifier \Lopt{capsz}, which is supported +% for the ngerman and naustrian varieties. I.\,e., pass \Lopt{ngerman.capsz} or \Lopt{naustrian.capsz} +% (rather than \Lopt{ngerman} or \Lopt{naustrian}) as \babel\ option. As the eszett letter is not common +% in Swiss German writing in general, the option is not supported there. Similarly, the pre-1996 varieties +% do not support the letter either. +% +% The modifier causes both |\MakeUppercase| and the |"S| shorthand to use the capital eszett letter. +% Note that this requires a font which actually contains the glyph (otherwise, you still get \graph{SS}) +% and \LaTeX\ kernel 2023/06 at least. +% +% \subsection{Handling of \texttt{"s} and \texttt{"z} in Swiss German}\label{sec:toss} % % In\newfeature{2.10} Swiss (and Liechtensteinian) German writing, the use of \graph{\ss} is rather uncommon. % Swiss writers would normally use \graph{ss} where German or Austrian writers use the \graph{\ss} character @@ -564,7 +587,7 @@ % \begin{macro}{\ntossfalse} % 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|.). +% is used or locally if |\ntosstrue|). % \begin{macrocode} \newif\ifntoss\ntossfalse \newif\ifbbl@ntoss\bbl@ntossfalse @@ -581,6 +604,37 @@ % \end{macro} % \end{macro} % +% \begin{macro}{capsz} +% \changes{Version 2.9e=Version 2.14}{2024/01/19}{Implement modifier \Lopt{capsz} +% to use capital eszett letter in Austrian and German varieties if possible.} +% For German and Austrian Standard German, we allow optionally to uppercase \graph{\ss} +% with the capital eszett letter rather as \graph{SS} if the font provides the glyph +% (if the modifier \Lopt{capsz} is used). +% \begin{macrocode} +\newif\ifcapsz\capszfalse +\newif\ifbbl@capsz\bbl@capszfalse +\ifx\bbl@mod@ngerman\@undefined\else + \@expandtwoargs\in@{,capsz,}{,\bbl@mod@ngerman,} + \ifin@ + \capsztrue + \fi + \addto\extrasngerman{% + \ifcapsz\bbl@capsztrue\bbl@csarg\xdef{casing@ngerman}{de-x-eszett}% + \else\bbl@csarg\xdef{casing@ngerman}{de}\bbl@capszfalse\fi} +\fi +\newif\if@at@capsz\@at@capszfalse +\ifx\bbl@mod@naustrian\@undefined\else + \@expandtwoargs\in@{,capsz,}{,\bbl@mod@naustrian,} + \ifin@ + \@at@capsztrue + \fi + \addto\extrasnaustrian{% + \if@at@capsz\bbl@capsztrue\bbl@csarg\xdef{casing@naustrian}{de-x-eszett}% + \else\bbl@csarg\xdef{casing@naustrian}{de}\bbl@capszfalse\fi} +\fi +% \end{macrocode} +% \end{macro} +% % Next, again depending on the option with which the language definition % file has been loaded, the macro |\noextrasngerman|, |\noextrasnaustrian| % or |\noextrasnswissgerman| is defined. @@ -593,9 +647,23 @@ % \begin{macrocode} \expandafter\addto\csname noextras\CurrentOption\endcsname{% \bbl@deactivate{"}} +% \end{macrocode} +% +% Now deactivate the settings that might have been done by the modifiers: +% \begin{macrocode} \ifx\CurrentOption\bbl@opt@nswissgerman \addto\noextrasnswissgerman{\bbl@ntossfalse} \fi +\ifx\CurrentOption\bbl@opt@ngerman + \ifbbl@capsz + \addto\noextrasngerman{\bbl@capszfalse\bbl@csarg\xdef{casing@ngerman}{de}} + \fi +\fi +\ifx\CurrentOption\bbl@opt@naustrian + \ifbbl@capsz + \addto\noextrasnaustrian{\bbl@capszfalse\bbl@csarg\xdef{casing@naustrian}{de}} + \fi +\fi % \end{macrocode} % % @@ -656,6 +724,7 @@ % couple of `support' macros. % % +% \changes{Version 2.9e=Version 2.14}{2024/01/19}{Output capital eszett for \texttt{"S} if possible and required} % \begin{macro}{\dq} % We save the original double quotation mark character in |\dq| to keep % it available, the math accent |\"| can now be typed as |"|. @@ -667,7 +736,7 @@ \def\dq{"} \def\@SS{\mathchar"7019 } \def\bbl@ss{\ifbbl@ntoss ss\else\textormath{\ss}{\@SS{}}\fi} - \def\bbl@SS{SS} + \def\bbl@SS{\ifbbl@capsz\MakeUppercase{\ss}\else SS\fi} \def\bbl@sz{\ifbbl@ntoss sz\else\textormath{\ss}{\@SS{}}\fi} \def\bbl@SZ{SZ} } @@ -713,7 +782,7 @@ \declare@shorthand{ngerman}{"<}{\flqq} \declare@shorthand{ngerman}{">}{\frqq} % \end{macrocode} -% and some additional commands (hyphenation, line breaking and ligature control): +% 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 @@ -734,6 +803,16 @@ \declare@shorthand{ngerman}{"/}{\textormath {\bbl@allowhyphens\discretionary{/}{}{/}\bbl@allowhyphens}{}} % \end{macrocode} +% and some shorthands to support gender-sensitive spelling: +% \changes{Version 2.9e=Version 2.14}{2024/01/19}{Add \texttt{"*}, \texttt{":}, \texttt{"\_}, and \texttt{"x} +% shorthands to support gender-sensitive writing} +% \begin{macrocode} +\def\mkngender{*} +\declare@shorthand{ngerman}{":}{\nobreak:\bbl@allowhyphens} +\declare@shorthand{ngerman}{"*}{\nobreak*\bbl@allowhyphens} +\declare@shorthand{ngerman}{"_}{\nobreak\_\bbl@allowhyphens} +\declare@shorthand{ngerman}{"x}{\nobreak\mkngender\bbl@allowhyphens} +% \end{macrocode} % % \begin{macro}{\mdqon} % \begin{macro}{\mdqoff} @@ -794,9 +873,6 @@ % \bibitem{exptl} Deutschsprachige Trennmustermannschaft: % \emph{dehyph-exptl -- Experimental hyphenation patterns for the German language}. % \url{https://ctan.org/pkg/dehyph-exptl}. -% \bibitem{hyphsubst} Heiko Oberdiek: -% \emph{hyphsubst -- Substitute hyphenation patterns}. -% \url{https://ctan.org/pkg/hyphsubst}. % \bibitem{HP} Partl, Hubert: % \emph{German \TeX}, \emph{TUGboat} 9/1 (1988), p.~70--72. % \bibitem{hyph-utf8} Manuel P\'egouri\'e-Gonnard et al.: diff --git a/Master/texmf-dist/tex/generic/babel-german/austrian.ldf b/Master/texmf-dist/tex/generic/babel-german/austrian.ldf index cf1634ce132..709a403c57a 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--2021 +%% Copyright 1989--2024 %% Johannes L. Braams %% Bernd Raichle %% Walter Schmidt @@ -34,7 +34,7 @@ %% via: https://github.com/jspitz/babel-german %% \ProvidesLanguage{austrian} - [2021/02/27 v2.13 German support for babel (pre-1996 orthography)] + [2024/01/19 v2.14 German support for babel (pre-1996 orthography)] \def\tmpa{germanb} \let\SaveCurrentOption\CurrentOption \ifx\CurrentOption\tmpa diff --git a/Master/texmf-dist/tex/generic/babel-german/german.ldf b/Master/texmf-dist/tex/generic/babel-german/german.ldf index b893f91ce73..a53b3f7c844 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--2021 +%% Copyright 1989--2024 %% Johannes L. Braams %% Bernd Raichle %% Walter Schmidt @@ -34,7 +34,7 @@ %% via: https://github.com/jspitz/babel-german %% \ProvidesLanguage{german} - [2021/02/27 v2.13 German support for babel (pre-1996 orthography)] + [2024/01/19 v2.14 German support for babel (pre-1996 orthography)] \def\tmpa{germanb} \let\SaveCurrentOption\CurrentOption \ifx\CurrentOption\tmpa diff --git a/Master/texmf-dist/tex/generic/babel-german/germanb.ldf b/Master/texmf-dist/tex/generic/babel-german/germanb.ldf index 21deae516e6..9329345b446 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--2021 +%% Copyright 1989--2024 %% Johannes L. Braams %% Bernd Raichle %% Walter Schmidt @@ -34,7 +34,7 @@ %% via: https://github.com/jspitz/babel-german %% \ProvidesLanguage{germanb} - [2021/02/27 v2.13 German support for babel (pre-1996 orthography)] + [2024/01/19 v2.14 German support for babel (pre-1996 orthography)] \def\tmpa{germanb} \let\SaveCurrentOption\CurrentOption \ifx\CurrentOption\tmpa @@ -237,6 +237,11 @@ \declare@shorthand{german}{"=}{\penalty\@M-\hskip\z@skip} \declare@shorthand{german}{"/}{\textormath {\bbl@allowhyphens\discretionary{/}{}{/}\bbl@allowhyphens}{}} +\def\mkgender{*} +\declare@shorthand{german}{":}{\nobreak:\bbl@allowhyphens} +\declare@shorthand{german}{"*}{\nobreak*\bbl@allowhyphens} +\declare@shorthand{german}{"_}{\nobreak\_\bbl@allowhyphens} +\declare@shorthand{german}{"x}{\nobreak\mkgender\bbl@allowhyphens} \def\mdqon{\shorthandon{"}} \def\mdqoff{\shorthandoff{"}} \def\ck{\bbl@allowhyphens\discretionary{k-}{k}{ck}\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 56da9a0153d..40751d8137f 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: `naustrian') %% This is a generated file. %% -%% Copyright 1989--2021 +%% Copyright 1989--2024 %% Johannes L. Braams %% Bernd Raichle %% Walter Schmidt @@ -34,7 +34,7 @@ %% via: https://github.com/jspitz/babel-german %% \ProvidesLanguage{naustrian} - [2021/02/27 v2.13 German support for babel (post-1996 orthography)] + [2024/01/19 v2.14 German support for babel (post-1996 orthography)] \def\tmpa{ngermanb} \ifx\CurrentOption\tmpa \def\CurrentOption{ngerman} diff --git a/Master/texmf-dist/tex/generic/babel-german/ngerman.ldf b/Master/texmf-dist/tex/generic/babel-german/ngerman.ldf index 3b6b8987046..be0607e64d7 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: `ngerman') %% This is a generated file. %% -%% Copyright 1989--2021 +%% Copyright 1989--2024 %% Johannes L. Braams %% Bernd Raichle %% Walter Schmidt @@ -34,7 +34,7 @@ %% via: https://github.com/jspitz/babel-german %% \ProvidesLanguage{ngerman} - [2021/02/27 v2.13 German support for babel (post-1996 orthography)] + [2024/01/19 v2.14 German support for babel (post-1996 orthography)] \def\tmpa{ngermanb} \ifx\CurrentOption\tmpa \def\CurrentOption{ngerman} diff --git a/Master/texmf-dist/tex/generic/babel-german/ngermanb.ldf b/Master/texmf-dist/tex/generic/babel-german/ngermanb.ldf index ee83d60bc6f..43994b571d9 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: `ngermanb') %% This is a generated file. %% -%% Copyright 1989--2021 +%% Copyright 1989--2024 %% Johannes L. Braams %% Bernd Raichle %% Walter Schmidt @@ -34,7 +34,7 @@ %% via: https://github.com/jspitz/babel-german %% \ProvidesLanguage{ngermanb} - [2021/02/27 v2.13 German support for babel (post-1996 orthography)] + [2024/01/19 v2.14 German support for babel (post-1996 orthography)] \def\tmpa{ngermanb} \ifx\CurrentOption\tmpa \def\CurrentOption{ngerman} @@ -135,11 +135,42 @@ \addto\extrasnswissgerman{% \ifntoss\bbl@ntosstrue\else\bbl@ntossfalse\fi} \fi +\newif\ifcapsz\capszfalse +\newif\ifbbl@capsz\bbl@capszfalse +\ifx\bbl@mod@ngerman\@undefined\else + \@expandtwoargs\in@{,capsz,}{,\bbl@mod@ngerman,} + \ifin@ + \capsztrue + \fi + \addto\extrasngerman{% + \ifcapsz\bbl@capsztrue\bbl@csarg\xdef{casing@ngerman}{de-x-eszett}% + \else\bbl@csarg\xdef{casing@ngerman}{de}\bbl@capszfalse\fi} +\fi +\newif\if@at@capsz\@at@capszfalse +\ifx\bbl@mod@naustrian\@undefined\else + \@expandtwoargs\in@{,capsz,}{,\bbl@mod@naustrian,} + \ifin@ + \@at@capsztrue + \fi + \addto\extrasnaustrian{% + \if@at@capsz\bbl@capsztrue\bbl@csarg\xdef{casing@naustrian}{de-x-eszett}% + \else\bbl@csarg\xdef{casing@naustrian}{de}\bbl@capszfalse\fi} +\fi \expandafter\addto\csname noextras\CurrentOption\endcsname{% \bbl@deactivate{"}} \ifx\CurrentOption\bbl@opt@nswissgerman \addto\noextrasnswissgerman{\bbl@ntossfalse} \fi +\ifx\CurrentOption\bbl@opt@ngerman + \ifbbl@capsz + \addto\noextrasngerman{\bbl@capszfalse\bbl@csarg\xdef{casing@ngerman}{de}} + \fi +\fi +\ifx\CurrentOption\bbl@opt@naustrian + \ifbbl@capsz + \addto\noextrasnaustrian{\bbl@capszfalse\bbl@csarg\xdef{casing@naustrian}{de}} + \fi +\fi \expandafter\addto\csname extras\CurrentOption\endcsname{% \babel@savevariable{\lccode25}% \lccode25=25} @@ -157,7 +188,7 @@ \def\dq{"} \def\@SS{\mathchar"7019 } \def\bbl@ss{\ifbbl@ntoss ss\else\textormath{\ss}{\@SS{}}\fi} - \def\bbl@SS{SS} + \def\bbl@SS{\ifbbl@capsz\MakeUppercase{\ss}\else SS\fi} \def\bbl@sz{\ifbbl@ntoss sz\else\textormath{\ss}{\@SS{}}\fi} \def\bbl@SZ{SZ} } @@ -195,6 +226,11 @@ \declare@shorthand{ngerman}{"=}{\penalty\@M-\hskip\z@skip} \declare@shorthand{ngerman}{"/}{\textormath {\bbl@allowhyphens\discretionary{/}{}{/}\bbl@allowhyphens}{}} +\def\mkngender{*} +\declare@shorthand{ngerman}{":}{\nobreak:\bbl@allowhyphens} +\declare@shorthand{ngerman}{"*}{\nobreak*\bbl@allowhyphens} +\declare@shorthand{ngerman}{"_}{\nobreak\_\bbl@allowhyphens} +\declare@shorthand{ngerman}{"x}{\nobreak\mkngender\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 b4a335bb8cd..a8754bb1cfd 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: `nswissgerman') %% This is a generated file. %% -%% Copyright 1989--2021 +%% Copyright 1989--2024 %% Johannes L. Braams %% Bernd Raichle %% Walter Schmidt @@ -34,7 +34,7 @@ %% via: https://github.com/jspitz/babel-german %% \ProvidesLanguage{nswissgerman} - [2021/02/27 v2.13 German support for babel (post-1996 orthography)] + [2024/01/19 v2.14 German support for babel (post-1996 orthography)] \def\tmpa{ngermanb} \ifx\CurrentOption\tmpa \def\CurrentOption{ngerman} diff --git a/Master/texmf-dist/tex/generic/babel-german/swissgerman.ldf b/Master/texmf-dist/tex/generic/babel-german/swissgerman.ldf index d2112f67239..e289a3710e3 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: `swissgerman') %% This is a generated file. %% -%% Copyright 1989--2021 +%% Copyright 1989--2024 %% Johannes L. Braams %% Bernd Raichle %% Walter Schmidt @@ -34,7 +34,7 @@ %% via: https://github.com/jspitz/babel-german %% \ProvidesLanguage{swissgerman} - [2021/02/27 v2.13 German support for babel (pre-1996 orthography)] + [2024/01/19 v2.14 German support for babel (pre-1996 orthography)] \def\tmpa{germanb} \let\SaveCurrentOption\CurrentOption \ifx\CurrentOption\tmpa |