summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/pdftexdir/ttf2afm.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 336be86ca81..d03504f67d6 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,8 @@
+2021-01-06 Karl Berry <karl@freefriends.org>
+
+ * ttf2afm.c (make_name): let's exclude iscntrl() per Thanh,
+ but accept crlf and tab.
+
2021-01-05 Karl Berry <karl@freefriends.org>
* ttf2afm.c (make_name): copy all characters, not just isprint().
diff --git a/Build/source/texk/web2c/pdftexdir/ttf2afm.c b/Build/source/texk/web2c/pdftexdir/ttf2afm.c
index 41b820ecf3b..e2158644e4f 100644
--- a/Build/source/texk/web2c/pdftexdir/ttf2afm.c
+++ b/Build/source/texk/web2c/pdftexdir/ttf2afm.c
@@ -444,7 +444,9 @@ static char *make_name(long platform_id, int len)
*p = get_char();
i++;
}
- p++;
+ /* don't copy strange characters */
+ if (!iscntrl(*p) || *p == '\r' || *p == '\n' || *p == '\t')
+ p++;
}
*p = 0;
return xstrdup(buf);