[latex3-commits] [git/LaTeX3-latex3-babel] main: Temporary patch for https://github.com/latex3/latex2e/pull/803 (03216dd)
Javier
email at dante.de
Sat Apr 23 08:59:25 CEST 2022
Repository : https://github.com/latex3/babel
On branch : main
Link : https://github.com/latex3/babel/commit/03216ddd4eec83d4f38ba16a0c9f31a45195194a
>---------------------------------------------------------------
commit 03216ddd4eec83d4f38ba16a0c9f31a45195194a
Author: Javier <email at localhost>
Date: Sat Apr 23 08:59:25 2022 +0200
Temporary patch for https://github.com/latex3/latex2e/pull/803
* First step before making safe=none the default setting.
>---------------------------------------------------------------
03216ddd4eec83d4f38ba16a0c9f31a45195194a
README.md | 2 +-
babel.dtx | 78 ++++++++++++++++++++++++++++++++++++-----------------------
babel.ins | 2 +-
babel.pdf | Bin 857136 -> 857898 bytes
bbcompat.dtx | 2 +-
5 files changed, 51 insertions(+), 33 deletions(-)
diff --git a/README.md b/README.md
index 79e4869..f05a5b0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## Babel 3.73.2714
+## Babel 3.73.2716
*(Development)*
diff --git a/babel.dtx b/babel.dtx
index d64e267..b4b85c8 100644
--- a/babel.dtx
+++ b/babel.dtx
@@ -32,7 +32,7 @@
%
% \iffalse
%<*filedriver>
-\ProvidesFile{babel.dtx}[2022/04/21 v3.73.2714 The Babel package]
+\ProvidesFile{babel.dtx}[2022/04/23 v3.73.2716 The Babel package]
\documentclass{ltxdoc}
\GetFileInfo{babel.dtx}
\usepackage{fontspec}
@@ -5116,8 +5116,8 @@ help from Bernd Raichle, for which I am grateful.
% \section{Tools}
%
% \begin{macrocode}
-%<<version=3.73.2714>>
-%<<date=2022/04/21>>
+%<<version=3.73.2716>>
+%<<date=2022/04/23>>
% \end{macrocode}
%
% \textbf{Do not use the following macros in \texttt{ldf} files. They
@@ -11168,6 +11168,8 @@ help from Bernd Raichle, for which I am grateful.
\DeclareOption{safe=none}{\let\bbl at opt@safe\@empty}
\DeclareOption{safe=bib}{\def\bbl at opt@safe{B}}
\DeclareOption{safe=ref}{\def\bbl at opt@safe{R}}
+\DeclareOption{safe=refbib}{\def\bbl at opt@safe{BR}}
+\DeclareOption{safe=bibref}{\def\bbl at opt@safe{BR}}
%<</More package options>>
% \end{macrocode}
%
@@ -11180,7 +11182,7 @@ help from Bernd Raichle, for which I am grateful.
%
% \begin{macrocode}
\bbl at trace{Cross referencing macros}
-\ifx\bbl at opt@safe\@empty\else
+\ifx\bbl at opt@safe\@empty\else % ie, if 'ref' and/or 'bib'
\def\@newl at bel#1#2#3{%
{\@safe at activestrue
\bbl at ifunset{#1@#2}%
@@ -11247,10 +11249,24 @@ help from Bernd Raichle, for which I am grateful.
% \begin{macrocode}
\bbl at xin@{R}\bbl at opt@safe
\ifin@
- \bbl at redefinerobust\ref#1{%
- \@safe at activestrue\org at ref{#1}\@safe at activesfalse}
- \bbl at redefinerobust\pageref#1{%
- \@safe at activestrue\org at pageref{#1}\@safe at activesfalse}
+ \edef\bbl at tempc{\expandafter\string\csname ref code\endcsname}%
+ \bbl at xin@{\expandafter\strip at prefix\meaning\bbl at tempc}%
+ {\expandafter\strip at prefix\meaning\ref}%
+ \ifin@
+ \bbl at redefine\@kernel at ref#1{%
+ \@safe at activestrue\org@@kernel at ref{#1}\@safe at activesfalse}
+ \bbl at redefine\@kernel at pageref#1{%
+ \@safe at activestrue\org@@kernel at pageref{#1}\@safe at activesfalse}
+ \bbl at redefine\@kernel at sref#1{%
+ \@safe at activestrue\org@@kernel at sref{#1}\@safe at activesfalse}
+ \bbl at redefine\@kernel at spageref#1{%
+ \@safe at activestrue\org@@kernel at spageref{#1}\@safe at activesfalse}
+ \else
+ \bbl at redefinerobust\ref#1{%
+ \@safe at activestrue\org at ref{#1}\@safe at activesfalse}
+ \bbl at redefinerobust\pageref#1{%
+ \@safe at activestrue\org at pageref{#1}\@safe at activesfalse}
+ \fi
\else
\let\org at ref\ref
\let\org at pageref\pageref
@@ -11514,28 +11530,30 @@ help from Bernd Raichle, for which I am grateful.
%
% \begin{macrocode}
\bbl at trace{Preventing clashes with other packages}
-\bbl at xin@{R}\bbl at opt@safe
-\ifin@
- \AtBeginDocument{%
- \@ifpackageloaded{ifthen}{%
- \bbl at redefine@long\ifthenelse#1#2#3{%
- \let\bbl at temp@pref\pageref
- \let\pageref\org at pageref
- \let\bbl at temp@ref\ref
- \let\ref\org at ref
- \@safe at activestrue
- \org at ifthenelse{#1}%
- {\let\pageref\bbl at temp@pref
- \let\ref\bbl at temp@ref
- \@safe at activesfalse
- #2}%
- {\let\pageref\bbl at temp@pref
- \let\ref\bbl at temp@ref
- \@safe at activesfalse
- #3}%
- }%
- }{}%
- }
+\ifx\org at ref\@undefined\else
+ \bbl at xin@{R}\bbl at opt@safe
+ \ifin@
+ \AtBeginDocument{%
+ \@ifpackageloaded{ifthen}{%
+ \bbl at redefine@long\ifthenelse#1#2#3{%
+ \let\bbl at temp@pref\pageref
+ \let\pageref\org at pageref
+ \let\bbl at temp@ref\ref
+ \let\ref\org at ref
+ \@safe at activestrue
+ \org at ifthenelse{#1}%
+ {\let\pageref\bbl at temp@pref
+ \let\ref\bbl at temp@ref
+ \@safe at activesfalse
+ #2}%
+ {\let\pageref\bbl at temp@pref
+ \let\ref\bbl at temp@ref
+ \@safe at activesfalse
+ #3}%
+ }%
+ }{}%
+ }
+\fi
% \end{macrocode}
%
% \end{macro}
diff --git a/babel.ins b/babel.ins
index 0fd6087..b58492c 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{2022/04/21}
+\def\filedate{2022/04/23}
\def\batchfile{babel.ins}
\input docstrip.tex
diff --git a/babel.pdf b/babel.pdf
index 8320c4e..fc89331 100644
Binary files a/babel.pdf and b/babel.pdf differ
diff --git a/bbcompat.dtx b/bbcompat.dtx
index 067fb07..655d2c8 100644
--- a/bbcompat.dtx
+++ b/bbcompat.dtx
@@ -30,7 +30,7 @@
%
% \iffalse
%<*dtx>
-\ProvidesFile{bbcompat.dtx}[2022/04/21 v3.73.2714]
+\ProvidesFile{bbcompat.dtx}[2022/04/23 v3.73.2716]
%</dtx>
%
%% File 'bbcompat.dtx'
More information about the latex3-commits
mailing list.