Skip to content

Commit

Permalink
updated for attachments support, metanorma/metanorma-standoc#872
Browse files Browse the repository at this point in the history
  • Loading branch information
Intelligent2013 committed Mar 3, 2024
1 parent 1db8d95 commit c7d8f0c
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Update version in `pom.xml`, e.g.:
----
<groupId>org.metanorma.fop</groupId>
<artifactId>mn2pdf</artifactId>
<version>1.83</version>
<version>1.84</version>
<name>Metanorma XML to PDF converter</name>
----

Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.metanorma.fop</groupId>
<artifactId>mn2pdf</artifactId>
<version>1.83</version>
<version>1.84</version>
<name>Metanorma XML to PDF converter</name>
<packaging>jar</packaging>
<url>https://www.metanorma.org</url>
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/org/metanorma/fop/PDFGenerator.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit c7d8f0c

Please sign in to comment.