texlive[64181] Build/source/texk/web2c/luatexdir: luatex: sync with

commits+kakuto at tug.org commits+kakuto at tug.org
Tue Aug 23 23:23:18 CEST 2022


Revision: 64181
          http://tug.org/svn/texlive?view=revision&revision=64181
Author:   kakuto
Date:     2022-08-23 23:23:18 +0200 (Tue, 23 Aug 2022)
Log Message:
-----------
luatex: sync with the upstream

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
    trunk/Build/source/texk/web2c/luatexdir/tex/texdeffont.c

Modified: trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h	2022-08-23 20:39:17 UTC (rev 64180)
+++ trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h	2022-08-23 21:23:18 UTC (rev 64181)
@@ -1,4 +1,4 @@
 #ifndef luatex_svn_revision_h
 #define luatex_svn_revision_h
-#define luatex_svn_revision 7538
+#define luatex_svn_revision 7539
 #endif

Modified: trunk/Build/source/texk/web2c/luatexdir/tex/texdeffont.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/tex/texdeffont.c	2022-08-23 20:39:17 UTC (rev 64180)
+++ trunk/Build/source/texk/web2c/luatexdir/tex/texdeffont.c	2022-08-23 21:23:18 UTC (rev 64181)
@@ -218,11 +218,13 @@
 
         This is tricky: when we redefine a string we loose the old one. So this
         will change as it's only used to display the |\fontname| so we can store
-        that with the font.
+        that with the font. To be consistent with the rest of the code, unlike 
+        |pdftex| the text of |null_cs| (i.e. |\csname\endcsname|) is the empty 
+        string |""|.
 
     */
     d = cs_text(font_id_base + f);
-    t = (u >= null_cs) ? cs_text(u) : maketexstring("FONT");
+    t = (u >= null_cs) ? ((u==null_cs) ? get_nullstr() : cs_text(u)) : maketexstring("FONT");
     if (!d) {
         /*tex We have a new string. */
         cs_text(font_id_base + f) = t;
@@ -230,7 +232,7 @@
         /*tex We have a duplicate string. */
         flush_str(t);
     } else if (d!=t){
-        d = search_string(t);
+        d = search_string(t) ;
         if (d) {
             /*tex We have already such a string. */
             cs_text(font_id_base + f) = d;



More information about the tex-live-commits mailing list.