From ff233fedba97e46b1f3669231e482970ada47af9 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Wed, 8 May 2024 18:05:38 +0300
Subject: [PATCH 1/6] collection.yml format updated, #186

---
 README.adoc                            | 56 +++++++++++++-------------
 pom.xml                                |  2 +-
 src/main/resources/stepmod2mn.adoc.xsl | 14 ++++---
 3 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/README.adoc b/README.adoc
index 244ae78..4af8d44 100644
--- a/README.adoc
+++ b/README.adoc
@@ -17,14 +17,14 @@ You will need the `maven` build tool and `make`.
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.55.jar <XML-FileName>
+java -Xss5m -jar target/stepmod2mn-1.56.jar <XML-FileName>
 ----
 
 e.g. 
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.55.jar data/resource_docs/draughting_elements/resource.xml 
+java -Xss5m -jar target/stepmod2mn-1.56.jar data/resource_docs/draughting_elements/resource.xml 
 ----
 
 NOTE: resulted AsciiDoc found in data/resource_docs/draughting_elements/document.adoc
@@ -34,28 +34,28 @@ NOTE: resulted AsciiDoc found in data/resource_docs/draughting_elements/document
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.55.jar <XML-FileName> [--output <AsciiDoc-FileName>]
+java -Xss5m -jar target/stepmod2mn-1.56.jar <XML-FileName> [--output <AsciiDoc-FileName>]
 ----
 
 e.g. 
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.55.jar data/resource_docs/draughting_elements/resource.xml --output result_dir/draughting_elements/document.adoc
+java -Xss5m -jar target/stepmod2mn-1.56.jar data/resource_docs/draughting_elements/resource.xml --output result_dir/draughting_elements/document.adoc
 ----
 
 === Convert all resource.xml and module.xml in the specified folder and sub-folders into the Metanorma AsciiDoc format:
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.55.jar <Input-folder>
+java -Xss5m -jar target/stepmod2mn-1.56.jar <Input-folder>
 ----
 
 e.g. 
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.55.jar data/
+java -Xss5m -jar target/stepmod2mn-1.56.jar data/
 ----
 
 NOTE: the result AsciiDocs will be saved in the folder with the source resource.xml and module.xml files.
@@ -65,14 +65,14 @@ NOTE: the result AsciiDocs will be saved in the folder with the source resource.
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.55.jar <Input-folder> [--output <Output-folder>]
+java -Xss5m -jar target/stepmod2mn-1.56.jar <Input-folder> [--output <Output-folder>]
 ----
 
 e.g. 
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.55.jar data/ --output documents/
+java -Xss5m -jar target/stepmod2mn-1.56.jar data/ --output documents/
 ----
 
 
@@ -80,42 +80,42 @@ java -Xss5m -jar target/stepmod2mn-1.55.jar data/ --output documents/
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.55.jar <Input-folder> [--exclude <documents or part numbers list>]
+java -Xss5m -jar target/stepmod2mn-1.56.jar <Input-folder> [--exclude <documents or part numbers list>]
 ----
 
 e.g. 
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.55.jar data/ --exclude "machining_features 104"
+java -Xss5m -jar target/stepmod2mn-1.56.jar data/ --exclude "machining_features 104"
 ----
 
 === Convert only specified documents resource.xml and module.xml in the specified folder and sub-folders into the Metanorma AsciiDoc format:
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.55.jar <Input-folder> [--include-only <documents list>]
+java -Xss5m -jar target/stepmod2mn-1.56.jar <Input-folder> [--include-only <documents list>]
 ----
 
 e.g. 
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.55.jar data/ --include-only "fundamentals_of_product_description_and_support kinematics"
+java -Xss5m -jar target/stepmod2mn-1.56.jar data/ --include-only "fundamentals_of_product_description_and_support kinematics"
 ----
 
 === Generate Metanorma collection files (metanorma.yml and collection.yml) for the documents specified in the publication index xml file in the tags 'resource_docs' and 'modules':
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.55.jar <Publication-Index-XML-FileName>
+java -Xss5m -jar target/stepmod2mn-1.56.jar <Publication-Index-XML-FileName>
 ----
 
 e.g.
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.55.jar publication/part1000/CR_PMI_5/publication_index.xml
+java -Xss5m -jar target/stepmod2mn-1.56.jar publication/part1000/CR_PMI_5/publication_index.xml
 ----
 
 NOTE: the Metanorma collection files .yml will be saved in the 3 level up folder (usually, source repository's root folder).
@@ -125,14 +125,14 @@ and save them into the output folder:
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.55.jar <Publication-Index-XML-FileName> [--output <Output-folder>]
+java -Xss5m -jar target/stepmod2mn-1.56.jar <Publication-Index-XML-FileName> [--output <Output-folder>]
 ----
 
 e.g.
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.55.jar iso-10303-srl/iso-10303-stepmod-wg12/publication/part1000/CR_PMI_5/publication_index.xml --output iso-10303-srl/
+java -Xss5m -jar target/stepmod2mn-1.56.jar iso-10303-srl/iso-10303-stepmod-wg12/publication/part1000/CR_PMI_5/publication_index.xml --output iso-10303-srl/
 ----
 
 NOTE: the output folder should contains the folder with the generated .adoc (usually, 'documents'). You can specify this folder obviously by the parameter '--input-documents':
@@ -141,7 +141,7 @@ e.g.
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.55.jar iso-10303-srl/iso-10303-stepmod-wg12/publication/part1000/CR_PMI_5/publication_index.xml --output iso-10303-srl/CR_PMI_5 --input-documents iso-10303-srl/documents
+java -Xss5m -jar target/stepmod2mn-1.56.jar iso-10303-srl/iso-10303-stepmod-wg12/publication/part1000/CR_PMI_5/publication_index.xml --output iso-10303-srl/CR_PMI_5 --input-documents iso-10303-srl/documents
 ----
 
 NOTE: the Metanorma collection files (.yml) will be saved in the folder 'iso-10303-srl/CR_PMI_5' and the references point to the documents in the folder iso-10303-srl/documents.
@@ -151,14 +151,14 @@ NOTE: the Metanorma collection files (.yml) will be saved in the folder 'iso-103
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.55.jar <Publication-Index-XML-FileName> [--type <resource_docs or modules>]
+java -Xss5m -jar target/stepmod2mn-1.56.jar <Publication-Index-XML-FileName> [--type <resource_docs or modules>]
 ----
 
 e.g.
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.55.jar publication/part1000/CR_PMI_5/publication_index.xml --type resource_docs
+java -Xss5m -jar target/stepmod2mn-1.56.jar publication/part1000/CR_PMI_5/publication_index.xml --type resource_docs
 ----
 
 NOTE: the Metanorma collection file 'metanorma.yml' will be saved in the 3 level up folder (usually, source repository's root folder).
@@ -168,42 +168,42 @@ NOTE: the Metanorma collection file 'metanorma.yml' will be saved in the 3 level
 
 [source,sh]
 ----
-java -jar target/stepmod2mn-1.55.jar <start folder to process xml maps files> --svg
+java -jar target/stepmod2mn-1.56.jar <start folder to process xml maps files> --svg
 ----
 
 e.g. 
 
 [source,sh]
 ----
-java -jar target/stepmod2mn-1.55.jar data/resources --svg
+java -jar target/stepmod2mn-1.56.jar data/resources --svg
 ----
 
 === Generate SVG images for the XML in the specified folder and sub-folders, and save them in the output folder:
 
 [source,sh]
 ----
-java -jar target/stepmod2mn-1.55.jar <start folder to process xml maps files> --svg [--output <Output-folder>]
+java -jar target/stepmod2mn-1.56.jar <start folder to process xml maps files> --svg [--output <Output-folder>]
 ----
 
 e.g. 
 
 [source,sh]
 ----
-java -jar target/stepmod2mn-1.55.jar data/resources --svg --output schemas/
+java -jar target/stepmod2mn-1.56.jar data/resources --svg --output schemas/
 ----
 
 === Generate SVG image for Express Imagemap XML and Image:
 
 [source,sh]
 ----
-java -jar stepmod2mn-1.55.jar --xml <Express Imagemap XML file path> --image <Image file name> [--svg <resulted SVG map file or folder>]
+java -jar stepmod2mn-1.56.jar --xml <Express Imagemap XML file path> --image <Image file name> [--svg <resulted SVG map file or folder>]
 ----
 
 e.g.
 
 [source,sh]
 ----
-java -jar stepmod2mn-1.55.jar --xml data\resource_docs\fundamentals_of_product_description_and_support\schema_diagexpg1.xml --image schema_diagexpg1.gif --svg schema_diagexpg1.svg
+java -jar stepmod2mn-1.56.jar --xml data\resource_docs\fundamentals_of_product_description_and_support\schema_diagexpg1.xml --image schema_diagexpg1.gif --svg schema_diagexpg1.svg
 ----
 
 
@@ -223,7 +223,7 @@ Update version in `pom.xml`, e.g.:
 ----
 <groupId>org.metanorma</groupId>
 <artifactId>stepmod2mn</artifactId>
-<version>1.55</version>
+<version>1.56</version>
 <name>STEPmod XML to Metanorma AsciiDoc converter</name>
 ----
 
@@ -234,8 +234,8 @@ Tag the same version in Git:
 
 [source,xml]
 ----
-git tag v1.55
-git push origin v1.55
+git tag v1.56
+git push origin v1.56
 ----
 
 Then the corresponding GitHub release will be automatically created at:
diff --git a/pom.xml b/pom.xml
index ff1b313..b6e7b49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.metanorma</groupId>
 	<artifactId>stepmod2mn</artifactId>
-	<version>1.55</version>
+	<version>1.56</version>
 	<name>STEPmod XML to Metanorma AsciiDoc converter</name>
 	<packaging>jar</packaging>
 	<url>https://www.metanorma.org</url>
diff --git a/src/main/resources/stepmod2mn.adoc.xsl b/src/main/resources/stepmod2mn.adoc.xsl
index 822f907..27ebcfa 100644
--- a/src/main/resources/stepmod2mn.adoc.xsl
+++ b/src/main/resources/stepmod2mn.adoc.xsl
@@ -1110,10 +1110,9 @@
 			manifest:
 				- level: document
 					title: Document
+					sectionsplit: true
 					docref:
-						- fileref: document.xml
-							identifier: iso10303-41
-							sectionsplit: true
+						- fileref: document.adoc
 				- level: attachments
 					title: Attachments
 					docref:
@@ -1173,15 +1172,18 @@
 			<xsl:text>&#xa;</xsl:text>
 			<xsl:text>      title: Document</xsl:text>
 			<xsl:text>&#xa;</xsl:text>
+			<xsl:text>      sectionsplit: true</xsl:text>
+			<xsl:text>&#xa;</xsl:text>
 			<xsl:text>      docref:</xsl:text>
 			<xsl:text>&#xa;</xsl:text>
-			<xsl:text>        - fileref: document.xml</xsl:text>
+			<!-- <xsl:text>        - fileref: document.xml</xsl:text> -->
+			<xsl:text>        - fileref: document.adoc</xsl:text>
 			<xsl:text>&#xa;</xsl:text>
 			<!-- <xsl:text>          identifier: iso10303-</xsl:text><xsl:value-of select="$data//part"/> -->
-			<xsl:text>          identifier: iso</xsl:text><xsl:value-of select="$data//docid"/>
+			<!-- <xsl:text>          identifier: iso</xsl:text><xsl:value-of select="$data//docid"/>
 			<xsl:text>&#xa;</xsl:text>
 			<xsl:text>          sectionsplit: true</xsl:text>
-			<xsl:text>&#xa;</xsl:text>
+			<xsl:text>&#xa;</xsl:text> -->
 			<xsl:text>    - level: attachments</xsl:text>
 			<xsl:text>&#xa;</xsl:text>
 			<xsl:text>      title: Attachments</xsl:text>

From 6fc91f48169a716aaaef338aaca3717e9e663e7b Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Wed, 8 May 2024 18:34:42 +0300
Subject: [PATCH 2/6] collection.yml generation refactoring, #186

---
 src/main/resources/stepmod2mn.adoc.xsl        | 182 +++++++-----------
 .../resources/stepmod2mn.resource.adoc.xsl    |  64 ++++++
 2 files changed, 129 insertions(+), 117 deletions(-)

diff --git a/src/main/resources/stepmod2mn.adoc.xsl b/src/main/resources/stepmod2mn.adoc.xsl
index 27ebcfa..1c171aa 100644
--- a/src/main/resources/stepmod2mn.adoc.xsl
+++ b/src/main/resources/stepmod2mn.adoc.xsl
@@ -1121,128 +1121,76 @@
 							attachment: true
 							...
 		-->
-	<xsl:template name="generateCollectionYaml">
+		
+	<xsl:template name="generateCollectionYaml_common_part">
 		<xsl:param name="data_element"/>
 		<xsl:variable name="data" select="xalan:nodeset($data_element)"/>
-		<xsl:message>[INFO] Generation collection.yaml ...</xsl:message>
-		<redirect:write file="{$outpath}/collection.yml">
-			<xsl:text>directives:</xsl:text>
-			<xsl:text>&#xa;</xsl:text>
-			<xsl:text>  - documents-inline</xsl:text>
-			<xsl:text>&#xa;</xsl:text>
-			<xsl:text>bibdata:</xsl:text>
-			<xsl:text>&#xa;</xsl:text>
-			<xsl:text>  title:</xsl:text>
-			<xsl:text>&#xa;</xsl:text>
-			<xsl:for-each select="$data//title">
-				<xsl:text>    - language: </xsl:text><xsl:value-of select="@lang"/>
-				<xsl:text>&#xa;</xsl:text>
-				<xsl:text>      content: "</xsl:text><xsl:value-of select="."/><xsl:text>"</xsl:text>
-				<xsl:text>&#xa;</xsl:text>
-			</xsl:for-each>
-			<xsl:text>  type: collection</xsl:text>
-			<xsl:text>&#xa;</xsl:text>
-			<xsl:text>  docid:</xsl:text>
-			<xsl:text>&#xa;</xsl:text>
-			<xsl:text>    type: iso</xsl:text>
-			<xsl:text>&#xa;</xsl:text>
-			<xsl:text>    id: </xsl:text><xsl:value-of select="$data//docid"/>
-			<xsl:text>&#xa;</xsl:text>
-			<xsl:text>  edition: </xsl:text><xsl:value-of select="$data//edition"/>
-			<xsl:text>&#xa;</xsl:text>
-			<xsl:text>  copyright:</xsl:text>
-			<xsl:text>&#xa;</xsl:text>
-			<xsl:text>    owner:</xsl:text>
-			<xsl:text>&#xa;</xsl:text>
-			<xsl:text>      name: International Standards Organization</xsl:text>
-			<xsl:text>&#xa;</xsl:text>
-			<xsl:text>      abbreviation: ISO</xsl:text>
-			<xsl:text>&#xa;</xsl:text>
-			<xsl:text>    from: </xsl:text><xsl:value-of select="$data//year"/>
-			<xsl:text>&#xa;</xsl:text>
-			<xsl:text>manifest:</xsl:text>
-			<xsl:text>&#xa;</xsl:text>
-			<xsl:text>  level: collection</xsl:text>
-			<xsl:text>&#xa;</xsl:text>
-			<xsl:text>  title: ISO Collection</xsl:text>
-			<xsl:text>&#xa;</xsl:text>
-			<xsl:text>  manifest:</xsl:text>
-			<xsl:text>&#xa;</xsl:text>
-			<xsl:text>    - level: document</xsl:text>
-			<xsl:text>&#xa;</xsl:text>
-			<xsl:text>      title: Document</xsl:text>
-			<xsl:text>&#xa;</xsl:text>
-			<xsl:text>      sectionsplit: true</xsl:text>
-			<xsl:text>&#xa;</xsl:text>
-			<xsl:text>      docref:</xsl:text>
-			<xsl:text>&#xa;</xsl:text>
-			<!-- <xsl:text>        - fileref: document.xml</xsl:text> -->
-			<xsl:text>        - fileref: document.adoc</xsl:text>
-			<xsl:text>&#xa;</xsl:text>
-			<!-- <xsl:text>          identifier: iso10303-</xsl:text><xsl:value-of select="$data//part"/> -->
-			<!-- <xsl:text>          identifier: iso</xsl:text><xsl:value-of select="$data//docid"/>
-			<xsl:text>&#xa;</xsl:text>
-			<xsl:text>          sectionsplit: true</xsl:text>
-			<xsl:text>&#xa;</xsl:text> -->
-			<xsl:text>    - level: attachments</xsl:text>
-			<xsl:text>&#xa;</xsl:text>
-			<xsl:text>      title: Attachments</xsl:text>
+		<xsl:text>directives:</xsl:text>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>  - documents-inline</xsl:text>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>bibdata:</xsl:text>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>  title:</xsl:text>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:for-each select="$data//title">
+			<xsl:text>    - language: </xsl:text><xsl:value-of select="@lang"/>
 			<xsl:text>&#xa;</xsl:text>
-			<xsl:text>      docref:</xsl:text>
+			<xsl:text>      content: "</xsl:text><xsl:value-of select="."/><xsl:text>"</xsl:text>
 			<xsl:text>&#xa;</xsl:text>
-			<xsl:variable name="current_resource_name" select="resource/@name"/>
-			<xsl:for-each select="resource/schema">
-				<xsl:text>        - fileref: </xsl:text>
-				<!-- <xsl:value-of select="concat('../../resources/',@name,'/',@name,'.exp')"/> --> <!-- updated for https://github.com/metanorma/stepmod2mn/issues/49, was ../../../resources/ -->
-				
-				<xsl:variable name="schema_exp_relative_path" select="concat('../../resources/',@name,'/',@name,'.exp')"/>
-				
-				<xsl:variable name="schema_exp_exists" select="java:org.metanorma.Util.fileExists(concat($path, '/', $schema_exp_relative_path))"/>
-				<xsl:if test="normalize-space($schema_exp_exists) = 'false'">
-					<xsl:variable name="msg">[ERROR] File '<xsl:value-of select="$schema_exp_relative_path"/>' does not exist.</xsl:variable>
-					<xsl:message><xsl:value-of select="$msg"/></xsl:message>
-					<xsl:message>[INFO] Repository index path: <xsl:value-of select="$repositoryIndex_path"/></xsl:message>
-					<xsl:if test="$repositoryIndex_path != ''">
-						<xsl:variable name="repositoryIndex_path_document" select="document($repositoryIndex_path)"/>
-						<xsl:if test="count($repositoryIndex_path_document//resource_doc[@name = $current_resource_name]) = 0">
-							<redirect:write file="{$errors_fatal_log_filename}">
-								<xsl:value-of select="$msg"/><xsl:text>&#xa;</xsl:text>
-							</redirect:write>
-						</xsl:if>
-					</xsl:if>
-				</xsl:if>
-        
-				<xsl:variable name="schema_exp_path">
-					<xsl:choose>
-						<xsl:when test="$outpath_schemas != ''">
-							<xsl:value-of select="concat($outpath_schemas,'/',@name,'/',@name,'.exp')"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:value-of select="concat($path, '/', $schema_exp_relative_path)"/>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:variable>
-				<!-- <xsl:variable name="schema_exp_path" select="concat($path, '/', $schema_exp_relative_path)"/> -->
-				<xsl:variable name="schema_exp_relative_path_new" select="java:org.metanorma.Util.getRelativePath($schema_exp_path, $outpath)"/>
-				<xsl:value-of select="$schema_exp_relative_path_new"/>
-				
-				<xsl:text>&#xa;</xsl:text>
-				<xsl:text>          identifier: </xsl:text><xsl:value-of select="@name"/><xsl:text>.exp</xsl:text>
-				<xsl:text>&#xa;</xsl:text>
-				<xsl:text>          attachment: true</xsl:text>
-				<xsl:text>&#xa;</xsl:text>
-			</xsl:for-each>
-			<xsl:for-each select="resource/schema">
-				<xsl:text>        - fileref: </xsl:text><xsl:value-of select="concat('sections/schemadocs/',@name,'.html')"/>
-				<xsl:text>&#xa;</xsl:text>
-				<xsl:text>          identifier: </xsl:text><xsl:value-of select="@name"/><xsl:text>.html</xsl:text>
-				<xsl:text>&#xa;</xsl:text>
-				<xsl:text>          attachment: true</xsl:text>
-				<xsl:text>&#xa;</xsl:text>
-			</xsl:for-each>
-		</redirect:write>
+		</xsl:for-each>
+		<xsl:text>  type: collection</xsl:text>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>  docid:</xsl:text>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>    type: iso</xsl:text>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>    id: </xsl:text><xsl:value-of select="$data//docid"/>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>  edition: </xsl:text><xsl:value-of select="$data//edition"/>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>  copyright:</xsl:text>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>    owner:</xsl:text>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>      name: International Standards Organization</xsl:text>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>      abbreviation: ISO</xsl:text>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>    from: </xsl:text><xsl:value-of select="$data//year"/>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>manifest:</xsl:text>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>  level: collection</xsl:text>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>  title: ISO Collection</xsl:text>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>  manifest:</xsl:text>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>    - level: document</xsl:text>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>      title: Document</xsl:text>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>      sectionsplit: true</xsl:text>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>      docref:</xsl:text>
+		<xsl:text>&#xa;</xsl:text>
+		<!-- <xsl:text>        - fileref: document.xml</xsl:text> -->
+		<xsl:text>        - fileref: document.adoc</xsl:text>
+		<xsl:text>&#xa;</xsl:text>
+		<!-- <xsl:text>          identifier: iso10303-</xsl:text><xsl:value-of select="$data//part"/> -->
+		<!-- <xsl:text>          identifier: iso</xsl:text><xsl:value-of select="$data//docid"/>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>          sectionsplit: true</xsl:text>
+		<xsl:text>&#xa;</xsl:text> -->
+		<xsl:text>    - level: attachments</xsl:text>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>      title: Attachments</xsl:text>
+		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>      docref:</xsl:text>
+		<xsl:text>&#xa;</xsl:text>
 	</xsl:template>
-	
+
 	<xsl:template name="generateHtmlAttachmentsSH">
 		<xsl:message>[INFO] Generation html_attachments.sh ...</xsl:message>
 		<redirect:write file="{$outpath}/html_attachments.sh">
diff --git a/src/main/resources/stepmod2mn.resource.adoc.xsl b/src/main/resources/stepmod2mn.resource.adoc.xsl
index ab33e79..51fb0a0 100644
--- a/src/main/resources/stepmod2mn.resource.adoc.xsl
+++ b/src/main/resources/stepmod2mn.resource.adoc.xsl
@@ -679,4 +679,68 @@
 		</redirect:write>
 	</xsl:template>
   
+	<xsl:template name="generateCollectionYaml">
+		<xsl:param name="data_element"/>
+		<xsl:message>[INFO] Generation collection.yaml ...</xsl:message>
+		<redirect:write file="{$outpath}/collection.yml">
+			<xsl:call-template name="generateCollectionYaml_common_part">
+				<xsl:with-param name="data_element" select="$data_element"/>
+			</xsl:call-template>
+
+			<xsl:variable name="current_resource_name" select="resource/@name"/>
+			
+			<xsl:variable name="root_element_name" select="local-name(*)"/>
+			
+			<xsl:for-each select="resource/schema">
+				<xsl:text>        - fileref: </xsl:text>
+				<!-- <xsl:value-of select="concat('../../resources/',@name,'/',@name,'.exp')"/> --> <!-- updated for https://github.com/metanorma/stepmod2mn/issues/49, was ../../../resources/ -->
+				
+				<xsl:variable name="schema_exp_relative_path" select="concat('../../', $root_element_name, 's/',@name,'/',@name,'.exp')"/>
+				
+				<xsl:variable name="schema_exp_exists" select="java:org.metanorma.Util.fileExists(concat($path, '/', $schema_exp_relative_path))"/>
+				<xsl:if test="normalize-space($schema_exp_exists) = 'false'">
+					<xsl:variable name="msg">[ERROR] File '<xsl:value-of select="$schema_exp_relative_path"/>' does not exist.</xsl:variable>
+					<xsl:message><xsl:value-of select="$msg"/></xsl:message>
+					<xsl:message>[INFO] Repository index path: <xsl:value-of select="$repositoryIndex_path"/></xsl:message>
+					<xsl:if test="$repositoryIndex_path != ''">
+						<xsl:variable name="repositoryIndex_path_document" select="document($repositoryIndex_path)"/>
+						<xsl:if test="count($repositoryIndex_path_document//resource_doc[@name = $current_resource_name]) = 0">
+							<redirect:write file="{$errors_fatal_log_filename}">
+								<xsl:value-of select="$msg"/><xsl:text>&#xa;</xsl:text>
+							</redirect:write>
+						</xsl:if>
+					</xsl:if>
+				</xsl:if>
+        
+				<xsl:variable name="schema_exp_path">
+					<xsl:choose>
+						<xsl:when test="$outpath_schemas != ''">
+							<xsl:value-of select="concat($outpath_schemas,'/',@name,'/',@name,'.exp')"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="concat($path, '/', $schema_exp_relative_path)"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+				<!-- <xsl:variable name="schema_exp_path" select="concat($path, '/', $schema_exp_relative_path)"/> -->
+				<xsl:variable name="schema_exp_relative_path_new" select="java:org.metanorma.Util.getRelativePath($schema_exp_path, $outpath)"/>
+				<xsl:value-of select="$schema_exp_relative_path_new"/>
+				
+				<xsl:text>&#xa;</xsl:text>
+				<xsl:text>          identifier: </xsl:text><xsl:value-of select="@name"/><xsl:text>.exp</xsl:text>
+				<xsl:text>&#xa;</xsl:text>
+				<xsl:text>          attachment: true</xsl:text>
+				<xsl:text>&#xa;</xsl:text>
+			</xsl:for-each>
+			<xsl:for-each select="resource/schema">
+				<xsl:text>        - fileref: </xsl:text><xsl:value-of select="concat('sections/schemadocs/',@name,'.html')"/>
+				<xsl:text>&#xa;</xsl:text>
+				<xsl:text>          identifier: </xsl:text><xsl:value-of select="@name"/><xsl:text>.html</xsl:text>
+				<xsl:text>&#xa;</xsl:text>
+				<xsl:text>          attachment: true</xsl:text>
+				<xsl:text>&#xa;</xsl:text>
+			</xsl:for-each>
+		</redirect:write>
+	</xsl:template>
+	
 </xsl:stylesheet>
\ No newline at end of file

From ae4a483a05a4c794fa02230ed7742d07cb3c2bd6 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Wed, 8 May 2024 19:08:48 +0300
Subject: [PATCH 3/6] collection.yml generation added for modules, #186

---
 src/main/resources/stepmod2mn.module.adoc.xsl | 125 ++++++++++++++++--
 .../resources/stepmod2mn.resource.adoc.xsl    |   4 +-
 2 files changed, 112 insertions(+), 17 deletions(-)

diff --git a/src/main/resources/stepmod2mn.module.adoc.xsl b/src/main/resources/stepmod2mn.module.adoc.xsl
index 1d43a88..47dccd4 100644
--- a/src/main/resources/stepmod2mn.module.adoc.xsl
+++ b/src/main/resources/stepmod2mn.module.adoc.xsl
@@ -382,19 +382,23 @@
 		<!-- Generation changes_paths.yaml -->
 		<xsl:call-template name="generateChangesPathsYaml"/>
 		
+		<redirect:open file="{$errors_fatal_log_filename}"/>
+		
 		<!-- Generation collection.yml -->
-		<!-- <xsl:call-template name="generateCollectionYaml">
+		<xsl:call-template name="generateCollectionYaml">
 			<xsl:with-param name="data_element">
 				<data>
-					<title lang="en"><xsl:value-of select="$title-intro-en"/> - - <xsl:value-of select="$title-main-en"/> - - <xsl:value-of select="$title-part-en"/></title>
-					<title lang="fr"><xsl:value-of select="$title-intro-fr"/> - - <xsl:value-of select="$title-main-fr"/> - - <xsl:value-of select="$title-part-fr"/></title>
-					<docid>10303-<xsl:value-of select="module/@part"/></docid>
+					<title lang="en"><xsl:value-of select="$title-intro-en"/> -- <xsl:value-of select="$title-main-en"/> -- <xsl:value-of select="$title-part-en"/></title>
+					<title lang="fr"><xsl:value-of select="$title-intro-fr"/> -- <xsl:value-of select="$title-main-fr"/> -- <xsl:value-of select="$title-part-fr"/></title>
+					<docid><xsl:value-of select="$docnumber"/>-<xsl:value-of select="$part"/></docid>
 					<edition><xsl:value-of select="module/@version"/></edition>
 					<year><xsl:value-of select="substring(module/@publication.year,1,4)"/></year>
-					<part><xsl:value-of select="module/@part"/></part>
+					<part><xsl:value-of select="$part"/></part>
 				</data>
 			</xsl:with-param>
-		</xsl:call-template> -->
+		</xsl:call-template>
+		
+		<redirect:close file="{$errors_fatal_log_filename}"/>
 		
 		<xsl:variable name="adoc">
 	
@@ -637,6 +641,13 @@
     </redirect:write>
   </xsl:template>
 	
+  <xsl:variable name="arm_mim_files">
+    <file><xsl:value-of select="concat($path, 'arm.xml')"/></file>
+    <file><xsl:value-of select="concat($path, 'mim.xml')"/></file>
+    <file><xsl:value-of select="concat($path, 'arm_lf.xml')"/></file>
+    <file><xsl:value-of select="concat($path, 'mim_lf.xml')"/></file>
+  </xsl:variable>
+  
   <!-- Example: 
   - - -
   schemas:
@@ -653,16 +664,9 @@
       <xsl:text>schemas:</xsl:text>
       <xsl:text>&#xa;</xsl:text>
       
-      <xsl:variable name="arm_mim_files">
-        <file><xsl:value-of select="concat($path, 'arm.xml')"/></file>
-        <file><xsl:value-of select="concat($path, 'mim.xml')"/></file>
-        <file><xsl:value-of select="concat($path, 'arm_lf.xml')"/></file>
-        <file><xsl:value-of select="concat($path, 'mim_lf.xml')"/></file>
-      </xsl:variable>
-      
       <xsl:for-each select="xalan:nodeset($arm_mim_files)/*">
       
-       <xsl:variable name="arm_mim_exp_exists" select="java:org.metanorma.Util.fileExists(.)"/>
+      <xsl:variable name="arm_mim_exp_exists" select="java:org.metanorma.Util.fileExists(.)"/>
        <xsl:if test="normalize-space($arm_mim_exp_exists) = 'true'">
         <xsl:variable name="arm_mim_document" select="document(.)"/>
         <xsl:for-each select="$arm_mim_document/express/schema">
@@ -723,4 +727,97 @@
     </redirect:write>
   </xsl:template>
   
+  <xsl:template name="generateCollectionYaml">
+    <xsl:param name="data_element"/>
+    <xsl:message>[INFO] Generation collection.yaml ...</xsl:message>
+    <redirect:write file="{$outpath}/collection.yml">
+      <xsl:call-template name="generateCollectionYaml_common_part">
+        <xsl:with-param name="data_element" select="$data_element"/>
+      </xsl:call-template>
+      
+      <xsl:variable name="current_module_name" select="module/@name"/>
+      
+      <xsl:for-each select="xalan:nodeset($arm_mim_files)/*">
+        <xsl:variable name="arm_mim_exp_exists" select="java:org.metanorma.Util.fileExists(.)"/>
+         <xsl:if test="normalize-space($arm_mim_exp_exists) = 'true'">
+          <xsl:variable name="arm_mim_document" select="document(.)"/>
+          <xsl:for-each select="$arm_mim_document/express/schema">
+            
+            
+            <xsl:variable name="UPPER">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable>
+            <xsl:variable name="LOWER">abcdefghijklmnopqrstuvwxyz</xsl:variable>
+            <xsl:variable name="name_lcase" select="translate(@name,$UPPER, $LOWER)"/>
+            
+            <xsl:variable name="name">
+              <xsl:choose>
+                <xsl:when test="contains($name_lcase,'_arm')">
+                  <xsl:value-of select="substring-before($name_lcase,'_arm')"/>
+                </xsl:when>
+                <xsl:when test="contains($name_lcase,'_mim')">
+                  <xsl:value-of select="substring-before($name_lcase,'_mim')"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="$name_lcase"/>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:variable>
+            
+            <xsl:variable name="arm_or_mim">
+              <xsl:choose>
+                <xsl:when test="contains($name_lcase,'_arm_lf')">arm_lf</xsl:when>
+                <xsl:when test="contains($name_lcase,'_arm')">arm</xsl:when>
+                <xsl:when test="contains($name_lcase,'_mim_lf')">mim_lf</xsl:when>
+                <xsl:when test="contains($name_lcase,'_mim')">mim</xsl:when>
+                <xsl:otherwise><xsl:value-of select="$name_lcase"/></xsl:otherwise>
+              </xsl:choose>
+            </xsl:variable>
+            
+            <xsl:variable name="schema_exp_relative_path" select="concat('../../modules/',$name,'/',$arm_or_mim,'.exp')"/>
+            
+            <xsl:variable name="schema_exp_exists" select="java:org.metanorma.Util.fileExists(concat($path, '/', $schema_exp_relative_path))"/>
+            
+            <xsl:if test="normalize-space($schema_exp_exists) = 'false'">
+              <xsl:variable name="msg">[ERROR] File '<xsl:value-of select="$schema_exp_relative_path"/>' does not exist.</xsl:variable>
+              <xsl:message><xsl:value-of select="$msg"/></xsl:message>
+              <xsl:message>[INFO] Repository index path: <xsl:value-of select="$repositoryIndex_path"/></xsl:message>
+              <xsl:if test="$repositoryIndex_path != ''">
+                <xsl:variable name="repositoryIndex_path_document" select="document($repositoryIndex_path)"/>
+                <xsl:if test="count($repositoryIndex_path_document//module[@name = $current_module_name]) = 0">
+                  <redirect:write file="{$errors_fatal_log_filename}">
+                    <xsl:value-of select="$msg"/><xsl:text>&#xa;</xsl:text>
+                  </redirect:write>
+                </xsl:if>
+              </xsl:if>
+            </xsl:if>
+            
+            <xsl:variable name="schema_exp_path">
+              <xsl:choose>
+                <xsl:when test="$outpath_schemas != ''">
+                  <xsl:value-of select="concat($outpath_schemas,'/',$name,'/',$arm_or_mim,'.exp')"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="concat($path, '/', $schema_exp_relative_path)"/>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:variable>
+            <xsl:variable name="schema_exp_relative_path_new" select="java:org.metanorma.Util.getRelativePath($schema_exp_path, $outpath)"/>
+            
+            <xsl:text>        - fileref: </xsl:text><xsl:value-of select="$schema_exp_relative_path_new"/>
+            <xsl:text>&#xa;</xsl:text>
+            <xsl:text>          identifier: </xsl:text><xsl:value-of select="$arm_or_mim"/><xsl:text>.exp</xsl:text>
+            <xsl:text>&#xa;</xsl:text>
+            <xsl:text>          attachment: true</xsl:text>
+            <xsl:text>&#xa;</xsl:text>
+            <xsl:text>        - fileref: </xsl:text><xsl:value-of select="concat('sections/schemadocs/',@name,'.html')"/>
+            <xsl:text>&#xa;</xsl:text>
+            <xsl:text>          identifier: </xsl:text><xsl:value-of select="@name"/><xsl:text>.html</xsl:text>
+            <xsl:text>&#xa;</xsl:text>
+            <xsl:text>          attachment: true</xsl:text>
+            <xsl:text>&#xa;</xsl:text>
+          </xsl:for-each>
+        </xsl:if>
+      </xsl:for-each>
+    </redirect:write>
+  </xsl:template>
+	
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/src/main/resources/stepmod2mn.resource.adoc.xsl b/src/main/resources/stepmod2mn.resource.adoc.xsl
index 51fb0a0..727fdb6 100644
--- a/src/main/resources/stepmod2mn.resource.adoc.xsl
+++ b/src/main/resources/stepmod2mn.resource.adoc.xsl
@@ -689,13 +689,11 @@
 
 			<xsl:variable name="current_resource_name" select="resource/@name"/>
 			
-			<xsl:variable name="root_element_name" select="local-name(*)"/>
-			
 			<xsl:for-each select="resource/schema">
 				<xsl:text>        - fileref: </xsl:text>
 				<!-- <xsl:value-of select="concat('../../resources/',@name,'/',@name,'.exp')"/> --> <!-- updated for https://github.com/metanorma/stepmod2mn/issues/49, was ../../../resources/ -->
 				
-				<xsl:variable name="schema_exp_relative_path" select="concat('../../', $root_element_name, 's/',@name,'/',@name,'.exp')"/>
+				<xsl:variable name="schema_exp_relative_path" select="concat('../../resources/',@name,'/',@name,'.exp')"/>
 				
 				<xsl:variable name="schema_exp_exists" select="java:org.metanorma.Util.fileExists(concat($path, '/', $schema_exp_relative_path))"/>
 				<xsl:if test="normalize-space($schema_exp_exists) = 'false'">

From f33dca9f0e65dd1d30228042d814eef55b63b103 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Wed, 8 May 2024 20:10:43 +0300
Subject: [PATCH 4/6] fixing issue with source document for terms, #185

---
 .../stepmod.base_xsl/sect_2_refs.xsl          | 26 ++++++++++++++++---
 .../stepmod.base_xsl/sect_3_defs.xsl          | 13 +++++++++-
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/stepmod.base_xsl/sect_2_refs.xsl b/src/main/resources/stepmod.base_xsl/sect_2_refs.xsl
index 17cf3b1..afcfb5f 100644
--- a/src/main/resources/stepmod.base_xsl/sect_2_refs.xsl
+++ b/src/main/resources/stepmod.base_xsl/sect_2_refs.xsl
@@ -638,10 +638,28 @@ $Id: sect_2_refs.xsl,v 1.22 2019/03/09 01:29:01 tom Exp $
      node set. The normrefs are sorted on output  -->
 <xsl:template match="normref_nodes" mode="output_normrefs">
   
-  <xsl:apply-templates select="normref" mode="output_html">    
-    <xsl:sort select="@group" data-type="text"/>
-    <xsl:sort select="@id" data-type="text"/>
-  </xsl:apply-templates>
+  <xsl:variable name="normative_references">
+    <xsl:apply-templates select="normref" mode="output_html">    
+      <xsl:sort select="@group" data-type="text"/>
+      <xsl:sort select="@id" data-type="text"/>
+    </xsl:apply-templates>
+  </xsl:variable>
+  
+  <xsl:copy-of select="$normative_references"/>
+  
+  <xsl:variable name="normative_references_tmp" select="translate($normative_references, '&#xa0;', ' ')"/>
+  <xsl:if test="not(contains($normative_references_tmp, ',ISO 10303-2]]]'))">
+    <!-- * [[[bibitem_010303000002,ISO 10303-2]]] _Industrial automation systems and integration — Product data representation and exchange— Part 2: Vocabulary_</xsl:text> -->
+    <xsl:variable name="normref_10303_2"><normref.inc normref="ref10303-2"/></xsl:variable>
+    <xsl:variable name="normref_list">
+      <xsl:element name="normref_nodes">
+        <xsl:apply-templates select="xalan:nodeset($normref_10303_2)/*" mode="generate_node"/>
+      </xsl:element>
+    </xsl:variable>  
+    <xsl:variable name="normref_nodes" select="xalan:nodeset($normref_list)"/>
+    <xsl:apply-templates select="$normref_nodes//normref" mode="output_html"/> 
+  </xsl:if>
+  
   <xsl:apply-templates select="normref.resource" mode="check_resources"/>
   
   <!-- <xsl:if test="normref/stdref[@published='n']">
diff --git a/src/main/resources/stepmod.base_xsl/sect_3_defs.xsl b/src/main/resources/stepmod.base_xsl/sect_3_defs.xsl
index 59dde23..ba337b6 100644
--- a/src/main/resources/stepmod.base_xsl/sect_3_defs.xsl
+++ b/src/main/resources/stepmod.base_xsl/sect_3_defs.xsl
@@ -94,9 +94,20 @@ $Id: sect_3_defs.xsl,v 1.11 2010/02/03 12:10:33 robbod Exp $
       </xsl:if>
     </xsl:for-each>
   </xsl:variable>
+  
   <xsl:variable name="attributes">
+    <!-- Example: source=bibitem_010303000002 -->
     <!-- <xsl:if test="xalan:nodeset($list_ref)//item[contains(., 'ISO 10303-')]">source=ref10303-2</xsl:if> -->
-    <xsl:if test="xalan:nodeset($list_ref_iso_10303)//item">source=ref10303-2</xsl:if>
+    <xsl:if test="xalan:nodeset($list_ref_iso_10303)//item">
+      <xsl:variable name="normref_10303_2"><normref.inc normref="ref10303-2"/></xsl:variable>
+      <xsl:variable name="normref_list">
+        <xsl:element name="normref_nodes">
+          <xsl:apply-templates select="xalan:nodeset($normref_10303_2)/*" mode="generate_node"/>
+        </xsl:element>
+      </xsl:variable>  
+      <xsl:variable name="normref_nodes" select="xalan:nodeset($normref_list)"/>
+      <xsl:value-of select="concat('source=bibitem_', $normref_nodes//normref/@id)"/>
+    </xsl:if>
   </xsl:variable>
 
   <xsl:call-template name="insertHeaderADOC">

From 4b5a305515e41c1e885b3e8b88cd945f590a6a2e Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Wed, 8 May 2024 20:58:34 +0300
Subject: [PATCH 5/6] updated path to schemas.yaml, #187

---
 src/main/resources/stepmod2mn.module.adoc.xsl   | 2 +-
 src/main/resources/stepmod2mn.resource.adoc.xsl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/stepmod2mn.module.adoc.xsl b/src/main/resources/stepmod2mn.module.adoc.xsl
index 47dccd4..d98b993 100644
--- a/src/main/resources/stepmod2mn.module.adoc.xsl
+++ b/src/main/resources/stepmod2mn.module.adoc.xsl
@@ -359,7 +359,7 @@
 		<xsl:text>&#xa;</xsl:text>
 		<xsl:text>:data-uri-image:</xsl:text>
 		<xsl:text>&#xa;</xsl:text>
-		<xsl:text>:lutaml-express-index: schemas; schemas.yaml;</xsl:text>
+		<xsl:text>:lutaml-express-index: schemas; ../../schemas_all.yaml;</xsl:text>
 		<xsl:text>&#xa;</xsl:text>
 		<xsl:text>&#xa;</xsl:text>
 		
diff --git a/src/main/resources/stepmod2mn.resource.adoc.xsl b/src/main/resources/stepmod2mn.resource.adoc.xsl
index 727fdb6..43bb0f1 100644
--- a/src/main/resources/stepmod2mn.resource.adoc.xsl
+++ b/src/main/resources/stepmod2mn.resource.adoc.xsl
@@ -343,7 +343,7 @@
 		<xsl:text>&#xa;</xsl:text>
 		<xsl:text>:data-uri-image:</xsl:text>
 		<xsl:text>&#xa;</xsl:text>
-		<xsl:text>:lutaml-express-index: schemas; schemas.yaml;</xsl:text>
+		<xsl:text>:lutaml-express-index: schemas; ../../schemas_all.yaml;</xsl:text>
 		<xsl:text>&#xa;</xsl:text>
 		<xsl:text>&#xa;</xsl:text>
 		

From 9b7fe8108336b79335f43613d4bfff060cd86dd8 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Wed, 8 May 2024 21:09:08 +0300
Subject: [PATCH 6/6] introduction for resource docs updated, #189

---
 .../stepmod.base_xsl/res_doc/sect_introduction.xsl   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/stepmod.base_xsl/res_doc/sect_introduction.xsl b/src/main/resources/stepmod.base_xsl/res_doc/sect_introduction.xsl
index 0077ec1..f127fbd 100644
--- a/src/main/resources/stepmod.base_xsl/res_doc/sect_introduction.xsl
+++ b/src/main/resources/stepmod.base_xsl/res_doc/sect_introduction.xsl
@@ -110,9 +110,9 @@ $Id: sect_introduction.xsl,v 1.15 2020/03/02 14:39:21 tom Exp $
 						<xsl:text>&#xa;&#xa;</xsl:text> -->
             
 						<!-- replaced by macros -->
-						<xsl:text>[lutaml_express, schemas, context, leveloffset=+1]</xsl:text>
+						<!-- <xsl:text>[lutaml_express, schemas, context, leveloffset=+1]</xsl:text>
 						<xsl:text>&#xa;</xsl:text>
-						<xsl:text>---</xsl:text>
+						<xsl:text>- - -</xsl:text>
 						<xsl:text>&#xa;</xsl:text>
 						<xsl:text>{% for schema in context.schemas %}</xsl:text>
 						<xsl:text>&#xa;</xsl:text>
@@ -120,7 +120,13 @@ $Id: sect_introduction.xsl,v 1.15 2020/03/02 14:39:21 tom Exp $
 						<xsl:text>&#xa;</xsl:text>
 						<xsl:text>{% endfor %}</xsl:text>
 						<xsl:text>&#xa;</xsl:text>
-						<xsl:text>---</xsl:text>
+						<xsl:text>- - -</xsl:text>
+						<xsl:text>&#xa;</xsl:text>
+						<xsl:text>&#xa;</xsl:text> -->
+						
+						<!-- https://github.com/metanorma/stepmod2mn/issues/189 -->
+						<!-- replaced by template -->
+						<xsl:text>include::../templates/resources/resource_introduction_subdivisions.adoc[]</xsl:text>
 						<xsl:text>&#xa;</xsl:text>
 						<xsl:text>&#xa;</xsl:text>