Drop \ifthenelse (plk#1348)

moewew · Mar 24, 2024 · 2bf42f7 · 2bf42f7
1 parent 4175cbe
commit 2bf42f7
Show file tree

Hide file tree

Showing 21 changed files with 100 additions and 71 deletions.
diff --git a/tex/latex/biblatex/cbx/alphabetic.cbx b/tex/latex/biblatex/cbx/alphabetic.cbx
@@ -49,7 +49,7 @@
 
 \newbibmacro*{textcite:postnote}{%
   \usebibmacro{postnote}%
-  \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+  \ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
@@ -109,7 +109,8 @@
    \pagetrackerfalse%
    \DeferNextCitekeyHook%
    \usebibmacro{textcite:init}}
-  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+  {\ifboolexpr{test {\iffirstcitekey}
+               and test {\ifnumgreater{\value{multicitetotal}}{0}}}
      {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
       \global\clearfield{multipostnote}}
      {}%

diff --git a/tex/latex/biblatex/cbx/authortitle-comp.cbx b/tex/latex/biblatex/cbx/authortitle-comp.cbx
@@ -73,7 +73,7 @@
        \printdelim{extpostnotedelim}\bibopenparen}}
     {\setunit{\printdelim{postnotedelim}}}%
   \printfield{postnote}%
-  \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+  \ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
@@ -154,7 +154,8 @@
    \pagetrackerfalse%
    \DeferNextCitekeyHook%
    \usebibmacro{cite:init}}
-  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+  {\ifboolexpr{test {\iffirstcitekey}
+               and test {\ifnumgreater{\value{multicitetotal}}{0}}}
      {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
       \global\clearfield{multipostnote}}
      {}%

diff --git a/tex/latex/biblatex/cbx/authortitle-ibid.cbx b/tex/latex/biblatex/cbx/authortitle-ibid.cbx
@@ -18,7 +18,7 @@
 \newbibmacro*{cite}{%
   \global\boolfalse{cbx:loccit}%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+    {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
        {\usebibmacro{cite:ibid}}
        {\printnames{labelname}%
         \setunit*{\printdelim{nametitledelim}}%
@@ -28,7 +28,7 @@
 \newbibmacro*{citetitle}{%
   \global\boolfalse{cbx:loccit}%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+    {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
        {\usebibmacro{cite:ibid}}
        {\usebibmacro{cite:title}}}%
     {\usebibmacro{cite:shorthand}}}
@@ -43,7 +43,7 @@
     {\usebibmacro{prenote}}
     {}%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+    {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
        {\usebibmacro{cite:ibid}}
        {\usebibmacro{cite:title}}}%
     {\usebibmacro{cite:shorthand}}}
@@ -67,7 +67,7 @@
     {\usebibmacro{postnote}}}
 
 \newbibmacro*{textcite:postnote}{%
-  \ifthenelse{\iffieldundef{postnote}\OR\boolean{cbx:loccit}}
+  \ifboolexpr{test {\iffieldundef{postnote}} or bool {cbx:loccit}}
     {\ifbool{cbx:parens}
        {\bibcloseparen}
        {}}

diff --git a/tex/latex/biblatex/cbx/authortitle-icomp.cbx b/tex/latex/biblatex/cbx/authortitle-icomp.cbx
@@ -32,7 +32,7 @@
 
 \newbibmacro*{cite}{%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+    {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
        {\usebibmacro{cite:ibid}}
        {\iffieldequals{namehash}{\cbx@lasthash}
           {\setunit{\compcitedelim}}
@@ -46,7 +46,7 @@
 
 \newbibmacro*{citetitle}{%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+    {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
        {\usebibmacro{cite:ibid}}
        {\usebibmacro{cite:title}}}%
     {\usebibmacro{cite:shorthand}}%
@@ -65,7 +65,7 @@
     {\usebibmacro{prenote}}
     {}%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+    {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
        {\usebibmacro{cite:ibid}}
        {\usebibmacro{cite:title}}}%
     {\usebibmacro{cite:shorthand}}%
@@ -102,7 +102,7 @@
           \printdelim{extpostnotedelim}\bibopenparen}}
        {\setunit{\printdelim{postnotedelim}}}%
      \printfield{postnote}}%
-  \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+  \ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
@@ -183,7 +183,8 @@
    \pagetrackerfalse%
    \DeferNextCitekeyHook%
    \usebibmacro{cite:init}}
-  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+  {\ifboolexpr{test {\iffirstcitekey}
+               and test {\ifnumgreater{\value{multicitetotal}}{0}}}
      {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
       \global\clearfield{multipostnote}}
      {}%

diff --git a/tex/latex/biblatex/cbx/authortitle-tcomp.cbx b/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
@@ -47,8 +47,10 @@
         \iffieldundef{shorthand}
           {\usebibmacro{cite:title}}%
           {\usebibmacro{cite:shorthand}}}
-       {\ifthenelse{\ifsingletitle\AND
-                    \(\iffieldundef{prenote}\OR\value{citecount}>1\)}
+       {\ifboolexpr{test {\ifsingletitle}
+                    and
+                    (test{\iffieldundef{prenote}}
+                     or test {\ifnumgreater{\value{citecount}}{1})}
           {\printtext[bibhyperref]{\printnames{labelname}}}
           {\printnames{labelname}
            \setunit{%
@@ -75,7 +77,7 @@
        \global\booltrue{cbx:parens}%
        \printdelim{extpostnotedelim}\bibopenparen}}%
   \printfield{postnote}%
-  \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+  \ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}

diff --git a/tex/latex/biblatex/cbx/authortitle-terse.cbx b/tex/latex/biblatex/cbx/authortitle-terse.cbx
@@ -23,8 +23,10 @@
      \iffieldundef{shorthand}
        {\usebibmacro{cite:title}}%
        {\usebibmacro{cite:shorthand}}}
-    {\ifthenelse{\ifsingletitle\AND
-                 \(\iffieldundef{prenote}\OR\value{citecount}>1\)}
+    {\ifboolexpr{test {\ifsingletitle}
+                 and
+                 (test{\iffieldundef{prenote}}
+                  or test {\ifnumgreater{\value{citecount}}{1})}
        {\printtext[bibhyperref]{\printnames{labelname}}}
        {\printnames{labelname}%
         \setunit{%

diff --git a/tex/latex/biblatex/cbx/authortitle-ticomp.cbx b/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
@@ -9,7 +9,7 @@
 
 \renewbibmacro*{cite}{%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+    {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
        {\usebibmacro{cite:ibid}}
        {\iffieldequals{namehash}{\cbx@lasthash}
           {\setunit{\compcitedelim}%
@@ -28,7 +28,7 @@
 
 \renewbibmacro*{citetitle}{%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+    {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
        {\usebibmacro{cite:ibid}}
        {\iffieldequals{namehash}{\cbx@lasthash}
           {\setunit{\compcitedelim}}
@@ -42,7 +42,7 @@
   \iffieldequals{namehash}{\cbx@lasthash}
     {\setunit{\compcitedelim}%
      \iffieldundef{shorthand}
-       {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+       {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
           {\usebibmacro{cite:ibid}}
           {\usebibmacro{cite:title}}}%
        {\usebibmacro{cite:shorthand}}}
@@ -51,12 +51,14 @@
           {\usebibmacro{prenote}}
           {}%
         \iffieldundef{shorthand}
-          {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+          {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
              {\usebibmacro{cite:ibid}}
              {\usebibmacro{cite:title}}}%
           {\usebibmacro{cite:shorthand}}}
-       {\ifthenelse{\ifsingletitle\AND
-                    \(\iffieldundef{prenote}\OR\value{citecount}>1\)}
+       {\ifboolexpr{test {\ifsingletitle}
+                    and
+                    (test{\iffieldundef{prenote}}
+                     or test {\ifnumgreater{\value{citecount}}{1})}
           {\printtext[bibhyperref]{\printnames{labelname}}}
           {\printnames{labelname}
            \setunit{%
@@ -66,7 +68,7 @@
              {\usebibmacro{prenote}}
              {}%
            \iffieldundef{shorthand}
-             {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+             {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
                 {\usebibmacro{cite:ibid}}
                 {\usebibmacro{cite:title}}}%
              {\usebibmacro{cite:shorthand}}}}%
@@ -85,7 +87,7 @@
        \global\booltrue{cbx:parens}%
        \printdelim{extpostnotedelim}\bibopenparen}}%
   \printfield{postnote}%
-  \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+  \ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}

diff --git a/tex/latex/biblatex/cbx/authoryear-comp.cbx b/tex/latex/biblatex/cbx/authoryear-comp.cbx
@@ -25,14 +25,16 @@
 
 \newbibmacro*{cite}{%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
+    {\ifboolexpr{test {\ifnameundef{labelname}}
+                 or test {\iffieldundef{labelyear}}}
        {\usebibmacro{cite:label}%
         \setunit{\printdelim{nonameyeardelim}}%
         \usebibmacro{cite:labeldate+extradate}%
         \usebibmacro{cite:reinit}}
        {\iffieldequals{namehash}{\cbx@lasthash}
-          {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
-                       \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
+          {\ifboolexpr{test {\iffieldequals{labelyear}{\cbx@lastyear}}
+                       and (test {\ifnumequal{\value{multicitecount}}{0}}
+                            or test {\iffieldundef{postnote}})}
              {\setunit{\addcomma}%
               \usebibmacro{cite:extradate}}
              {\setunit{\compcitedelim}%
@@ -53,8 +55,9 @@
        {\usebibmacro{cite:label}%
         \usebibmacro{cite:reinit}}
        {\iffieldequals{namehash}{\cbx@lasthash}
-          {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
-                       \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
+          {\ifboolexpr{test {\iffieldequals{labelyear}{\cbx@lastyear}}
+                       and (test {\ifnumequal{\value{multicitecount}}{0}}
+                            or test {\iffieldundef{postnote}})}
              {\setunit{\addcomma}%
               \usebibmacro{cite:extradate}}
              {\setunit{\compcitedelim}%
@@ -70,8 +73,9 @@
 \newbibmacro*{textcite}{%
   \iffieldequals{namehash}{\cbx@lasthash}
     {\iffieldundef{shorthand}
-       {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
-                    \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
+       {\ifboolexpr{test {\iffieldequals{labelyear}{\cbx@lastyear}}
+                    and (test {\ifnumequal{\value{multicitecount}}{0}}
+                         or test {\iffieldundef{postnote}})}
           {\setunit{\addcomma}%
            \usebibmacro{cite:extradate}}
           {\setunit{\compcitedelim}%
@@ -145,7 +149,7 @@
 
 \newbibmacro*{textcite:postnote}{%
   \usebibmacro{postnote}%
-  \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+  \ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
@@ -226,7 +230,8 @@
    \pagetrackerfalse%
    \DeferNextCitekeyHook%
    \usebibmacro{cite:init}}
-  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+  {\ifboolexpr{test {\iffirstcitekey}
+               and test {\ifnumgreater{\value{multicitetotal}}{0}}
      {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
       \global\clearfield{multipostnote}}
      {}%

diff --git a/tex/latex/biblatex/cbx/authoryear-ibid.cbx b/tex/latex/biblatex/cbx/authoryear-ibid.cbx
@@ -18,9 +18,10 @@
 \newbibmacro*{cite}{%
   \global\boolfalse{cbx:loccit}%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+    {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
        {\usebibmacro{cite:ibid}}
-       {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
+       {\ifboolexpr{test {\ifnameundef{labelname}}
+                    or test {\iffieldundef{labelyear}}}
           {\usebibmacro{cite:label}%
            \setunit{\printdelim{nonameyeardelim}}}
           {\printnames{labelname}%
@@ -31,7 +32,7 @@
 \newbibmacro*{citeyear}{%
   \global\boolfalse{cbx:loccit}%
   \iffieldundef{shorthand}
-    {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+    {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
        {\usebibmacro{cite:ibid}}
        {\iffieldundef{labelyear}
           {\usebibmacro{cite:label}}
@@ -59,7 +60,7 @@
        {\usebibmacro{prenote}}
        {}%
      \iffieldundef{shorthand}
-       {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+       {\ifboolexpr{test {\ifciteibid} and not test {\iffirstonpage}}
           {\usebibmacro{cite:ibid}}
           {\iffieldundef{labelyear}
              {\usebibmacro{cite:label}}
@@ -97,7 +98,7 @@
     {\usebibmacro{postnote}}}
 
 \newbibmacro*{textcite:postnote}{%
-  \ifthenelse{\iffieldundef{postnote}\OR\boolean{cbx:loccit}}
+  \ifboolexpr{test {\iffieldundef{postnote}} or bool {cbx:loccit}}
     {\ifbool{cbx:parens}
        {\bibcloseparen}
        {}}