Merge pull request #242 from metanorma/updates

Updates
metanorma · Mar 10, 2024 · 4295027 · 4295027
2 parents 5d0b3b2 + de5e5d3
commit 4295027
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 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.84
+JAR_VERSION := 1.85
 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.84</version>
+<version>1.85</version>
 <name>Metanorma XML to PDF converter</name>
 ----
 
@@ -111,8 +111,8 @@ Tag the same version in Git:
 
 [source,xml]
 ----
-git tag v1.84
-git push origin v1.84
+git tag v1.85
+git push origin v1.85
 ----
 
 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.84</version>
+	<version>1.85</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/SourceXMLDocument.java b/src/main/java/org/metanorma/fop/SourceXMLDocument.java
@@ -164,7 +164,8 @@ public List<String> getDocumentFonts() {
                                 attrText = attrText.substring(0, attrText.indexOf(";"));
                             }
                             for (String fname: attrText.split(",")) {
-                                fname = fname.trim().replace("'","");
+                                fname = fname.trim().replace("'","")
+                                        .replace("\"","");
                                 if (!documentFontList.contains(fname)) {
                                     documentFontList.add(fname);
                                 }

diff --git a/src/main/resources/pdf_fonts_config.xml b/src/main/resources/pdf_fonts_config.xml
@@ -209,7 +209,7 @@ Relative config URLs are resolved relative to location of this file.
 				<font kerning="yes" embed-url="SourceSansPro-Light.ttf"> <!--  mn_default="true" -->
 					<font-triplet name="Source Sans Pro" style="normal" weight="300"/>
 				</font>
-				<font kerning="yes" embed-url="SourceSansPro-LightIt.ttf" mn_default="true"> <!--  mn_default="true" -->
+				<font kerning="yes" embed-url="SourceSansPro-LightIt.ttf"> <!--  mn_default="true" -->
 					<font-triplet name="Source Sans Pro" style="italic" weight="300"/>
 				</font>