[latex3-commits] [git/LaTeX3-latex3-latex3] luacmd: Multiple smaller things (31872c00f)

Marcel Fabian Krüger tex at 2krueger.de
Fri Aug 21 18:32:04 CEST 2020


Repository : https://github.com/latex3/latex3
On branch  : luacmd
Link       : https://github.com/latex3/latex3/commit/31872c00fa9ea39d4dbb2e49e343d898c2e9520c

>---------------------------------------------------------------

commit 31872c00fa9ea39d4dbb2e49e343d898c2e9520c
Author: Marcel Fabian Krüger <tex at 2krueger.de>
Date:   Fri Aug 21 18:32:04 2020 +0200

    Multiple smaller things


>---------------------------------------------------------------

31872c00fa9ea39d4dbb2e49e343d898c2e9520c
 l3kernel/l3luatex.dtx |  5 ++---
 l3kernel/l3names.dtx  |  2 +-
 l3kernel/l3str.dtx    |  5 -----
 l3kernel/l3sys.dtx    | 37 ++++++++++++++++++++-----------------
 4 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/l3kernel/l3luatex.dtx b/l3kernel/l3luatex.dtx
index b00b73418..7dda9723f 100644
--- a/l3kernel/l3luatex.dtx
+++ b/l3kernel/l3luatex.dtx
@@ -346,7 +346,6 @@ local string   = string
 local tex      = tex
 local texio    = texio
 local tonumber = tonumber
-local unicode  = unicode
 %    \end{macrocode}
 %
 %   Local copies of standard functions.
@@ -450,7 +449,7 @@ local function filedump(name,offset,length)
 end
 ltxutils.filedump = filedump
 deprecated(l3kernel, "filedump", function(name, offset, length)
-local dump = filedump(name, tonumber(offset), tonumber(length))
+  local dump = filedump(name, tonumber(offset), tonumber(length))
   if dump then
     write(dump)
   end
@@ -461,7 +460,7 @@ end)
 %
 % \begin{macro}{md5.HEX}
 % Hash a string and return the hash in uppercase hexadecimal format.
-% In some engines, this is build-in. For traditional LuaTeX, the conversion
+% In some engines, this is build-in. For traditional \LuaTeX{}, the conversion
 % to hexadecimal has to be done by us.
 %    \begin{macrocode}
 local md5_HEX = md5.HEX
diff --git a/l3kernel/l3names.dtx b/l3kernel/l3names.dtx
index 3bfba8759..7ee79d46f 100644
--- a/l3kernel/l3names.dtx
+++ b/l3kernel/l3names.dtx
@@ -1450,7 +1450,7 @@
 % \begin{macro}{\tex_strcmp:D}
 %   Compare two strings, expanding to |0| if they are equal,
 %   |-1| if the first one is smaller and |1| if the second one is smaller.
-%   Here ``smaller'' refers to codepoint order which does not correspond to
+%   Here \enquote{smaller} refers to codepoint order which does not correspond to
 %   the user expected order for most non-ASCII strings.
 %    \begin{macrocode}
 luacmd('tex_strcmp:D', function()
diff --git a/l3kernel/l3str.dtx b/l3kernel/l3str.dtx
index e9034cee5..d390f61ad 100644
--- a/l3kernel/l3str.dtx
+++ b/l3kernel/l3str.dtx
@@ -1125,11 +1125,6 @@
 %   so we define a new name for it.
 %    \begin{macrocode}
 \cs_new_eq:NN \@@_if_eq:nn \tex_strcmp:D
-\cs_if_exist:NT \tex_luatexversion:D
-   {
-     \cs_set_eq:NN \lua_escape:e \tex_luaescapestring:D
-     \cs_set_eq:NN \lua_now:e    \tex_directlua:D
-   }
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/l3kernel/l3sys.dtx b/l3kernel/l3sys.dtx
index 61083db17..a4de84f8b 100644
--- a/l3kernel/l3sys.dtx
+++ b/l3kernel/l3sys.dtx
@@ -391,23 +391,26 @@
 %   however, is reliable only if the user doesn't change
 %   \cs{tex_pdfoutput:D} before loading this code.
 %    \begin{macrocode}
-\str_const:Nx \c_sys_engine_exec_str
-  {
-    \sys_if_engine_pdftex:T { pdf }
-    \sys_if_engine_xetex:T  { xe  }
-    \sys_if_engine_ptex:T   { ep  }
-    \sys_if_engine_uptex:T  { eup }
-    \sys_if_engine_luatex:T
-      {
-        lua \lua_now:e
-          {
-            if (pcall(require, 'luaharfbuzz')) then ~
-              tex.print("hb") ~
-            end
-          }
-      }
-    tex
-  }
+\group_begin:
+  \cs_set_eq:NN \lua_now:e    \tex_directlua:D
+  \str_const:Nx \c_sys_engine_exec_str
+    {
+      \sys_if_engine_pdftex:T { pdf }
+      \sys_if_engine_xetex:T  { xe  }
+      \sys_if_engine_ptex:T   { ep  }
+      \sys_if_engine_uptex:T  { eup }
+      \sys_if_engine_luatex:T
+        {
+          lua \lua_now:e
+            {
+              if (pcall(require, 'luaharfbuzz')) then ~
+                tex.print("hb") ~
+              end
+            }
+        }
+      tex
+    }
+\group_end:
 \str_const:Nx \c_sys_engine_format_str
   {
     \cs_if_exist:NTF \fmtname





More information about the latex3-commits mailing list.