[latex3-commits] [git/LaTeX3-latex3-babel] master: Better autoloading (catcodes). Fix #59 (part). \bbl at texormathorpdf. (6bcc04c)
Javier
email at dante.de
Tue Oct 13 18:58:35 CEST 2020
Repository : https://github.com/latex3/babel
On branch : master
Link : https://github.com/latex3/babel/commit/6bcc04ce37a2ecbc35717ecc26b7472b8c60b28d
>---------------------------------------------------------------
commit 6bcc04ce37a2ecbc35717ecc26b7472b8c60b28d
Author: Javier <email at localhost>
Date: Tue Oct 13 18:58:35 2020 +0200
Better autoloading (catcodes). Fix #59 (part). \bbl at texormathorpdf.
And also experiments with provide@=*.
>---------------------------------------------------------------
6bcc04ce37a2ecbc35717ecc26b7472b8c60b28d
README.md | 7 +++++--
babel.dtx | 53 +++++++++++++++++++++++++++++++----------------------
babel.ins | 2 +-
babel.pdf | Bin 812047 -> 812054 bytes
bbcompat.dtx | 2 +-
5 files changed, 38 insertions(+), 26 deletions(-)
diff --git a/README.md b/README.md
index 5bb3b07..87fb1f2 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## Babel 3.50.2158
+## Babel 3.50.2159
This package manages culturally-determined typographical (and other)
rules, and hyphenation patterns for a wide range of languages. Many
@@ -45,9 +45,12 @@ respective authors.
```
3.51 2020-10-??
- Common interface to redefine captions (with \babelprovide).
- - frenchspacing filled in many languages.
+ - frenchspacing filled in many ini files.
- Fixes:
- Error when loading a language on the fly in tabular (#97).
+ - 'hyphenrules' raised an error with 'base' option (#59).
+ - Better handling of autoloaded languages (eg, catcodes).
+ - An error was raised with CJK and a null font (#99).
3.50 2020-10-06
- Fixes:
diff --git a/babel.dtx b/babel.dtx
index 1d2be8f..7cf3f6b 100644
--- a/babel.dtx
+++ b/babel.dtx
@@ -31,7 +31,7 @@
%
% \iffalse
%<*filedriver>
-\ProvidesFile{babel.dtx}[2020/10/12 v3.50.2158 The Babel package]
+\ProvidesFile{babel.dtx}[2020/10/13 v3.50.2159 The Babel package]
\documentclass{ltxdoc}
\GetFileInfo{babel.dtx}
\usepackage{fontspec}
@@ -4778,8 +4778,8 @@ help from Bernd Raichle, for which I am grateful.
% \section{Tools}
%
% \begin{macrocode}
-%<<version=3.50.2158>>
-%<<date=2020/10/12>>
+%<<version=3.50.2159>>
+%<<date=2020/10/13>>
% \end{macrocode}
%
% \textbf{Do not use the following macros in \texttt{ldf} files. They
@@ -5377,9 +5377,12 @@ help from Bernd Raichle, for which I am grateful.
% Don't use. Experimental. TODO.
\newif\ifbbl at single
\DeclareOption{selectors=off}{\bbl at singletrue}
-\DeclareOption{provide@=*}{} % autoload with cat @=letter
+\let\bbl at autoload@options\@empty
+% autoload with cat @=letter
+\DeclareOption{provide@=*}{\def\bbl at autoload@options{import}}
\makeatother
-\DeclareOption{provide@=*}{} % autoload with cat @=other
+\DeclareOption{provide@=*}% autoload with cat @=other
+ {\expandafter\def\csname bbl at autoload@options\endcsname{import}}
\makeatletter
<@More package options@>
% \end{macrocode}
@@ -7057,7 +7060,6 @@ help from Bernd Raichle, for which I am grateful.
\IfFileExists{babel-\bbl at tempa.ini}{\let\bbl at bcp\bbl at tempa}{}%
\fi
\fi\fi}
-\let\bbl at autoload@options\@empty
\let\bbl at initoload\relax
\def\bbl at provide@locale{%
\ifx\babelprovide\@undefined
@@ -7682,7 +7684,9 @@ help from Bernd Raichle, for which I am grateful.
\bbl at fixname\bbl at tempf
\bbl at iflanguage\bbl at tempf{%
\expandafter\bbl at patterns\expandafter{\bbl at tempf}%
- \languageshorthands{none}%
+ \ifx\languageshorthands\@undefined\else
+ \languageshorthands{none}%
+ \fi
\expandafter\ifx\csname\bbl at tempf hyphenmins\endcsname\relax
\set at hyphenmins\tw@\thr@@\relax
\else
@@ -8752,11 +8756,11 @@ help from Bernd Raichle, for which I am grateful.
% \end{enumerate}
%
% \begin{macrocode}
-\def\bbl at pdfortexormath#1#2#3{%
+\def\bbl at texormathorpdf#1#2#3{%
\ifx\texorpdfstring\@undefined
- \textormath{#2}{#3}%
+ \textormath{#1}{#2}%
\else
- \texorpdfstring{\textormath{#2}{#3}}{}%
+ \texorpdfstring{\textormath{#1}{#2}}{#3}%
\fi}
\def\declare at shorthand#1#2{\@decl at short{#1}#2\@nil}
\def\@decl at short#1#2#3\@nil#4{%
@@ -10751,15 +10755,17 @@ help from Bernd Raichle, for which I am grateful.
\fi
% == require.babel in ini ==
% To load or reaload the babel-*.tex, if require.babel in ini
- \bbl at ifunset{bbl at rqtex@\languagename}{}%
- {\expandafter\ifx\csname bbl at rqtex@\languagename\endcsname\@empty\else
- \let\BabelBeforeIni\@gobbletwo
- \chardef\atcatcode=\catcode`\@
- \catcode`\@=11\relax
- \bbl at input@texini{\bbl at cs{rqtex@\languagename}}%
- \catcode`\@=\atcatcode
- \let\atcatcode\relax
- \fi}%
+ \ifx\bbl at beforestart\relax\else % But only in preamble
+ \bbl at ifunset{bbl at rqtex@\languagename}{}%
+ {\expandafter\ifx\csname bbl at rqtex@\languagename\endcsname\@empty\else
+ \let\BabelBeforeIni\@gobbletwo
+ \chardef\atcatcode=\catcode`\@
+ \catcode`\@=11\relax
+ \bbl at input@texini{\bbl at cs{rqtex@\languagename}}%
+ \catcode`\@=\atcatcode
+ \let\atcatcode\relax
+ \fi}%
+ \fi
% == caption redefinition ==
\ifx\bbl at KVP@captions\@nil
\def\bbl at elt##1##2{%
@@ -10958,9 +10964,13 @@ help from Bernd Raichle, for which I am grateful.
\def\bbl at input@texini#1{%
\bbl at bsphack
\bbl at exp{%
- \catcode`\\\%=14
+ \catcode`\\\%=14 \catcode`\\\\=0
+ \catcode`\\\{=1 \catcode`\\\}=2
\lowercase{\\\InputIfFileExists{babel-#1.tex}{}{}}%
- \catcode`\\\%=\the\catcode`\%\relax}%
+ \catcode`\\\%=\the\catcode`\%\relax
+ \catcode`\\\\=\the\catcode`\\\relax
+ \catcode`\\\{=\the\catcode`\{\relax
+ \catcode`\\\}=\the\catcode`\}\relax}%
\bbl at esphack}
\def\bbl at inipreread#1=#2\@@{%
\bbl at trim@def\bbl at tempa{#1}% Redundant below !!
@@ -21829,7 +21839,6 @@ Babel.cjk_breaks = {
\input babel.def
%</plain>
% \end{macrocode}
-
%
% \Finale
%
diff --git a/babel.ins b/babel.ins
index 1e53416..3a3adaa 100644
--- a/babel.ins
+++ b/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{2020/10/12}
+\def\filedate{2020/10/13}
\def\batchfile{babel.ins}
\input docstrip.tex
diff --git a/babel.pdf b/babel.pdf
index 7e0bfa3..f9a8ddb 100644
Binary files a/babel.pdf and b/babel.pdf differ
diff --git a/bbcompat.dtx b/bbcompat.dtx
index 3602c6c..01125a5 100644
--- a/bbcompat.dtx
+++ b/bbcompat.dtx
@@ -30,7 +30,7 @@
%
% \iffalse
%<*dtx>
-\ProvidesFile{bbcompat.dtx}[2020/10/12 v3.50.2158]
+\ProvidesFile{bbcompat.dtx}[2020/10/13 v3.50.2159]
%</dtx>
%
%% File 'bbcompat.dtx'
More information about the latex3-commits
mailing list.