From 1b771c1e303b8274d871ee6bd4bdd5ba03bdd152 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 19 Mar 2024 03:02:55 +0000 Subject: CTAN sync 202403190302 --- macros/latex/contrib/babel-contrib/norsk/README.md | 9 +++++++-- macros/latex/contrib/babel-contrib/norsk/norsk.dtx | 20 +++++++++++--------- macros/latex/contrib/babel-contrib/norsk/norsk.pdf | Bin 154485 -> 154661 bytes 3 files changed, 18 insertions(+), 11 deletions(-) (limited to 'macros/latex/contrib/babel-contrib') diff --git a/macros/latex/contrib/babel-contrib/norsk/README.md b/macros/latex/contrib/babel-contrib/norsk/README.md index 230f986bc5..f5f0a37ba7 100644 --- a/macros/latex/contrib/babel-contrib/norsk/README.md +++ b/macros/latex/contrib/babel-contrib/norsk/README.md @@ -1,4 +1,4 @@ -Norwegian 2.0j +Norwegian 2.0k -------------- This is the babel style for Norwegian @@ -11,5 +11,10 @@ https://latex3.github.io/babel/contact.html .** Changes 2.0j ------------ -Allow norwegian as the language name, preferred to norsk. +Allow norwegian as the language name, preferred to norsk.รง +Changes 2.0k +------------ + +Bug fix: if language.dat does not set the languages an error +was raised. diff --git a/macros/latex/contrib/babel-contrib/norsk/norsk.dtx b/macros/latex/contrib/babel-contrib/norsk/norsk.dtx index ab541701b8..1e8e279aad 100644 --- a/macros/latex/contrib/babel-contrib/norsk/norsk.dtx +++ b/macros/latex/contrib/babel-contrib/norsk/norsk.dtx @@ -33,7 +33,7 @@ %\ProvidesLanguage{norsk} %\fi %\ProvidesFile{norsk.dtx} - [2024/01/26 v2.0j Norwegian support from the babel system] + [2024/03/18 v2.0k Norwegian support from the babel system] %\iffalse %%File `norsk.dtx' %% Babel package for LaTeX version 2e @@ -79,6 +79,8 @@ % \changes{norsk-1.2h}{1996/10/10}{Moved the definition of % \cs{atcatcode} right to the beginning.} % \changes{norsk-2.0j}{2024/01/23}{Dual load norwegian/norsk} +% \changes{norsk-2.0k}{2024/03/18}{Fix bug with missing language in +% language.dat} % % % \section{The Norwegian language} @@ -158,15 +160,15 @@ % \changes{norsk-1.2d}{1994/06/26}{Now use \cs{@nopatterns} to produce % the warning} % \begin{macrocode} -\expandafter\ifx\csname l@\CurrentOption\endcsname\relax - \def\bbl@tempa#1{% - \ifx#1\@undefined\else +\def\bbl@tempa#1{% + \ifx#1\@undefined\else + \expandafter\ifx\csname l@\CurrentOption\endcsname\relax \expandafter\adddialect\csname l@\CurrentOption\endcsname#1% - \fi}% Last wins: - \bbl@tempa\l@nynorsk - \bbl@tempa\l@norsk - \bbl@tempa\l@norwegian -\fi + \fi + \fi}% First wins: +\bbl@tempa\l@norwegian +\bbl@tempa\l@norsk +\bbl@tempa\l@nynorsk \expandafter\ifx\csname l@\CurrentOption\endcsname\relax \@nopatterns{\CurrentOption} \expandafter\adddialect\csname l@\CurrentOption\endcsname\z@ diff --git a/macros/latex/contrib/babel-contrib/norsk/norsk.pdf b/macros/latex/contrib/babel-contrib/norsk/norsk.pdf index 7416dfc5bd..860a0c8f34 100644 Binary files a/macros/latex/contrib/babel-contrib/norsk/norsk.pdf and b/macros/latex/contrib/babel-contrib/norsk/norsk.pdf differ -- cgit v1.2.3