From 6b077da42cd0e21958c1e67ab5557eae33e47aae Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Mon, 4 Mar 2024 16:12:33 +0300
Subject: [PATCH 01/23] official NISO STS XML sample conversion added to JUnit
 test, #407

---
 README.adoc                                  | 37 ++++++++++----------
 pom.xml                                      |  2 +-
 src/test/java/org/metanorma/sts2mnTests.java | 12 +++++++
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/README.adoc b/README.adoc
index 8b786e8f..7b9ba8ef 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,12 +1,5 @@
 = Metanorma mnconvert
 
-== Installing Build Tools
-
-You will need the `maven` build tool and `make`.
-
-* https://www.baeldung.com/install-maven-on-windows-linux-mac[How to install Maven on Windows, Linux, Mac]
-
-
 == Usage
 
 
@@ -14,7 +7,7 @@ You will need the `maven` build tool and `make`.
 
 [source,sh]
 ----
-java -jar mnconvert-1.59.0.jar xml_file --check-type xsd-niso
+java -jar mnconvert-1.60.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)
@@ -26,7 +19,7 @@ or check any XML against XSD, DTD.
 
 [source,sh]
 ----
-java -jar mnconvert-1.44.0.jar xml_file --validation-against <path DTD or XSD>
+java -jar mnconvert-1.60.0.jar xml_file --validation-against <path DTD or XSD>
 ----
 
 - `--validation-against`, `-va` - Check against specified DTD ot XSD
@@ -37,7 +30,7 @@ java -jar mnconvert-1.44.0.jar xml_file --validation-against <path DTD or XSD>
 
 [source,sh]
 ----
-java -jar mnconvert-1.59.0.jar xml_file [options]
+java -jar mnconvert-1.60.0.jar xml_file [options]
 ----
 
 - `--xsl-file`, `-s` - path to XSL file, optional
@@ -52,7 +45,7 @@ java -jar mnconvert-1.59.0.jar xml_file [options]
 
 [source,sh]
 ----
-java -jar mnconvert-1.59.0.jar xml_file [options]
+java -jar mnconvert-1.60.0.jar xml_file [options]
 ----
 
 - `--xsl-file`, `-s` - path to XSL file, optional
@@ -67,7 +60,7 @@ java -jar mnconvert-1.59.0.jar xml_file [options]
 
 [source,sh]
 ----
-java -jar mnconvert-1.59.0.jar xml_file [options]
+java -jar mnconvert-1.60.0.jar xml_file [options]
 ----
 
 - `--xsl-file`, `-s` - path to XSL file, optional
@@ -78,7 +71,7 @@ java -jar mnconvert-1.59.0.jar xml_file [options]
 
 [source,sh]
 ----
-java -jar mnconvert-1.59.0.jar docx_file [options]
+java -jar mnconvert-1.60.0.jar docx_file [options]
 ----
 
 - `--xsl-file`, `-s` - path to XSL file, optional
@@ -88,7 +81,7 @@ java -jar mnconvert-1.59.0.jar docx_file [options]
 === 6. Convert from IEEE STL XML to Metanorma AsciiDoc.
 
 ----
-java -jar mnconvert-1.59.0.jar xml_file [options]
+java -jar mnconvert-1.60.0.jar xml_file [options]
 ----
 
 - `--xsl-file`, `-s` - path to XSL file, optional
@@ -100,7 +93,7 @@ java -jar mnconvert-1.59.0.jar xml_file [options]
 
 [source,sh]
 ----
-java -jar mnconvert-1.59.0.jar xml_file --output-format ieee --validation-against <path to IEEE DTD>
+java -jar mnconvert-1.60.0.jar xml_file --output-format ieee --validation-against <path to IEEE DTD>
 ----
 
 - `--xsl-file`, `-s` - path to XSL file, optional
@@ -118,7 +111,7 @@ e.g.
 
 [source,sh]
 ----
-java -jar target/mnconvert-1.59.0.jar tests/iso-tc154-8601-1-en.xml --output tests/iso-tc154-8601-1-en.out.xml
+java -jar target/mnconvert-1.60.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: +
@@ -134,6 +127,12 @@ NOTE: Output format (Metanorma or STS) determines programmatically by root eleme
 - Metanorma for input XML2RFC
 
 
+== Installing Build Tools
+
+You will need the `maven` build tool and `make`.
+
+* https://www.baeldung.com/install-maven-on-windows-linux-mac[How to install Maven on Windows, Linux, Mac]
+
 
 == Building the package
 
@@ -151,7 +150,7 @@ Update version in `pom.xml`, e.g.:
 ----
 <groupId>org.metanorma</groupId>
 <artifactId>mnconvert</artifactId>
-<version>1.59.0</version>
+<version>1.60.0</version>
 <name>Metanorma XML to NISO STS XML two-directional converter</name>
 ----
 
@@ -162,8 +161,8 @@ Tag the same version in Git:
 
 [source,xml]
 ----
-git tag v1.59.0
-git push origin v1.59.0
+git tag v1.60.0
+git push origin v1.60.0
 ----
 
 Then the corresponding GitHub release will be automatically created at:
diff --git a/pom.xml b/pom.xml
index 8301aa8f..e0137e8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.metanorma</groupId>
 	<artifactId>mnconvert</artifactId>
-	<version>1.59.0</version>
+	<version>1.60.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/test/java/org/metanorma/sts2mnTests.java b/src/test/java/org/metanorma/sts2mnTests.java
index 4441a909..b18d8950 100644
--- a/src/test/java/org/metanorma/sts2mnTests.java
+++ b/src/test/java/org/metanorma/sts2mnTests.java
@@ -121,6 +121,18 @@ public void successConvertToAdocOutputSpecified() throws ParseException {
         assertTrue(Files.exists(fileout));
     }
 
+    @Test
+    public void successConvertRemoteToAdocOutputSpecified() throws ParseException {
+        System.out.println(name.getMethodName());
+        Path fileout = Paths.get(System.getProperty("buildDirectory"), "NISO-STS-Standard-1-0.adoc");
+        fileout.toFile().delete();
+        String remoteXML = "https://www.niso-sts.org/downloadables/samples/NISO-STS-Standard-1-0.XML";
+        String[] args = new String[]{"--output-format", "adoc", "--output", fileout.toAbsolutePath().toString(), remoteXML};
+        mnconvert.main(args);
+
+        assertTrue(Files.exists(fileout));
+    }
+
     @Test
     public void successConvertToRelativeAdocOutputSpecified() throws ParseException {
         assumeNotNull(XMLFILE_MN);

From 7dd49ce5385d4f4b414593dfedaefce78262bb16 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Mon, 4 Mar 2024 16:46:22 +0300
Subject: [PATCH 02/23] official NISO STS XML sample conversion added to JUnit
 test, #407

---
 src/test/java/org/metanorma/sts2mnTests.java | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/metanorma/sts2mnTests.java b/src/test/java/org/metanorma/sts2mnTests.java
index b18d8950..361f03dc 100644
--- a/src/test/java/org/metanorma/sts2mnTests.java
+++ b/src/test/java/org/metanorma/sts2mnTests.java
@@ -166,7 +166,19 @@ public void successConvertToXML() throws ParseException {
 
         assertTrue(Files.exists(fileout));        
     }
-    
+
+    @Test
+    public void successConvertRemoteToXML() throws ParseException {
+        System.out.println(name.getMethodName());
+        Path fileout = Paths.get(System.getProperty("buildDirectory"), "NISO-STS-Standard-1-0.mn.xml");
+        fileout.toFile().delete();
+        String remoteXML = "https://www.niso-sts.org/downloadables/samples/NISO-STS-Standard-1-0.XML";
+        fileout.toFile().delete();
+        String[] args = new String[]{"--output-format", "xml", "--output", fileout.toAbsolutePath().toString(), remoteXML};
+        mnconvert.main(args);
+        assertTrue(Files.exists(fileout));
+    }
+
     @Test
     public void successConvertToADOCWithImageLink() throws ParseException {
         assumeNotNull(XMLFILE_MN);

From d582ed13851809e98192acc3a789bda1d1d79bf6 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Fri, 29 Mar 2024 12:10:27 +0300
Subject: [PATCH 03/23] slash in output path fixing, #407 [skip actions]

---
 src/main/resources/sts2mn.adoc.xsl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/sts2mn.adoc.xsl b/src/main/resources/sts2mn.adoc.xsl
index 9f3ae922..bfb1554f 100644
--- a/src/main/resources/sts2mn.adoc.xsl
+++ b/src/main/resources/sts2mn.adoc.xsl
@@ -2265,12 +2265,13 @@
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:variable name="title" select="normalize-space(translate(title, ',&#x200b;&#xa0;‑','    '))"/> <!-- get first word -->
-		<xsl:variable name="sec_title_">
+		<xsl:variable name="sec_title__">
 			<xsl:choose>
 				<xsl:when test="contains($title, ' ')"><xsl:value-of select="substring-before($title,' ')"/></xsl:when>
 				<xsl:otherwise><xsl:value-of select="$title"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
+		<xsl:variable name="sec_title_" select="translate($sec_title__, '/.' , '__')"/>
 		<xsl:variable name="sec_title" select="java:toLowerCase(java:java.lang.String.new($sec_title_))"/>
 		<xsl:variable name="sectionsFolder"><xsl:call-template name="getSectionsFolder"/></xsl:variable>
 		<redirect:write file="{$outpath}/{$sectionsFolder}/{$sec_number}-{$sec_title}.adoc">

From fc4ece3856bf5987d427584f199b4d632dea2b48 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Fri, 29 Mar 2024 12:30:37 +0300
Subject: [PATCH 04/23] date processing refactored, #407 [skip actions]

---
 src/main/resources/sts2mn.adoc.xsl | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/sts2mn.adoc.xsl b/src/main/resources/sts2mn.adoc.xsl
index bfb1554f..c205bb88 100644
--- a/src/main/resources/sts2mn.adoc.xsl
+++ b/src/main/resources/sts2mn.adoc.xsl
@@ -1164,13 +1164,15 @@
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($value), '^©(\s|\h)*', '')"/> <!-- remove copyright sign -->
 	</xsl:template>
 	
+	<xsl:template name="getDate">
+		<xsl:choose>
+			<xsl:when test="normalize-space(@iso-8601-date) != ''"><xsl:value-of select="@iso-8601-date"/></xsl:when>
+			<xsl:otherwise><xsl:value-of select="normalize-space(.)"/></xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+	
 	<xsl:template match="pub-date[ancestor::front or ancestor::adoption-front]">
-		<xsl:variable name="date">
-			<xsl:choose>
-				<xsl:when test="normalize-space(@iso-8601-date) != ''"><xsl:value-of select="@iso-8601-date"/></xsl:when>
-				<xsl:otherwise><xsl:value-of select="normalize-space(.)"/></xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
+		<xsl:variable name="date"><xsl:call-template name="getDate"/></xsl:variable>
 		<xsl:if test="normalize-space($date) != ''">
 			<xsl:choose>
 				<xsl:when test="$inputformat = 'IEEE'">
@@ -1197,10 +1199,10 @@
 	</xsl:template>
 	
 	<xsl:template match="release-date[ancestor::front or ancestor::adoption-front]">
-		<xsl:if test="normalize-space() != ''">
-			<!-- <xsl:text>:date: release </xsl:text><xsl:value-of select="."/>
-			<xsl:text>&#xa;</xsl:text> -->
-			<date type="release"><xsl:value-of select="."/></date>
+		<xsl:variable name="date"><xsl:call-template name="getDate"/></xsl:variable>
+		<xsl:if test="$date != ''">
+			<!-- <xsl:text>:date: release </xsl:text><xsl:value-of select="."/> -->
+			<date type="release"><xsl:value-of select="$date"/></date>
 		</xsl:if>
 	</xsl:template>
 	
@@ -1667,7 +1669,7 @@
 	</xsl:template>
 	
 	<xsl:template match="approval/approval-date">
-		<xsl:variable name="date" select="normalize-space(@iso-8601-date)"/>
+		<xsl:variable name="date"><xsl:call-template name="getDate"/></xsl:variable>
 		<xsl:if test="$date != ''">
 			<xsl:choose>
 				<xsl:when test="@date-type = 'approved'">
@@ -1685,7 +1687,7 @@
 	</xsl:template>
 	
 	<xsl:template match="reaffirm-date">
-		<xsl:variable name="date" select="normalize-space(@iso-8601-date)"/>
+		<xsl:variable name="date"><xsl:call-template name="getDate"/></xsl:variable>
 		<xsl:if test="$date != ''">
 			<!-- <xsl:text>:date: reaffirm </xsl:text><xsl:value-of select="$date"/>
 			<xsl:text>&#xa;</xsl:text> -->

From 1abe139a2d9d8a5978329cbc4846964aba24b6f9 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Fri, 29 Mar 2024 19:03:19 +0300
Subject: [PATCH 05/23] main-title-wrap processing added, #407 [skip actions]

---
 src/main/resources/sts2mn.adoc.xsl | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/sts2mn.adoc.xsl b/src/main/resources/sts2mn.adoc.xsl
index c205bb88..c7bc14ca 100644
--- a/src/main/resources/sts2mn.adoc.xsl
+++ b/src/main/resources/sts2mn.adoc.xsl
@@ -1256,7 +1256,7 @@
 		</xsl:choose>
 	</xsl:template>
 	
-	
+	<!-- for BSI, PAS -->
 	<xsl:template match="title-wrap/full | title-wrap/main" mode="bibdata_title_full">
 	
 		<!-- <xsl:variable name="title" select="translate(., '-–', '——')"/> -->
@@ -1285,24 +1285,28 @@
 		
 	</xsl:template>
 	
+	<!-- for BSI, PAS -->
 	<xsl:template match="title-wrap/intro" mode="bibdata">
 		<title language="{../@xml:lang}" format="text/plain" type="title-intro">
 			<xsl:apply-templates mode="bibdata"/>
 		</title>
 	</xsl:template>
 	
+	<!-- for BSI, PAS -->
 	<xsl:template match="title-wrap/main" mode="bibdata">
 		<title language="{../@xml:lang}" format="text/plain" type="title-main">
 			<xsl:apply-templates mode="bibdata"/>
 		</title>
 	</xsl:template>
 	
+	<!-- for BSI, PAS -->
 	<xsl:template match="title-wrap/compl" mode="bibdata">
 		<title language="{../@xml:lang}" format="text/plain" type="title-part">
 			<xsl:apply-templates mode="bibdata"/>
 		</title>
 	</xsl:template>
 	
+	<!-- for BSI, PAS -->
 	<xsl:template match="title-wrap/compl/node()[1][self::text()]" mode="bibdata">
 		<!-- strip 'Part N:' -->
 		<xsl:value-of select="normalize-space(java:replaceAll(java:java.lang.String.new(.), '^Part(\s|\h)*(\d)+:(.+)$', '$3'))"/>
@@ -1346,6 +1350,13 @@
 		</xsl:choose>	
 	</xsl:template>
 	
+	<xsl:template match="title-wrap[ancestor::front or ancestor::adoption-front]/main-title-wrap/main[normalize-space(.) != '']">
+		<xsl:param name="lang"/>
+		<xsl:text>:title-main-</xsl:text><xsl:value-of select="$lang"/><xsl:text>: </xsl:text><xsl:value-of select="."/>
+		<xsl:if test="../subtitle"><xsl:text> -- </xsl:text><xsl:value-of select="../subtitle"/></xsl:if>
+		<xsl:text>&#xa;</xsl:text>
+	</xsl:template>
+	
 	<xsl:template match="title-wrap[ancestor::front or ancestor::adoption-front]/compl[normalize-space(.) != '']">
 		<xsl:param name="lang"/>
 		<xsl:text>:title-part-</xsl:text><xsl:value-of select="$lang"/><xsl:text>: </xsl:text><xsl:value-of select="."/>

From d678ca6bbf9b98cfb6b78cadaa2611712da11348 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Tue, 9 Apr 2024 15:26:39 +0300
Subject: [PATCH 06/23] language determination refactored, #407

---
 src/main/resources/sts2mn.adoc.xsl   | 55 ++++++++++++++++++++++++----
 src/main/resources/sts2mn.common.xsl |  9 +++++
 2 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/sts2mn.adoc.xsl b/src/main/resources/sts2mn.adoc.xsl
index c7bc14ca..81b1bba1 100644
--- a/src/main/resources/sts2mn.adoc.xsl
+++ b/src/main/resources/sts2mn.adoc.xsl
@@ -63,7 +63,18 @@
 	<xsl:variable name="one_document_" select="count(//standard/front/*[contains(local-name(), '-meta')]) = 1 or //standards-document"/>
 	<xsl:variable name="one_document" select="normalize-space($one_document_)"/>
 	
-	<xsl:variable name="language" select="//standard/front/*/doc-ident/language"/>
+	<xsl:variable name="language1" select="normalize-space(//standard/front/*/doc-ident/language)"/>
+	<xsl:variable name="language2" select="normalize-space(//standard/front/*/std-ident/content-language)"/>
+	<xsl:variable name="language3" select="normalize-space(//standard/front/*/content-language)"/>
+	
+	<xsl:variable name="language"> <!-- see https://www.niso-sts.org/TagLibrary/niso-sts-TL-1-2-html/element/content-language.html -->
+		<xsl:choose>
+			<xsl:when test="$language1 != ''"><xsl:value-of select="$language1"/></xsl:when>
+			<xsl:when test="$language2 != ''"><xsl:value-of select="$language2"/></xsl:when>
+			<xsl:when test="$language3 != ''"><xsl:value-of select="$language3"/></xsl:when>
+			<xsl:otherwise>en</xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
 	
 	<xsl:variable name="organization">
 		<xsl:choose>
@@ -1241,7 +1252,10 @@
 					<xsl:copy-of select="xalan:nodeset($titles)/*[@type='title-part'][1]"/>
 				</xsl:variable>
 				
-				<xsl:variable name="lang" select="@xml:lang"/>
+				<!-- <xsl:variable name="lang" select="@xml:lang"/> -->
+				<xsl:variable name="lang">
+					<xsl:call-template name="getLang"/>
+				</xsl:variable>
 				<xsl:for-each select="xalan:nodeset($title_components)/*">
 					<xsl:text>:</xsl:text><xsl:value-of select="@type"/><xsl:text>-</xsl:text><xsl:value-of select="$lang"/><xsl:text>: </xsl:text><xsl:value-of select="normalize-space(.)"/>
 					<xsl:text>&#xa;</xsl:text>
@@ -1250,7 +1264,10 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:apply-templates>
-					<xsl:with-param name="lang" select="@xml:lang"/>
+					<!-- <xsl:with-param name="lang" select="@xml:lang"/> -->
+					<xsl:with-param name="lang">
+						<xsl:call-template name="getLang"/>
+					</xsl:with-param>
 				</xsl:apply-templates>
 			</xsl:otherwise>
 		</xsl:choose>
@@ -1272,7 +1289,11 @@
 		
 		<xsl:variable name="parts" select="xalan:nodeset($parts_)"/>
 		
-		<xsl:variable name="lang" select="../@xml:lang"/>
+		<xsl:variable name="lang"> <!--  select="../@xml:lang"/> -->
+			<xsl:call-template name="getLang">
+				<xsl:with-param name="fromParent">true</xsl:with-param>
+			</xsl:call-template>
+		</xsl:variable>
 		
 		<xsl:if test="count($parts/*) &gt; 0">
 			<title language="{$lang}" format="text/plain" type="title-main">
@@ -1287,21 +1308,36 @@
 	
 	<!-- for BSI, PAS -->
 	<xsl:template match="title-wrap/intro" mode="bibdata">
-		<title language="{../@xml:lang}" format="text/plain" type="title-intro">
+		<title format="text/plain" type="title-intro"> <!-- language="{../@xml:lang}" -->
+			<xsl:attribute name="language">
+				<xsl:call-template name="getLang">
+					<xsl:with-param name="fromParent">true</xsl:with-param>
+				</xsl:call-template>
+			</xsl:attribute>
 			<xsl:apply-templates mode="bibdata"/>
 		</title>
 	</xsl:template>
 	
 	<!-- for BSI, PAS -->
 	<xsl:template match="title-wrap/main" mode="bibdata">
-		<title language="{../@xml:lang}" format="text/plain" type="title-main">
+		<title format="text/plain" type="title-main"> <!-- language="{../@xml:lang}" -->
+			<xsl:attribute name="language">
+				<xsl:call-template name="getLang">
+					<xsl:with-param name="fromParent">true</xsl:with-param>
+				</xsl:call-template>
+			</xsl:attribute>
 			<xsl:apply-templates mode="bibdata"/>
 		</title>
 	</xsl:template>
 	
 	<!-- for BSI, PAS -->
 	<xsl:template match="title-wrap/compl" mode="bibdata">
-		<title language="{../@xml:lang}" format="text/plain" type="title-part">
+		<title format="text/plain" type="title-part"> <!-- language="{../@xml:lang}" -->
+			<xsl:attribute name="language">
+				<xsl:call-template name="getLang">
+					<xsl:with-param name="fromParent">true</xsl:with-param>
+				</xsl:call-template>
+			</xsl:attribute>
 			<xsl:apply-templates mode="bibdata"/>
 		</title>
 	</xsl:template>
@@ -1352,7 +1388,10 @@
 	
 	<xsl:template match="title-wrap[ancestor::front or ancestor::adoption-front]/main-title-wrap/main[normalize-space(.) != '']">
 		<xsl:param name="lang"/>
-		<xsl:text>:title-main-</xsl:text><xsl:value-of select="$lang"/><xsl:text>: </xsl:text><xsl:value-of select="."/>
+		<xsl:text>:title-main-</xsl:text>
+			<xsl:value-of select="$lang"/>
+			<xsl:if test="normalize-space($lang) = ''"><xsl:call-template name="getLang"/></xsl:if>
+		<xsl:text>: </xsl:text><xsl:value-of select="."/>
 		<xsl:if test="../subtitle"><xsl:text> -- </xsl:text><xsl:value-of select="../subtitle"/></xsl:if>
 		<xsl:text>&#xa;</xsl:text>
 	</xsl:template>
diff --git a/src/main/resources/sts2mn.common.xsl b/src/main/resources/sts2mn.common.xsl
index 10c046f7..1e940586 100644
--- a/src/main/resources/sts2mn.common.xsl
+++ b/src/main/resources/sts2mn.common.xsl
@@ -1557,4 +1557,13 @@
 		</xsl:if>
 	</xsl:template>
 	
+	<xsl:template name="getLang">
+		<xsl:param name="fromParent">false</xsl:param>
+		<xsl:choose>
+			<xsl:when test="$fromParent = 'true' and ../@xml:lang"><xsl:value-of select="../@xml:lang"/></xsl:when>
+			<xsl:when test="@xml:lang"><xsl:value-of select="@xml:lang"/></xsl:when>
+			<xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+	
 </xsl:stylesheet>
\ No newline at end of file

From 64198fa3e5519dc2e0d92b592d991293c0840fb6 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Tue, 9 Apr 2024 16:42:08 +0300
Subject: [PATCH 07/23] document attributes added, #407

---
 src/main/resources/sts2mn.adoc.xsl   | 68 ++++++++++++++++++++++++----
 src/main/resources/sts2mn.common.xsl |  8 ++++
 2 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/sts2mn.adoc.xsl b/src/main/resources/sts2mn.adoc.xsl
index 81b1bba1..3890ea41 100644
--- a/src/main/resources/sts2mn.adoc.xsl
+++ b/src/main/resources/sts2mn.adoc.xsl
@@ -729,6 +729,8 @@
 		<!-- :docstatus: active -->
 		<xsl:apply-templates select="/*/@article-status"/>
 		
+		<!-- :docidentifier: ANSI/NISO Z39.102-2017 -->
+		<xsl:apply-templates select="std-ident/std-id-group"/>
 		<!-- :publisher: ISO;IEC -->
 		<xsl:apply-templates select="std-ident/originator"/>
 		<!-- :partnumber: 1 -->
@@ -1014,6 +1016,13 @@
 		<xsl:apply-templates select="isbn[@publication-format = 'online']"/>
 		<!-- :isbn-print: -->
 		<xsl:apply-templates select="isbn[@publication-format = 'print']"/>
+		<!-- :isbn: -->
+		<xsl:apply-templates select="std-ident/isbn[@publication-format = 'PDF']"/>
+		<!-- :presentation-metadata-isbn-html: -->
+		<xsl:apply-templates select="std-ident/isbn[@publication-format = 'HTML']"/>
+		<!-- :presentation-metadata-issn: -->
+		<xsl:apply-templates select="std-ident/issn"/>
+		
 
 		<!-- :semantic-metadata-open-access: -->
 		<xsl:apply-templates select="ancestor::standards-document/@open-access"/>
@@ -1095,8 +1104,12 @@
 	</xsl:template>
 	
 	<xsl:template match="std-ident[ancestor::front or ancestor::adoption-front]/doc-number[normalize-space(.) != '']">
-		<xsl:text>:docnumber: </xsl:text><xsl:call-template name="getDocNumber"/>
-		<xsl:text>&#xa;</xsl:text>
+		<xsl:call-template name="addDocumentAttribute">
+			<xsl:with-param name="key">docnumber</xsl:with-param>
+			<xsl:with-param name="value">
+				<xsl:call-template name="getDocNumber"/>
+			</xsl:with-param>
+		</xsl:call-template>
 	</xsl:template>
 	
 	<xsl:template match="std-ident[ancestor::front or ancestor::adoption-front]/originator[normalize-space(.) != '']">
@@ -1541,8 +1554,10 @@
 	</xsl:template>
 	
 	<xsl:template match="custom-meta-group/custom-meta[meta-name = 'ISBN']/meta-value">
-		<xsl:text>:isbn: </xsl:text><xsl:value-of select="."/>
-		<xsl:text>&#xa;</xsl:text>
+		<xsl:call-template name="addDocumentAttribute">
+			<xsl:with-param name="key">isbn</xsl:with-param>
+			<xsl:with-param name="value" select="."/>
+		</xsl:call-template>
 	</xsl:template>
 	
 	<xsl:template match="custom-meta-group/custom-meta[meta-name = 'TOC Heading Level']/meta-value">
@@ -1661,13 +1676,38 @@
 	</xsl:template>
 	
 	<xsl:template match="isbn[@publication-format = 'online']">
-		<xsl:text>:isbn-pdf: </xsl:text><xsl:value-of select="."/>
-		<xsl:text>&#xa;</xsl:text>
+		<xsl:call-template name="addDocumentAttribute">
+			<xsl:with-param name="key">isbn-pdf</xsl:with-param>
+			<xsl:with-param name="value" select="."/>
+		</xsl:call-template>
+	</xsl:template>
+	
+	<xsl:template match="isbn[@publication-format = 'PDF']">
+		<xsl:call-template name="addDocumentAttribute">
+			<xsl:with-param name="key">isbn</xsl:with-param>
+			<xsl:with-param name="value" select="."/>
+		</xsl:call-template>
 	</xsl:template>
 	
 	<xsl:template match="isbn[@publication-format = 'print']">
-		<xsl:text>:isbn-print: </xsl:text><xsl:value-of select="."/>
-		<xsl:text>&#xa;</xsl:text>
+		<xsl:call-template name="addDocumentAttribute">
+			<xsl:with-param name="key">isbn-print</xsl:with-param>
+			<xsl:with-param name="value" select="."/>
+		</xsl:call-template>
+	</xsl:template>
+	
+	<xsl:template match="isbn[@publication-format = 'HTML']">
+		<xsl:call-template name="addDocumentAttribute">
+			<xsl:with-param name="key">presentation-metadata-isbn-html</xsl:with-param>
+			<xsl:with-param name="value" select="."/>
+		</xsl:call-template>
+	</xsl:template>
+	
+	<xsl:template match="issn">
+		<xsl:call-template name="addDocumentAttribute">
+			<xsl:with-param name="key">presentation-metadata-issn</xsl:with-param>
+			<xsl:with-param name="value" select="."/>
+		</xsl:call-template>
 	</xsl:template>
 	
 	<xsl:template match="std-title-group">
@@ -3149,8 +3189,18 @@
 	</xsl:template>
 	
 
+	<xsl:template match="std-id-group">
+		<xsl:if test="ancestor::std-doc-meta">
+			<xsl:apply-templates select="std-id[@std-id-type = 'dated']"/>
+		</xsl:if>
+	</xsl:template>
 	
-	<xsl:template match="std-id-group"/>
+	<xsl:template match="std-id-group/std-id">
+		<xsl:call-template name="addDocumentAttribute">
+			<xsl:with-param name="key">docidentifier</xsl:with-param>
+			<xsl:with-param name="value" select="."/>
+		</xsl:call-template>
+	</xsl:template>
 	
 	<!-- <xsl:template match="std[not(ancestor::ref)]/text()">
 		<xsl:variable name="text" select="normalize-space(translate(.,'&#xA0;', ' '))"/>
diff --git a/src/main/resources/sts2mn.common.xsl b/src/main/resources/sts2mn.common.xsl
index 1e940586..118820bd 100644
--- a/src/main/resources/sts2mn.common.xsl
+++ b/src/main/resources/sts2mn.common.xsl
@@ -11,6 +11,8 @@
 		extension-element-prefixes="redirect"
 		version="1.0">
 
+	<xsl:variable name="newline"><xsl:text>&#xa;</xsl:text></xsl:variable>
+
 	<!-- ================= -->
 	<!-- std model processing -->
 	<!-- ================= -->
@@ -1566,4 +1568,10 @@
 		</xsl:choose>
 	</xsl:template>
 	
+	<xsl:template name="addDocumentAttribute">
+		<xsl:param name="key"/>
+		<xsl:param name="value"/>
+		<xsl:value-of select="concat(':', $key, ': ', $value, $newline)"/>
+	</xsl:template>
+	
 </xsl:stylesheet>
\ No newline at end of file

From d4b955720bb05739f99fc0a110cf84d0bb14d5f4 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Tue, 9 Apr 2024 21:16:53 +0300
Subject: [PATCH 08/23] document attributes added, #407

---
 src/main/resources/sts2mn.adoc.xsl | 128 +++++++++++++++++++++++++++--
 1 file changed, 119 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/sts2mn.adoc.xsl b/src/main/resources/sts2mn.adoc.xsl
index 3890ea41..7a93f35d 100644
--- a/src/main/resources/sts2mn.adoc.xsl
+++ b/src/main/resources/sts2mn.adoc.xsl
@@ -80,6 +80,7 @@
 		<xsl:choose>
 			<xsl:when test="/standard/front/nat-meta/std-ident/originator = 'PAS'">PAS</xsl:when>
 			<xsl:when test="/standard/front/nat-meta/@originator = 'BSI' or /standard/front/iso-meta/secretariat = 'BSI'">BSI</xsl:when>
+			<xsl:when test="/standard/front/std-doc-meta/std-org-group/std-org/std-org-abbrev = 'NISO'">NISO</xsl:when>
 			<xsl:otherwise>
 				<xsl:value-of select="/standard/front/*/doc-ident/sdo"/>
 			</xsl:otherwise>
@@ -584,8 +585,10 @@
 				
 				</xsl:for-each>
 				
-				
-				<xsl:for-each select="std-meta/abstract">
+			</xsl:if>	
+			
+			<xsl:if test="$inputformat = 'IEEE' or $organization = 'NISO'">
+				<xsl:for-each select="std-meta/abstract | std-doc-meta/abstract">
 					<xsl:variable name="sectionsFolder"><xsl:call-template name="getSectionsFolder"/></xsl:variable>
 					<xsl:variable name="section_name" select="local-name()"/>
 					<xsl:variable name="filename">
@@ -609,6 +612,22 @@
 				</xsl:for-each>
 			</xsl:if>
 			
+			<xsl:if test="*/meta-note">
+				<xsl:variable name="sectionsFolder"><xsl:call-template name="getSectionsFolder"/></xsl:variable>
+				<xsl:variable name="filename">
+					<xsl:value-of select="$sectionsFolder"/><xsl:text>/00-meta-notes.</xsl:text><xsl:value-of select="$docfile_ext"/>
+				</xsl:variable>
+				
+				<redirect:write file="{$outpath}/{$filename}">
+					<xsl:text>&#xa;</xsl:text>
+					<xsl:apply-templates select="*/meta-note"/>
+				</redirect:write>
+				<redirect:write file="{$outpath}/{$docfile}">
+					<xsl:text>include::</xsl:text><xsl:value-of select="$filename"/><xsl:text>[]</xsl:text>
+					<xsl:text>&#xa;&#xa;</xsl:text>
+				</redirect:write>
+			</xsl:if>
+			
 			<!-- if in front there are another elements, except xxx-meta -->
 			<xsl:for-each select="*[local-name() != 'iso-meta' and local-name() != 'nat-meta' and local-name() != 'reg-meta' and local-name() != 'std-meta'] | ancestor::standards-document/back/ack[title = 'Acknowledgements']">
 				<xsl:variable name="number_"><xsl:number /></xsl:variable>
@@ -733,6 +752,13 @@
 		<xsl:apply-templates select="std-ident/std-id-group"/>
 		<!-- :publisher: ISO;IEC -->
 		<xsl:apply-templates select="std-ident/originator"/>
+		<!-- :publisher: NISO -->
+		<xsl:apply-templates select="std-org-group/std-org/std-org-abbrev"/>
+		<!-- :pub-address: NISO + \
+		     3600 Clipper Mill Road + \
+				 ...
+		-->
+		<xsl:apply-templates select="std-org-group/std-org/std-org-loc"/>
 		<!-- :partnumber: 1 -->
 		<xsl:apply-templates select="std-ident/part-number"/>		
 		<!-- :edition: 1 -->
@@ -780,7 +806,11 @@
 		<xsl:apply-templates select="self-uri"/>
 		
 		<!-- :language: en -->
-		<xsl:apply-templates select="doc-ident/language"/>
+		<!-- <xsl:apply-templates select="doc-ident/language"/> -->
+		<xsl:call-template name="addDocumentAttribute">
+			<xsl:with-param name="key">language</xsl:with-param>
+			<xsl:with-param name="value" select="$language"/>
+		</xsl:call-template>
 		<xsl:if test="$inputformat = 'IEEE'">
 			<xsl:text>:language: en</xsl:text>
 			<xsl:text>&#xa;</xsl:text>
@@ -883,6 +913,12 @@
 		<!-- :semantic-metadata-partner-secretariat: -->
 		<xsl:apply-templates select="partner" />
 		
+		<!-- :semantic-metadata-accrediting-organizationt: -->
+		<xsl:apply-templates select="accrediting-organization"/>
+		
+		<!-- ::authorizer: An American National Standard -->
+		<xsl:apply-templates select="authorization"/>
+		
 		<!-- :keywords: -->
 		<xsl:apply-templates select="kwd-group"/>
 		
@@ -966,6 +1002,9 @@
 		<!-- :semantic-metadata-copyright-statement:  All rights of exploitation in any form and ... -->
 		<xsl:apply-templates select="permissions/copyright-statement"/>
 		
+		<!-- :semantic-metadata-license: All rights reserved under International -->
+		<xsl:apply-templates select="permissions/license"/>
+		
 		<!-- :semantic-metadata-xplore-article-id: 6457401 -->
 		<xsl:apply-templates select="xplore-article-id"/>
 		
@@ -1018,9 +1057,9 @@
 		<xsl:apply-templates select="isbn[@publication-format = 'print']"/>
 		<!-- :isbn: -->
 		<xsl:apply-templates select="std-ident/isbn[@publication-format = 'PDF']"/>
-		<!-- :presentation-metadata-isbn-html: -->
+		<!-- :semantic-metadata-isbn-html: -->
 		<xsl:apply-templates select="std-ident/isbn[@publication-format = 'HTML']"/>
-		<!-- :presentation-metadata-issn: -->
+		<!-- :semantic-metadata-issn: -->
 		<xsl:apply-templates select="std-ident/issn"/>
 		
 
@@ -1118,6 +1157,25 @@
 			<xsl:text>&#xa;</xsl:text>
 		</xsl:if>
 	</xsl:template>
+	
+	<xsl:template match="std-org-group/std-org/std-org-abbrev">
+		<xsl:call-template name="addDocumentAttribute">
+			<xsl:with-param name="key">publisher</xsl:with-param>
+			<xsl:with-param name="value" select="."/>
+		</xsl:call-template>
+	</xsl:template>
+	
+	<xsl:template match="std-org-group/std-org/std-org-loc">
+		<xsl:call-template name="addDocumentAttribute">
+			<xsl:with-param name="key">pub-address</xsl:with-param>
+			<xsl:with-param name="value">
+				<xsl:for-each select="*">
+					<xsl:value-of select="."/>
+					<xsl:if test="position() != last()"><xsl:value-of select="concat(' + \', $newline)"/></xsl:if>
+				</xsl:for-each>
+			</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
 
 	<xsl:template name="getDocNumber">
 		<xsl:param name="value" select="."/>
@@ -1225,8 +1283,16 @@
 	<xsl:template match="release-date[ancestor::front or ancestor::adoption-front]">
 		<xsl:variable name="date"><xsl:call-template name="getDate"/></xsl:variable>
 		<xsl:if test="$date != ''">
-			<!-- <xsl:text>:date: release </xsl:text><xsl:value-of select="."/> -->
-			<date type="release"><xsl:value-of select="$date"/></date>
+			<xsl:choose>
+				<xsl:when test="@date-type = 'approved'">
+					<!-- :issued-date: ... -->
+					<issued-date><xsl:value-of select="$date"/></issued-date>
+				</xsl:when>
+				<xsl:otherwise>
+					<!-- <xsl:text>:date: release </xsl:text><xsl:value-of select="."/> -->
+					<date type="release"><xsl:value-of select="$date"/></date>
+				</xsl:otherwise>
+			</xsl:choose>
 		</xsl:if>
 	</xsl:template>
 	
@@ -1637,6 +1703,18 @@
 		</xsl:choose>
 	</xsl:template>
 	
+	<xsl:template match="permissions/license">
+		<xsl:call-template name="addDocumentAttribute">
+			<xsl:with-param name="key">semantic-metadata-license</xsl:with-param>
+			<xsl:with-param name="value">
+				<xsl:for-each select="*">
+					<xsl:value-of select="."/>
+					<xsl:if test="position() != last()"><xsl:value-of select="concat(' + \', $newline)"/></xsl:if>
+				</xsl:for-each>
+			</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	
 	<xsl:template match="xplore-article-id[normalize-space() != '']">
 		<xsl:text>:semantic-metadata-xplore-article-id: </xsl:text><xsl:value-of select="."/>
 		<xsl:text>&#xa;</xsl:text>
@@ -1698,14 +1776,14 @@
 	
 	<xsl:template match="isbn[@publication-format = 'HTML']">
 		<xsl:call-template name="addDocumentAttribute">
-			<xsl:with-param name="key">presentation-metadata-isbn-html</xsl:with-param>
+			<xsl:with-param name="key">semantic-metadata-isbn-html</xsl:with-param>
 			<xsl:with-param name="value" select="."/>
 		</xsl:call-template>
 	</xsl:template>
 	
 	<xsl:template match="issn">
 		<xsl:call-template name="addDocumentAttribute">
-			<xsl:with-param name="key">presentation-metadata-issn</xsl:with-param>
+			<xsl:with-param name="key">semantic-metadata-issn</xsl:with-param>
 			<xsl:with-param name="value" select="."/>
 		</xsl:call-template>
 	</xsl:template>
@@ -1804,6 +1882,23 @@
 		<xsl:text>&#xa;</xsl:text>
 	</xsl:template>
 	
+	<xsl:template match="accrediting-organization">
+		<xsl:call-template name="addDocumentAttribute">
+			<xsl:with-param name="key">semantic-metadata-accrediting-organization</xsl:with-param>
+			<xsl:with-param name="value" select="."/>
+		</xsl:call-template>
+	</xsl:template>
+	
+	<xsl:template match="authorization">
+		<xsl:call-template name="addDocumentAttribute">
+			<xsl:with-param name="key">authorizer</xsl:with-param>
+			<xsl:with-param name="value">
+				<xsl:value-of select="."/>
+				<xsl:if test="@authorize-acronym">, <xsl:value-of select="@authorize-acronym"/></xsl:if>
+			</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	
 	<xsl:template match="kwd-group">
 		<xsl:choose>
 			<xsl:when test="$inputformat = 'STS' or @kwd-group-type = 'AuthorFree'">
@@ -2055,6 +2150,20 @@
 		</xsl:if>
 	</xsl:template>
 		
+	<xsl:template match="meta-note">
+		<xsl:text>[.preface</xsl:text>
+		<xsl:if test="@content-type">,type=<xsl:value-of select="@content-type"/></xsl:if>
+		<xsl:text>]</xsl:text>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:if test="not(title)">
+			<xsl:text>== {blank}</xsl:text>
+			<xsl:text>&#xa;</xsl:text>
+			<xsl:text>&#xa;</xsl:text>
+		</xsl:if>
+		<xsl:apply-templates/>			
+	</xsl:template>
+		
+		
 	<!-- =========== -->
 	<!-- end bibdata (standard/front) -->
 	<!-- =========== -->
@@ -3227,6 +3336,7 @@
 	
 	<xsl:template match="ref/std/std-id"/> <!-- for IEC -->
 	
+	<xsl:template match="abstract/title"/>
 	
 	<!-- ================= -->
 	<!-- tbx:source processing -->

From 75ff8398b3143aa189d86b84a560b812a8bce67b Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Sat, 13 Apr 2024 17:06:00 +0300
Subject: [PATCH 09/23] term-display definition list processing added, #407

---
 src/main/resources/sts2mn.adoc.xsl | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/main/resources/sts2mn.adoc.xsl b/src/main/resources/sts2mn.adoc.xsl
index 7a93f35d..363b332a 100644
--- a/src/main/resources/sts2mn.adoc.xsl
+++ b/src/main/resources/sts2mn.adoc.xsl
@@ -6196,6 +6196,21 @@
 		<xsl:apply-templates/>
 	</xsl:template>
 	
+	<xsl:template match="term-display">
+		<xsl:apply-templates/>
+		<xsl:text>&#xa;&#xa;</xsl:text>
+	</xsl:template>
+	
+	<xsl:template match="term-display/term">
+		<xsl:apply-templates/>
+		<xsl:text>:: </xsl:text>
+	</xsl:template>
+	
+	<xsl:template match="term-display/def/p">
+		<xsl:apply-templates/>
+		<xsl:if test="following-sibling::*"> +&#xa;</xsl:if>
+	</xsl:template>
+	
 	<!-- =============== -->
 	<!-- End Definitions list (dl) -->
 	<!-- =============== -->

From 9cf114a29267a7f4d3bc5016d88469950237f8c6 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Sat, 13 Apr 2024 21:10:24 +0300
Subject: [PATCH 10/23] wrong sections order fixing, #407

---
 src/main/resources/sts2mn.adoc.xsl | 72 ++++++++++++++++++++----------
 1 file changed, 49 insertions(+), 23 deletions(-)

diff --git a/src/main/resources/sts2mn.adoc.xsl b/src/main/resources/sts2mn.adoc.xsl
index 363b332a..0dbab80a 100644
--- a/src/main/resources/sts2mn.adoc.xsl
+++ b/src/main/resources/sts2mn.adoc.xsl
@@ -2261,7 +2261,13 @@
 	<!-- Scope -->
 	<xsl:template match="body/sec[@sec-type = 'scope'] | front/sec[@sec-type = 'scope']" priority="2">
 		<xsl:variable name="sectionsFolder"><xsl:call-template name="getSectionsFolder"/></xsl:variable>
-		<redirect:write file="{$outpath}/{$sectionsFolder}/01-scope.adoc">
+		<xsl:variable name="sec_number">
+			<xsl:call-template name="getSecNumber">
+				<xsl:with-param name="defaultNum">1</xsl:with-param>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:variable name="adoc_path" select="concat($sectionsFolder, '/', $sec_number, '-scope.adoc')"/>
+		<redirect:write file="{$outpath}/{$adoc_path}">
 			<xsl:text>&#xa;</xsl:text>
 			<xsl:call-template name="setId"/>
 			<xsl:apply-templates />
@@ -2269,7 +2275,7 @@
 		<xsl:variable name="docfile"><xsl:call-template name="getDocFilename"/></xsl:variable>
 		<xsl:variable name="sectionsFolder"><xsl:call-template name="getSectionsFolder"/></xsl:variable>
 		<redirect:write file="{$outpath}/{$docfile}">
-			<xsl:text>include::</xsl:text><xsl:value-of select="$sectionsFolder"/><xsl:text>/01-scope.adoc[]</xsl:text>
+			<xsl:text>include::</xsl:text><xsl:value-of select="$adoc_path"/><xsl:text>[]</xsl:text><!-- sections/01-scope.adoc[] -->
 			<xsl:text>&#xa;&#xa;</xsl:text>
 		</redirect:write>
 	</xsl:template>
@@ -2288,7 +2294,13 @@
 	<!-- ======================== -->
 	<xsl:template match="body/sec[@sec-type = 'norm-refs'] | front/sec[@sec-type = 'norm-refs'] | body/sec[title = 'Normative references' or list/@list-content = 'normative-references']" priority="2">
 		<xsl:variable name="sectionsFolder"><xsl:call-template name="getSectionsFolder"/></xsl:variable>
-		<redirect:write file="{$outpath}/{$sectionsFolder}/02-normrefs.adoc">
+		<xsl:variable name="sec_number">
+			<xsl:call-template name="getSecNumber">
+				<xsl:with-param name="defaultNum">2</xsl:with-param>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:variable name="adoc_path" select="concat($sectionsFolder, '/', $sec_number, '-normrefs.adoc')"/>
+		<redirect:write file="{$outpath}/{$adoc_path}">
 			<xsl:text>&#xa;</xsl:text>
 			<xsl:text>[bibliography]</xsl:text>
 			<xsl:text>&#xa;</xsl:text>
@@ -2297,7 +2309,7 @@
 		</redirect:write>
 		<xsl:variable name="docfile"><xsl:call-template name="getDocFilename"/></xsl:variable>
 		<redirect:write file="{$outpath}/{$docfile}">
-			<xsl:text>include::</xsl:text><xsl:value-of select="$sectionsFolder"/><xsl:text>/02-normrefs.adoc[]</xsl:text>
+			<xsl:text>include::</xsl:text><xsl:value-of select="$adoc_path"/><xsl:text>[]</xsl:text> <!-- 02-normrefs.adoc[] -->
 			<xsl:text>&#xa;&#xa;</xsl:text>
 		</redirect:write>
 	</xsl:template>
@@ -2448,23 +2460,7 @@
 	
 	
 	<xsl:template match="body/sec | body[count(*) = 1]/sec[@sec-type = 'scope']/sec">
-		<xsl:variable name="sec_number_" select="format-number(label, '00')" />
-		<xsl:variable name="sec_number">
-			<xsl:choose>
-				<!-- Example: Section 3 -->
-				<xsl:when test="$sec_number_ = 'NaN'">
-					<xsl:choose>
-						<xsl:when test="label">
-							<xsl:value-of select="java:toLowerCase(java:java.lang.String.new(normalize-space(translate(label, ',&#x200b;&#xa0; ','___'))))"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:value-of select="@id"/>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:when>
-				<xsl:otherwise><xsl:value-of select="$sec_number_"/></xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
+		<xsl:variable name="sec_number"><xsl:call-template name="getSecNumber"/></xsl:variable>
 		<xsl:variable name="title" select="normalize-space(translate(title, ',&#x200b;&#xa0;‑','    '))"/> <!-- get first word -->
 		<xsl:variable name="sec_title__">
 			<xsl:choose>
@@ -2475,18 +2471,48 @@
 		<xsl:variable name="sec_title_" select="translate($sec_title__, '/.' , '__')"/>
 		<xsl:variable name="sec_title" select="java:toLowerCase(java:java.lang.String.new($sec_title_))"/>
 		<xsl:variable name="sectionsFolder"><xsl:call-template name="getSectionsFolder"/></xsl:variable>
-		<redirect:write file="{$outpath}/{$sectionsFolder}/{$sec_number}-{$sec_title}.adoc">
+		<xsl:variable name="adoc_path" select="concat($sectionsFolder, '/', $sec_number, '-', $sec_title, '.adoc')"/>
+		<redirect:write file="{$outpath}/{$adoc_path}">
 			<xsl:text>&#xa;</xsl:text>
 			<xsl:call-template name="setIdOrType"/>
 			<xsl:apply-templates />
 		</redirect:write>
 		<xsl:variable name="docfile"><xsl:call-template name="getDocFilename"/></xsl:variable>
 		<redirect:write file="{$outpath}/{$docfile}">
-			<xsl:text>include::</xsl:text><xsl:value-of select="$sectionsFolder"/><xsl:text>/</xsl:text><xsl:value-of select="$sec_number"/>-<xsl:value-of select="$sec_title"/><xsl:text>.adoc[]</xsl:text>
+			<xsl:text>include::</xsl:text><xsl:value-of select="$adoc_path"/><xsl:text>[]</xsl:text>
 			<xsl:text>&#xa;&#xa;</xsl:text>
 		</redirect:write>
 	</xsl:template>
 	
+	<xsl:template name="getSecNumber">
+		<xsl:param name="defaultNum">1</xsl:param>
+		<xsl:choose>
+			<xsl:when test="normalize-space(label) = ''">
+				<xsl:value-of select="format-number($defaultNum, '00')"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:variable name="sec_number_" select="format-number(label, '00')" />
+				<xsl:variable name="sec_number">
+					<xsl:choose>
+						<!-- Example: Section 3 -->
+						<xsl:when test="$sec_number_ = 'NaN'">
+							<xsl:choose>
+								<xsl:when test="label">
+									<xsl:value-of select="java:toLowerCase(java:java.lang.String.new(normalize-space(translate(label, ',&#x200b;&#xa0; ','___'))))"/>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:value-of select="@id"/>
+								</xsl:otherwise>
+							</xsl:choose>
+						</xsl:when>
+						<xsl:otherwise><xsl:value-of select="$sec_number_"/></xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+				<xsl:value-of select="$sec_number"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+	
 	<xsl:template match="sec">
 		<xsl:call-template name="setIdOrType"/>
 		<xsl:apply-templates />

From 1207347d8952783ba14c6764bb4485b15cace780 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Sun, 14 Apr 2024 22:17:52 +0300
Subject: [PATCH 11/23] named-content transformation updated, #407

---
 src/main/resources/sts2mn.adoc.xsl | 100 ++++++++++++++++++-----------
 1 file changed, 61 insertions(+), 39 deletions(-)

diff --git a/src/main/resources/sts2mn.adoc.xsl b/src/main/resources/sts2mn.adoc.xsl
index 0dbab80a..71a502bd 100644
--- a/src/main/resources/sts2mn.adoc.xsl
+++ b/src/main/resources/sts2mn.adoc.xsl
@@ -156,19 +156,27 @@
 	
 	
 	<xsl:variable name="linearized_xml">
+		<!-- <xsl:message>start: linearized_xml</xsl:message> -->
 		<xsl:apply-templates select="/" mode="linearize"/>
+		<!-- <xsl:message>end: linearized_xml</xsl:message> -->
 	</xsl:variable>
 	
 	<xsl:variable name="remove_word_clause_xml">
+		<!-- <xsl:message>start: remove_word_clause_xml</xsl:message> -->
 		<xsl:apply-templates select="xalan:nodeset($linearized_xml)" mode="remove_word_clause"/>
+		<!-- <xsl:message>end: remove_word_clause_xml</xsl:message> -->
 	</xsl:variable>
 
 	<xsl:variable name="unconstrained_formatting_xml">
+		<!-- <xsl:message>start: unconstrained_formatting_xml</xsl:message> -->
 		<xsl:apply-templates select="xalan:nodeset($remove_word_clause_xml)" mode="unconstrained_formatting"/>
+		<!-- <xsl:message>end: unconstrained_formatting_xml</xsl:message> -->
 	</xsl:variable>
 
 	<xsl:variable name="ref_fix">
+		<!-- <xsl:message>start: ref_fix</xsl:message> -->
 		<xsl:apply-templates select="xalan:nodeset($unconstrained_formatting_xml)" mode="ref_fix"/>
+		<!-- <xsl:message>end: ref_fix</xsl:message> -->
 	</xsl:variable>
 	
 	<xsl:variable name="updated_xml" select="xalan:nodeset($ref_fix)"/>
@@ -6297,7 +6305,7 @@
 		
 		<xsl:variable name="target">
 			<xsl:choose>
-				<xsl:when test="translate(@xlink:href, '#', '') = ''"> <!-- empty xlink:href -->
+				<xsl:when test="@xlink:href and translate(@xlink:href, '#', '') = ''"> <!-- empty xlink:href -->
 					<xsl:value-of select="translate(normalize-space(), ' ()', '---')"/>
 				</xsl:when>
 				<xsl:when test="starts-with(@xlink:href, '#')">
@@ -6308,54 +6316,68 @@
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
-		
-		<xsl:variable name="isTerm">
-			<xsl:for-each select="$updated_xml"> <!-- change context -->
-				<xsl:value-of select="local-name(key('ids', $target)) = 'term-sec' or local-name(key('ids', $target)) = 'termEntry'"/>
-			</xsl:for-each>
-		</xsl:variable>
-		
+		<!-- target='<xsl:value-of select="$target"/>'
+		<xsl:apply-templates select="." mode="print_as_xml"/> -->
+		<!-- <xsl:message><xsl:value-of select="@content-type"/></xsl:message> -->
 		<xsl:choose>
-			<!-- <xsl:when test="@content-type = 'term' and (local-name(//*[@id = $target]) = 'term-sec' or local-name(//*[@id = $target]) = 'termEntry')"> -->
-			<!-- <xsl:when test="@content-type = 'term' and (local-name(key('ids', $target)) = 'term-sec' or local-name(key('ids', $target)) = 'termEntry')"> -->
-			<xsl:when test="@content-type = 'term' and normalize-space($isTerm) = 'true'">
-				<!-- <xsl:variable name="term_real" select="//*[@id = $target]//tbx:term[1]"/> -->
-				<!-- <xsl:variable name="term_real" select="key('ids', $target)//tbx:term[1]"/> -->
-				<xsl:variable name="term_real">
+			<xsl:when test="normalize-space($target) != ''">
+		
+				<xsl:variable name="isTerm">
 					<xsl:for-each select="$updated_xml"> <!-- change context -->
-						 <xsl:value-of select="key('ids', $target)//tbx:term[1]"/>
+						<xsl:value-of select="local-name(key('ids', $target)) = 'term-sec' or local-name(key('ids', $target)) = 'termEntry'"/>
 					</xsl:for-each>
 				</xsl:variable>
 				
-				<!-- <xsl:variable name="term_name" select="java:toLowerCase(java:java.lang.String.new(translate($term_name_, ' ', '-')))"/> -->
-				<!-- <xsl:text>term-</xsl:text><xsl:value-of select="$term_name"/>,<xsl:value-of select="."/> -->
-				
-				<xsl:variable name="value" select="."/>
-				
-				<xsl:variable name="options">
-					<xsl:if test="ancestor::*[@sec-type='terms'] and ancestor::term-sec">
-						<xsl:text>noref,noital</xsl:text>
-					</xsl:if>
-				</xsl:variable>
-				
-				<xsl:call-template name="insertTermReference">
-					<xsl:with-param name="term" select="$term_real"/>
-					<xsl:with-param name="rendering" select="$value"/>
-					<xsl:with-param name="options" select="$options"/>
-				</xsl:call-template>
+				<xsl:choose>
+					<!-- <xsl:when test="@content-type = 'term' and (local-name(//*[@id = $target]) = 'term-sec' or local-name(//*[@id = $target]) = 'termEntry')"> -->
+					<!-- <xsl:when test="@content-type = 'term' and (local-name(key('ids', $target)) = 'term-sec' or local-name(key('ids', $target)) = 'termEntry')"> -->
+					<xsl:when test="@content-type = 'term' and normalize-space($isTerm) = 'true'">
+						<!-- <xsl:variable name="term_real" select="//*[@id = $target]//tbx:term[1]"/> -->
+						<!-- <xsl:variable name="term_real" select="key('ids', $target)//tbx:term[1]"/> -->
+						<xsl:variable name="term_real">
+							<xsl:for-each select="$updated_xml"> <!-- change context -->
+								 <xsl:value-of select="key('ids', $target)//tbx:term[1]"/>
+							</xsl:for-each>
+						</xsl:variable>
+						
+						<!-- <xsl:variable name="term_name" select="java:toLowerCase(java:java.lang.String.new(translate($term_name_, ' ', '-')))"/> -->
+						<!-- <xsl:text>term-</xsl:text><xsl:value-of select="$term_name"/>,<xsl:value-of select="."/> -->
+						
+						<xsl:variable name="value" select="."/>
+						
+						<xsl:variable name="options">
+							<xsl:if test="ancestor::*[@sec-type='terms'] and ancestor::term-sec">
+								<xsl:text>noref,noital</xsl:text>
+							</xsl:if>
+						</xsl:variable>
+						
+						<xsl:call-template name="insertTermReference">
+							<xsl:with-param name="term" select="$term_real"/>
+							<xsl:with-param name="rendering" select="$value"/>
+							<xsl:with-param name="options" select="$options"/>
+						</xsl:call-template>
+						
+					</xsl:when>
+					<xsl:otherwise>
+						
+						<xsl:variable name="value">
+							<xsl:apply-templates/>
+						</xsl:variable>
+						
+						<xsl:call-template name="insertTermReference">
+							<xsl:with-param name="term" select="$target"/>
+							<xsl:with-param name="rendering" select="$value"/>
+						</xsl:call-template>
+						
+					</xsl:otherwise>
+				</xsl:choose>
 				
-			</xsl:when>
+			</xsl:when> <!-- $target != '' -->
 			<xsl:otherwise>
-				
 				<xsl:variable name="value">
 					<xsl:apply-templates/>
 				</xsl:variable>
-				
-				<xsl:call-template name="insertTermReference">
-					<xsl:with-param name="term" select="$target"/>
-					<xsl:with-param name="rendering" select="$value"/>
-				</xsl:call-template>
-				
+				<xsl:text>span:</xsl:text><xsl:value-of select="@content-type"/><xsl:text>[</xsl:text><xsl:value-of select="normalize-space($value)"/><xsl:text>]</xsl:text>
 			</xsl:otherwise>
 		</xsl:choose>
 		

From bfc370706d37ff74cb4fd3ff1370fe817efa3c0c Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Mon, 15 Apr 2024 12:54:32 +0300
Subject: [PATCH 12/23] redundant 00-01-std-doc-meta.adoc generation removed,
 #407

---
 src/main/resources/sts2mn.adoc.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/sts2mn.adoc.xsl b/src/main/resources/sts2mn.adoc.xsl
index 71a502bd..40f343d6 100644
--- a/src/main/resources/sts2mn.adoc.xsl
+++ b/src/main/resources/sts2mn.adoc.xsl
@@ -637,7 +637,7 @@
 			</xsl:if>
 			
 			<!-- if in front there are another elements, except xxx-meta -->
-			<xsl:for-each select="*[local-name() != 'iso-meta' and local-name() != 'nat-meta' and local-name() != 'reg-meta' and local-name() != 'std-meta'] | ancestor::standards-document/back/ack[title = 'Acknowledgements']">
+			<xsl:for-each select="*[local-name() != 'iso-meta' and local-name() != 'nat-meta' and local-name() != 'reg-meta' and local-name() != 'std-meta' and local-name() != 'std-doc-meta'] | ancestor::standards-document/back/ack[title = 'Acknowledgements']">
 				<xsl:variable name="number_"><xsl:number /></xsl:variable>
 				<xsl:variable name="number" select="format-number($number_, '00')"/>
 				<xsl:variable name="section_name">

From 4b41fc68e8f634b6112558c80b928d19de9fd67a Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Mon, 15 Apr 2024 16:53:49 +0300
Subject: [PATCH 13/23] markup update, #407

---
 src/main/resources/sts2mn.adoc.xsl | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/sts2mn.adoc.xsl b/src/main/resources/sts2mn.adoc.xsl
index 40f343d6..f937e563 100644
--- a/src/main/resources/sts2mn.adoc.xsl
+++ b/src/main/resources/sts2mn.adoc.xsl
@@ -2481,6 +2481,10 @@
 		<xsl:variable name="sectionsFolder"><xsl:call-template name="getSectionsFolder"/></xsl:variable>
 		<xsl:variable name="adoc_path" select="concat($sectionsFolder, '/', $sec_number, '-', $sec_title, '.adoc')"/>
 		<redirect:write file="{$outpath}/{$adoc_path}">
+			<xsl:if test="@sec-type = 'non-norm-refs'">
+				<xsl:text>&#xa;</xsl:text>
+				<xsl:text>[bibliography]</xsl:text>
+			</xsl:if>
 			<xsl:text>&#xa;</xsl:text>
 			<xsl:call-template name="setIdOrType"/>
 			<xsl:apply-templates />
@@ -6789,7 +6793,11 @@
 						<xsl:value-of select="@id"/>
 					</xsl:when>
 					<xsl:otherwise>
-						<xsl:value-of select="@sec-type"/>
+						<xsl:variable name="sec_type" select="@sec-type"/>
+						<xsl:value-of select="$sec_type"/>
+						<xsl:if test="count(//*[@sec-type = $sec_type]) &gt; 1">
+							<xsl:number count="*[@sec-type = $sec_type]"/>
+						</xsl:if>
 					</xsl:otherwise>
 				</xsl:choose>
 			<xsl:text>]]</xsl:text>

From d356aa6de46a5b2c2366978a61453fe238f90731 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Mon, 15 Apr 2024 19:02:43 +0300
Subject: [PATCH 14/23] NISO adoc example moved to Makefile, #407

---
 .github/workflows/release.yml                |  2 ++
 .github/workflows/test.yml                   |  2 ++
 Makefile                                     | 11 +++++++++++
 src/test/java/org/metanorma/sts2mnTests.java | 10 +++++-----
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ce60760c..f8567ebc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -53,6 +53,8 @@ jobs:
 
       - run: make mn2stsDTD_NISO
 
+      - run: make NISO-STS-Standard
+
 #      - run: make mn2stsDTD_ISO
 
       - run: make publish
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4ec91c87..4eae2429 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -81,6 +81,8 @@ jobs:
 
       - run: make testMN2IEEE
 
+      - run: make NISO-STS-Standard
+
       - if: matrix.os == 'ubuntu-latest'
         name: Notify mn-samples-bsi
         uses: peter-evans/repository-dispatch@v1
diff --git a/Makefile b/Makefile
index 699562f0..65fc7f3b 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,9 @@ SRCFILESTS := $(SRCDIR)/rice-en.final.sts.xml
 SRCRFCDIR := rfcsources
 SRCRFCMASK := rfc865*.xml
 
+SRCNISODIR := nisosource
+NISO_STANDARD_URL = https://www.niso-sts.org/downloadables/samples/NISO-STS-Standard-1-0.XML
+
 DESTDIR := documents
 DESTSTSXML := $(patsubst %.mn.xml,%.sts.xml,$(patsubst src/test/resources/%,documents/%,$(SRCFILE)))
 DESTSTSHTML := $(patsubst %.xml,%.html,$(DESTSTSXML))
@@ -105,6 +108,14 @@ rfcsources:
 saxon.jar:
 	curl -sSL $(SAXON_URL) -o $@
 
+
+NISO-STS-Standard: target/$(JAR_FILE) nisosource documents
+	for f in $(SRCNISODIR)/*.xml; do java -jar target/$(JAR_FILE) $$f  --output $(DESTDIR)/$@.adoc ; done
+
+nisosource:
+	curl -sSLk --create-dirs -O --output-dir $(SRCNISODIR) $(NISO_STANDARD_URL)
+
+
 documents.rxl: $(DESTSTSHTML) | bundle
 	bundle exec relaton concatenate \
 	  -t "mnconvert samples" \
diff --git a/src/test/java/org/metanorma/sts2mnTests.java b/src/test/java/org/metanorma/sts2mnTests.java
index 361f03dc..4fe35001 100644
--- a/src/test/java/org/metanorma/sts2mnTests.java
+++ b/src/test/java/org/metanorma/sts2mnTests.java
@@ -121,17 +121,17 @@ public void successConvertToAdocOutputSpecified() throws ParseException {
         assertTrue(Files.exists(fileout));
     }
 
-    @Test
+    /*@Test
     public void successConvertRemoteToAdocOutputSpecified() throws ParseException {
         System.out.println(name.getMethodName());
-        Path fileout = Paths.get(System.getProperty("buildDirectory"), "NISO-STS-Standard-1-0.adoc");
+        Path fileout = Paths.get(System.getProperty("buildDirectory"),"NISO-STS-Standard-1-0", "NISO-STS-Standard-1-0.adoc");
         fileout.toFile().delete();
         String remoteXML = "https://www.niso-sts.org/downloadables/samples/NISO-STS-Standard-1-0.XML";
         String[] args = new String[]{"--output-format", "adoc", "--output", fileout.toAbsolutePath().toString(), remoteXML};
         mnconvert.main(args);
 
         assertTrue(Files.exists(fileout));
-    }
+    }*/
 
     @Test
     public void successConvertToRelativeAdocOutputSpecified() throws ParseException {
@@ -167,7 +167,7 @@ public void successConvertToXML() throws ParseException {
         assertTrue(Files.exists(fileout));        
     }
 
-    @Test
+    /*@Test
     public void successConvertRemoteToXML() throws ParseException {
         System.out.println(name.getMethodName());
         Path fileout = Paths.get(System.getProperty("buildDirectory"), "NISO-STS-Standard-1-0.mn.xml");
@@ -177,7 +177,7 @@ public void successConvertRemoteToXML() throws ParseException {
         String[] args = new String[]{"--output-format", "xml", "--output", fileout.toAbsolutePath().toString(), remoteXML};
         mnconvert.main(args);
         assertTrue(Files.exists(fileout));
-    }
+    }*/
 
     @Test
     public void successConvertToADOCWithImageLink() throws ParseException {

From f3ec41cee7c10b0498616f231c5de7b633993f43 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Mon, 15 Apr 2024 19:30:36 +0300
Subject: [PATCH 15/23] Makefile updated, #407

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 65fc7f3b..535d31f3 100644
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,7 @@ saxon.jar:
 
 
 NISO-STS-Standard: target/$(JAR_FILE) nisosource documents
-	for f in $(SRCNISODIR)/*.xml; do java -jar target/$(JAR_FILE) $$f  --output $(DESTDIR)/$@.adoc ; done
+	for f in $(SRCNISODIR)/*.XML; do java -jar target/$(JAR_FILE) $$f  --output $(DESTDIR)/$@.adoc ; done
 
 nisosource:
 	curl -sSLk --create-dirs -O --output-dir $(SRCNISODIR) $(NISO_STANDARD_URL)

From 74d1b443bc5400779eee55c1e45cb84ba7efabca Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Mon, 15 Apr 2024 19:53:36 +0300
Subject: [PATCH 16/23] Bibliography generation issue fixing, #407

---
 src/main/resources/sts2mn.adoc.xsl | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/sts2mn.adoc.xsl b/src/main/resources/sts2mn.adoc.xsl
index f937e563..584b52e0 100644
--- a/src/main/resources/sts2mn.adoc.xsl
+++ b/src/main/resources/sts2mn.adoc.xsl
@@ -43,6 +43,7 @@
 	<xsl:variable name="FILENAME_EUROPEAN_PREFACE">en-preface.adoc</xsl:variable>
 	<xsl:variable name="FILENAME_FOREWORD">00-foreword.adoc</xsl:variable>
 	<xsl:variable name="FILENAME_INTRODUCTION">00-introduction.adoc</xsl:variable>
+	<xsl:variable name="FILENAME_BIBLIOGRAPHY">99-bibliography.adoc</xsl:variable>
 	<xsl:variable name="FILENAME_COLLECTION">metanorma.yml</xsl:variable>
 	
 	<!-- false --> <!-- true, for new features -->
@@ -1122,9 +1123,9 @@
 	</xsl:template>
 	
 	<xsl:template match="//standard/back">
-		<xsl:if test="$split-bibdata != 'true'">		
-			<xsl:apply-templates select="*[not(local-name() = 'ref-list' and @content-type = 'bibl')]" />
-			<xsl:apply-templates select="ref-list[@content-type = 'bibl']" />
+		<xsl:if test="$split-bibdata != 'true'">
+			<xsl:apply-templates select="*[not(local-name() = 'ref-list' and (@content-type = 'bibl' or title = 'Bibliography'))]" />
+			<xsl:apply-templates select="ref-list[@content-type = 'bibl' or title = 'Bibliography']" />
 		</xsl:if>
 	</xsl:template>
 	
@@ -5129,9 +5130,9 @@
 	<xsl:variable name="regex_add_bsi_prefix">^(PAS(\s|\h))</xsl:variable>
 	<xsl:variable name="regex_add_bsi_prefix_result">BSI $1</xsl:variable>
 	
-	<xsl:template match="ref-list[@content-type = 'bibl']" priority="2">
+	<xsl:template match="ref-list[@content-type = 'bibl' or title = 'Bibliography']" priority="2">
 		<xsl:variable name="sectionsFolder"><xsl:call-template name="getSectionsFolder"/></xsl:variable>
-		<redirect:write file="{$outpath}/{$sectionsFolder}/99-bibliography.adoc">
+		<redirect:write file="{$outpath}/{$sectionsFolder}/{$FILENAME_BIBLIOGRAPHY}">
 			<xsl:text>&#xa;</xsl:text>
 			<xsl:text>[bibliography]</xsl:text>
 			<xsl:text>&#xa;</xsl:text>
@@ -5306,15 +5307,15 @@
 		</redirect:write>
 		<xsl:variable name="docfile"><xsl:call-template name="getDocFilename"/></xsl:variable>
 		<redirect:write file="{$outpath}/{$docfile}">
-			<xsl:text>include::</xsl:text><xsl:value-of select="$sectionsFolder"/><xsl:text>/99-bibliography.adoc[]</xsl:text>
+			<xsl:text>include::</xsl:text><xsl:value-of select="concat($sectionsFolder, '/', $FILENAME_BIBLIOGRAPHY)"/><xsl:text>[]</xsl:text>
 			<xsl:text>&#xa;&#xa;</xsl:text>
 		</redirect:write>
 	</xsl:template>
 	
 	<!-- ignore p in Bibliography with text start with 'For dated references, only the edition cited applies'-->
 	<!-- This boilerplate text will be added by metanorma -->
-	<xsl:template match="ref-list[@content-type = 'bibl']//p[starts-with(normalize-space(), 'For dated references, only the edition cited applies')]" priority="2"/>
-	<xsl:template match="ref-list[@content-type = 'bibl']//title[starts-with(normalize-space(), 'For dated references, only the edition cited applies')]" priority="2"/>
+	<xsl:template match="ref-list[@content-type = 'bibl' or title = 'Bibliography']//p[starts-with(normalize-space(), 'For dated references, only the edition cited applies')]" priority="2"/>
+	<xsl:template match="ref-list[@content-type = 'bibl' or title = 'Bibliography']//title[starts-with(normalize-space(), 'For dated references, only the edition cited applies')]" priority="2"/>
 	
 	<xsl:template match="ref-list"> <!-- sub-section for Bibliography -->
 		<!-- <xsl:if test="@content-type = 'bibl' or parent::ref-list/@content-type = 'bibl'"> -->
@@ -5385,10 +5386,14 @@
 			<xsl:choose>
 				<xsl:when test="@id and preceding-sibling::ref[@id = current()/@id]">false</xsl:when>
 				<xsl:when test="std/@std-id and preceding-sibling::ref[std/@std-id = current()/std/@std-id]">false</xsl:when>
-				<xsl:when test="std/std-ref and preceding-sibling::ref[std/std-ref = current()/std/std-ref]">false</xsl:when>
+				<xsl:when test="std/std-ref and preceding-sibling::ref[std/std-ref = current()/std/std-ref]">
+					<xsl:choose>
+						<xsl:when test="std/title and preceding-sibling::ref[std/title = current()/std/title]">false</xsl:when>
+						<xsl:when test="not(std/title)">false</xsl:when>
+					</xsl:choose>
+				</xsl:when>
 			</xsl:choose>
 		</xsl:variable>
-		
 		<!-- DEBUG:<xsl:apply-templates select="." mode="print_as_xml"/> -->
 		
 		<!-- <xsl:variable name="isAsciiBibFormat" select="normalize-space(@referenceText != '' and

From 0a6fdc89d9560e2dd2e993de1c91e37a13e5611f Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Mon, 15 Apr 2024 20:05:40 +0300
Subject: [PATCH 17/23] Bibliography duplicate warning fixing, #407

---
 src/main/resources/sts2mn.adoc.xsl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/sts2mn.adoc.xsl b/src/main/resources/sts2mn.adoc.xsl
index 584b52e0..566eca2d 100644
--- a/src/main/resources/sts2mn.adoc.xsl
+++ b/src/main/resources/sts2mn.adoc.xsl
@@ -5588,7 +5588,12 @@
 			<xsl:value-of select="translate($std-ref_, '&#x2011;', '-')"/>
 		</xsl:variable>
 		<xsl:if test="count($refs/ref[normalize-space(@referenceText) != '' and @referenceText = normalize-space($std-ref)]) &gt; 1">
-			<xsl:message>WARNING: Repeated reference - <xsl:copy-of select="."/></xsl:message>
+			<xsl:choose>
+				<xsl:when test="std/title"></xsl:when>
+				<xsl:otherwise>
+					<xsl:message>WARNING: Repeated reference - <xsl:copy-of select="."/></xsl:message>
+				</xsl:otherwise>
+			</xsl:choose>
 		</xsl:if>
 		
 	</xsl:template> <!-- ref -->

From 00855864be60f80d0bbb9bdf662d46188dc4d6c0 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Tue, 16 Apr 2024 20:49:12 +0300
Subject: [PATCH 18/23] Bibliography item formatting fixing, #407

---
 src/main/resources/sts2mn.adoc.xsl | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/sts2mn.adoc.xsl b/src/main/resources/sts2mn.adoc.xsl
index 566eca2d..f8c3275f 100644
--- a/src/main/resources/sts2mn.adoc.xsl
+++ b/src/main/resources/sts2mn.adoc.xsl
@@ -3894,7 +3894,12 @@
 			<xsl:otherwise><xsl:value-of select="$href"/></xsl:otherwise>
 		</xsl:choose>
 		
-		<xsl:text>[</xsl:text><xsl:apply-templates /><xsl:text>]</xsl:text>
+		<xsl:choose>
+			<xsl:when test="$href = normalize-space() and ancestor::ref[@content-type = 'standard_other']"></xsl:when>
+			<xsl:otherwise>
+				<xsl:text>[</xsl:text><xsl:apply-templates /><xsl:text>]</xsl:text>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 	
 	<xsl:template match="supplementary-material/p">
@@ -5443,8 +5448,8 @@
 							</xsl:otherwise>
 						</xsl:choose>
 					</xsl:variable>
-					<!-- remove comma at start -->
-					<xsl:value-of select="normalize-space(java:replaceAll(java:java.lang.String.new($title),'^(\s|\h)*,',''))"/>
+					<!-- remove space, comma, dot at start -->
+					<xsl:value-of select="normalize-space(java:replaceAll(java:java.lang.String.new($title),'^(\s|\h|,|\.)*',''))"/>
 					<xsl:text>&#xa;</xsl:text>
 					<xsl:text>docid::&#xa;</xsl:text>
 					<xsl:text>id::: </xsl:text>

From 078968723165ddb82f92b6f2943a283c233a98c8 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Tue, 16 Apr 2024 21:35:45 +0300
Subject: [PATCH 19/23] sts2mn.xsl updated for std-doc-meta support, #407

---
 src/main/resources/sts2mn.common.xsl |  14 ++++
 src/main/resources/sts2mn.xsl        | 113 ++++++++++++++++-----------
 2 files changed, 82 insertions(+), 45 deletions(-)

diff --git a/src/main/resources/sts2mn.common.xsl b/src/main/resources/sts2mn.common.xsl
index 118820bd..d1deb9f4 100644
--- a/src/main/resources/sts2mn.common.xsl
+++ b/src/main/resources/sts2mn.common.xsl
@@ -1574,4 +1574,18 @@
 		<xsl:value-of select="concat(':', $key, ': ', $value, $newline)"/>
 	</xsl:template>
 	
+	<xsl:template name="get_named_content_target">
+		<xsl:choose>
+			<xsl:when test="@xlink:href and translate(@xlink:href, '#', '') = ''"> <!-- empty xlink:href -->
+				<xsl:value-of select="translate(normalize-space(), ' ()', '---')"/>
+			</xsl:when>
+			<xsl:when test="starts-with(@xlink:href, '#')">
+				<xsl:value-of select="substring-after(@xlink:href, '#')"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="@xlink:href"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+	
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/src/main/resources/sts2mn.xsl b/src/main/resources/sts2mn.xsl
index 0a45ce10..7777aa66 100644
--- a/src/main/resources/sts2mn.xsl
+++ b/src/main/resources/sts2mn.xsl
@@ -239,7 +239,7 @@
 		
 		<xsl:if test="not(nat-meta)">
 		
-			<xsl:for-each select="iso-meta">
+			<xsl:for-each select="iso-meta | std-doc-meta">
 				<bibdata type="standard">
 						<xsl:call-template name="xxx-meta">
 							<xsl:with-param name="include_reg_meta">true</xsl:with-param>
@@ -277,7 +277,7 @@
 		</xsl:if>
 		
 		<xsl:if test="not ($split-bibdata = 'true')">
-			<xsl:if test="/standard/front/iso-meta">
+			<xsl:if test="/standard/front/iso-meta or /standard/front/std-doc-meta">
 				<boilerplate>
 					<copyright-statement>
 						<clause>
@@ -287,7 +287,7 @@
 									<p id="boilerplate-message"><xsl:apply-templates select="/standard/front/iso-meta/permissions/copyright-statement/node()" /></p>
 								</xsl:when>
 								<xsl:otherwise>
-									<xsl:for-each select="/standard/front/iso-meta/permissions/copyright-statement">
+									<xsl:for-each select="/standard/front/iso-meta/permissions/copyright-statement | /standard/front/std-doc-meta/permissions/copyright-statement">
 										<p>
 											<xsl:copy-of select="@id"/>
 											<xsl:apply-templates />
@@ -303,7 +303,7 @@
 						</xsl:if> -->
 						</clause>
 					</copyright-statement>
-					<xsl:apply-templates select="/standard/front/iso-meta/permissions/license" mode="bibdata"/>
+					<xsl:apply-templates select="/standard/front/iso-meta/permissions/license | /standard/front/std-doc-meta/permissions/license" mode="bibdata"/>
 				</boilerplate>
 			</xsl:if>
 			<xsl:if test="sec or notes">
@@ -584,7 +584,7 @@
 
 	
 	
-	<xsl:template match="iso-meta | nat-meta | reg-meta | std-meta |
+	<xsl:template match="iso-meta | nat-meta | reg-meta | std-meta | std-doc-meta | 
 																title-wrap" mode="bibdata_check">
 		<xsl:apply-templates mode="bibdata_check"/>
 	</xsl:template>
@@ -599,23 +599,28 @@
 															nat-meta/doc-ref |
 															reg-meta/doc-ref |
 															std-meta/doc-ref |
+															std-doc-meta/doc-ref |
 															iso-meta/std-ref |
 															nat-meta/std-ref |
 															reg-meta/std-ref |
 															std-meta/std-ref |
+															std-doc-meta/std-ref |
 															iso-meta/pub-date |
 															nat-meta/pub-date |
 															reg-meta/pub-date |
 															std-meta/pub-date |
+															std-doc-meta/pub-date |
 															iso-meta/release-date |
 															nat-meta/release-date |
 															reg-meta/release-date |
 															std-meta/release-date |
+															std-doc-meta/release-date |
 															iso-meta/meta-date |															
 															iso-meta/std-ident/doc-number |
 															nat-meta/std-ident/doc-number |
 															reg-meta/std-ident/doc-number |
 															std-meta/std-ident/doc-number |
+															std-doc-meta/std-ident/doc-number |
 															iso-meta/doc-ident/sdo |
 															nat-meta/doc-ident/sdo |
 															reg-meta/doc-ident/sdo |
@@ -625,6 +630,7 @@
 															reg-meta/doc-ident/proj-id |
 															std-meta/doc-ident/proj-id |
 															std-meta/proj-id |
+															std-doc-meta/proj-id |
 															iso-meta/doc-ident/language |
 															nat-meta/doc-ident/language |
 															reg-meta/doc-ident/language |
@@ -634,18 +640,22 @@
 															nat-meta/std-ident/originator |
 															reg-meta/std-ident/originator |
 															std-meta/std-ident/originator |
+															std-doc-meta/std-ident/originator |
 															iso-meta/std-ident/edition |
 															nat-meta/std-ident/edition |
 															reg-meta/std-ident/edition |
 															std-meta/std-ident/edition |
+															std-doc-meta/std-ident/edition |
 															iso-meta/std-ident/version |
 															nat-meta/std-ident/version |
 															reg-meta/std-ident/version |
 															std-meta/std-ident/version |
+															std-doc-meta/std-ident/version |
 															iso-meta/content-language |
 															nat-meta/content-language |
 															reg-meta/content-language |
 															std-meta/content-language |
+															std-doc-meta/content-language |
 															iso-meta/doc-ident/release-version |
 															nat-meta/doc-ident/release-version |
 															reg-meta/doc-ident/release-version |
@@ -655,43 +665,54 @@
 															nat-meta/permissions/copyright-year |
 															reg-meta/permissions/copyright-year |
 															std-meta/permissions/copyright-year |
+															std-doc-meta/permissions/copyright-year |
 															iso-meta/permissions/copyright-holder |
 															nat-meta/permissions/copyright-holder |
 															reg-meta/permissions/copyright-holder |
 															std-meta/permissions/copyright-holder |
+															std-doc-meta/permissions/copyright-holder |
 															iso-meta/permissions/copyright-statement |
 															nat-meta/permissions/copyright-statement |
 															reg-meta/permissions/copyright-statement |
 															std-meta/permissions/copyright-statement |
+															std-doc-meta/permissions/copyright-statement |
 															iso-meta/permissions/license |
+															std-doc-meta/permissions/license |
 															iso-meta/std-ident/doc-type |
 															nat-meta/std-ident/doc-type |
 															reg-meta/std-ident/doc-type |
 															std-meta/std-ident/doc-type |
+															std-doc-meta/std-ident/doc-type |
 															iso-meta/comm-ref |
 															nat-meta/comm-ref |
 															reg-meta/comm-ref |
 															std-meta/comm-ref |
+															std-doc-meta/comm-ref |
 															iso-meta/secretariat |
 															nat-meta/secretariat |
 															reg-meta/secretariat |
 															std-meta/secretariat |
+															std-doc-meta/secretariat |
 															iso-meta/ics |
 															nat-meta/ics |
 															reg-meta/ics |
 															std-meta/ics |
+															std-doc-meta/ics |
 															iso-meta/std-ident/part-number |
 															nat-meta/std-ident/part-number |
 															reg-meta/std-ident/part-number |
 															std-meta/std-ident/part-number |
+															std-doc-meta/std-ident/part-number |
 															iso-meta/page-count |
 															reg-meta/page-count |
 															nat-meta/page-count |
 															std-meta/page-count |
+															std-doc-meta/page-count |
 															iso-meta/std-xref |
 															nat-meta/std-xref |
 															reg-meta/std-xref |
 															std-meta/std-xref |
+															std-doc-meta/std-xref |
 															reg-meta/meta-date |
 															reg-meta/wi-number |
 															reg-meta/release-version-id |
@@ -726,8 +747,8 @@
 	
 	
 	<xsl:template match="iso-meta/doc-ident | nat-meta/doc-ident | reg-meta/doc-ident | std-meta/doc-ident |
-															iso-meta/std-ident | nat-meta/std-ident |  reg-meta/std-ident | std-meta/std-ident |
-															iso-meta/permissions | nat-meta/permissions | reg-meta/permissions | std-meta/permissions" mode="bibdata_check">
+															iso-meta/std-ident | nat-meta/std-ident |  reg-meta/std-ident | std-meta/std-ident | std-doc-meta/std-ident |
+															iso-meta/permissions | nat-meta/permissions | reg-meta/permissions | std-meta/permissions | std-doc-meta/permissions" mode="bibdata_check">
 		<xsl:apply-templates mode="bibdata_check"/>
 	</xsl:template>
 	
@@ -739,7 +760,7 @@
 	
 	
 	
-	<xsl:template match="iso-meta/title-wrap | nat-meta/title-wrap | reg-meta/title-wrap | std-meta/title-wrap" mode="bibdata">
+	<xsl:template match="iso-meta/title-wrap | nat-meta/title-wrap | reg-meta/title-wrap | std-meta/title-wrap | std-doc-meta/title-wrap" mode="bibdata">
 		<!-- <xsl:variable name="lang" select="@xml:lang"/>
 		<title language="{$lang}" format="text/plain" type="main">
 			<xsl:apply-templates select="full" mode="bibdata"/>
@@ -979,14 +1000,14 @@
 		</semantic-metadata>
 	</xsl:template>
 	
-	<xsl:template match="iso-meta/std-ident/doc-number | nat-meta/std-ident/doc-number | reg-meta/std-ident/doc-number | std-meta/std-ident/doc-number" mode="bibdata">
+	<xsl:template match="iso-meta/std-ident/doc-number | nat-meta/std-ident/doc-number | reg-meta/std-ident/doc-number | std-meta/std-ident/doc-number | std-doc-meta/std-ident/doc-number" mode="bibdata">
 		<docnumber>
 			<xsl:apply-templates mode="bibdata"/>
 		</docnumber>
 	</xsl:template>
 	
 
-	<xsl:template match="iso-meta/pub-date | nat-meta/pub-date | reg-meta/pub-date | std-meta/pub-date" mode="bibdata">
+	<xsl:template match="iso-meta/pub-date | nat-meta/pub-date | reg-meta/pub-date | std-meta/pub-date | std-doc-meta/pub-date" mode="bibdata">
 		<date type="published">
 			<on>
 				<xsl:apply-templates mode="bibdata"/>
@@ -994,7 +1015,7 @@
 		</date>
 	</xsl:template>
 	
-	<xsl:template match="iso-meta/release-date | nat-meta/release-date | reg-meta/release-date | std-meta/release-date" mode="bibdata">
+	<xsl:template match="iso-meta/release-date | nat-meta/release-date | reg-meta/release-date | std-meta/release-date | std-doc-meta/release-date" mode="bibdata">
 		<date type="release">
 			<on>
 				<xsl:apply-templates mode="bibdata"/>
@@ -1021,7 +1042,7 @@
 	</xsl:template>
 	
 	
-	<xsl:template match="iso-meta/std-ident/originator | nat-meta/std-ident/originator | reg-meta/std-ident/originator| std-meta/std-ident/originator" mode="bibdata" name="publisher">
+	<xsl:template match="iso-meta/std-ident/originator | nat-meta/std-ident/originator | reg-meta/std-ident/originator | std-meta/std-ident/originator | std-doc-meta/std-ident/originator" mode="bibdata" name="publisher">
 		<contributor>
 			<role type="publisher"/>
 				<organization>
@@ -1038,20 +1059,20 @@
 		</contributor>
 	</xsl:template>
 	
-	<xsl:template match="iso-meta/std-org/std-org-abbrev | nat-meta/std-org/std-org-abbrev | reg-meta/std-org/std-org-abbrev | std-meta/std-org/std-org-abbrev" mode="bibdata">
+	<xsl:template match="iso-meta//std-org/std-org-abbrev | nat-meta//std-org/std-org-abbrev | reg-meta//std-org/std-org-abbrev | std-meta//std-org/std-org-abbrev | std-doc-meta//std-org/std-org-abbrev" mode="bibdata">
 		<xsl:param name="process">false</xsl:param>
 		<xsl:if test="$process = 'true'">
 			<xsl:call-template name="publisher"/>
 		</xsl:if>
 	</xsl:template>
 	
-	<xsl:template match="*[self::iso-meta or self::nat-meta or self::reg-meta or self::std-meta]/std-ident/edition[normalize-space() != '']" mode="bibdata">
+	<xsl:template match="*[self::iso-meta or self::nat-meta or self::reg-meta or self::std-meta or self::std-doc-meta]/std-ident/edition[normalize-space() != '']" mode="bibdata">
 		<edition>
 			<xsl:apply-templates mode="bibdata"/>
 		</edition>
 	</xsl:template>
 	
-	<xsl:template match="*[self::iso-meta or self::nat-meta or self::reg-meta or self::std-meta]/std-ident/version[normalize-space() != '']" mode="bibdata">
+	<xsl:template match="*[self::iso-meta or self::nat-meta or self::reg-meta or self::std-meta or self::std-doc-meta]/std-ident/version[normalize-space() != '']" mode="bibdata">
 		<version>
 			<xsl:variable name="version"><xsl:apply-templates mode="bibdata"/></xsl:variable>
 			<xsl:choose>
@@ -1070,7 +1091,7 @@
 		</version>
 	</xsl:template>
 	
-	<xsl:template match="*[self::iso-meta or self::nat-meta or self::reg-meta or self::std-meta]/content-language" mode="bibdata">
+	<xsl:template match="*[self::iso-meta or self::nat-meta or self::reg-meta or self::std-meta or self::std-doc-meta]/content-language" mode="bibdata">
 		<xsl:variable name="language"><xsl:apply-templates mode="bibdata"/></xsl:variable>
 		<language>
 			<xsl:if test="$type_xml = 'presentation'">
@@ -1172,7 +1193,7 @@
 		</status>		
 	</xsl:template>
 	
-	<xsl:template match="iso-meta/std-xref | nat-meta/std-xref | reg-meta/std-xref| std-meta/std-xref" mode="bibdata">
+	<xsl:template match="iso-meta/std-xref | nat-meta/std-xref | reg-meta/std-xref | std-meta/std-xref | std-doc-meta/std-xref" mode="bibdata">
 		<xsl:choose>
 			<xsl:when test="@type = 'isPublishedFormatOf'"></xsl:when> <!-- see <relation type="related"> -->
 			<xsl:otherwise>
@@ -1190,26 +1211,26 @@
 		</relation>
 	</xsl:template>
 	
-	<xsl:template match="iso-meta/std-xref/std-ref | nat-meta/std-xref/std-ref | reg-meta/std-xref/std-ref| std-meta/std-xref/std-ref" mode="bibdata">
+	<xsl:template match="iso-meta/std-xref/std-ref | nat-meta/std-xref/std-ref | reg-meta/std-xref/std-ref | std-meta/std-xref/std-ref | std-doc-meta/std-xref/std-ref" mode="bibdata">
 		<bibitem>
 			<xsl:apply-templates mode="bibdata"/>
 		</bibitem>
 	</xsl:template>
 	
-	<xsl:template match="iso-meta/permissions | nat-meta/permissions | reg-meta/permissions| std-meta/permissions" mode="bibdata">
+	<xsl:template match="iso-meta/permissions | nat-meta/permissions | reg-meta/permissions | std-meta/permissions | std-doc-meta/permissions" mode="bibdata">
 		<copyright>
 			<xsl:apply-templates select="copyright-year" mode="bibdata"/>
 			<xsl:apply-templates select="copyright-holder" mode="bibdata"/>			
 		</copyright>
 	</xsl:template>
 		
-	<xsl:template match="iso-meta/permissions/copyright-year | nat-meta/permissions/copyright-year | reg-meta/permissions/copyright-year | std-meta/permissions/copyright-year" mode="bibdata">
+	<xsl:template match="iso-meta/permissions/copyright-year | nat-meta/permissions/copyright-year | reg-meta/permissions/copyright-year | std-meta/permissions/copyright-year | std-doc-meta/permissions/copyright-year" mode="bibdata">
 		<from>
 			<xsl:apply-templates mode="bibdata"/>
 		</from>
 	</xsl:template>
 	
-	<xsl:template match="iso-meta/permissions/copyright-holder | nat-meta/permissions/copyright-holder | reg-meta/permissions/copyright-holder | std-meta/permissions/copyright-holder" mode="bibdata">
+	<xsl:template match="iso-meta/permissions/copyright-holder | nat-meta/permissions/copyright-holder | reg-meta/permissions/copyright-holder | std-meta/permissions/copyright-holder | std-doc-meta/permissions/copyright-holder" mode="bibdata">
 		<owner>
 				<organization>
 					<xsl:choose>
@@ -1235,7 +1256,7 @@
 	</xsl:template>
 	
 
-	<xsl:template match="iso-meta/std-ident/doc-type | nat-meta/std-ident/doc-type | reg-meta/std-ident/doc-type | std-meta/std-ident/doc-type" mode="bibdata">
+	<xsl:template match="iso-meta/std-ident/doc-type | nat-meta/std-ident/doc-type | reg-meta/std-ident/doc-type | std-meta/std-ident/doc-type | std-doc-meta/std-ident/doc-type" mode="bibdata">
 		<xsl:variable name="value" select="java:toLowerCase(java:java.lang.String.new(.))"/>
 		<xsl:variable name="originator" select=" normalize-space(ancestor::std-ident/originator)"/>
 		<doctype>
@@ -1258,7 +1279,7 @@
 		</doctype>
 	</xsl:template>
 	
-	<xsl:template match="iso-meta/comm-ref | nat-meta/comm-ref | reg-meta/comm-ref | std-meta/comm-ref" mode="bibdata">
+	<xsl:template match="iso-meta/comm-ref | nat-meta/comm-ref | reg-meta/comm-ref | std-meta/comm-ref | std-doc-meta/comm-ref" mode="bibdata">
 		<editorialgroup>
 			<xsl:if test="$organization != 'BSI'">
 				<xsl:variable name="comm-ref">
@@ -1297,13 +1318,13 @@
 		
 	</xsl:template>
 	
-	<xsl:template match="iso-meta/secretariat | nat-meta/secretariat | reg-meta/secretariat | std-meta/secretariat" mode="bibdata">
+	<xsl:template match="iso-meta/secretariat | nat-meta/secretariat | reg-meta/secretariat | std-meta/secretariat | std-doc-meta/secretariat" mode="bibdata">
 		<secretariat>
 			<xsl:apply-templates mode="bibdata"/>
 		</secretariat>
 	</xsl:template>
 	
-	<xsl:template match="iso-meta/ics | nat-meta/ics | reg-meta/ics | std-meta/ics" mode="bibdata">
+	<xsl:template match="iso-meta/ics | nat-meta/ics | reg-meta/ics | std-meta/ics | std-doc-meta/ics" mode="bibdata">
 		<ics>
 			<code>
 				<xsl:apply-templates mode="bibdata"/>
@@ -1311,7 +1332,7 @@
 		</ics>
 	</xsl:template>
 	
-	<xsl:template match="iso-meta/std-ident | nat-meta/std-ident | reg-meta/std-ident | std-meta/std-ident" mode="bibdata">
+	<xsl:template match="iso-meta/std-ident | nat-meta/std-ident | reg-meta/std-ident | std-meta/std-ident | std-doc-meta/std-ident" mode="bibdata">
 		<xsl:if test="$organization != 'BSI'">
 			<structuredidentifier>
 				<project-number part="{part-number}">
@@ -2599,7 +2620,12 @@
 			<xsl:choose>
 				<xsl:when test="@id and preceding-sibling::ref[@id = current()/@id]">false</xsl:when>
 				<xsl:when test="std/@std-id and preceding-sibling::ref[std/@std-id = current()/std/@std-id]">false</xsl:when>
-				<xsl:when test="std/std-ref and preceding-sibling::ref[std/std-ref = current()/std/std-ref]">false</xsl:when>
+				<xsl:when test="std/std-ref and preceding-sibling::ref[std/std-ref = current()/std/std-ref]">
+					<xsl:choose>
+						<xsl:when test="std/title and preceding-sibling::ref[std/title = current()/std/title]">false</xsl:when>
+						<xsl:when test="not(std/title)">false</xsl:when>
+					</xsl:choose>
+				</xsl:when>
 			</xsl:choose>
 		</xsl:variable>
 		<!-- unique='<xsl:value-of select="$unique"/>' -->
@@ -2787,17 +2813,7 @@
 	
 	<xsl:template match="named-content">
 		<xsl:variable name="target">
-			<xsl:choose>
-				<xsl:when test="translate(@xlink:href, '#', '') = ''"> <!-- empty xlink:href -->
-					<xsl:value-of select="translate(normalize-space(), ' ()', '---')"/>
-				</xsl:when>
-				<xsl:when test="starts-with(@xlink:href, '#')">
-					<xsl:value-of select="substring-after(@xlink:href, '#')"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:value-of select="@xlink:href"/>
-				</xsl:otherwise>
-			</xsl:choose>
+			<xsl:call-template name="get_named_content_target"/>
 		</xsl:variable>
 		<xsl:choose>
 			<xsl:when test="$type_xml = 'semantic' and (@content-type = 'term' and (local-name(//*[@id = $target]) = 'term-sec' or local-name(//*[@id = $target]) = 'termEntry'))">
@@ -2809,13 +2825,20 @@
 				</concept>
 			</xsl:when>
 			<xsl:otherwise>
-				<xref>
-					<xsl:attribute name="target">
-						<xsl:value-of select="$target"/>
-					</xsl:attribute>
-					<xsl:copy-of select="@content-type"/>
-					<xsl:apply-templates />
-				</xref>
+				<xsl:choose>
+					<xsl:when test="normalize-space($target) != ''">
+						<xref>
+							<xsl:attribute name="target">
+								<xsl:value-of select="$target"/>
+							</xsl:attribute>
+							<xsl:copy-of select="@content-type"/>
+							<xsl:apply-templates />
+						</xref>
+					</xsl:when>
+					<xsl:otherwise>
+						<span class="{@content-type}"><xsl:apply-templates /></span>
+					</xsl:otherwise>
+				</xsl:choose>
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>

From d1b246e683f176c51d39b5c2d14895872854bcab Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Tue, 16 Apr 2024 22:01:45 +0300
Subject: [PATCH 20/23] sts2mn.xsl updated for bibdata, #407

---
 src/main/resources/sts2mn.adoc.xsl | 12 +-------
 src/main/resources/sts2mn.xsl      | 45 +++++++++++++++++++-----------
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/main/resources/sts2mn.adoc.xsl b/src/main/resources/sts2mn.adoc.xsl
index f8c3275f..86a7ef23 100644
--- a/src/main/resources/sts2mn.adoc.xsl
+++ b/src/main/resources/sts2mn.adoc.xsl
@@ -6323,17 +6323,7 @@
 		<xsl:value-of select="$space_before"/>
 		
 		<xsl:variable name="target">
-			<xsl:choose>
-				<xsl:when test="@xlink:href and translate(@xlink:href, '#', '') = ''"> <!-- empty xlink:href -->
-					<xsl:value-of select="translate(normalize-space(), ' ()', '---')"/>
-				</xsl:when>
-				<xsl:when test="starts-with(@xlink:href, '#')">
-					<xsl:value-of select="substring-after(@xlink:href, '#')"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:value-of select="@xlink:href"/>
-				</xsl:otherwise>
-			</xsl:choose>
+			<xsl:call-template name="get_named_content_target"/>
 		</xsl:variable>
 		<!-- target='<xsl:value-of select="$target"/>'
 		<xsl:apply-templates select="." mode="print_as_xml"/> -->
diff --git a/src/main/resources/sts2mn.xsl b/src/main/resources/sts2mn.xsl
index 7777aa66..d770f5e9 100644
--- a/src/main/resources/sts2mn.xsl
+++ b/src/main/resources/sts2mn.xsl
@@ -365,7 +365,9 @@
 		
 		<!-- docidentifier @type="iso", "iso-with-lang", "iso-reference" -->
 		<xsl:apply-templates select="std-ref[@type='dated']" mode="bibdata"/>	
-		<xsl:apply-templates select="doc-ref" mode="bibdata"/>	
+		<xsl:apply-templates select="doc-ref" mode="bibdata"/>
+		<xsl:apply-templates select="std-ident/std-id-group/std-id[@std-id-type='dated']" mode="bibdata"/>	
+		
 		
 		<xsl:apply-templates select="custom-meta-group/custom-meta[meta-name = 'ISBN']/meta-value" mode="bibdata"/>	
 		
@@ -591,9 +593,9 @@
 	
 	
 	
-	<xsl:template match="title-wrap/intro |
-															title-wrap/main |
-															title-wrap/compl |
+	<xsl:template match="title-wrap/intro | title-wrap/intro-title-wrap/intro |
+															title-wrap/main | title-wrap/main-title-wrap |
+															title-wrap/compl | title-wrap/compl-title-wrap |
 															title-wrap/full |
 															iso-meta/doc-ref |
 															nat-meta/doc-ref |
@@ -809,17 +811,17 @@
 				
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:apply-templates select="full[normalize-space() != '']" mode="bibdata"/>
-				<xsl:apply-templates select="intro[normalize-space() != '']" mode="bibdata"/>
-				<xsl:apply-templates select="main[normalize-space() != '']" mode="bibdata"/>
-				<xsl:apply-templates select="compl[normalize-space() != '']" mode="bibdata"/>
+				<xsl:apply-templates select=".//full[normalize-space() != '']" mode="bibdata"/>
+				<xsl:apply-templates select=".//intro[normalize-space() != '']" mode="bibdata"/>
+				<xsl:apply-templates select=".//main[normalize-space() != '']" mode="bibdata"/>
+				<xsl:apply-templates select=".//compl[normalize-space() != '']" mode="bibdata"/>
 			</xsl:otherwise>
 		</xsl:choose>
 		
 	</xsl:template>
 
 	
-	<xsl:template match="title-wrap/full | title-wrap/main" mode="bibdata_title_full">
+	<xsl:template match="title-wrap/full | title-wrap//main" mode="bibdata_title_full">
 	
 		<xsl:variable name="title" select="translate(., '–', '—')"/> <!-- replace en dash to em dash -->
 		<xsl:variable name="parts">
@@ -856,26 +858,26 @@
 		</title>
 	</xsl:template>
 	
-	<xsl:template match="title-wrap/intro" mode="bibdata">
+	<xsl:template match="title-wrap//intro" mode="bibdata">
 		<title language="{../@xml:lang}" format="text/plain" type="title-intro">
 			<xsl:apply-templates mode="bibdata"/>
 		</title>
 	</xsl:template>
 	
-	<xsl:template match="title-wrap/main" mode="bibdata">
+	<xsl:template match="title-wrap//main" mode="bibdata">
 		<title language="{../@xml:lang}" format="text/plain" type="title-main">
 			<xsl:apply-templates mode="bibdata"/>
 		</title>
 	</xsl:template>
 	
-	<xsl:template match="title-wrap/compl" mode="bibdata">
+	<xsl:template match="title-wrap//compl" mode="bibdata">
 		<title language="{../@xml:lang}" format="text/plain" type="title-part">
 			<xsl:apply-templates mode="bibdata"/>
 		</title>
 	</xsl:template>
   
   
-	<xsl:template match="iso-meta/std-ref[@type='dated'] | nat-meta/std-ref[@type='dated'] | reg-meta/std-ref[@type='dated'] | std-meta/std-ref[@type='dated']" mode="bibdata">
+	<xsl:template match="iso-meta/std-ref[@type='dated'] | nat-meta/std-ref[@type='dated'] | reg-meta/std-ref[@type='dated'] | std-meta/std-ref[@type='dated'] | std-doc-meta/std-ident//std-id[@std-id-type='dated']" mode="bibdata">
 		<docidentifier type="ISO">
 			<xsl:apply-templates mode="bibdata"/>
 		</docidentifier>
@@ -883,7 +885,7 @@
 		
 		<xsl:variable name="language_">
 			<xsl:value-of select="$language_1st_letter"/>
-			<xsl:if test="$language_1st_letter = ''"><xsl:value-of select="substring(../content-language, 1, 1)"/></xsl:if>
+			<xsl:if test="$language_1st_letter = ''"><xsl:value-of select="substring(ancestor::*[content-language]/content-language, 1, 1)"/></xsl:if>
 		</xsl:variable>
 		
 		<xsl:variable name="language" select="java:toUpperCase(java:java.lang.String.new($language_))"/>
@@ -1010,19 +1012,30 @@
 	<xsl:template match="iso-meta/pub-date | nat-meta/pub-date | reg-meta/pub-date | std-meta/pub-date | std-doc-meta/pub-date" mode="bibdata">
 		<date type="published">
 			<on>
-				<xsl:apply-templates mode="bibdata"/>
+				<!-- <xsl:apply-templates mode="bibdata"/> -->
+				<xsl:call-template name="getDate"/>
 			</on>
 		</date>
 	</xsl:template>
 	
 	<xsl:template match="iso-meta/release-date | nat-meta/release-date | reg-meta/release-date | std-meta/release-date | std-doc-meta/release-date" mode="bibdata">
 		<date type="release">
+			<xsl:if test="@date-type = 'approved' and ancestor::std-doc-meta">
+				<xsl:attribute name="type">issued</xsl:attribute>
+			</xsl:if>
 			<on>
-				<xsl:apply-templates mode="bibdata"/>
+				<!-- <xsl:apply-templates mode="bibdata"/> -->
+				<xsl:call-template name="getDate"/>
 			</on>
 		</date>
 	</xsl:template>
 			
+	<xsl:template name="getDate">
+		<xsl:choose>
+			<xsl:when test="normalize-space(@iso-8601-date) != ''"><xsl:value-of select="@iso-8601-date"/></xsl:when>
+			<xsl:otherwise><xsl:apply-templates mode="bibdata"/></xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
 	
 	<xsl:template match="iso-meta/doc-ident/sdo | nat-meta/doc-ident/sdo | reg-meta/doc-ident/sdo | std-meta/doc-ident/sdo" mode="bibdata">
 		<contributor>

From 0c1166a56b5e06a42505338967121bd915ba016e Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Wed, 17 Apr 2024 18:23:27 +0300
Subject: [PATCH 21/23] sts2mn.xsl updated for bibdata, #407

---
 src/main/resources/sts2mn.xsl | 42 ++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/sts2mn.xsl b/src/main/resources/sts2mn.xsl
index d770f5e9..d377c1a2 100644
--- a/src/main/resources/sts2mn.xsl
+++ b/src/main/resources/sts2mn.xsl
@@ -306,7 +306,7 @@
 					<xsl:apply-templates select="/standard/front/iso-meta/permissions/license | /standard/front/std-doc-meta/permissions/license" mode="bibdata"/>
 				</boilerplate>
 			</xsl:if>
-			<xsl:if test="sec or notes">
+			<xsl:if test="sec or notes or */meta-note">
 				<preface>
 					
 					<xsl:if test="$type_xml = 'presentation' and ($organization = 'BSI' or $organization = 'PAS')">
@@ -332,6 +332,9 @@
 					<xsl:if test="$nat_meta_only = 'true'"> <!-- move Introduction section from body to preface, if  nat_meta_only -->
 						<xsl:apply-templates select="/standard/body/sec[@sec-type = 'intro']" mode="preface"/>
 					</xsl:if>
+					
+					<xsl:apply-templates select="*/meta-note"/>
+					
 				</preface>
 			</xsl:if>
 		</xsl:if>
@@ -389,6 +392,8 @@
 			</xsl:apply-templates>
 		</xsl:if>
 		
+		<xsl:apply-templates select="std-org-group"/>
+		
 		<!-- edition -->
 		<xsl:apply-templates select="std-ident/edition" mode="bibdata"/>
 		
@@ -744,6 +749,9 @@
 															nat-meta/std-org/std-org-abbrev |
 															reg-meta/std-org/std-org-abbrev |
 															std-meta/std-org/std-org-abbrev |
+															*[contains(local-name(), '-meta')]/std-ident/std-id-group |
+															*[contains(local-name(), '-meta')]/std-org-group |
+															*[contains(local-name(), '-meta')]/meta-note |
 															front/notes |
 															front/sec " mode="bibdata_check"/>
 	
@@ -1079,6 +1087,33 @@
 		</xsl:if>
 	</xsl:template>
 	
+	<xsl:template match="iso-meta/std-org-group | nat-meta/std-org-group | reg-meta/std-org-group | std-meta/std-org-group | std-doc-meta/std-org-group">
+		<contributor>
+			<role>
+				<xsl:attribute name="type">
+					<xsl:choose>
+						<xsl:when test="std-org/@std-org-role = 'developer'">author</xsl:when>
+						<xsl:otherwise>author</xsl:otherwise>
+					</xsl:choose>
+				</xsl:attribute>
+			</role>
+			<organization>
+					<name><xsl:value-of select="std-org/std-org-abbrev"/></name>
+					<xsl:if test="std-org/std-org-loc">
+						<address>
+							<formattedAddress>
+								<xsl:for-each select="std-org/std-org-loc/*">
+									<xsl:apply-templates />
+									<xsl:if test="position() != last()"><br/></xsl:if>
+								</xsl:for-each>
+							</formattedAddress>
+						</address>
+					</xsl:if>
+			</organization>
+	</contributor>
+	</xsl:template>
+	
+	
 	<xsl:template match="*[self::iso-meta or self::nat-meta or self::reg-meta or self::std-meta or self::std-doc-meta]/std-ident/edition[normalize-space() != '']" mode="bibdata">
 		<edition>
 			<xsl:apply-templates mode="bibdata"/>
@@ -1441,6 +1476,11 @@
 		</xsl:element>
 	</xsl:template>
 	
+	<xsl:template match="*[contains(local-name(), '-meta')]/meta-note">
+		<clause type="{@content-type}">
+			<xsl:apply-templates />
+		</clause>
+	</xsl:template>
 	
 	<xsl:template match="front//sec">
 		<clause id="{@id}">

From 36f37f4f1092fffc3f3428e1cad7c9fddaa16e2d Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Wed, 17 Apr 2024 22:13:00 +0300
Subject: [PATCH 22/23] sts2mn.xsl updated for bibdata, #407

---
 src/main/resources/sts2mn.adoc.xsl   |  13 ----
 src/main/resources/sts2mn.common.xsl |  13 ++++
 src/main/resources/sts2mn.xsl        | 100 ++++++++++++++++++++++++---
 3 files changed, 102 insertions(+), 24 deletions(-)

diff --git a/src/main/resources/sts2mn.adoc.xsl b/src/main/resources/sts2mn.adoc.xsl
index 86a7ef23..8f8b44d1 100644
--- a/src/main/resources/sts2mn.adoc.xsl
+++ b/src/main/resources/sts2mn.adoc.xsl
@@ -64,19 +64,6 @@
 	<xsl:variable name="one_document_" select="count(//standard/front/*[contains(local-name(), '-meta')]) = 1 or //standards-document"/>
 	<xsl:variable name="one_document" select="normalize-space($one_document_)"/>
 	
-	<xsl:variable name="language1" select="normalize-space(//standard/front/*/doc-ident/language)"/>
-	<xsl:variable name="language2" select="normalize-space(//standard/front/*/std-ident/content-language)"/>
-	<xsl:variable name="language3" select="normalize-space(//standard/front/*/content-language)"/>
-	
-	<xsl:variable name="language"> <!-- see https://www.niso-sts.org/TagLibrary/niso-sts-TL-1-2-html/element/content-language.html -->
-		<xsl:choose>
-			<xsl:when test="$language1 != ''"><xsl:value-of select="$language1"/></xsl:when>
-			<xsl:when test="$language2 != ''"><xsl:value-of select="$language2"/></xsl:when>
-			<xsl:when test="$language3 != ''"><xsl:value-of select="$language3"/></xsl:when>
-			<xsl:otherwise>en</xsl:otherwise>
-		</xsl:choose>
-	</xsl:variable>
-	
 	<xsl:variable name="organization">
 		<xsl:choose>
 			<xsl:when test="/standard/front/nat-meta/std-ident/originator = 'PAS'">PAS</xsl:when>
diff --git a/src/main/resources/sts2mn.common.xsl b/src/main/resources/sts2mn.common.xsl
index d1deb9f4..588879da 100644
--- a/src/main/resources/sts2mn.common.xsl
+++ b/src/main/resources/sts2mn.common.xsl
@@ -1558,6 +1558,19 @@
 			</xsl:if>
 		</xsl:if>
 	</xsl:template>
+
+	<xsl:variable name="language1" select="normalize-space(//standard/front/*/doc-ident/language)"/>
+	<xsl:variable name="language2" select="normalize-space(//standard/front/*/std-ident/content-language)"/>
+	<xsl:variable name="language3" select="normalize-space(//standard/front/*/content-language)"/>
+	
+	<xsl:variable name="language"> <!-- see https://www.niso-sts.org/TagLibrary/niso-sts-TL-1-2-html/element/content-language.html -->
+		<xsl:choose>
+			<xsl:when test="$language1 != ''"><xsl:value-of select="$language1"/></xsl:when>
+			<xsl:when test="$language2 != ''"><xsl:value-of select="$language2"/></xsl:when>
+			<xsl:when test="$language3 != ''"><xsl:value-of select="$language3"/></xsl:when>
+			<xsl:otherwise>en</xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
 	
 	<xsl:template name="getLang">
 		<xsl:param name="fromParent">false</xsl:param>
diff --git a/src/main/resources/sts2mn.xsl b/src/main/resources/sts2mn.xsl
index d377c1a2..6478d540 100644
--- a/src/main/resources/sts2mn.xsl
+++ b/src/main/resources/sts2mn.xsl
@@ -47,8 +47,6 @@
 		</xsl:choose>
 	</xsl:variable> 
 
-	<xsl:variable name="language" select="//standard/front/*/doc-ident/language"/>
-
 	<xsl:variable name="_typestandard">
 		<xsl:choose>
 			<xsl:when test="$typestandard = ''">
@@ -374,6 +372,8 @@
 		
 		<xsl:apply-templates select="custom-meta-group/custom-meta[meta-name = 'ISBN']/meta-value" mode="bibdata"/>	
 		
+		<xsl:apply-templates select="std-ident/isbn[@publication-format = 'PDF']" mode="bibdata"/>
+		
 		<!-- docnumber -->
 		<xsl:apply-templates select="std-ident/doc-number" mode="bibdata"/>
 		
@@ -392,7 +392,9 @@
 			</xsl:apply-templates>
 		</xsl:if>
 		
-		<xsl:apply-templates select="std-org-group"/>
+		<xsl:apply-templates select="std-org-group" mode="bibdata"/>
+		
+		<xsl:apply-templates select="authorization" mode="bibdata"/>
 		
 		<!-- edition -->
 		<xsl:apply-templates select="std-ident/edition" mode="bibdata"/>
@@ -403,6 +405,8 @@
 		<!-- language -->
 		<xsl:apply-templates select="content-language" mode="bibdata"/>
 		
+		<xsl:apply-templates select="abstract" mode="bibdata"/>
+		
 		<!-- status/stage @abbreviation , substage -->
 		<xsl:apply-templates select="release-version | doc-ident/release-version" mode="bibdata"/>
 		
@@ -752,6 +756,12 @@
 															*[contains(local-name(), '-meta')]/std-ident/std-id-group |
 															*[contains(local-name(), '-meta')]/std-org-group |
 															*[contains(local-name(), '-meta')]/meta-note |
+															*[contains(local-name(), '-meta')]/abstract |
+															*[contains(local-name(), '-meta')]/isbn |
+															*[contains(local-name(), '-meta')]/std-ident/isbn |
+															*[contains(local-name(), '-meta')]/std-ident/issn |
+															*[contains(local-name(), '-meta')]/accrediting-organization |
+															*[contains(local-name(), '-meta')]/authorization |
 															front/notes |
 															front/sec " mode="bibdata_check"/>
 	
@@ -808,7 +818,11 @@
 					<xsl:copy-of select="xalan:nodeset($titles)/*[@type='title-part'][1]"/>
 				</xsl:variable>
 				
-				<title language="{@xml:lang}" format="text/plain" type="main">
+				<xsl:variable name="lang">
+					<xsl:call-template name="getLang"/>
+				</xsl:variable>
+				
+				<title language="{$lang}" format="text/plain" type="main">
 					<xsl:for-each select="xalan:nodeset($title_components)/*">
 						<xsl:apply-templates mode="bibdata"/>
 						<xsl:if test="position() != last()"> — </xsl:if>
@@ -839,7 +853,11 @@
 			</xsl:call-template>
 		</xsl:variable>
 		
-		<xsl:variable name="lang" select="../@xml:lang"/>
+		<xsl:variable name="lang">
+			<xsl:call-template name="getLang">
+				<xsl:with-param name="fromParent">true</xsl:with-param>
+			</xsl:call-template>
+		</xsl:variable>
 		<xsl:for-each select="xalan:nodeset($parts)/*">
 			<xsl:if test="position() = 1">
 				<title language="{$lang}" format="text/plain" type="title-intro">
@@ -861,25 +879,45 @@
 	</xsl:template>
 	
 	<xsl:template match="title-wrap/full" mode="bibdata">
-		<title language="{../@xml:lang}" format="text/plain" type="main">
+		<xsl:variable name="lang">
+			<xsl:call-template name="getLang">
+				<xsl:with-param name="fromParent">true</xsl:with-param>
+			</xsl:call-template>
+		</xsl:variable>
+		<title language="{$lang}" format="text/plain" type="main">
 			<xsl:apply-templates mode="bibdata"/>
 		</title>
 	</xsl:template>
 	
 	<xsl:template match="title-wrap//intro" mode="bibdata">
-		<title language="{../@xml:lang}" format="text/plain" type="title-intro">
+		<xsl:variable name="lang">
+			<xsl:call-template name="getLang">
+				<xsl:with-param name="fromParent">true</xsl:with-param>
+			</xsl:call-template>
+		</xsl:variable>
+		<title language="{$lang}" format="text/plain" type="title-intro">
 			<xsl:apply-templates mode="bibdata"/>
 		</title>
 	</xsl:template>
 	
 	<xsl:template match="title-wrap//main" mode="bibdata">
-		<title language="{../@xml:lang}" format="text/plain" type="title-main">
+		<xsl:variable name="lang">
+			<xsl:call-template name="getLang">
+				<xsl:with-param name="fromParent">true</xsl:with-param>
+			</xsl:call-template>
+		</xsl:variable>
+		<title language="{$lang}" format="text/plain" type="title-main">
 			<xsl:apply-templates mode="bibdata"/>
 		</title>
 	</xsl:template>
 	
 	<xsl:template match="title-wrap//compl" mode="bibdata">
-		<title language="{../@xml:lang}" format="text/plain" type="title-part">
+		<xsl:variable name="lang">
+			<xsl:call-template name="getLang">
+				<xsl:with-param name="fromParent">true</xsl:with-param>
+			</xsl:call-template>
+		</xsl:variable>
+		<title language="{$lang}" format="text/plain" type="title-part">
 			<xsl:apply-templates mode="bibdata"/>
 		</title>
 	</xsl:template>
@@ -922,6 +960,10 @@
 		<docidentifier type="ISBN"><xsl:apply-templates mode="bibdata"/></docidentifier>
 	</xsl:template>
 	
+	<xsl:template match="std-ident/isbn[@publication-format = 'PDF']" mode="bibdata">
+		<docidentifier type="ISBN"><xsl:apply-templates mode="bibdata"/></docidentifier>
+	</xsl:template>
+	
 	<xsl:template name="processMetadata">
 		<xsl:variable name="metanorma-extension">
 			<xsl:apply-templates select="custom-meta-group/custom-meta[meta-name = 'TOC Heading Level']/meta-value" mode="bibdata"/>
@@ -936,6 +978,9 @@
 			<xsl:apply-templates select="page-count" mode="bibdata"/>
 			<xsl:apply-templates select="custom-meta-group/custom-meta[not(meta-name = 'TOC Heading Level' or meta-name = 'ISBN' or meta-name = 'horizontal')]" mode="bibdata"/>
 			<xsl:apply-templates select="permissions/copyright-statement" mode="bibdata"/>
+			<xsl:apply-templates select="std-ident/isbn[@publication-format = 'HTML']" mode="bibdata"/>
+			<xsl:apply-templates select="std-ident/issn" mode="bibdata"/>
+			<xsl:apply-templates select="accrediting-organization" mode="bibdata"/>
 		</xsl:variable>
 		<xsl:if test="xalan:nodeset($metanorma-extension)/*">
 			<metanorma-extension>
@@ -1010,6 +1055,18 @@
 		</semantic-metadata>
 	</xsl:template>
 	
+	<xsl:template match="isbn[@publication-format = 'HTML']" mode="bibdata">
+		<semantic-metadata><isbn-html><xsl:apply-templates mode="bibdata"/></isbn-html></semantic-metadata>
+	</xsl:template>
+	
+	<xsl:template match="issn" mode="bibdata">
+		<semantic-metadata><issn><xsl:apply-templates mode="bibdata"/></issn></semantic-metadata>
+	</xsl:template>
+	
+	<xsl:template match="accrediting-organization" mode="bibdata">
+		<semantic-metadata><accrediting-organization><xsl:apply-templates mode="bibdata"/></accrediting-organization></semantic-metadata>
+	</xsl:template>
+	
 	<xsl:template match="iso-meta/std-ident/doc-number | nat-meta/std-ident/doc-number | reg-meta/std-ident/doc-number | std-meta/std-ident/doc-number | std-doc-meta/std-ident/doc-number" mode="bibdata">
 		<docnumber>
 			<xsl:apply-templates mode="bibdata"/>
@@ -1087,7 +1144,7 @@
 		</xsl:if>
 	</xsl:template>
 	
-	<xsl:template match="iso-meta/std-org-group | nat-meta/std-org-group | reg-meta/std-org-group | std-meta/std-org-group | std-doc-meta/std-org-group">
+	<xsl:template match="iso-meta/std-org-group | nat-meta/std-org-group | reg-meta/std-org-group | std-meta/std-org-group | std-doc-meta/std-org-group" mode="bibdata">
 		<contributor>
 			<role>
 				<xsl:attribute name="type">
@@ -1113,6 +1170,21 @@
 	</contributor>
 	</xsl:template>
 	
+	<xsl:template match="*[contains(local-name(), '-meta')]/authorization" mode="bibdata">
+		<contributor>
+			<role type="authorizer" />
+			<organization>
+					<name>
+						<xsl:apply-templates mode="bibdata"/>
+						<xsl:apply-templates select="@authorize-acronym" mode="bibdata"/>
+					</name>
+			</organization>
+	</contributor>
+	</xsl:template>
+	
+	<xsl:template match="authorization/@authorize-acronym" mode="bibdata">
+		<xsl:value-of select="concat(', ', .)"/>
+	</xsl:template>
 	
 	<xsl:template match="*[self::iso-meta or self::nat-meta or self::reg-meta or self::std-meta or self::std-doc-meta]/std-ident/edition[normalize-space() != '']" mode="bibdata">
 		<edition>
@@ -1158,7 +1230,13 @@
 			</xsl:when>
 		</xsl:choose>
 	</xsl:template>
-		
+	
+	<xsl:template match="*[self::iso-meta or self::nat-meta or self::reg-meta or self::std-meta or self::std-doc-meta]/abstract" mode="bibdata">
+		<abstract>
+			<xsl:apply-templates select="*[not(self::title)]"/>
+		</abstract>
+	</xsl:template>
+	
 	<xsl:template match="iso-meta/doc-ident/release-version | nat-meta/doc-ident/release-version | reg-meta/doc-ident/release-version | std-meta/doc-ident/release-version | std-meta/release-version" mode="bibdata">
 		<xsl:variable name="value" select="java:toUpperCase(java:java.lang.String.new(.))"/>
 		

From 7a7af65e3fe70df9b71e89f0e936c73fb3108580 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Thu, 18 Apr 2024 14:46:33 +0300
Subject: [PATCH 23/23] xsl updated for definitions, #407

---
 src/main/resources/sts2mn.adoc.xsl | 18 +++++++++++++---
 src/main/resources/sts2mn.xsl      | 33 ++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/sts2mn.adoc.xsl b/src/main/resources/sts2mn.adoc.xsl
index 8f8b44d1..669e9f30 100644
--- a/src/main/resources/sts2mn.adoc.xsl
+++ b/src/main/resources/sts2mn.adoc.xsl
@@ -2343,7 +2343,7 @@
 	<!-- Terms and definitions -->
 	<!-- ======================== -->
 	<!-- first element in Terms and definitions section -->
-	<xsl:template match="sec[@sec-type = 'terms']/title | sec[@sec-type = 'terms']//sec/title | sec[.//std-def-list]/title" priority="2">
+	<xsl:template match="sec[@sec-type = 'terms' or @sec-type = 'definitions']/title | sec[@sec-type = 'terms']//sec/title | sec[.//std-def-list]/title" priority="2">
 	
 		<xsl:choose>
 			<xsl:when test="$inputformat = 'IEEE' and ../../self::body and . != 'Definitions'">
@@ -2358,6 +2358,10 @@
 				<xsl:text>&#xa;</xsl:text>
 			</xsl:when>
 			<xsl:otherwise>
+				<xsl:if test="../@sec-type = 'definitions'">
+					<xsl:text>[heading=terms and definitions,keeptitle=true]</xsl:text>
+					<xsl:text>&#xa;</xsl:text>
+				</xsl:if>
 				<xsl:call-template name="title"/>
 			</xsl:otherwise>
 		</xsl:choose>
@@ -6242,11 +6246,19 @@
 	</xsl:template>
 	
 	<xsl:template match="term-display/term">
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel">
+				<xsl:with-param name="addon">-1</xsl:with-param>
+			</xsl:call-template>
+		</xsl:variable>				
+		<xsl:value-of select="$level"/>
+		<xsl:text> </xsl:text>
 		<xsl:apply-templates/>
-		<xsl:text>:: </xsl:text>
+		<!-- <xsl:text>:: </xsl:text> -->
+		<xsl:text>&#xa;&#xa;</xsl:text>
 	</xsl:template>
 	
-	<xsl:template match="term-display/def/p">
+	<xsl:template match="term-display/def/*	">
 		<xsl:apply-templates/>
 		<xsl:if test="following-sibling::*"> +&#xa;</xsl:if>
 	</xsl:template>
diff --git a/src/main/resources/sts2mn.xsl b/src/main/resources/sts2mn.xsl
index 6478d540..5b4fef30 100644
--- a/src/main/resources/sts2mn.xsl
+++ b/src/main/resources/sts2mn.xsl
@@ -1918,6 +1918,39 @@
 		</field-of-application>
 	</xsl:template>
 	
+	<xsl:template match="term-display">
+		<term>
+			<xsl:copy-of select="@id"/>
+			<xsl:if test="not(@id)">
+				<xsl:attribute name="id">
+					<xsl:variable name="id_tmp" select="java:replaceAll(java:java.lang.String.new(term),'[^a-zA-Z0-9 ]', '_')"/><!-- replace all non word char to underscore -->
+					<xsl:text>term-</xsl:text><xsl:value-of select="translate($id_tmp, ' ', '-')"/>
+				</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates/>
+		</term>
+	</xsl:template>
+	
+	<xsl:template match="term-display/term">
+		<preferred>
+			<xsl:choose>
+				<xsl:when test="$type_xml = 'presentation'">
+					<strong><xsl:apply-templates/></strong>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates/>
+				</xsl:otherwise>
+			</xsl:choose>
+			
+		</preferred>
+	</xsl:template>
+	
+	<xsl:template match="term-display/def">
+		<definition>
+			<xsl:apply-templates/>
+		</definition>
+	</xsl:template>
+	
 	<!-- ======================== -->
 	<!-- END Terms, definitions -->
 	<!-- ======================== -->