fixed issue with missing fonts, #177

metanorma · Jul 16, 2023 · efa5fef · efa5fef
1 parent 28c6c4f
commit efa5fef
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 41 deletions.
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ SHELL ?= /bin/bash
 endif
 
 #JAR_VERSION := $(shell mvn -q -Dexec.executable="echo" -Dexec.args='$${project.version}' --non-recursive exec:exec -DforceStdout)
-JAR_VERSION := 1.78
+JAR_VERSION := 1.79
 JAR_FILE := mn2pdf-$(JAR_VERSION).jar
 
 all: target/$(JAR_FILE)

diff --git a/README.adoc b/README.adoc
@@ -100,7 +100,7 @@ Update version in `pom.xml`, e.g.:
 ----
 <groupId>org.metanorma.fop</groupId>
 <artifactId>mn2pdf</artifactId>
-<version>1.78</version>
+<version>1.79</version>
 <name>Metanorma XML to PDF converter</name>
 ----
 
@@ -111,8 +111,8 @@ Tag the same version in Git:
 
 [source,xml]
 ----
-git tag v1.78
-git push origin v1.78
+git tag v1.79
+git push origin v1.79
 ----
 
 Then the corresponding GitHub release will be automatically created at:

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.metanorma.fop</groupId>
 	<artifactId>mn2pdf</artifactId>
-	<version>1.78</version>
+	<version>1.79</version>
 	<name>Metanorma XML to PDF converter</name>
 	<packaging>jar</packaging>
 	<url>https://www.metanorma.org</url>

diff --git a/src/main/java/org/metanorma/fop/fontConfig.java b/src/main/java/org/metanorma/fop/fontConfig.java
@@ -596,7 +596,7 @@ private void setFontsPaths() throws IOException, URISyntaxException {
         List<String> machineFontList = getMachineFonts();
 
         // remove unused fonts
-        fopFonts.removeIf(fopFont -> !fopFont.isUsing());
+        //fopFonts.removeIf(fopFont -> !fopFont.isUsing());
 
         fopFonts.stream()
             .filter(fopFont -> !fopFont.getEmbed_url().isEmpty())
@@ -695,7 +695,7 @@ private void setFontsPaths() throws IOException, URISyntaxException {
                     }
                 }
             });
-       
+
         StringBuilder sb = new StringBuilder();
         fopFonts.stream()
                 .filter(f -> f.isUsing())
@@ -742,48 +742,51 @@ private void updateFontsInFOPConfig(Document xmlDocument) {
 
             // add 'font' from fopFonts array
             for(FOPFont fopFont: fopFonts) {
-
-                String embed_url = fopFont.getEmbed_url();
-                String embed_url_updated = embed_url;
-                try {
-                    if (!embed_url.startsWith("file:")) {
-                        // add file: prefix and update xml attribute embed-url
-                        embed_url_updated = new File(embed_url).toURI().toURL().toString();
-                    }
-                }
-                catch (MalformedURLException ex) { }
-
-                fopFont.setEmbed_url(embed_url_updated);
-
-                try {
-                    String fopFontString = new XmlMapper().writeValueAsString(fopFont);
-                    //restore path
-                    fopFont.setEmbed_url(embed_url);
-                    if (DEBUG) {
-                        //System.out.println("DEBUG: FOP config font entry:");
-                        //System.out.println(fopFontString);
-                        fopFontsLog.append(fopFontString).append("\n");
+
+                if(fopFont.isUsing()) {
+
+                    String embed_url = fopFont.getEmbed_url();
+                    String embed_url_updated = embed_url;
+                    try {
+                        if (!embed_url.startsWith("file:")) {
+                            // add file: prefix and update xml attribute embed-url
+                            embed_url_updated = new File(embed_url).toURI().toURL().toString();
+                        }
+                    } catch (MalformedURLException ex) {
                     }
-                    Node newNodeFont =  DocumentBuilderFactory
-                        .newInstance()
-                        .newDocumentBuilder()
-                        .parse(new ByteArrayInputStream(fopFontString.getBytes()))
-                        .getDocumentElement();
-                    //newNodeFont.getAttributes().getNamedItem("embed-url").setTextContent(embed_url);
-
-                    Document doc = nodeFonts.getOwnerDocument();
-                    newNodeFont = doc.importNode(newNodeFont, true);
-                    nodeFonts.appendChild(newNodeFont);
+
+                    fopFont.setEmbed_url(embed_url_updated);
+
+                    try {
+                        String fopFontString = new XmlMapper().writeValueAsString(fopFont);
+                        //restore path
+                        fopFont.setEmbed_url(embed_url);
+                        if (DEBUG) {
+                            //System.out.println("DEBUG: FOP config font entry:");
+                            //System.out.println(fopFontString);
+                            fopFontsLog.append(fopFontString).append("\n");
+                        }
+                        Node newNodeFont = DocumentBuilderFactory
+                                .newInstance()
+                                .newDocumentBuilder()
+                                .parse(new ByteArrayInputStream(fopFontString.getBytes()))
+                                .getDocumentElement();
+                        //newNodeFont.getAttributes().getNamedItem("embed-url").setTextContent(embed_url);
+
+                        Document doc = nodeFonts.getOwnerDocument();
+                        newNodeFont = doc.importNode(newNodeFont, true);
+                        nodeFonts.appendChild(newNodeFont);
 
                     /*if (fopFont.isUsing()) {
                         String msg = fopFont.getMessages();
                         if(!msg.isEmpty()) {
                             System.out.println();
                         }
                     }*/
-
-                } catch (SAXException | IOException | ParserConfigurationException ex) {
-                    logger.log(Level.SEVERE, "Error in FOP font xml processing: {0}", ex.toString());
+
+                    } catch (SAXException | IOException | ParserConfigurationException ex) {
+                        logger.log(Level.SEVERE, "Error in FOP font xml processing: {0}", ex.toString());
+                    }
                 }
             }
         } catch (XPathExpressionException ex) {