Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mn2xml.xsl updated for new term tags, #418 #421

Merged
merged 2 commits into from
Jan 21, 2025
Merged

mn2xml.xsl updated for new term tags, #418 #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70e29de
mn2xml.xsl updated for new term tags, #418
Intelligent2013 Jan 21, 2025
8b56e49
mn2xml.xsl updated for new term tags, #418
Intelligent2013 Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

[source,sh]
----
java -jar mnconvert-1.66.0.jar xml_file --check-type xsd-niso
java -jar mnconvert-1.67.0.jar xml_file --check-type xsd-niso
----

- `--check-type`, `-ct` - Check against XSD NISO (value xsd-niso), DTD ISO (dtd-iso), DTD NISO (dtd-niso)
Expand All @@ -19,7 +19,7 @@ or check any XML against XSD, DTD.

[source,sh]
----
java -jar mnconvert-1.66.0.jar xml_file --validation-against <path DTD or XSD>
java -jar mnconvert-1.67.0.jar xml_file --validation-against <path DTD or XSD>
----

- `--validation-against`, `-va` - Check against specified DTD ot XSD
Expand All @@ -30,7 +30,7 @@ java -jar mnconvert-1.66.0.jar xml_file --validation-against <path DTD or XSD>

[source,sh]
----
java -jar mnconvert-1.66.0.jar xml_file [options]
java -jar mnconvert-1.67.0.jar xml_file [options]
----

- `--xsl-file`, `-s` - path to XSL file, optional
Expand All @@ -45,7 +45,7 @@ java -jar mnconvert-1.66.0.jar xml_file [options]

[source,sh]
----
java -jar mnconvert-1.66.0.jar xml_file [options]
java -jar mnconvert-1.67.0.jar xml_file [options]
----

- `--xsl-file`, `-s` - path to XSL file, optional
Expand All @@ -60,7 +60,7 @@ java -jar mnconvert-1.66.0.jar xml_file [options]

[source,sh]
----
java -jar mnconvert-1.66.0.jar xml_file [options]
java -jar mnconvert-1.67.0.jar xml_file [options]
----

- `--xsl-file`, `-s` - path to XSL file, optional
Expand All @@ -71,7 +71,7 @@ java -jar mnconvert-1.66.0.jar xml_file [options]

[source,sh]
----
java -jar mnconvert-1.66.0.jar docx_file [options]
java -jar mnconvert-1.67.0.jar docx_file [options]
----

- `--xsl-file`, `-s` - path to XSL file, optional
Expand All @@ -81,7 +81,7 @@ java -jar mnconvert-1.66.0.jar docx_file [options]
=== 6. Convert from IEEE STL XML to Metanorma AsciiDoc.

----
java -jar mnconvert-1.66.0.jar xml_file [options]
java -jar mnconvert-1.67.0.jar xml_file [options]
----

- `--xsl-file`, `-s` - path to XSL file, optional
Expand All @@ -93,7 +93,7 @@ java -jar mnconvert-1.66.0.jar xml_file [options]

[source,sh]
----
java -jar mnconvert-1.66.0.jar xml_file --output-format ieee --validation-against <path to IEEE DTD>
java -jar mnconvert-1.67.0.jar xml_file --output-format ieee --validation-against <path to IEEE DTD>
----

- `--xsl-file`, `-s` - path to XSL file, optional
Expand All @@ -111,7 +111,7 @@ e.g.

[source,sh]
----
java -jar target/mnconvert-1.66.0.jar tests/iso-tc154-8601-1-en.xml --output tests/iso-tc154-8601-1-en.out.xml --output-format ieee
java -jar target/mnconvert-1.67.0.jar tests/iso-tc154-8601-1-en.xml --output tests/iso-tc154-8601-1-en.out.xml --output-format ieee
----

NOTE: Input XML format (Metanorma, STS ISO/NISO, IEEE or XML2RFC) determines programmatically by root element of input file: +
Expand Down Expand Up @@ -150,7 +150,7 @@ Update version in `pom.xml`, e.g.:
----
<groupId>org.metanorma</groupId>
<artifactId>mnconvert</artifactId>
<version>1.66.0</version>
<version>1.67.0</version>
<name>Metanorma XML to NISO STS XML two-directional converter</name>
----

Expand All @@ -161,8 +161,8 @@ Tag the same version in Git:

[source,xml]
----
git tag v1.66.0
git push origin v1.66.0
git tag v1.67.0
git push origin v1.67.0
----

Then the corresponding GitHub release will be automatically created at:
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.metanorma</groupId>
<artifactId>mnconvert</artifactId>
<version>1.66.0</version>
<version>1.67.0</version>
<name>Metanorma XML to NISO STS XML two-directional, IEEE to Metanorma ADOC, Metanorma XML to IEEE XML, and XML2RFC to Metanorma Asciidoc IETF converter</name>
<packaging>jar</packaging>
<url>https://www.metanorma.org</url>
Expand Down
39 changes: 37 additions & 2 deletions src/main/resources/mn2xml.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,13 @@
</xsl:template>

<xsl:template match="*[local-name() = 'title'][following-sibling::*[1][local-name() = 'fmt-title']] |
*[local-name() = 'name'][following-sibling::*[1][local-name() = 'fmt-name']]" mode="remove_namespace" priority="3"/>
*[local-name() = 'name'][following-sibling::*[1][local-name() = 'fmt-name']] |
*[local-name() = 'preferred'][ancestor::*[local-name() = 'term'][1]//*[local-name() = 'fmt-preferred']] |
*[local-name() = 'admitted'][ancestor::*[local-name() = 'term'][1]//*[local-name() = 'fmt-admitted']] |
*[local-name() = 'deprecates'][ancestor::*[local-name() = 'term'][1]//*[local-name() = 'fmt-deprecates']] |
*[local-name() = 'related'] |
*[local-name() = 'definition'][ancestor::*[local-name() = 'term'][1]//*[local-name() = 'fmt-definition']] |
*[local-name() = 'termsource'][ancestor::*[local-name() = 'term'][1]//*[local-name() = 'fmt-termsource']]" mode="remove_namespace" priority="3"/>

<xsl:template match="*[local-name() = 'fmt-title']//*[local-name() = 'span'] |
*[local-name() = 'semx'] |
Expand All @@ -79,8 +85,37 @@

<xsl:template match="*[local-name() = 'fmt-xref-label']" mode="remove_namespace" priority="3"/>

<xsl:template match="*[local-name() = 'fmt-preferred'][*[local-name() = 'p']]" mode="remove_namespace" priority="3">
<xsl:apply-templates mode="remove_namespace"/>
</xsl:template>
<xsl:template match="*[local-name() = 'fmt-preferred'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-preferred']/*[local-name() = 'p']" mode="remove_namespace" priority="3">
<xsl:element name="preferred">
<xsl:apply-templates select="@*|node()" mode="remove_namespace"/>
</xsl:element>
</xsl:template>

<xsl:template match="*[local-name() = 'fmt-admitted'][*[local-name() = 'p']]" mode="remove_namespace" priority="3">
<xsl:apply-templates mode="remove_namespace"/>
</xsl:template>
<xsl:template match="*[local-name() = 'fmt-admitted'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-admitted']/*[local-name() = 'p']" mode="remove_namespace" priority="3">
<xsl:element name="admitted">
<xsl:apply-templates select="@*|node()" mode="remove_namespace"/>
</xsl:element>
</xsl:template>

<xsl:template match="*[local-name() = 'fmt-deprecates'][*[local-name() = 'p']]" mode="remove_namespace" priority="3">
<xsl:apply-templates mode="remove_namespace"/>
</xsl:template>
<xsl:template match="*[local-name() = 'fmt-deprecates'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-deprecates']/*[local-name() = 'p']" mode="remove_namespace" priority="3">
<xsl:element name="deprecates">
<xsl:apply-templates select="@*|node()" mode="remove_namespace"/>
</xsl:element>
</xsl:template>

<xsl:template match="*[local-name() = 'fmt-title'] |
*[local-name() = 'fmt-name']" mode="remove_namespace" priority="3">
*[local-name() = 'fmt-name'] |
*[local-name() = 'fmt-definition'] |
*[local-name() = 'fmt-termsource']" mode="remove_namespace" priority="3">
<xsl:element name="{substring-after(local-name(), 'fmt-')}">
<xsl:apply-templates select="@*|node()" mode="remove_namespace"/>
</xsl:element>
Expand Down
Loading