added fallback for missing chars in ofm-based VF files

as described in GH issue #241
mgieseki · May 10, 2023 · 2ab9ee2 · 2ab9ee2
1 parent 2be56bf
commit 2ab9ee2
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/DVIReader.cpp b/src/DVIReader.cpp
@@ -206,8 +206,11 @@ void DVIReader::putVFChar (Font *font, uint32_t c) {
 		FontManager &fm = FontManager::instance();
 		const vector<uint8_t> *dvi = vf->getDVI(c);    // try to get DVI snippet that represents character c
 		Font *firstFont = fm.vfFirstFont(vf);
-		if (!dvi && (!firstFont || !firstFont->getMetrics() || !firstFont->getMetrics()->isJFM()))
-			return;
+		if (!dvi) {
+			const FontMetrics *ffm = firstFont ? firstFont->getMetrics() : nullptr;
+			if (!ffm || (!ffm->isJFM() && !ffm->isOFM()))
+				return;
+		}
 		fm.enterVF(vf);                              // enter VF font number context
 		int savedFontNum = _currFontNum;             // save current font number
 		setFont(fm.vfFirstFontNum(vf), SetFontMode::VF_ENTER);