[latex3-commits] [l3svn] r7065 - Use lazy boolean functions in a few more places

[noreply at latex-project.org]

Author: bruno
Date: 2017-04-08 02:47:37 +0200 (Sat, 08 Apr 2017)
New Revision: 7065

Modified:
   trunk/l3kernel/expl3.dtx
   trunk/l3kernel/l3candidates.dtx
   trunk/l3kernel/l3final.dtx
   trunk/l3kernel/l3sys.dtx
Log:
Use lazy boolean functions in a few more places


Modified: trunk/l3kernel/expl3.dtx
===================================================================
--- trunk/l3kernel/expl3.dtx	2017-04-08 00:46:49 UTC (rev 7064)
+++ trunk/l3kernel/expl3.dtx	2017-04-08 00:47:37 UTC (rev 7065)
@@ -1292,11 +1292,9 @@
                 \sys_if_output_pdf:TF
                   { pdfmode }
                   {
-                    \bool_if:nTF
-                      {
-                        \sys_if_engine_pdftex_p: ||
-                        \sys_if_engine_luatex_p:
-                      }
+                    \bool_lazy_or:nnTF
+                      { \sys_if_engine_pdftex_p: }
+                      { \sys_if_engine_luatex_p: }
                       { dvips }
                       { dvipdfmx }
                   }

Modified: trunk/l3kernel/l3candidates.dtx
===================================================================
--- trunk/l3kernel/l3candidates.dtx	2017-04-08 00:46:49 UTC (rev 7064)
+++ trunk/l3kernel/l3candidates.dtx	2017-04-08 00:47:37 UTC (rev 7065)
@@ -3069,11 +3069,10 @@
 % octets, so that is taken as read.
 %    \begin{macrocode}
 \group_begin:
-  \bool_if:nT
+  \bool_lazy_or:nnT
+    { \sys_if_engine_pdftex_p: }
+    { \sys_if_engine_uptex_p: }
     {
-      \sys_if_engine_pdftex_p: || \sys_if_engine_uptex_p:
-    }
-    {
       \cs_set_protected:Npn \@@_loop:nn #1#2
         {
           \quark_if_recursion_tail_stop:n {#1}

Modified: trunk/l3kernel/l3final.dtx
===================================================================
--- trunk/l3kernel/l3final.dtx	2017-04-08 00:46:49 UTC (rev 7064)
+++ trunk/l3kernel/l3final.dtx	2017-04-08 00:47:37 UTC (rev 7065)
@@ -98,11 +98,9 @@
 % (The primitives have to be available at point of use not just at point of
 % definition so a compatibility layer is hard to arrange here.)
 %    \begin{macrocode}
-\bool_if:nTF
-  {
-       \sys_if_engine_luatex_p:
-    || \sys_if_engine_xetex_p:
-  }
+\bool_lazy_or:nnTF
+  { \sys_if_engine_luatex_p: }
+  { \sys_if_engine_xetex_p: }
 %    \end{macrocode}
 % Unicode engines: make these two invalid (this happens after \TeX{}
 % has read and thrown away their use in the following).
@@ -261,12 +259,10 @@
     \tex_everyjob:D
       {
         \tex_the:D \tex_everyjob:D
-        \bool_if:nTF
+        \bool_lazy_or:nnTF
+          { \sys_if_engine_luatex_p: }
+          { \sys_if_engine_xetex_p: }
           {
-             \sys_if_engine_luatex_p: ||
-             \sys_if_engine_xetex_p:
-          }
-          {
             \tex_font:D \exp_not:c { TU/lmr/m/n/10 }
               = "[lmroman10-regular.otf]/OT" \scan_stop:
             \exp_not:c { TU/lmr/m/n/10 }

Modified: trunk/l3kernel/l3sys.dtx
===================================================================
--- trunk/l3kernel/l3sys.dtx	2017-04-08 00:46:49 UTC (rev 7064)
+++ trunk/l3kernel/l3sys.dtx	2017-04-08 00:47:37 UTC (rev 7065)
@@ -218,12 +218,10 @@
   }
 \cs_if_exist:NT \ptex_kanjiskip:D
   {
-    \bool_if:nTF
+    \bool_lazy_and:nnTF
+      { \cs_if_exist_p:N \uptex_disablecjktoken:D }
+      { \int_compare_p:nNn { \ptex_jis:D "2121 } = { "3000 } }
       {
-        \cs_if_exist_p:N \uptex_disablecjktoken:D &&
-        \int_compare_p:nNn { \ptex_jis:D "2121 } = { "3000 }
-      }
-      {
         \cs_gset_eq:NN \sys_if_engine_uptex:T  \use:n
         \cs_gset_eq:NN \sys_if_engine_uptex:F  \use_none:n
         \cs_gset_eq:NN \sys_if_engine_uptex:TF \use_i:nn