Merge pull request #406 from metanorma/issue/405

Issue/405
metanorma · Feb 28, 2024 · 73421d9 · 73421d9
2 parents 0c60c69 + 19fe5cc
commit 73421d9
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 14 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.58.0.jar xml_file --check-type xsd-niso
+java -jar mnconvert-1.59.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.58.0.jar xml_file [options]
+java -jar mnconvert-1.59.0.jar xml_file [options]
 ----
 
 - `--xsl-file`, `-s` - path to XSL file, optional
@@ -52,7 +52,7 @@ java -jar mnconvert-1.58.0.jar xml_file [options]
 
 [source,sh]
 ----
-java -jar mnconvert-1.58.0.jar xml_file [options]
+java -jar mnconvert-1.59.0.jar xml_file [options]
 ----
 
 - `--xsl-file`, `-s` - path to XSL file, optional
@@ -67,7 +67,7 @@ java -jar mnconvert-1.58.0.jar xml_file [options]
 
 [source,sh]
 ----
-java -jar mnconvert-1.58.0.jar xml_file [options]
+java -jar mnconvert-1.59.0.jar xml_file [options]
 ----
 
 - `--xsl-file`, `-s` - path to XSL file, optional
@@ -78,7 +78,7 @@ java -jar mnconvert-1.58.0.jar xml_file [options]
 
 [source,sh]
 ----
-java -jar mnconvert-1.58.0.jar docx_file [options]
+java -jar mnconvert-1.59.0.jar docx_file [options]
 ----
 
 - `--xsl-file`, `-s` - path to XSL file, optional
@@ -88,7 +88,7 @@ java -jar mnconvert-1.58.0.jar docx_file [options]
 === 6. Convert from IEEE STL XML to Metanorma AsciiDoc.
 
 ----
-java -jar mnconvert-1.58.0.jar xml_file [options]
+java -jar mnconvert-1.59.0.jar xml_file [options]
 ----
 
 - `--xsl-file`, `-s` - path to XSL file, optional
@@ -100,7 +100,7 @@ java -jar mnconvert-1.58.0.jar xml_file [options]
 
 [source,sh]
 ----
-java -jar mnconvert-1.58.0.jar xml_file --output-format ieee --validation-against <path to IEEE DTD>
+java -jar mnconvert-1.59.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.58.0.jar tests/iso-tc154-8601-1-en.xml --output tests/iso-tc154-8601-1-en.out.xml
+java -jar target/mnconvert-1.59.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.58.0</version>
+<version>1.59.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.58.0
-git push origin v1.58.0
+git tag v1.59.0
+git push origin v1.59.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.58.0</version>
+	<version>1.59.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
@@ -2949,11 +2949,21 @@
 		</name>
 	</xsl:template>
 
+	<xsl:template match="bibitem/contributor/person/name[completename]">
+		<string-name>
+			<xsl:apply-templates />
+		</string-name>
+	</xsl:template>
+
+	<xsl:template match="bibitem/contributor/person/name/completename">
+		<xsl:apply-templates />
+	</xsl:template>
+
 	<xsl:template match="bibitem/contributor/person/name/surname">
 		<surname><xsl:apply-templates/></surname>
 	</xsl:template>
 
-	<xsl:template match="bibitem/contributor/person/name/forename">
+	<xsl:template match="bibitem/contributor/person/name/forename | bibitem/contributor/person/name/formatted-initials">
 		<given-names><xsl:apply-templates/></given-names>
 	</xsl:template>
 
@@ -3019,7 +3029,14 @@
 		<xsl:if test="$metanorma_type != 'IEC'">
 			<xsl:text>, </xsl:text>
 		</xsl:if>
-		<title><xsl:apply-templates/></title>
+		<xsl:choose>
+			<xsl:when test="normalize-space(../@type) = ''">
+				<italic><xsl:apply-templates/></italic>
+			</xsl:when>
+			<xsl:otherwise>
+				<title><xsl:apply-templates/></title>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<xsl:template match="bibitem[@type != '' and @type != 'standard']/note" priority="3">