[makeotfexe] Correct "glyph not in font" error

c/makeotf/makeotf_lib/build/hotpccts/featgram.g

@@ -356,14 +356,13 @@ glyphClass[int named, char *gcname]>[GNode *gnode]
 					  gcAddRange(gid, endgid, firstPart, secondPart);
 					}
 					else {
-					  zzFAIL(1,zzerr2,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk);
-					  goto fail;
+					  hotMsg(g, hotFATAL, "aborting because of errors");
 					}
 
 				}
 				else {
-				  zzFAIL(1,zzerr2,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk);
-				  goto fail;
+				  featMapGName2GID(g, firstPart, FALSE);
+				  hotMsg(g, hotFATAL, "aborting because of errors");
 				}
 				zzEXIT(zztasp4);
 			}

c/makeotf/makeotf_lib/source/hotconv/featgram.c

@@ -178,13 +178,12 @@ char *gcname;
                                                 if (gid != 0 && endgid != 0) {
                                                     gcAddRange(gid, endgid, firstPart, secondPart);
                                                 } else {
-                                                    zzFAIL(1, zzerr2, &zzMissSet, &zzMissText, &zzBadTok, &zzBadText, &zzErrk);
-                                                    goto fail;
+                                                    hotMsg(g, hotFATAL, "aborting because of errors");
                                                 }
 
                                             } else {
-                                                zzFAIL(1, zzerr2, &zzMissSet, &zzMissText, &zzBadTok, &zzBadText, &zzErrk);
-                                                goto fail;
+                                                featMapGName2GID(g, firstPart, FALSE);
+                                                hotMsg(g, hotFATAL, "aborting because of errors");
                                             }
                                             zzEXIT(zztasp4);
                                         } else {

c/makeotf/makeotf_lib/source/typecomp/recode.c

@@ -893,10 +893,10 @@ static void addWidth(recodeCtx h, Fixed width) {
         width = 0;
         switch (h->idType) {
             case SIDType:
-                parseWarning(h->g, "glyph '%s' has a negative advance width. Setting width to 0.\n", sindexGetString(h->g, (SID)h->id));
+                parseWarning(h->g, "glyph '%s' has a negative advance width. Setting width to 0.", sindexGetString(h->g, (SID)h->id));
                 break;
             case CIDType:
-                parseWarning(h->g, "glyph 'cid#%hu' has a negative advance width. Setting width to 0.\n", h->id);
+                parseWarning(h->g, "glyph 'cid#%hu' has a negative advance width. Setting width to 0.", h->id);
                 break;
             default:;
         }
@@ -4912,7 +4912,7 @@ void recodeAddNewGlyph(tcCtx g, unsigned id, unsigned fill_in_font_id, unsigned
                 diff = (diff > 0) ? diff : -diff;
 
                 if (diff == 1) {
-                    parseWarning(g, "Zero width vs  calculated Euro width round-off difference: %f, %d", FIX2DBL(zeroWidth), iwidth);
+                    parseWarning(g, "Zero width vs. calculated Euro width round-off difference: %f, %d", FIX2DBL(zeroWidth), iwidth);
                 }
                 if (diff > 1) {
                     parseWarning(g, "Problem: Zero width of target font is not same as calculated Euro width: %f, %d", FIX2DBL(zeroWidth), iwidth);

c/makeotf/source/cb.c

@@ -1818,17 +1818,17 @@ void cbConvert(cbCtx h, int flags, char *clientVers,
     if (h->fcdb.files.cnt == 0) {
         {
             fcdbGetRec(h->fcdb.ctx, FontName);
-            cbWarning(h, "Font Menu Name database is not specified or not found .[%s]", FontName);
+            cbWarning(h, "FontMenuNameDB file was not specified or not found. [%s]", FontName);
         }
     } else if (fcdbGetRec(h->fcdb.ctx, FontName)) {
         {
-            cbWarning(h, "not in Font Menu Name database [%s]", FontName);
+            cbWarning(h, "not in FontMenuNameDB [%s]", FontName);
         }
     }
 
     // Make sure that GOADB file has been read in, if required
     if ((flags & HOT_RENAME) && (h->alias.recs.cnt < 1) && (type != hotCID)) {
-        cbWarning(h, "Glyph renaming is requested, but the Glyph Alias And Order DB file was not specified.");
+        cbWarning(h, "Glyph renaming was requested, but the GlyphOrderAndAliasDB file was not specified.");
     }
 
     h->mac.cmapScript = macScript; /* Used in hotAddmiscData, in ProcessFontInfo */

tests/makeotfexe_data/input/bug492/features.fea

@@ -0,0 +1,2 @@
+
+@CLASS = [glyph_not_found a];

tests/makeotfexe_test.py

@@ -100,6 +100,24 @@ def test_DFLT_script_with_any_lang_bug438():
                    '-r', r'^\s+Version.*;hotconv.*;makeotfexe'])
 
 
+def test_glyph_not_in_font_bug492():
+    input_filename = 'bug492/font.pfa'
+    feat_filename = 'bug492/features.fea'
+    otf_path = get_temp_file_path()
+
+    stderr_path = runner(
+        CMD + ['-s', '-e', '-o',
+               'f', '_{}'.format(get_input_path(input_filename)),
+               'ff', '_{}'.format(get_input_path(feat_filename)),
+               'o', '_{}'.format(otf_path)])
+
+    with open(stderr_path, 'rb') as f:
+        output = f.read()
+    assert (b'[ERROR] <SourceSans-Test> Glyph "glyph_not_found" not in font. '
+            b'[') in output
+    assert (b'syntax error at "a" [') not in output
+
+
 def test_version_warning_bug610():
     input_filename = 'bug610/font.pfa'
     feat_filename = 'bug610/v0005.fea'