From 70e29de2f6b776b327fd1a0f8de25fc5bbc84caf Mon Sep 17 00:00:00 2001 From: Alexander Dyuzhev Date: Tue, 21 Jan 2025 12:43:31 +0300 Subject: [PATCH 1/2] mn2xml.xsl updated for new term tags, #418 --- README.adoc | 24 ++++++++++----------- pom.xml | 2 +- src/main/resources/mn2xml.xsl | 39 +++++++++++++++++++++++++++++++++-- 3 files changed, 50 insertions(+), 15 deletions(-) diff --git a/README.adoc b/README.adoc index e60dd49..a080633 100644 --- a/README.adoc +++ b/README.adoc @@ -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) @@ -19,7 +19,7 @@ or check any XML against XSD, DTD. [source,sh] ---- -java -jar mnconvert-1.66.0.jar xml_file --validation-against +java -jar mnconvert-1.67.0.jar xml_file --validation-against ---- - `--validation-against`, `-va` - Check against specified DTD ot XSD @@ -30,7 +30,7 @@ java -jar mnconvert-1.66.0.jar xml_file --validation-against [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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 +java -jar mnconvert-1.67.0.jar xml_file --output-format ieee --validation-against ---- - `--xsl-file`, `-s` - path to XSL file, optional @@ -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: + @@ -150,7 +150,7 @@ Update version in `pom.xml`, e.g.: ---- org.metanorma mnconvert -1.66.0 +1.67.0 Metanorma XML to NISO STS XML two-directional converter ---- @@ -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: diff --git a/pom.xml b/pom.xml index b2690df..dfbff18 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.metanorma mnconvert - 1.66.0 + 1.67.0 Metanorma XML to NISO STS XML two-directional, IEEE to Metanorma ADOC, Metanorma XML to IEEE XML, and XML2RFC to Metanorma Asciidoc IETF converter jar https://www.metanorma.org diff --git a/src/main/resources/mn2xml.xsl b/src/main/resources/mn2xml.xsl index a31d36b..9fefd03 100644 --- a/src/main/resources/mn2xml.xsl +++ b/src/main/resources/mn2xml.xsl @@ -69,7 +69,13 @@ + *[local-name() = 'name'][following-sibling::*[1][local-name() = 'fmt-name']] | + *[local-name() = 'preferred'] | + *[local-name() = 'admitted'] | + *[local-name() = 'deprecates'] | + *[local-name() = 'related'] | + *[local-name() = 'definition'] | + *[local-name() = 'termsource']" mode="remove_namespace" priority="3"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + *[local-name() = 'fmt-name'] | + *[local-name() = 'fmt-definition'] | + *[local-name() = 'fmt-termsource']" mode="remove_namespace" priority="3"> From 8b56e492cd978d2721cf1f0812cab5941cb495e5 Mon Sep 17 00:00:00 2001 From: Alexander Dyuzhev Date: Tue, 21 Jan 2025 17:08:13 +0300 Subject: [PATCH 2/2] mn2xml.xsl updated for new term tags, #418 --- src/main/resources/mn2xml.xsl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/mn2xml.xsl b/src/main/resources/mn2xml.xsl index 9fefd03..827e117 100644 --- a/src/main/resources/mn2xml.xsl +++ b/src/main/resources/mn2xml.xsl @@ -70,12 +70,12 @@ + *[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"/>