diff options
author | Karl Berry <karl@freefriends.org> | 2023-07-16 19:53:10 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-07-16 19:53:10 +0000 |
commit | 55db676dc7605a1c83af390674e9c3b5cff31ed2 (patch) | |
tree | 54cd9ec60731b3e7acbbe198c887c20f834cee3c /Master/texmf-dist/source/latex/babel/babel.dtx | |
parent | 53acff007994228b5e46d123ecbe3a3c54741a2f (diff) |
babel (15jul23)
git-svn-id: svn://tug.org/texlive/trunk@67653 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/babel/babel.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/babel/babel.dtx | 28 |
1 files changed, 21 insertions, 7 deletions
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}% |