Skip to content

Commit

Permalink
Merge pull request #208 from metanorma/dl_table
Browse files Browse the repository at this point in the history
tables_only.xsl updated for dl inside table, metanorma/metanorma-iec#248
  • Loading branch information
Intelligent2013 authored Jun 6, 2023
2 parents f8e9f9c + de63c28 commit 163e719
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 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.71
JAR_VERSION := 1.72
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.70</version>
<version>1.72</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.71
git push origin v1.71
git tag v1.72
git push origin v1.72
----

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.71</version>
<version>1.72</version>
<name>Metanorma XML to PDF converter</name>
<packaging>jar</packaging>
<url>https://www.metanorma.org</url>
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/tables_only.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
<xsl:for-each select=".//*[local-name() = 'dt']">
<xsl:variable name="ns" select="namespace-uri()"/>
<xsl:element name="p" namespace="{$ns}">
<xsl:attribute name="from_dl">true</xsl:attribute>
<xsl:copy-of select="node()"/>
<xsl:text> </xsl:text>
<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]/*[local-name() = 'p']/node()" />
Expand Down Expand Up @@ -120,6 +121,7 @@
<xsl:for-each select=".//*[local-name() = 'dt']">
<xsl:variable name="ns" select="namespace-uri()"/>
<xsl:element name="p" namespace="{$ns}">
<xsl:attribute name="from_dl">true</xsl:attribute>
<xsl:copy-of select="node()"/>
<xsl:text> </xsl:text>
<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]/*[local-name() = 'p']/node()" mode="simple_td"/>
Expand Down

0 comments on commit 163e719

Please sign in to comment.