[latex3-commits] [l3svn] 02/02: Streamline font loading 'hack'

[noreply at latex-project.org]

This is an automated email from the git hooks/post-receive script.

joseph pushed a commit to branch master
in repository l3svn.

commit a42e165beb2504e56c38d14474ba37ce7641e644
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sat Feb 6 20:35:44 2016 +0000

    Streamline font loading 'hack'
---
 l3kernel/l3final.dtx |   37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/l3kernel/l3final.dtx b/l3kernel/l3final.dtx
index 239f2f8..d82a81d 100644
--- a/l3kernel/l3final.dtx
+++ b/l3kernel/l3final.dtx
@@ -273,27 +273,26 @@
         \lua_now_x:n { require("l3format.lua") }
       }
   }
-\bool_if:nTF
-  {
-    \sys_if_engine_luatex_p: ||
-    \sys_if_engine_xetex_p:
-  }
-  {
-    \tex_everyjob:D \exp_after:wN
-      {
-        \tex_the:D \exp_after:wN \tex_everyjob:D
-        \exp_after:wN \tex_font:D \cs:w TU/lmr/m/n/10 \cs_end:
-          = "[lmroman10-regular.otf]"~at~10pt \scan_stop:
-        \use:c { TU/lmr/m/n/10 }
-      }
-  }
+\use:x
   {
-    \tex_everyjob:D \exp_after:wN
+    \tex_everyjob:D
       {
-        \tex_the:D \exp_after:wN \tex_everyjob:D
-        \exp_after:wN \tex_font:D \cs:w T1/lmr/m/n/10 \cs_end:
-          = ec-lmr10 \scan_stop:
-        \use:c { T1/lmr/m/n/10 }
+        \tex_the:D \tex_everyjob:D
+        \bool_if:nTF
+          {
+             \sys_if_engine_luatex_p: ||
+             \sys_if_engine_xetex_p:
+          }
+          {
+            \tex_font:D \exp_not:c { TU/lmr/m/n/10 }
+              = "[lmroman10-regular.otf]"~at~10pt \scan_stop:
+            \exp_not:c { TU/lmr/m/n/10 }
+          }
+          {
+            \tex_font:D \exp_not:c { T1/lmr/m/n/10 }
+              = ec-lmr10~at~10pt \scan_stop:
+            \exp_not:c { T1/lmr/m/n/10 }
+          }
       }
   }
 %    \end{macrocode}

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.