diff options
-rw-r--r-- | Master/texmf-dist/doc/latex/babel/README.md | 15 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/babel/babel-code.pdf | bin | 626873 -> 626956 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/babel/babel.pdf | bin | 404347 -> 404462 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/babel/babel.dtx | 28 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/babel/babel.ins | 2 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/babel/bbcompat.dtx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/babel/locale.zip | bin | 942671 -> 942671 bytes | |||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/babel.def | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/babel.sty | 19 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/hyphen.cfg | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/luababel.def | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/nil.ldf | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/xebabel.def | 6 |
13 files changed, 66 insertions, 26 deletions
diff --git a/Master/texmf-dist/doc/latex/babel/README.md b/Master/texmf-dist/doc/latex/babel/README.md index d9e620c5a68..f57a55cf41e 100644 --- a/Master/texmf-dist/doc/latex/babel/README.md +++ b/Master/texmf-dist/doc/latex/babel/README.md @@ -1,6 +1,6 @@ -## Babel 3.91 +## Babel 3.92 -2023-07-09 +2023-07-15 This package manages culturally-determined typographical (and other) rules, and hyphenation patterns for a wide range of languages. Many @@ -10,9 +10,9 @@ is a set of ini files for about 250 languages. The latest stable version is available on <https://ctan.org/pkg/babel>. -Changes in version 3.91 are described in: +Changes in version 3.92 are described in: -https://latex3.github.io/babel/news/whats-new-in-babel-3.91.html +https://latex3.github.io/babel/news/whats-new-in-babel-3.92.html Apart from the manual, you can find information on some aspects of babel at: @@ -48,6 +48,13 @@ respective authors. ### Summary of latest changes ``` +3.92 2023-07-15 + * The fix for #240 in version 3.90, related to `\normalsfcodes`, + broke the `onchar` mechanism in some cases and some other + things. A different fix has been devised. + * Weird behavior when declaring the same font for two families + (#178). + 3.91 2023-07-09 * Transform for transliterated Hebrew, based on cjhebrew. * Fixes: diff --git a/Master/texmf-dist/doc/latex/babel/babel-code.pdf b/Master/texmf-dist/doc/latex/babel/babel-code.pdf Binary files differindex 3308a56ba7e..2c8615ff4e9 100644 --- a/Master/texmf-dist/doc/latex/babel/babel-code.pdf +++ b/Master/texmf-dist/doc/latex/babel/babel-code.pdf diff --git a/Master/texmf-dist/doc/latex/babel/babel.pdf b/Master/texmf-dist/doc/latex/babel/babel.pdf Binary files differindex d6a75241db7..39ea9b89e9b 100644 --- a/Master/texmf-dist/doc/latex/babel/babel.pdf +++ b/Master/texmf-dist/doc/latex/babel/babel.pdf diff --git a/Master/texmf-dist/source/latex/babel/babel.dtx b/Master/texmf-dist/source/latex/babel/babel.dtx index 6f91f1141cc..d7a77ac1de5 100644 --- a/Master/texmf-dist/source/latex/babel/babel.dtx +++ b/Master/texmf-dist/source/latex/babel/babel.dtx @@ -32,7 +32,7 @@ % % \iffalse %<*filedriver> -\ProvidesFile{babel.dtx}[2023/07/09 v3.91 The Babel package] +\ProvidesFile{babel.dtx}[2023/07/15 v3.92 The Babel package] \documentclass{ltxdoc} \GetFileInfo{babel.dtx} \usepackage{fontspec} @@ -5466,8 +5466,8 @@ wouldn’t exist. % \section{Tools} % % \begin{macrocode} -%<<version=3.91>> -%<<date=2023/07/09>> +%<<version=3.92>> +%<<date=2023/07/15>> % \end{macrocode} % % \textbf{Do not use the following macros in \texttt{ldf} files. They @@ -7678,9 +7678,18 @@ wouldn’t exist. \string\providecommand\string\babel@aux[2]{}}% \immediate\write\@mainaux{\string\@nameuse{bbl@beforestart}}% \fi -%<-package> \expandafter\selectlanguage\expandafter{\bbl@main@language}% -%<+package> +%<-core> + \ifx\bbl@normalsf\@empty + \ifnum\sfcode`\.=\@m + \let\normalsfcodes\frenchspacing + \else + \let\normalsfcodes\nonfrenchspacing + \fi + \else + \let\normalsfcodes\bbl@normalsf + \fi +%<+core> \ifbbl@single % must go after the line above. \renewcommand\selectlanguage[1]{}% \renewcommand\foreignlanguage[2]{#2}% @@ -7688,7 +7697,8 @@ wouldn’t exist. \fi} %<-core> \AddToHook{begindocument/before}{% - \expandafter\selectlanguage\expandafter{\bbl@main@language}} + \let\bbl@normalsf\normalsfcodes + \let\normalsfcodes\relax} % Hack, to delay the setting %<+core> \ifcase\bbl@engine\or \AtBeginDocument{\pagedir\bodydir} % TODO - a better place @@ -13432,6 +13442,8 @@ wouldn’t exist. % still not sure -- must investigate: \def\bbl@fontspec@set#1#2#3#4{% eg \bbl@rmdflt@lang fnt-opt fnt-nme \xxfamily \let\bbl@tempe\bbl@mapselect + \edef\bbl@tempb{\bbl@stripslash#4/}% Catcodes hack (better pass it). + \bbl@exp{\\\bbl@replace\\\bbl@tempb{\bbl@stripslash\family/}{}}% \let\bbl@mapselect\relax \let\bbl@temp@fam#4% eg, '\rmfamily', to be restored below \let#4\@empty % Make sure \renewfontfamily is valid @@ -13446,7 +13458,9 @@ wouldn’t exist. \let\\\bbl@tempfs@nxx\<__fontspec_warning:nxx>% \let\<__fontspec_warning:nxx>\\\bbl@fs@warn@nxx \\\renewfontfamily\\#4% - [\bbl@cl{lsys},#2]}{#3}% ie \bbl@exp{..}{#3} + [\bbl@cl{lsys},% + \ifcase\bbl@engine\or RawFeature={family=\bbl@tempb},\fi + #2]}{#3}% ie \bbl@exp{..}{#3} \bbl@exp{% \let\<__fontspec_warning:nx>\\\bbl@tempfs@nx \let\<__fontspec_warning:nxx>\\\bbl@tempfs@nxx}% diff --git a/Master/texmf-dist/source/latex/babel/babel.ins b/Master/texmf-dist/source/latex/babel/babel.ins index 0ecbabbcf5e..0bd796ff02c 100644 --- a/Master/texmf-dist/source/latex/babel/babel.ins +++ b/Master/texmf-dist/source/latex/babel/babel.ins @@ -26,7 +26,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. %% -\def\filedate{2023/07/09} +\def\filedate{2023/07/15} \def\batchfile{babel.ins} \input docstrip.tex diff --git a/Master/texmf-dist/source/latex/babel/bbcompat.dtx b/Master/texmf-dist/source/latex/babel/bbcompat.dtx index 6aed1294ac3..9f926505d58 100644 --- a/Master/texmf-dist/source/latex/babel/bbcompat.dtx +++ b/Master/texmf-dist/source/latex/babel/bbcompat.dtx @@ -30,7 +30,7 @@ % % \iffalse %<*dtx> -\ProvidesFile{bbcompat.dtx}[2023/07/09 v3.91] +\ProvidesFile{bbcompat.dtx}[2023/07/15 v3.92] %</dtx> % %% File 'bbcompat.dtx' diff --git a/Master/texmf-dist/source/latex/babel/locale.zip b/Master/texmf-dist/source/latex/babel/locale.zip Binary files differindex db424156901..95e1eb7ef93 100644 --- a/Master/texmf-dist/source/latex/babel/locale.zip +++ b/Master/texmf-dist/source/latex/babel/locale.zip diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def index eb056080a46..1971af9a721 100644 --- a/Master/texmf-dist/tex/generic/babel/babel.def +++ b/Master/texmf-dist/tex/generic/babel/babel.def @@ -40,7 +40,7 @@ \wlog{File: #1 #4 #3 <#2>}% \let\ProvidesFile\@undefined} \fi -\ProvidesFile{babel.def}[2023/07/09 v3.91 Babel common definitions] +\ProvidesFile{babel.def}[2023/07/15 v3.92 Babel common definitions] \ifx\AtBeginDocument\@undefined % TODO. change test. \def\@empty{} \def\loadlocalcfg#1{% @@ -595,8 +595,8 @@ \toks@\expandafter{\bbl@tempc#3}% \expandafter\edef\csname extras\languagename\endcsname{\the\toks@}% \fi} -\def\bbl@version{3.91} -\def\bbl@date{2023/07/09} +\def\bbl@version{3.92} +\def\bbl@date{2023/07/15} \ifx\language\@undefined \csname newcount\endcsname\language \fi diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty index f0f04f93baa..96d41f27e1f 100644 --- a/Master/texmf-dist/tex/generic/babel/babel.sty +++ b/Master/texmf-dist/tex/generic/babel/babel.sty @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2005/12/01] -\ProvidesPackage{babel}[2023/07/09 v3.91 The Babel package] +\ProvidesPackage{babel}[2023/07/15 v3.92 The Babel package] \@ifpackagewith{babel}{debug} {\providecommand\bbl@trace[1]{\message{^^J[ #1 ]}}% \let\bbl@debug\@firstofone @@ -470,8 +470,8 @@ \expandafter\@secondoftwo \fi} \fi -\def\bbl@version{3.91} -\def\bbl@date{2023/07/09} +\def\bbl@version{3.92} +\def\bbl@date{2023/07/15} \ifx\language\@undefined \csname newcount\endcsname\language \fi @@ -1190,13 +1190,24 @@ \string\providecommand\string\babel@aux[2]{}}% \immediate\write\@mainaux{\string\@nameuse{bbl@beforestart}}% \fi + \expandafter\selectlanguage\expandafter{\bbl@main@language}% + \ifx\bbl@normalsf\@empty + \ifnum\sfcode`\.=\@m + \let\normalsfcodes\frenchspacing + \else + \let\normalsfcodes\nonfrenchspacing + \fi + \else + \let\normalsfcodes\bbl@normalsf + \fi \ifbbl@single % must go after the line above. \renewcommand\selectlanguage[1]{}% \renewcommand\foreignlanguage[2]{#2}% \global\let\babel@aux\@gobbletwo % Also as flag \fi} \AddToHook{begindocument/before}{% - \expandafter\selectlanguage\expandafter{\bbl@main@language}} + \let\bbl@normalsf\normalsfcodes + \let\normalsfcodes\relax} % Hack, to delay the setting \ifcase\bbl@engine\or \AtBeginDocument{\pagedir\bodydir} % TODO - a better place \fi diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg index f8273087aee..edeb6fdfa7d 100644 --- a/Master/texmf-dist/tex/generic/babel/hyphen.cfg +++ b/Master/texmf-dist/tex/generic/babel/hyphen.cfg @@ -38,10 +38,10 @@ \wlog{File: #1 #4 #3 <#2>}% \let\ProvidesFile\@undefined} \fi -\ProvidesFile{hyphen.cfg}[2023/07/09 v3.91 Babel hyphens] +\ProvidesFile{hyphen.cfg}[2023/07/15 v3.92 Babel hyphens] \xdef\bbl@format{\jobname} -\def\bbl@version{3.91} -\def\bbl@date{2023/07/09} +\def\bbl@version{3.92} +\def\bbl@date{2023/07/15} \ifx\AtBeginDocument\@undefined \def\@empty{} \fi diff --git a/Master/texmf-dist/tex/generic/babel/luababel.def b/Master/texmf-dist/tex/generic/babel/luababel.def index ed8b34db77a..69b25b49855 100644 --- a/Master/texmf-dist/tex/generic/babel/luababel.def +++ b/Master/texmf-dist/tex/generic/babel/luababel.def @@ -975,6 +975,8 @@ end {}}} \def\bbl@fontspec@set#1#2#3#4{% eg \bbl@rmdflt@lang fnt-opt fnt-nme \xxfamily \let\bbl@tempe\bbl@mapselect + \edef\bbl@tempb{\bbl@stripslash#4/}% Catcodes hack (better pass it). + \bbl@exp{\\\bbl@replace\\\bbl@tempb{\bbl@stripslash\family/}{}}% \let\bbl@mapselect\relax \let\bbl@temp@fam#4% eg, '\rmfamily', to be restored below \let#4\@empty % Make sure \renewfontfamily is valid @@ -989,7 +991,9 @@ end \let\\\bbl@tempfs@nxx\<__fontspec_warning:nxx>% \let\<__fontspec_warning:nxx>\\\bbl@fs@warn@nxx \\\renewfontfamily\\#4% - [\bbl@cl{lsys},#2]}{#3}% ie \bbl@exp{..}{#3} + [\bbl@cl{lsys},% + \ifcase\bbl@engine\or RawFeature={family=\bbl@tempb},\fi + #2]}{#3}% ie \bbl@exp{..}{#3} \bbl@exp{% \let\<__fontspec_warning:nx>\\\bbl@tempfs@nx \let\<__fontspec_warning:nxx>\\\bbl@tempfs@nxx}% diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf index 63867cc950c..e0432823fdf 100644 --- a/Master/texmf-dist/tex/generic/babel/nil.ldf +++ b/Master/texmf-dist/tex/generic/babel/nil.ldf @@ -33,7 +33,7 @@ %% extension |.ins|) which are part of the distribution. %% -\ProvidesLanguage{nil}[2023/07/09 v3.91 Nil language] +\ProvidesLanguage{nil}[2023/07/15 v3.92 Nil language] \LdfInit{nil}{datenil} \ifx\l@nil\@undefined \newlanguage\l@nil diff --git a/Master/texmf-dist/tex/generic/babel/xebabel.def b/Master/texmf-dist/tex/generic/babel/xebabel.def index 0440b07c18d..3fb3b7e4898 100644 --- a/Master/texmf-dist/tex/generic/babel/xebabel.def +++ b/Master/texmf-dist/tex/generic/babel/xebabel.def @@ -232,6 +232,8 @@ {}}} \def\bbl@fontspec@set#1#2#3#4{% eg \bbl@rmdflt@lang fnt-opt fnt-nme \xxfamily \let\bbl@tempe\bbl@mapselect + \edef\bbl@tempb{\bbl@stripslash#4/}% Catcodes hack (better pass it). + \bbl@exp{\\\bbl@replace\\\bbl@tempb{\bbl@stripslash\family/}{}}% \let\bbl@mapselect\relax \let\bbl@temp@fam#4% eg, '\rmfamily', to be restored below \let#4\@empty % Make sure \renewfontfamily is valid @@ -246,7 +248,9 @@ \let\\\bbl@tempfs@nxx\<__fontspec_warning:nxx>% \let\<__fontspec_warning:nxx>\\\bbl@fs@warn@nxx \\\renewfontfamily\\#4% - [\bbl@cl{lsys},#2]}{#3}% ie \bbl@exp{..}{#3} + [\bbl@cl{lsys},% + \ifcase\bbl@engine\or RawFeature={family=\bbl@tempb},\fi + #2]}{#3}% ie \bbl@exp{..}{#3} \bbl@exp{% \let\<__fontspec_warning:nx>\\\bbl@tempfs@nx \let\<__fontspec_warning:nxx>\\\bbl@tempfs@nxx}% |