diff --git a/README.adoc b/README.adoc index ab71bf9d..8e06bd02 100644 --- a/README.adoc +++ b/README.adoc @@ -14,7 +14,7 @@ You will need the `maven` build tool and `make`. [source,sh] ---- -java -jar mnconvert-1.57.0.jar xml_file --check-type xsd-niso +java -jar mnconvert-1.58.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) @@ -37,7 +37,7 @@ java -jar mnconvert-1.44.0.jar xml_file --validation-against [source,sh] ---- -java -jar mnconvert-1.57.0.jar xml_file [options] +java -jar mnconvert-1.58.0.jar xml_file [options] ---- - `--xsl-file`, `-s` - path to XSL file, optional @@ -52,7 +52,7 @@ java -jar mnconvert-1.57.0.jar xml_file [options] [source,sh] ---- -java -jar mnconvert-1.57.0.jar xml_file [options] +java -jar mnconvert-1.58.0.jar xml_file [options] ---- - `--xsl-file`, `-s` - path to XSL file, optional @@ -67,7 +67,7 @@ java -jar mnconvert-1.57.0.jar xml_file [options] [source,sh] ---- -java -jar mnconvert-1.57.0.jar xml_file [options] +java -jar mnconvert-1.58.0.jar xml_file [options] ---- - `--xsl-file`, `-s` - path to XSL file, optional @@ -78,7 +78,7 @@ java -jar mnconvert-1.57.0.jar xml_file [options] [source,sh] ---- -java -jar mnconvert-1.57.0.jar docx_file [options] +java -jar mnconvert-1.58.0.jar docx_file [options] ---- - `--xsl-file`, `-s` - path to XSL file, optional @@ -88,7 +88,7 @@ java -jar mnconvert-1.57.0.jar docx_file [options] === 6. Convert from IEEE STL XML to Metanorma AsciiDoc. ---- -java -jar mnconvert-1.57.0.jar xml_file [options] +java -jar mnconvert-1.58.0.jar xml_file [options] ---- - `--xsl-file`, `-s` - path to XSL file, optional @@ -100,7 +100,7 @@ java -jar mnconvert-1.57.0.jar xml_file [options] [source,sh] ---- -java -jar mnconvert-1.57.0.jar xml_file --output-format ieee --validation-against +java -jar mnconvert-1.58.0.jar xml_file --output-format ieee --validation-against ---- - `--xsl-file`, `-s` - path to XSL file, optional @@ -118,7 +118,7 @@ e.g. [source,sh] ---- -java -jar target/mnconvert-1.57.0.jar tests/iso-tc154-8601-1-en.xml --output tests/iso-tc154-8601-1-en.out.xml +java -jar target/mnconvert-1.58.0.jar tests/iso-tc154-8601-1-en.xml --output tests/iso-tc154-8601-1-en.out.xml ---- NOTE: Input XML format (Metanorma, STS ISO/NISO, IEEE or XML2RFC) determines programmatically by root element of input file: + @@ -151,7 +151,7 @@ Update version in `pom.xml`, e.g.: ---- org.metanorma mnconvert -1.57.0 +1.58.0 Metanorma XML to NISO STS XML two-directional converter ---- @@ -162,8 +162,8 @@ Tag the same version in Git: [source,xml] ---- -git tag v1.57.0 -git push origin v1.57.0 +git tag v1.58.0 +git push origin v1.58.0 ---- Then the corresponding GitHub release will be automatically created at: diff --git a/pom.xml b/pom.xml index ec0a707c..c55664db 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.metanorma mnconvert - 1.57.0 + 1.58.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/mn2sts.xsl b/src/main/resources/mn2sts.xsl index 42080474..49df766a 100644 --- a/src/main/resources/mn2sts.xsl +++ b/src/main/resources/mn2sts.xsl @@ -1225,7 +1225,7 @@ - symbol + acronym abbreviation fullForm diff --git a/src/main/resources/mn2xml.xsl b/src/main/resources/mn2xml.xsl index e4f88a8e..974ed8d6 100644 --- a/src/main/resources/mn2xml.xsl +++ b/src/main/resources/mn2xml.xsl @@ -2143,6 +2143,7 @@ contributor/organization/subdivision | contributor/organization/identifier | contributor/role/text() | + contributor/role/description | ext/structuredidentifier/project-number | language | script | diff --git a/src/main/resources/sts2mn.adoc.xsl b/src/main/resources/sts2mn.adoc.xsl index e5aeb2d1..9f3ae922 100644 --- a/src/main/resources/sts2mn.adoc.xsl +++ b/src/main/resources/sts2mn.adoc.xsl @@ -2535,7 +2535,13 @@ abbreviation-type:: - letter-symbol:: true + letter-symbol:: symbol + + + letter-symbol:: formula + + + letter-symbol:: equation type:: @@ -2543,8 +2549,6 @@ full - full