From c7d8f0ccd966d1814628eaa0493ec03d560de1ed Mon Sep 17 00:00:00 2001 From: Alexander Dyuzhev Date: Mon, 4 Mar 2024 00:04:23 +0300 Subject: [PATCH] updated for attachments support, metanorma/metanorma-standoc#872 --- Makefile | 2 +- README.adoc | 6 +++--- pom.xml | 2 +- src/main/java/org/metanorma/fop/PDFGenerator.java | 6 +++++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 2c51072..0bf425e 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.83 +JAR_VERSION := 1.84 JAR_FILE := mn2pdf-$(JAR_VERSION).jar all: target/$(JAR_FILE) diff --git a/README.adoc b/README.adoc index 9c2c8f3..455fc80 100644 --- a/README.adoc +++ b/README.adoc @@ -100,7 +100,7 @@ Update version in `pom.xml`, e.g.: ---- org.metanorma.fop mn2pdf -1.83 +1.84 Metanorma XML to PDF converter ---- @@ -111,8 +111,8 @@ Tag the same version in Git: [source,xml] ---- -git tag v1.83 -git push origin v1.83 +git tag v1.84 +git push origin v1.84 ---- Then the corresponding GitHub release will be automatically created at: diff --git a/pom.xml b/pom.xml index 197c887..7a03611 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.metanorma.fop mn2pdf - 1.83 + 1.84 Metanorma XML to PDF converter jar https://www.metanorma.org diff --git a/src/main/java/org/metanorma/fop/PDFGenerator.java b/src/main/java/org/metanorma/fop/PDFGenerator.java index 7afb573..00c04e7 100644 --- a/src/main/java/org/metanorma/fop/PDFGenerator.java +++ b/src/main/java/org/metanorma/fop/PDFGenerator.java @@ -415,7 +415,11 @@ private void convertmn2pdf(fontConfig fontcfg, XSLTconverter xsltConverter, File basepath = xsltParams.getProperty("baseassetpath") + File.separator; } additionalXSLTparams.setProperty("basepath", basepath); - + + File fInputXML = new File(inputXMLFilePath); + additionalXSLTparams.setProperty("inputxml_basepath", fInputXML.getParent() + File.separator); + additionalXSLTparams.setProperty("inputxml_filename", fInputXML.getName()); + xsltConverter.setParams(additionalXSLTparams); setTablesWidths(fontcfg, xsltConverter, pdf);