diff --git a/Makefile b/Makefile index 0befd86..f766833 100644 --- 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.95 +JAR_VERSION := 1.96 JAR_FILE := mn2pdf-$(JAR_VERSION).jar all: target/$(JAR_FILE) diff --git a/README.adoc b/README.adoc index 9f9e2f7..0ffdc6e 100644 --- a/README.adoc +++ b/README.adoc @@ -17,14 +17,14 @@ You will need the Java Development Kit (JDK) version 8, Update 241 (8u241) or hi [source,sh] ---- -java -Xss5m -Xmx2048m -jar target/mn2pdf-1.95.jar --xml-file --xsl-file --pdf-file [--syntax-highlight] +java -Xss5m -Xmx2048m -jar target/mn2pdf-1.96.jar --xml-file --xsl-file --pdf-file [--syntax-highlight] ---- e.g. [source,sh] ---- -java -Xss5m -Xmx2048m -jar target/mn2pdf-1.95.jar --xml-file tests/G.191.xml --xsl-file tests/itu.recommendation.xsl --pdf-file tests/G.191.pdf +java -Xss5m -Xmx2048m -jar target/mn2pdf-1.96.jar --xml-file tests/G.191.xml --xsl-file tests/itu.recommendation.xsl --pdf-file tests/G.191.pdf ---- === PDF encryption features @@ -100,7 +100,7 @@ Update version in `pom.xml`, e.g.: ---- org.metanorma.fop mn2pdf -1.95 +1.96 Metanorma XML to PDF converter ---- @@ -111,8 +111,8 @@ Tag the same version in Git: [source,xml] ---- -git tag v1.95 -git push origin v1.95 +git tag v1.96 +git push origin v1.96 ---- Then the corresponding GitHub release will be automatically created at: diff --git a/pom.xml b/pom.xml index 129cd81..3c23c0f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.metanorma.fop mn2pdf - 1.95 + 1.96 Metanorma XML to PDF converter jar https://www.metanorma.org diff --git a/src/main/java/org/metanorma/fop/annotations/Annotation.java b/src/main/java/org/metanorma/fop/annotations/Annotation.java index 2ec90b5..fad7980 100644 --- a/src/main/java/org/metanorma/fop/annotations/Annotation.java +++ b/src/main/java/org/metanorma/fop/annotations/Annotation.java @@ -30,6 +30,8 @@ import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathException; import javax.xml.xpath.XPathFactory; + +import org.apache.pdfbox.pdmodel.PDPage; import org.xml.sax.InputSource; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.fdf.FDFAnnotation; @@ -274,7 +276,12 @@ public void process(File pdf, String xmlReview) throws IOException { } for (Map.Entry> set: map_pdfannots.entrySet()) { - document.getPage(set.getKey()).setAnnotations(set.getValue()); + PDPage page = document.getPage(set.getKey()); + List pageAnotations = page.getAnnotations(); + // merge existing annotations (including hyperlinks) and new annotations + pageAnotations.addAll(set.getValue()); + //document.getPage(set.getKey()).setAnnotations(set.getValue()); + document.getPage(set.getKey()).setAnnotations(pageAnotations); } fdfDoc.close();