summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-02-01 22:43:41 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-02-01 22:43:41 +0000
commit23d1eb6423786dfd7bdb4bc3c13f399ee0da6612 (patch)
treeb8ea34e42bd186f391050eef006e6d03ff4a949e
parent7e0f5f37cb41918b36a55179926b38b64770f784 (diff)
web2c/luatexdir: sync with the upstream
git-svn-id: svn://tug.org/texlive/trunk@39537 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/luatexdir/font/writecff.w3
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/errors.w27
2 files changed, 28 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/luatexdir/font/writecff.w b/Build/source/texk/web2c/luatexdir/font/writecff.w
index 389eed8db76..3f4a4e58879 100644
--- a/Build/source/texk/web2c/luatexdir/font/writecff.w
+++ b/Build/source/texk/web2c/luatexdir/font/writecff.w
@@ -3374,6 +3374,9 @@ void write_cid_cff(PDF pdf, cff_font * cffont, fd_entry * fd)
num_glyphs++;
}
}
+ if (last_cid >= cffont->num_glyphs) {
+ formatted_error("cff font","bad glyph index %i",last_cid);
+ }
/* CIDSet: a table of bits indexed by cid, bytes with high order bit first,
each (set) bit is a (present) CID. */
diff --git a/Build/source/texk/web2c/luatexdir/tex/errors.w b/Build/source/texk/web2c/luatexdir/tex/errors.w
index 506b0b75411..d981f9fee4f 100644
--- a/Build/source/texk/web2c/luatexdir/tex/errors.w
+++ b/Build/source/texk/web2c/luatexdir/tex/errors.w
@@ -688,7 +688,15 @@ void wrapup_backend(void) {
void normal_error(const char *t, const char *p)
{
normalize_selector();
- print_err("error ");
+ if (interaction == error_stop_mode) {
+ wake_up_terminal();
+ }
+ if (filelineerrorstylep) {
+ print_file_line();
+ } else {
+ tprint_nl("! ");
+ }
+ tprint("error: ");
if (cur_file_name) {
tprint(" (file ");
tprint(cur_file_name);
@@ -702,12 +710,27 @@ void normal_error(const char *t, const char *p)
tprint(": ");
if (p != NULL)
tprint(p);
- /* quit */
history = fatal_error_stop;
wrapup_backend();
exit(EXIT_FAILURE);
}
+/*
+void normal_error(const char *t, const char *p)
+{
+ normalize_selector();
+ if (interaction == error_stop_mode) {
+ wake_up_terminal();
+ }
+ tprint("error : ");
+ if (p != NULL)
+ tprint(p);
+ history = fatal_error_stop;
+ wrapup_backend();
+ exit(EXIT_FAILURE);
+}
+*/
+
@ @c
void normal_warning(const char *t, const char *p)
{