Merge pull request #400 from metanorma/update

Conversion issue fix
metanorma · Sep 6, 2023 · ddc9bf9 · ddc9bf9
2 parents 6c8a6ae + 35f567e
commit ddc9bf9
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 13 deletions.
diff --git 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.55.0.jar xml_file --check-type xsd-niso
+java -jar mnconvert-1.56.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 <path DTD or XSD>
 
 [source,sh]
 ----
-java -jar mnconvert-1.55.0.jar xml_file [options]
+java -jar mnconvert-1.56.0.jar xml_file [options]
 ----
 
 - `--xsl-file`, `-s` - path to XSL file, optional
@@ -52,7 +52,7 @@ java -jar mnconvert-1.55.0.jar xml_file [options]
 
 [source,sh]
 ----
-java -jar mnconvert-1.55.0.jar xml_file [options]
+java -jar mnconvert-1.56.0.jar xml_file [options]
 ----
 
 - `--xsl-file`, `-s` - path to XSL file, optional
@@ -67,7 +67,7 @@ java -jar mnconvert-1.55.0.jar xml_file [options]
 
 [source,sh]
 ----
-java -jar mnconvert-1.55.0.jar xml_file [options]
+java -jar mnconvert-1.56.0.jar xml_file [options]
 ----
 
 - `--xsl-file`, `-s` - path to XSL file, optional
@@ -78,7 +78,7 @@ java -jar mnconvert-1.55.0.jar xml_file [options]
 
 [source,sh]
 ----
-java -jar mnconvert-1.55.0.jar docx_file [options]
+java -jar mnconvert-1.56.0.jar docx_file [options]
 ----
 
 - `--xsl-file`, `-s` - path to XSL file, optional
@@ -88,7 +88,7 @@ java -jar mnconvert-1.55.0.jar docx_file [options]
 === 6. Convert from IEEE STL XML to Metanorma AsciiDoc.
 
 ----
-java -jar mnconvert-1.55.0.jar xml_file [options]
+java -jar mnconvert-1.56.0.jar xml_file [options]
 ----
 
 - `--xsl-file`, `-s` - path to XSL file, optional
@@ -100,7 +100,7 @@ java -jar mnconvert-1.55.0.jar xml_file [options]
 
 [source,sh]
 ----
-java -jar mnconvert-1.55.0.jar xml_file --output-format ieee --validation-against <path to IEEE DTD>
+java -jar mnconvert-1.56.0.jar xml_file --output-format ieee --validation-against <path to IEEE DTD>
 ----
 
 - `--xsl-file`, `-s` - path to XSL file, optional
@@ -118,7 +118,7 @@ e.g.
 
 [source,sh]
 ----
-java -jar target/mnconvert-1.55.0.jar tests/iso-tc154-8601-1-en.xml --output tests/iso-tc154-8601-1-en.out.xml
+java -jar target/mnconvert-1.56.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.:
 ----
 <groupId>org.metanorma</groupId>
 <artifactId>mnconvert</artifactId>
-<version>1.55.0</version>
+<version>1.56.0</version>
 <name>Metanorma XML to NISO STS XML two-directional converter</name>
 ----
 
@@ -162,8 +162,8 @@ Tag the same version in Git:
 
 [source,xml]
 ----
-git tag v1.55.0
-git push origin v1.55.0
+git tag v1.56.0
+git push origin v1.56.0
 ----
 
 Then the corresponding GitHub release will be automatically created at:

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.metanorma</groupId>
 	<artifactId>mnconvert</artifactId>
-	<version>1.55.0</version>
+	<version>1.56.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>

diff --git a/src/main/resources/mn2xml.xsl b/src/main/resources/mn2xml.xsl
@@ -349,6 +349,12 @@
 		<xsl:apply-templates select="xalan:nodeset($element)" mode="add_attributes"/>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'bibdata'] | *[local-name() = 'bibdata']//*" mode="xml_presentation_catalog">
+		<xsl:element name="{local-name()}">
+			<xsl:apply-templates select="@*|node()" mode="xml_presentation_catalog"/>
+		</xsl:element>
+	</xsl:template>
+
 	<xsl:variable name="xml_presentation_catalog" select="xalan:nodeset($xml_presentation_catalog_)"/>
 	<!-- ================================== -->
 	<!-- END Presentation XML Catalog -->
@@ -1471,7 +1477,10 @@
 						<xsl:value-of select="normalize-space(substring-after($related_comm_ref, $related_comm_ref_text))"/>
 					</xsl:when>
 					<xsl:when test="ext/editorialgroup/@identifier">
-						<xsl:value-of select="@identifier"/>
+						<xsl:value-of select="ext/editorialgroup/@identifier"/>
+					</xsl:when>
+					<xsl:when test="$xml_presentation_catalog/bibdata/ext/editorialgroup/@identifier">
+						<xsl:value-of select="$xml_presentation_catalog/bibdata/ext/editorialgroup/@identifier"/>
 					</xsl:when>
 					<xsl:when test="ext/editorialgroup/technical-committee and not(
 						ext/editorialgroup/subcommittee and 
@@ -2131,11 +2140,15 @@
 																bibdata/title[@type = 'title-amd'] |
 																contributor[role/@type='author']/organization/abbreviation |																
 																contributor[role/@type='author']/organization/name |
+																contributor/organization/subdivision |
+																contributor/organization/identifier |
+																contributor/role/text() |
 																ext/structuredidentifier/project-number |
 																language |
 																script |
 																contributor[role/@type='publisher']/organization/abbreviation |																
 																contributor[role/@type='publisher']/organization/name |
+																contributor[role/@type!='author' and role/@type!='publisher'] |
 																status/stage |
 																status/substage |
 																ext/doctype |