diff options
author | Karl Berry <karl@freefriends.org> | 2024-12-10 21:44:09 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-12-10 21:44:09 +0000 |
commit | ceafee80e4ab6839f451475a09d4a6feecee6d08 (patch) | |
tree | 4904b53c0869aa420d79001d113b2a95375b502f /Master/texmf-dist | |
parent | 902b0dd27d14268465d37436e297acfa7726c9f3 (diff) |
babel-german (10dec24)
git-svn-id: svn://tug.org/texlive/trunk@73094 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/generic/babel-german/germanb.pdf | bin | 410715 -> 410702 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/generic/babel-german/ngermanb.pdf | bin | 388947 -> 389579 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/generic/babel-german/germanb.dtx | 7 | ||||
-rw-r--r-- | Master/texmf-dist/source/generic/babel-german/ngermanb.dtx | 43 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-german/austrian.ldf | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-german/german.ldf | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-german/germanb.ldf | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-german/naustrian.ldf | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-german/ngerman.ldf | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-german/ngermanb.ldf | 29 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-german/nswissgerman.ldf | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel-german/swissgerman.ldf | 2 |
12 files changed, 70 insertions, 23 deletions
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 5ca9a0fcad6..5ef8af18829 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 5de8fa8cf21..03b05cdeede 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/germanb.dtx b/Master/texmf-dist/source/generic/babel-german/germanb.dtx index ef510a14fcc..fa2ac5811d7 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} - [2024/01/19 v2.14 German support for babel (pre-1996 orthography)] + [2024/12/10 v2.15 German support for babel (pre-1996 orthography)] %\iffalse % %<*filedriver> @@ -51,7 +51,6 @@ \usepackage{array} \usepackage{booktabs} \usepackage[tableposition=top,skip=5pt]{caption} -\usepackage{marginnote} \usepackage[svgnames]{xcolor} \usepackage[pdfusetitle]{hyperref} \hypersetup{% @@ -68,7 +67,9 @@ \newcommand*\note[1]{} \newcommand*\Lopt[1]{\texttt{#1}} \newcommand*\file[1]{\texttt{#1}} -\newcommand*\newfeature[1]{\marginnote{\footnotesize New feature\\in v.\,#1!}} +\newcommand*\newfeature[1]{% + \leavevmode\vadjust{\smash{\llap{\parbox[t]{\marginparwidth}{\raggedleft\footnotesize New feature\\in v.\,#1!}\kern\marginparsep\hspace{3em}}}}% +} \GlossaryMin = .33\textheight \begin{document} diff --git a/Master/texmf-dist/source/generic/babel-german/ngermanb.dtx b/Master/texmf-dist/source/generic/babel-german/ngermanb.dtx index 98b9d2063a0..e572ef155da 100644 --- a/Master/texmf-dist/source/generic/babel-german/ngermanb.dtx +++ b/Master/texmf-dist/source/generic/babel-german/ngermanb.dtx @@ -29,7 +29,7 @@ % by Bernd Raichle, Hubert Partl et.al. % % \fi -% \CheckSum{505} +% \CheckSum{544} % % \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} - [2024/01/19 v2.14 German support for babel (post-1996 orthography)] + [2024/12/10 v2.15 German support for babel (post-1996 orthography)] %\iffalse % %<*filedriver> @@ -55,7 +55,6 @@ \usepackage{array} \usepackage{booktabs} \usepackage[tableposition=top,skip=5pt]{caption} -\usepackage{marginnote} \usepackage[svgnames]{xcolor} \usepackage[pdfusetitle]{hyperref} \hypersetup{% @@ -72,7 +71,9 @@ \newcommand*\note[1]{} \newcommand*\Lopt[1]{\texttt{#1}} \newcommand*\file[1]{\texttt{#1}} -\newcommand*\newfeature[1]{\marginnote{\footnotesize New feature\\in v.\,#1!}} +\newcommand*\newfeature[1]{% + \leavevmode\vadjust{\smash{\llap{\parbox[t]{\marginparwidth}{\raggedleft\footnotesize New feature\\in v.\,#1!}\kern\marginparsep\hspace{3em}}}}% +} \GlossaryMin = .33\textheight \begin{document} @@ -280,6 +281,10 @@ % Note that this requires a font which actually contains the glyph (otherwise, you still get \graph{SS}) % and \LaTeX\ kernel 2023/06 at least. % +% Note\newfeature{2.15} that you can also set the casing via |\babelprovide[casing=eszett]{<lang>}|. +% This is adhered to. If you want to disable such a global setting, you can do so by means of the +% modifier \Lopt{nocapsz}. +% % \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. @@ -607,20 +612,38 @@ % \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.} +% \changes{Version 2.9f=Version 2.15}{2024/12/10}{Implement modifier \Lopt{nocapsz} +% to deactivate global capital eszett casing in Austrian and German varieties. +% Global settings are now adhered to if no modifier is used.} % 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\ifnocapsz\nocapszfalse \newif\ifbbl@capsz\bbl@capszfalse +\ifdefined\casing@ngerman + \let\save@casing@ngerman\casing@ngerman +\else + \xdef\save@casing@naustrian{de} +\fi +\ifdefined\casing@naustrian + \let\save@casing@naustrian\casing@naustrian +\else + \xdef\save@casing@naustrian{de} +\fi \ifx\bbl@mod@ngerman\@undefined\else \@expandtwoargs\in@{,capsz,}{,\bbl@mod@ngerman,} \ifin@ \capsztrue \fi + \@expandtwoargs\in@{,nocapsz,}{,\bbl@mod@ngerman,} + \ifin@ + \nocapsztrue + \fi \addto\extrasngerman{% \ifcapsz\bbl@capsztrue\bbl@csarg\xdef{casing@ngerman}{de-x-eszett}% - \else\bbl@csarg\xdef{casing@ngerman}{de}\bbl@capszfalse\fi} + \else\ifnocapsz\bbl@csarg\xdef{casing@ngerman}{de}\fi\bbl@capszfalse\fi} \fi \newif\if@at@capsz\@at@capszfalse \ifx\bbl@mod@naustrian\@undefined\else @@ -628,9 +651,13 @@ \ifin@ \@at@capsztrue \fi + \@expandtwoargs\in@{,nocapsz,}{,\bbl@mod@naustrian,} + \ifin@ + \nocapsztrue + \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} + \else\ifnocapsz\bbl@csarg\xdef{casing@naustrian}{de}\fi\bbl@capszfalse\fi} \fi % \end{macrocode} % \end{macro} @@ -656,12 +683,12 @@ \fi \ifx\CurrentOption\bbl@opt@ngerman \ifbbl@capsz - \addto\noextrasngerman{\bbl@capszfalse\bbl@csarg\xdef{casing@ngerman}{de}} + \addto\noextrasngerman{\bbl@capszfalse\bbl@csarg\xdef{casing@ngerman}{\save@casing@ngerman}} \fi \fi \ifx\CurrentOption\bbl@opt@naustrian \ifbbl@capsz - \addto\noextrasnaustrian{\bbl@capszfalse\bbl@csarg\xdef{casing@naustrian}{de}} + \addto\noextrasnaustrian{\bbl@capszfalse\bbl@csarg\xdef{casing@naustrian}{\save@casing@naustrian}} \fi \fi % \end{macrocode} diff --git a/Master/texmf-dist/tex/generic/babel-german/austrian.ldf b/Master/texmf-dist/tex/generic/babel-german/austrian.ldf index 709a403c57a..3e93098438e 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} - [2024/01/19 v2.14 German support for babel (pre-1996 orthography)] + [2024/12/10 v2.15 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 a53b3f7c844..0805b114305 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} - [2024/01/19 v2.14 German support for babel (pre-1996 orthography)] + [2024/12/10 v2.15 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 9329345b446..a2385a4c89c 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} - [2024/01/19 v2.14 German support for babel (pre-1996 orthography)] + [2024/12/10 v2.15 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/naustrian.ldf b/Master/texmf-dist/tex/generic/babel-german/naustrian.ldf index 40751d8137f..909d141338b 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} - [2024/01/19 v2.14 German support for babel (post-1996 orthography)] + [2024/12/10 v2.15 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 be0607e64d7..5e7a3eca597 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} - [2024/01/19 v2.14 German support for babel (post-1996 orthography)] + [2024/12/10 v2.15 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 43994b571d9..b5a8619286b 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} - [2024/01/19 v2.14 German support for babel (post-1996 orthography)] + [2024/12/10 v2.15 German support for babel (post-1996 orthography)] \def\tmpa{ngermanb} \ifx\CurrentOption\tmpa \def\CurrentOption{ngerman} @@ -136,15 +136,30 @@ \ifntoss\bbl@ntosstrue\else\bbl@ntossfalse\fi} \fi \newif\ifcapsz\capszfalse +\newif\ifnocapsz\nocapszfalse \newif\ifbbl@capsz\bbl@capszfalse +\ifdefined\casing@ngerman + \let\save@casing@ngerman\casing@ngerman +\else + \xdef\save@casing@naustrian{de} +\fi +\ifdefined\casing@naustrian + \let\save@casing@naustrian\casing@naustrian +\else + \xdef\save@casing@naustrian{de} +\fi \ifx\bbl@mod@ngerman\@undefined\else \@expandtwoargs\in@{,capsz,}{,\bbl@mod@ngerman,} \ifin@ \capsztrue \fi + \@expandtwoargs\in@{,nocapsz,}{,\bbl@mod@ngerman,} + \ifin@ + \nocapsztrue + \fi \addto\extrasngerman{% \ifcapsz\bbl@capsztrue\bbl@csarg\xdef{casing@ngerman}{de-x-eszett}% - \else\bbl@csarg\xdef{casing@ngerman}{de}\bbl@capszfalse\fi} + \else\ifnocapsz\bbl@csarg\xdef{casing@ngerman}{de}\fi\bbl@capszfalse\fi} \fi \newif\if@at@capsz\@at@capszfalse \ifx\bbl@mod@naustrian\@undefined\else @@ -152,9 +167,13 @@ \ifin@ \@at@capsztrue \fi + \@expandtwoargs\in@{,nocapsz,}{,\bbl@mod@naustrian,} + \ifin@ + \nocapsztrue + \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} + \else\ifnocapsz\bbl@csarg\xdef{casing@naustrian}{de}\fi\bbl@capszfalse\fi} \fi \expandafter\addto\csname noextras\CurrentOption\endcsname{% \bbl@deactivate{"}} @@ -163,12 +182,12 @@ \fi \ifx\CurrentOption\bbl@opt@ngerman \ifbbl@capsz - \addto\noextrasngerman{\bbl@capszfalse\bbl@csarg\xdef{casing@ngerman}{de}} + \addto\noextrasngerman{\bbl@capszfalse\bbl@csarg\xdef{casing@ngerman}{\save@casing@ngerman}} \fi \fi \ifx\CurrentOption\bbl@opt@naustrian \ifbbl@capsz - \addto\noextrasnaustrian{\bbl@capszfalse\bbl@csarg\xdef{casing@naustrian}{de}} + \addto\noextrasnaustrian{\bbl@capszfalse\bbl@csarg\xdef{casing@naustrian}{\save@casing@naustrian}} \fi \fi \expandafter\addto\csname extras\CurrentOption\endcsname{% diff --git a/Master/texmf-dist/tex/generic/babel-german/nswissgerman.ldf b/Master/texmf-dist/tex/generic/babel-german/nswissgerman.ldf index a8754bb1cfd..216c657174f 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} - [2024/01/19 v2.14 German support for babel (post-1996 orthography)] + [2024/12/10 v2.15 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 e289a3710e3..1143a49e7fb 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} - [2024/01/19 v2.14 German support for babel (pre-1996 orthography)] + [2024/12/10 v2.15 German support for babel (pre-1996 orthography)] \def\tmpa{germanb} \let\SaveCurrentOption\CurrentOption \ifx\CurrentOption\tmpa |