biblatex (12jul22)

git-svn-id: svn://tug.org/texlive/trunk@63878 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 149 insertions, 67 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex/CHANGES.md b/Master/texmf-dist/doc/latex/biblatex/CHANGES.md
index d6fc6c23b96..c4db07a41c7 100644
--- a/Master/texmf-dist/doc/latex/biblatex/CHANGES.md
+++ b/Master/texmf-dist/doc/latex/biblatex/CHANGES.md
@@ -1,6 +1,10 @@
+# RELEASE NOTES FOR VERSION 3.18b
+- Reenable `\MakeUppercase`/`\MakeLowercase` "patches" for `\bibstring`
+  based on `\CaseSwitch`.
+
 # RELEASE NOTES FOR VERSION 3.18a
 - Disable `\MakeUppercase`/`\MakeLowercase` patches as emergency fix
-  for LaTeX 2022-06-01-PL compatibility.
+  for LaTeX 2022-06-01-PL4 compatibility.
 
 # RELEASE NOTES FOR VERSION 3.18
 - New sorting name key generation macro `\visibility` which allows
diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
index e9264025b99..a1f4b3d3c11 100644
--- a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
index 7cf466cc6e6..67d334accd6 100644
--- a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
@@ -68,7 +68,7 @@
   url={\biblatexhome},
   author={Philip Kime, Moritz Wemheuer, Philipp Lehman},
   email={},
-  revision={3.18a},
+  revision={3.18b},
   date={\today}}
 
 \hypersetup{%
@@ -8545,7 +8545,7 @@ For any entry with an \bibfield{author} field, try to set
 }
 \end{ltxexample}
 %
-Here, we use multiple match/replace for the same field to regularise some inconstant name variants. Bear in mind that \cmd{step} processing within a \opt{map} element is sequential and so the changes from a previous \cmd{step}s are already committed. Note that we don't need the \cmd{regexp} macro to protect the regular expressions in this example as they contain no characters which need special escaping. Please note that due to the difficulty of protecting regular expressions in \LaTeX, there should be no literal spaces in the argument to \cmd{regexp}. Please use escape code equivalents if spaces are needed. For example, this example, if using \cmd{regexp}, should be:
+Here, we use multiple match/replace for the same field to regularise some inconstant name variants. Bear in mind that \cmd{step} processing within a \opt{map} element is sequential and so the changes from a previous \cmd{step}s are already committed. Note that we don't need the \cmd{regexp} macro to protect the regular expressions in this example as they contain no characters which need special escaping. Please note that due to the difficulty of protecting regular expressions in \latex, there should be no literal spaces in the argument to \cmd{regexp}. Please use escape code equivalents if spaces are needed. For example, this example, if using \cmd{regexp}, should be:
 %
 \begin{ltxexample}
 \DeclareSourcemap{
@@ -14858,9 +14858,13 @@ use$<$name$>$                     &\+&\+&\_&\+&\+&\_&\_\\
 This revision history is a list of changes relevant to users of this package. Changes of a more technical nature which do not affect the user interface or the behavior of the package are not included in the list. More technical details are to be found in the \file{CHANGES.md} file. The numbers on the right indicate the relevant section of this manual.
 
 \begin{changelog}
+\begin{release}{3.18b}{2022-07-12}
+\item Reenable \cmd{MakeUppercase}/\cmd{MakeLowercase} <patches>
+      based on \cmd{CaseSwitch}
+\end{release}
 \begin{release}{3.18a}{2022-07-02}
 \item Disable \cmd{MakeUppercase}/\cmd{MakeLowercase} patches as emergency
-      fix for LaTeX 2022-06-01-PL compatibility.
+      fix for \latex 2022-06-01-PL4 compatibility.
 \end{release}
 \begin{release}{3.18}{2022-06-22}
 \item Added sorting option \cmd{intciteorder}\see{aut:ctm:srt}
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
index 9fce90b22f1..8b33c5d0217 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
@@ -12,8 +12,8 @@
 % particular purpose.
 
 % Set up the version strings here
-\def\abx@date{2022/07/02}
-\def\abx@version{3.18a}
+\def\abx@date{2022/07/12}
+\def\abx@version{3.18b}
 \def\abx@bbxid{\abx@date\space v\abx@version\space biblatex bibliography style (PK/MW)}
 \def\abx@cbxid{\abx@date\space v\abx@version\space biblatex citation style (PK/MW)}
 \def\abx@lbxid{\abx@date\space v\abx@version\space biblatex localization (PK/MW)}
@@ -5052,73 +5052,147 @@
   \ifbibstring \ifbibxstring \iffieldbibstring
   \iffieldplusstringbibstring}
 
-\let\blx@hook@uc\relax
-\let\blx@hook@lc\relax
-
-\iffalse
-% disable this as emergency "fix"
-% for LaTeX 2022-06-01-PL4
-\AtEndPreamble{%
-  \toggletrue{blx@tempa}%
-  \toggletrue{blx@tempb}%
-  \expandafter\patchcmd\csname MakeUppercase \endcsname
-    {\protected@edef}
-    {\blx@hook@uc\protected@edef}
-    {\togglefalse{blx@tempa}}
-    {}%
-  \expandafter\patchcmd\csname MakeLowercase \endcsname
-    {\protected@edef}
-    {\blx@hook@lc\protected@edef}
-    {\togglefalse{blx@tempb}}
-    {}%
-  \@ifpackageloaded{textcase}
-    {\expandafter\patchcmd\csname MakeUppercase \endcsname
-       {\def\i}
-       {\blx@hook@uc\def\i}
+% \DeclareCaseChangeEquivalent is available in
+% LaTeX 2022-06-01-PL5
+% the older code works-ish for LaTeX before 2022-06-01
+% it errors with 2022-06-01-PL4
+% but we'll not guard against this specific PL
+\ifundef\DeclareCaseChangeEquivalent
+  {\let\blx@hook@uc\relax
+   \let\blx@hook@lc\relax
+   %
+   \AtEndPreamble{%
+     \toggletrue{blx@tempa}%
+     \toggletrue{blx@tempb}%
+     \expandafter\patchcmd\csname MakeUppercase \endcsname
+       {\protected@edef}
+       {\blx@hook@uc\protected@edef}
        {\togglefalse{blx@tempa}}
        {}%
      \expandafter\patchcmd\csname MakeLowercase \endcsname
-       {\@uclcnotmath{}}
-       {\@uclcnotmath{\blx@hook@lc}}
+       {\protected@edef}
+       {\blx@hook@lc\protected@edef}
        {\togglefalse{blx@tempb}}
        {}%
-     \expandafter\patchcmd\csname MakeTextUppercase \endcsname
-       {\def\i}
-       {\blx@hook@uc\def\i}
-       {}
+     \@ifpackageloaded{textcase}
+       {\expandafter\patchcmd\csname MakeUppercase \endcsname
+          {\def\i}
+          {\blx@hook@uc\def\i}
+          {\togglefalse{blx@tempa}}
+          {}%
+        \expandafter\patchcmd\csname MakeLowercase \endcsname
+          {\@uclcnotmath{}}
+          {\@uclcnotmath{\blx@hook@lc}}
+          {\togglefalse{blx@tempb}}
+          {}%
+        \expandafter\patchcmd\csname MakeTextUppercase \endcsname
+          {\def\i}
+          {\blx@hook@uc\def\i}
+          {}
+          {}%
+        \expandafter\patchcmd\csname MakeTextLowercase \endcsname
+          {\@uclcnotmath{}}
+          {\@uclcnotmath{\blx@hook@lc}}
+          {}
+          {}}
        {}%
-     \expandafter\patchcmd\csname MakeTextLowercase \endcsname
-       {\@uclcnotmath{}}
-       {\@uclcnotmath{\blx@hook@lc}}
-       {}
-       {}}
-    {}%
-  \iftoggle{blx@tempa}{\blx@err@patch{\string\MakeUppercase}}{}%
-  \iftoggle{blx@tempb}{\blx@err@patch{\string\MakeLowercase}}{}%
-}
-\fi
-
-\appto\blx@blxinit{%
-  \def\blx@hook@uc{%
-    \def\bibstring{\blx@imc@bibucstring}%
-    \def\biblstring{\blx@imc@bibuclstring}%
-    \def\bibsstring{\blx@imc@bibucsstring}%
-    \def\biblcstring{\blx@imc@bibucstring}%
-    \def\biblclstring{\blx@imc@bibuclstring}%
-    \def\biblcsstring{\blx@imc@bibucsstring}%
-    \def\bibcpstring{\blx@imc@bibucstring}%
-    \def\bibcplstring{\blx@imc@bibuclstring}%
-    \def\bibcpsstring{\blx@imc@bibucsstring}}%
-  \def\blx@hook@lc{%
-    \def\bibstring{\blx@imc@biblcstring}%
-    \def\biblstring{\blx@imc@biblclstring}%
-    \def\bibsstring{\blx@imc@biblcsstring}%
-    \def\bibucstring{\blx@imc@biblcstring}%
-    \def\bibuclstring{\blx@imc@biblclstring}%
-    \def\bibucsstring{\blx@imc@biblcsstring}%
-    \def\bibcpstring{\blx@imc@biblcstring}%
-    \def\bibcplstring{\blx@imc@biblclstring}%
-    \def\bibcpsstring{\blx@imc@biblcsstring}}}
+     \iftoggle{blx@tempa}{\blx@err@patch{\string\MakeUppercase}}{}%
+     \iftoggle{blx@tempb}{\blx@err@patch{\string\MakeLowercase}}{}%
+   }
+   %
+   \appto\blx@blxinit{%
+     \def\blx@hook@uc{%
+       \def\bibstring{\blx@imc@bibucstring}%
+       \def\biblstring{\blx@imc@bibuclstring}%
+       \def\bibsstring{\blx@imc@bibucsstring}%
+       \def\biblcstring{\blx@imc@bibucstring}%
+       \def\biblclstring{\blx@imc@bibuclstring}%
+       \def\biblcsstring{\blx@imc@bibucsstring}%
+       \def\bibcpstring{\blx@imc@bibucstring}%
+       \def\bibcplstring{\blx@imc@bibuclstring}%
+       \def\bibcpsstring{\blx@imc@bibucsstring}}%
+     \def\blx@hook@lc{%
+       \def\bibstring{\blx@imc@biblcstring}%
+       \def\biblstring{\blx@imc@biblclstring}%
+       \def\bibsstring{\blx@imc@biblcsstring}%
+       \def\bibucstring{\blx@imc@biblcstring}%
+       \def\bibuclstring{\blx@imc@biblclstring}%
+       \def\bibucsstring{\blx@imc@biblcsstring}%
+       \def\bibcpstring{\blx@imc@biblcstring}%
+       \def\bibcplstring{\blx@imc@biblclstring}%
+       \def\bibcpsstring{\blx@imc@biblcsstring}}}}
+  {\DeclareCaseChangeEquivalent{\bibstring}{%
+     \CaseSwitch
+       {\blx@imc@bibstring}
+       {\blx@imc@bibucstring}
+       {\blx@imc@biblcstring}
+       {\blx@imc@bibcpstring}}
+   \DeclareCaseChangeEquivalent{\biblstring}{%
+     \CaseSwitch
+       {\blx@imc@biblstring}
+       {\blx@imc@bibuclstring}
+       {\blx@imc@biblclstring}
+       {\blx@imc@bibcplstring}}
+   \DeclareCaseChangeEquivalent{\bibsstring}{%
+     \CaseSwitch
+       {\blx@imc@bibsstring}
+       {\blx@imc@bibucsstring}
+       {\blx@imc@biblcsstring}
+       {\blx@imc@bibcpsstring}}
+   \DeclareCaseChangeEquivalent{\biblcstring}{%
+     \CaseSwitch
+       {\blx@imc@bibstring}
+       {\blx@imc@bibucstring}
+       {\blx@imc@biblcstring}
+       {\blx@imc@bibcpstring}}
+   \DeclareCaseChangeEquivalent{\biblclstring}{%
+     \CaseSwitch
+       {\blx@imc@biblstring}
+       {\blx@imc@bibuclstring}
+       {\blx@imc@biblclstring}
+       {\blx@imc@bibcplstring}}
+   \DeclareCaseChangeEquivalent{\biblcsstring}{%
+     \CaseSwitch
+       {\blx@imc@bibsstring}
+       {\blx@imc@bibucsstring}
+       {\blx@imc@biblcsstring}
+       {\blx@imc@bibcpsstring}}
+   \DeclareCaseChangeEquivalent{\bibucstring}{%
+     \CaseSwitch
+       {\blx@imc@bibstring}
+       {\blx@imc@bibucstring}
+       {\blx@imc@biblcstring}
+       {\blx@imc@bibcpstring}}
+   \DeclareCaseChangeEquivalent{\bibuclstring}{%
+     \CaseSwitch
+       {\blx@imc@biblstring}
+       {\blx@imc@bibuclstring}
+       {\blx@imc@biblclstring}
+       {\blx@imc@bibcplstring}}
+   \DeclareCaseChangeEquivalent{\bibucsstring}{%
+     \CaseSwitch
+       {\blx@imc@bibsstring}
+       {\blx@imc@bibucsstring}
+       {\blx@imc@biblcsstring}
+       {\blx@imc@bibcpsstring}}
+   \DeclareCaseChangeEquivalent{\bibcpstring}{%
+     \CaseSwitch
+       {\blx@imc@bibstring}
+       {\blx@imc@bibucstring}
+       {\blx@imc@biblcstring}
+       {\blx@imc@bibcpstring}}
+   \DeclareCaseChangeEquivalent{\bibcplstring}{%
+     \CaseSwitch
+       {\blx@imc@biblstring}
+       {\blx@imc@bibuclstring}
+       {\blx@imc@biblclstring}
+       {\blx@imc@bibcplstring}}
+   \DeclareCaseChangeEquivalent{\bibcpsstring}{%
+     \CaseSwitch
+       {\blx@imc@bibsstring}
+       {\blx@imc@bibucsstring}
+       {\blx@imc@biblcsstring}
+       {\blx@imc@bibcpsstring}}}
 
 \def\abx@dostrings{%
   \do{bibliography}%