summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2022-08-23 21:23:18 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2022-08-23 21:23:18 +0000
commit7351b01e95f2473f99f2caeb669f22c2dabc8087 (patch)
treeb0b462ccb61e590391303237103e46b1caf4a41f /Build/source/texk/web2c
parenta85ddf9ec9fa6da691637667cc8a9dff2cc6b5ae (diff)
luatex: sync with the upstream
git-svn-id: svn://tug.org/texlive/trunk@64181 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex_svnversion.h2
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/texdeffont.c8
2 files changed, 6 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
index d513865325a..6809e8b9c9d 100644
--- a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
+++ b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
@@ -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
diff --git a/Build/source/texk/web2c/luatexdir/tex/texdeffont.c b/Build/source/texk/web2c/luatexdir/tex/texdeffont.c
index 1ec4b12bf06..5adc8f51861 100644
--- a/Build/source/texk/web2c/luatexdir/tex/texdeffont.c
+++ b/Build/source/texk/web2c/luatexdir/tex/texdeffont.c
@@ -218,11 +218,13 @@ void tex_def_font(small_number a)
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 @@ void tex_def_font(small_number a)
/*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;