updated for fixing macos fonts issue, metanorma/metanorma-iso#910

metanorma · Apr 25, 2023 · 50b1103 · 50b1103
1 parent 0bbf8ac
commit 50b1103
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/org/metanorma/fop/fontConfig.java b/src/main/java/org/metanorma/fop/fontConfig.java
@@ -211,6 +211,7 @@ public void setFontManifest(File fFontManifest) {
                                             Path fontPathNew = Paths.get(tmpfilepath.toString(), fontFile.getName());
                                             Files.copy(fontFile.toPath(), fontPathNew, StandardCopyOption.REPLACE_EXISTING);
                                             fontPath__ = fontPathNew.toAbsolutePath().toString();
+                                            registerFont(ge, fontPath__);
                                         } catch (IOException ex) {
                                             ex.printStackTrace();
                                         }
@@ -286,7 +287,8 @@ public void setFontManifest(File fFontManifest) {
                                         fopFonts.stream()
                                             .filter(f -> !f.isReadyToUse())
                                             .filter(f -> f.getSimulate_style() != null && f.getSimulate_style().equals("true"))
-                                            .filter(f -> fontPath_.toLowerCase().contains(f.getEmbed_url().toLowerCase()))
+                                            .filter(f -> fontPath_.toLowerCase().contains(f.getEmbed_url().toLowerCase()) ||
+                                                    (f.getAlternate().size() != 0 && fontPath_.toLowerCase().contains(f.getAlternate().get(0).getEmbed_url().toLowerCase())))
                                             .filter(f -> f.contains(fontName))
                                             .forEach(f -> {
                                                 f.setEmbed_url(fontPath_);