diff --git a/README.adoc b/README.adoc
index a59c4db..ccdacfa 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.47.jar <XML-FileName>
+java -Xss5m -jar target/stepmod2mn-1.48.jar <XML-FileName>
 ----
 
 e.g. 
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.47.jar data/resource_docs/draughting_elements/resource.xml 
+java -Xss5m -jar target/stepmod2mn-1.48.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.47.jar <XML-FileName> [--output <AsciiDoc-FileName>]
+java -Xss5m -jar target/stepmod2mn-1.48.jar <XML-FileName> [--output <AsciiDoc-FileName>]
 ----
 
 e.g. 
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.47.jar data/resource_docs/draughting_elements/resource.xml --output result_dir/draughting_elements/document.adoc
+java -Xss5m -jar target/stepmod2mn-1.48.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.47.jar <Input-folder>
+java -Xss5m -jar target/stepmod2mn-1.48.jar <Input-folder>
 ----
 
 e.g. 
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.47.jar data/
+java -Xss5m -jar target/stepmod2mn-1.48.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.47.jar <Input-folder> [--output <Output-folder>]
+java -Xss5m -jar target/stepmod2mn-1.48.jar <Input-folder> [--output <Output-folder>]
 ----
 
 e.g. 
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.47.jar data/ --output documents/
+java -Xss5m -jar target/stepmod2mn-1.48.jar data/ --output documents/
 ----
 
 
@@ -80,42 +80,42 @@ java -Xss5m -jar target/stepmod2mn-1.47.jar data/ --output documents/
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.47.jar <Input-folder> [--exclude <documents or part numbers list>]
+java -Xss5m -jar target/stepmod2mn-1.48.jar <Input-folder> [--exclude <documents or part numbers list>]
 ----
 
 e.g. 
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.47.jar data/ --exclude "machining_features 104"
+java -Xss5m -jar target/stepmod2mn-1.48.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.47.jar <Input-folder> [--include-only <documents list>]
+java -Xss5m -jar target/stepmod2mn-1.48.jar <Input-folder> [--include-only <documents list>]
 ----
 
 e.g. 
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.47.jar data/ --include-only "fundamentals_of_product_description_and_support kinematics"
+java -Xss5m -jar target/stepmod2mn-1.48.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.47.jar <Publication-Index-XML-FileName>
+java -Xss5m -jar target/stepmod2mn-1.48.jar <Publication-Index-XML-FileName>
 ----
 
 e.g.
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.47.jar publication/part1000/CR_PMI_5/publication_index.xml
+java -Xss5m -jar target/stepmod2mn-1.48.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.47.jar <Publication-Index-XML-FileName> [--output <Output-folder>]
+java -Xss5m -jar target/stepmod2mn-1.48.jar <Publication-Index-XML-FileName> [--output <Output-folder>]
 ----
 
 e.g.
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.47.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.48.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.47.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.48.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.47.jar <Publication-Index-XML-FileName> [--type <resource_docs or modules>]
+java -Xss5m -jar target/stepmod2mn-1.48.jar <Publication-Index-XML-FileName> [--type <resource_docs or modules>]
 ----
 
 e.g.
 
 [source,sh]
 ----
-java -Xss5m -jar target/stepmod2mn-1.47.jar publication/part1000/CR_PMI_5/publication_index.xml --type resource_docs
+java -Xss5m -jar target/stepmod2mn-1.48.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.47.jar <start folder to process xml maps files> --svg
+java -jar target/stepmod2mn-1.48.jar <start folder to process xml maps files> --svg
 ----
 
 e.g. 
 
 [source,sh]
 ----
-java -jar target/stepmod2mn-1.47.jar data/resources --svg
+java -jar target/stepmod2mn-1.48.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.47.jar <start folder to process xml maps files> --svg [--output <Output-folder>]
+java -jar target/stepmod2mn-1.48.jar <start folder to process xml maps files> --svg [--output <Output-folder>]
 ----
 
 e.g. 
 
 [source,sh]
 ----
-java -jar target/stepmod2mn-1.47.jar data/resources --svg --output schemas/
+java -jar target/stepmod2mn-1.48.jar data/resources --svg --output schemas/
 ----
 
 === Generate SVG image for Express Imagemap XML and Image:
 
 [source,sh]
 ----
-java -jar stepmod2mn-1.47.jar --xml <Express Imagemap XML file path> --image <Image file name> [--svg <resulted SVG map file or folder>]
+java -jar stepmod2mn-1.48.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.47.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.48.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.47</version>
+<version>1.48</version>
 <name>STEPmod XML to Metanorma AsciiDoc converter</name>
 ----
 
@@ -234,8 +234,8 @@ Tag the same version in Git:
 
 [source,xml]
 ----
-git tag v1.47
-git push origin v1.47
+git tag v1.48
+git push origin v1.48
 ----
 
 Then the corresponding GitHub release will be automatically created at:
diff --git a/pom.xml b/pom.xml
index 091898f..d9f96ae 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.47</version>
+	<version>1.48</version>
 	<name>STEPmod XML to Metanorma AsciiDoc converter</name>
 	<packaging>jar</packaging>
 	<url>https://www.metanorma.org</url>
diff --git a/src/main/resources/stepmod.base_xsl/common.xsl b/src/main/resources/stepmod.base_xsl/common.xsl
index 82552e0..f72e349 100644
--- a/src/main/resources/stepmod.base_xsl/common.xsl
+++ b/src/main/resources/stepmod.base_xsl/common.xsl
@@ -4665,14 +4665,17 @@ is case sensitive.')"/>
 
 <xsl:template match="projlead">
 	<xsl:variable name="ref" select="@ref"/>
-	<xsl:variable name="contacts_xml_document" select="document('../data/basic/contacts.xml')"/>
+	<xsl:variable name="contacts_xml_document" select="document(concat($path, '../../../data/basic/contacts.xml'))"/>
 	<xsl:variable name="projlead"
 		select="$contacts_xml_document/contact.list/contact[@id=$ref]"/>
 	<!-- <b>Project leader: </b> -->
-	<xsl:text> *Project leader:* </xsl:text>
+	<!-- <xsl:text> *Project leader:* </xsl:text> -->
+	<xsl:variable name="document_attribute_prefix">:semantic-metadata-project-leader-</xsl:variable>
 	<xsl:choose>
 		<xsl:when test="$projlead">
-			<xsl:apply-templates select="$projlead"/>      
+			<xsl:apply-templates select="$projlead">
+				<xsl:with-param name="document_attribute_prefix" select="$document_attribute_prefix"/>
+			</xsl:apply-templates>
 		</xsl:when>
 		<xsl:otherwise>
 			<xsl:call-template name="error_message">
@@ -4724,14 +4727,18 @@ is case sensitive.')"/>
 
 <xsl:template match="editor">
 	<xsl:variable name="ref" select="@ref"/>
-	<xsl:variable name="contacts_xml_document" select="document('../data/basic/contacts.xml')"/>
+	<xsl:variable name="contacts_xml_document" select="document(concat($path, '../../../data/basic/contacts.xml'))"/>
 	<xsl:variable name="editor"
 		select="$contacts_xml_document/contact.list/contact[@id=$ref]"/>
 	<!-- <b>Project editor: </b> -->  
-	<xsl:text> *Project editor:* </xsl:text>
+	<!--<xsl:text> *Project editor:* </xsl:text> -->
+	
+	<xsl:variable name="document_attribute_prefix">:semantic-metadata-project-editor-</xsl:variable>
 	<xsl:choose>
 		<xsl:when test="$editor">
-			<xsl:apply-templates select="$editor"/>      
+			<xsl:apply-templates select="$editor">
+				<xsl:with-param name="document_attribute_prefix" select="$document_attribute_prefix"/>
+			</xsl:apply-templates>    
 		</xsl:when>
 		<xsl:otherwise>
 			<xsl:call-template name="error_message">
@@ -4804,15 +4811,28 @@ is case sensitive.')"/>
 
 
 <xsl:template match="contact">
-	<xsl:apply-templates select="firstname"/>
-	&#160;
-	<xsl:apply-templates select="lastname"/>
-	<br/>
-	<xsl:apply-templates select="." mode="address"/>
-	<br/>
-	<xsl:apply-templates select="phone"/>
-	<xsl:apply-templates select="fax"/>
-	<xsl:apply-templates select="email"/>
+	<xsl:param name="document_attribute_prefix"/>
+	<xsl:apply-templates select="firstname[normalize-space() != '']">
+		<xsl:with-param name="document_attribute_prefix" select="$document_attribute_prefix"/>
+	</xsl:apply-templates>
+	<!-- &#160; -->
+	<xsl:apply-templates select="lastname[normalize-space() != '']">
+		<xsl:with-param name="document_attribute_prefix" select="$document_attribute_prefix"/>
+	</xsl:apply-templates>
+	<!-- <br/> -->
+	<xsl:apply-templates select="." mode="address">
+		<xsl:with-param name="document_attribute_prefix" select="$document_attribute_prefix"/>
+	</xsl:apply-templates>
+	<!-- <br/> -->
+	<xsl:apply-templates select="phone[normalize-space() != '']">
+		<xsl:with-param name="document_attribute_prefix" select="$document_attribute_prefix"/>
+	</xsl:apply-templates>
+	<xsl:apply-templates select="fax[normalize-space() != '']">
+		<xsl:with-param name="document_attribute_prefix" select="$document_attribute_prefix"/>
+	</xsl:apply-templates>
+	<xsl:apply-templates select="email[normalize-space() != '']">
+		<xsl:with-param name="document_attribute_prefix" select="$document_attribute_prefix"/>
+	</xsl:apply-templates>
 </xsl:template>
 
 
@@ -4833,65 +4853,102 @@ is case sensitive.')"/>
 
 
 <xsl:template match="firstname | lastname">
-	<xsl:value-of select="."/>
+	<xsl:param name="document_attribute_prefix"/>
+	<xsl:value-of select="concat($document_attribute_prefix, local-name(), ': ', .)"/>
+	<xsl:text>&#xa;</xsl:text>
 </xsl:template>
 
 <xsl:template match="contact" mode="address">
+	<xsl:param name="document_attribute_prefix"/>
 	<!-- <b>Address: </b> -->  
-	<xsl:text> *Address:* </xsl:text>
-	<xsl:apply-templates select="./affiliation"/>
-	<xsl:apply-templates select="./street"/>
-	<xsl:apply-templates select="./pobox"/>
-	<xsl:apply-templates select="./city"/>
-	<xsl:apply-templates select="./state"/>
-	<xsl:apply-templates select="./postcode"/>
-	<xsl:apply-templates select="./country"/>
+	<!-- <xsl:text> *Address:* </xsl:text> -->
+	<xsl:variable name="document_attribute_prefix_address" select="concat($document_attribute_prefix, 'address-')"/>
+	<xsl:apply-templates select="./affiliation[normalize-space() != '']">
+		<xsl:with-param name="document_attribute_prefix" select="$document_attribute_prefix_address"/>
+	</xsl:apply-templates>
+	<xsl:apply-templates select="./street[normalize-space() != '']">
+		<xsl:with-param name="document_attribute_prefix" select="$document_attribute_prefix_address"/>
+	</xsl:apply-templates>
+	<xsl:apply-templates select="./pobox[normalize-space() != '']">
+		<xsl:with-param name="document_attribute_prefix" select="$document_attribute_prefix_address"/>
+	</xsl:apply-templates>
+	<xsl:apply-templates select="./city[normalize-space() != '']">
+		<xsl:with-param name="document_attribute_prefix" select="$document_attribute_prefix_address"/>
+	</xsl:apply-templates>
+	<xsl:apply-templates select="./state[normalize-space() != '']">
+		<xsl:with-param name="document_attribute_prefix" select="$document_attribute_prefix_address"/>
+	</xsl:apply-templates>
+	<xsl:apply-templates select="./postcode[normalize-space() != '']">
+		<xsl:with-param name="document_attribute_prefix" select="$document_attribute_prefix_address"/>
+	</xsl:apply-templates>
+	<xsl:apply-templates select="./country[normalize-space() != '']">
+		<xsl:with-param name="document_attribute_prefix" select="$document_attribute_prefix_address"/>
+	</xsl:apply-templates>
 </xsl:template>
 
 
 <xsl:template match="affiliation">
-	<xsl:value-of select="."/> <br/>
+	<xsl:param name="document_attribute_prefix"/>
+	<xsl:value-of select="concat($document_attribute_prefix, local-name(), ': ', .)"/><!--  <br/> -->
+	<xsl:text>&#xa;</xsl:text>
 </xsl:template>
 
 <xsl:template match="street">
-	<xsl:value-of select="."/> <br/>
+	<xsl:param name="document_attribute_prefix"/>
+	<xsl:value-of select="concat($document_attribute_prefix, local-name(), ': ', .)"/><!--  <br/> -->
+	<xsl:text>&#xa;</xsl:text>
 </xsl:template>
 
 <xsl:template match="pobox">
-	<xsl:value-of select="."/> <br/>
+	<xsl:param name="document_attribute_prefix"/>
+	<xsl:value-of select="concat($document_attribute_prefix, local-name(), ': ', .)"/><!--  <br/> -->
+	<xsl:text>&#xa;</xsl:text>
 </xsl:template>
 
 <xsl:template match="city">
-	<xsl:value-of select="."/> <br/>
+	<xsl:param name="document_attribute_prefix"/>
+	<xsl:value-of select="concat($document_attribute_prefix, local-name(), ': ', .)"/><!--  <br/> -->
+	<xsl:text>&#xa;</xsl:text>
 </xsl:template>
 
 <xsl:template match="state">
-	<xsl:value-of select="."/> <br/>
+	<xsl:param name="document_attribute_prefix"/>
+	<xsl:value-of select="concat($document_attribute_prefix, local-name(), ': ', .)"/><!--  <br/> -->
+	<xsl:text>&#xa;</xsl:text>
 </xsl:template>
 
 <xsl:template match="postcode">
-	<xsl:value-of select="."/> <br/>
+	<xsl:param name="document_attribute_prefix"/>
+	<xsl:value-of select="concat($document_attribute_prefix, local-name(), ': ', .)"/><!--  <br/> -->
+	<xsl:text>&#xa;</xsl:text>
 </xsl:template>
 
 <xsl:template match="country">
-	<xsl:value-of select="."/> <br/>
+	<xsl:param name="document_attribute_prefix"/>
+	<xsl:value-of select="concat($document_attribute_prefix, local-name(), ': ', .)"/><!--  <br/> -->
+	<xsl:text>&#xa;</xsl:text>
 </xsl:template>
 
 <xsl:template match="phone">
+	<xsl:param name="document_attribute_prefix"/>
 	<!-- <b>Telephone: </b> -->
-	<xsl:text> *Telephone:* </xsl:text>
-	<xsl:value-of select="."/>
-	<br/>
+	<!-- <xsl:text> *Telephone:* </xsl:text> -->
+	<xsl:value-of select="concat($document_attribute_prefix, local-name(), ': ', .)"/>
+	<!-- <br/> -->
+	<xsl:text>&#xa;</xsl:text>
 </xsl:template>
 
 <xsl:template match="fax">
+	<xsl:param name="document_attribute_prefix"/>
 	<!-- <b>Telefacsimile: </b> -->
-	<xsl:text> *Telefacsimile:* </xsl:text>
-	<xsl:value-of select="."/>
-	<br/>
+	<!-- <xsl:text> *Telefacsimile:* </xsl:text> -->
+	<xsl:value-of select="concat($document_attribute_prefix, local-name(), ': ', .)"/>
+	<!-- <br/> -->
+	<xsl:text>&#xa;</xsl:text>
 </xsl:template>
 
 <xsl:template match="email">
+	<xsl:param name="document_attribute_prefix"/>
 	<xsl:variable name="mailto" select="concat('mailto:',.)"/>
 	<!-- <b>Electronic mail: </b>
 	<a href="{$mailto}">
@@ -4899,8 +4956,9 @@ is case sensitive.')"/>
 	</a>  
 	<br/> -->	
 	
-	<xsl:text> *Electronic mail:* </xsl:text>
-	<xsl:value-of select="$mailto"/><xsl:text>[]</xsl:text>
+	<!-- <xsl:text> *Electronic mail:* </xsl:text> -->
+	<!--<xsl:value-of select="$mailto"/> <xsl:text>[]</xsl:text> -->
+	<xsl:value-of select="concat($document_attribute_prefix, local-name(), ': ', .)"/>
 	<xsl:text>&#xa;</xsl:text>
 </xsl:template>
 
diff --git a/src/main/resources/stepmod.base_xsl/module.xsl b/src/main/resources/stepmod.base_xsl/module.xsl
index a57cc26..1d1429d 100644
--- a/src/main/resources/stepmod.base_xsl/module.xsl
+++ b/src/main/resources/stepmod.base_xsl/module.xsl
@@ -2803,16 +2803,30 @@ this document,  may be provided to support implementations.  If the information
     <xsl:apply-templates select="." mode="output_clause_issue">
       <xsl:with-param name="clause" select="'normrefs'"/>
     </xsl:apply-templates>
-    <!-- output the normative reference explicitly defined in the module -->
-    <xsl:apply-templates select="/module/normrefs/normref">
-      <xsl:with-param name="current_module" select="$current_module"/>
-    </xsl:apply-templates>
-    <!-- output the default normative reference and any implicit in the
-       module through the ARM and MIM -->
-    <xsl:call-template name="output_default_normrefs">
-      <xsl:with-param name="module_number" select="$module_number"/>
-      <xsl:with-param name="current_module" select="$current_module"/>
-    </xsl:call-template>
+    
+    <xsl:variable name="normative_references">
+      <!-- output the normative reference explicitly defined in the module -->
+      <xsl:apply-templates select="/module/normrefs/normref">
+        <xsl:with-param name="current_module" select="$current_module"/>
+      </xsl:apply-templates>
+      <!-- output the default normative reference and any implicit in the
+         module through the ARM and MIM -->
+      <xsl:call-template name="output_default_normrefs">
+        <xsl:with-param name="module_number" select="$module_number"/>
+        <xsl:with-param name="current_module" select="$current_module"/>
+      </xsl:call-template>
+    </xsl:variable>
+    
+    <xsl:copy-of select="$normative_references"/>
+		
+		<xsl:if test="not(contains($normative_references, '* [[[ref10303-2,'))">
+			<!-- * [[[ref10303-2,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 ref="ref10303-2"/></xsl:variable>
+			<xsl:apply-templates select="xalan:nodeset($normref_10303_2)/*">
+				<xsl:with-param name="current_resource" select="."/>
+			</xsl:apply-templates>
+		</xsl:if>
+    
   </xsl:template>
   <!-- output the default normative reference and any implicit in the
      module through the ARM and MIM -->
@@ -3609,7 +3623,11 @@ test="document('../data/basic/normrefs.xml')/normref.list/normref[@id=$normref]/
             <!-- normref stdnumber are 10303-1107 whereas module numbers are
                1107, so remove the 10303- -->
             <xsl:variable name="part_no" select="substring-after($normref/stdref/stdnumber,'-')"/>
-            <xsl:if test="$module_number!=$part_no">
+            <!-- from https://github.com/metanorma/stepmod2mn/issues/145#issuecomment-2076664788 
+							it means all "ISO 10303-*" parts should be omitted, because ISO 10303-2 is a new publication that includes all terms.
+							This means once we include ISO 10303-2 in the source, 
+							we do not need to import any other term from any ISO 10303-* document. -->
+            <xsl:if test="$module_number!=$part_no and not(contains($stdnumber, 'ISO 10303-'))">
               <!-- <h2>
             <xsl:value-of select="concat('3.1.',$section_no,
                                   ' Terms defined in ',$stdnumber)"/>
@@ -3673,34 +3691,125 @@ test="document('../data/basic/normrefs.xml')/normref.list/normref[@id=$normref]/
                 <xsl:if test="not(contains($normref_ids,$normrefid))">
                   <xsl:variable name="module_node" select="$module_xml_document/module"/>
                   <xsl:variable name="stdnumber" select="concat('ISO/',$module_node/@status,'&#160;10303-',$module_node/@part)"/>
-                  <!-- output the section header for the normative reference
-                     that is defining terms -->
-                  <!-- <h2>
-                  <xsl:value-of select="concat('3.',$section_no,
-                                        ' Terms defined in ', $stdnumber)"/>
-                </h2> -->
-                  <xsl:call-template name="insertHeaderADOC">
-                    <xsl:with-param name="id" select="concat('sec_3.',$section_no)"/>
-                    <xsl:with-param name="level" select="3"/>
-                    <xsl:with-param name="header" select="concat('Terms defined in ', $stdnumber)"/>
-                  </xsl:call-template>
-                  <!-- <p> -->
-                  <!-- RBN Changed due to request from ISO
-                  For the purposes of this part of ISO 10303, -->
-                  <xsl:call-template name="insertParagraph">
-                    <xsl:with-param name="text">
-                  For the purposes of this document,
-                  the following terms defined in 
-                  <xsl:value-of select="$stdnumber"/>
-                  apply:
+                  
+                  <!-- from https://github.com/metanorma/stepmod2mn/issues/145#issuecomment-2076664788 
+                    it means all "ISO 10303-*" parts should be omitted, because ISO 10303-2 is a new publication that includes all terms.
+                    This means once we include ISO 10303-2 in the source, 
+                    we do not need to import any other term from any ISO 10303-* document. -->
+                  <xsl:if test="not(contains($stdnumber, 'ISO 10303-'))">
+                    <!-- output the section header for the normative reference
+                       that is defining terms -->
+                    <!-- <h2>
+                    <xsl:value-of select="concat('3.',$section_no,
+                                          ' Terms defined in ', $stdnumber)"/>
+                  </h2> -->
+                    <xsl:call-template name="insertHeaderADOC">
+                      <xsl:with-param name="id" select="concat('sec_3.',$section_no)"/>
+                      <xsl:with-param name="level" select="3"/>
+                      <xsl:with-param name="header" select="concat('Terms defined in ', $stdnumber)"/>
+                    </xsl:call-template>
+                    <!-- <p> -->
+                    <!-- RBN Changed due to request from ISO
+                    For the purposes of this part of ISO 10303, -->
+                    <xsl:call-template name="insertParagraph">
+                      <xsl:with-param name="text">
+                    For the purposes of this document,
+                    the following terms defined in 
+                    <xsl:value-of select="$stdnumber"/>
+                    apply:
+                    </xsl:with-param>
+                    </xsl:call-template>
+                    <!-- </p> -->
+                    <!-- <ul> -->
+                    <!-- now output the terms -->
+                    <xsl:apply-templates select="/module/normrefs/normref.inc[@module.name=$module]/term.ref" mode="module"/>
+                    <xsl:text>&#xa;&#xa;</xsl:text>
+                    <!-- </ul> -->
+                  </xsl:if>
+                </xsl:if>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:call-template name="error_message">
+                  <xsl:with-param name="message">
+                    <xsl:value-of select="concat('Error ref 2: ',
+$module_ok,' Check the normatives references')"/>
                   </xsl:with-param>
-                  </xsl:call-template>
-                  <!-- </p> -->
-                  <!-- <ul> -->
-                  <!-- now output the terms -->
-                  <xsl:apply-templates select="/module/normrefs/normref.inc[@module.name=$module]/term.ref" mode="module"/>
-                  <xsl:text>&#xa;&#xa;</xsl:text>
-                  <!-- </ul> -->
+                </xsl:call-template>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:when>
+          <xsl:when test="contains($first,'resource:')">
+            <xsl:variable name="resource" select="substring-after($first,'resource:')"/>
+            <!-- should never get here -->
+          </xsl:when>
+        </xsl:choose>
+        <xsl:call-template name="output_normrefs_terms_rec">
+          <xsl:with-param name="normrefs" select="$rest"/>
+          <xsl:with-param name="normref_ids" select="$normref_ids"/>
+          <xsl:with-param name="section" select="$section_no"/>
+          <xsl:with-param name="module_number" select="$module_number"/>
+          <xsl:with-param name="current_module" select="$current_module"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <!-- end of recursion -->
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  
+  <xsl:template name="get_list_normrefs_terms_rec">
+    <xsl:param name="normrefs"/>
+    <xsl:param name="normref_ids"/>
+    <xsl:param name="section"/>
+    <xsl:param name="module_number"/>
+    <xsl:param name="current_module"/>
+    <xsl:choose>
+      <xsl:when test="$normrefs">
+        <xsl:variable name="first" select="substring-before(substring-after($normrefs,','),',')"/>
+        <xsl:variable name="section_no" select="$section+1"/>
+        <xsl:variable name="rest" select="substring-after(substring-after($normrefs,','),',')"/>
+        <xsl:choose>
+          <xsl:when test="contains($first,'normref:')">
+            <xsl:variable name="ref" select="substring-after($first,'normref:')"/>
+            <xsl:variable name="normrefs_xml_document" select="document(concat($path, '../../../data/basic/normrefs.xml'))"/>
+            <xsl:variable name="normref" select="$normrefs_xml_document/normref.list/normref[@id=$ref]"/>
+            <!-- get the number of the standard -->
+            <xsl:variable name="stdnumber" select="concat($normref/stdref/orgname, ' ',$normref/stdref/stdnumber)"/>
+            <!-- output the section header for the normative reference that is
+               defining terms 
+               IGNORE if the normative ref is referring to this module
+               -->
+            <!-- normref stdnumber are 10303-1107 whereas module numbers are
+               1107, so remove the 10303- -->
+            <xsl:variable name="part_no" select="substring-after($normref/stdref/stdnumber,'-')"/>
+            <xsl:if test="$module_number!=$part_no">
+              <item><xsl:value-of select="$stdnumber"/></item>
+            </xsl:if>
+          </xsl:when>
+          <!-- a term defined in another module -->
+          <xsl:when test="contains($first,'module:')">
+            <xsl:variable name="module" select="substring-after($first,'module:')"/>
+            <xsl:variable name="module_dir">
+              <xsl:call-template name="module_directory">
+                <xsl:with-param name="module" select="$module"/>
+              </xsl:call-template>
+            </xsl:variable>
+            <xsl:variable name="module_ok">
+              <xsl:call-template name="check_module_exists">
+                <xsl:with-param name="module" select="$module"/>
+              </xsl:call-template>
+            </xsl:variable>
+            <xsl:choose>
+              <xsl:when test="$module_ok='true'">
+                <xsl:variable name="module_xml" select="concat($module_dir,'/module.xml')"/>
+                <xsl:variable name="module_xml_document" select="document($module_xml)"/>
+                <xsl:variable name="normrefid" select="concat('10303-',$module_xml_document/module/@part)"/>
+                <!-- check to see if the terms for the module have been output
+                   as part of normative references -->
+                <xsl:if test="not(contains($normref_ids,$normrefid))">
+                  <xsl:variable name="module_node" select="$module_xml_document/module"/>
+                  <xsl:variable name="stdnumber" select="concat('ISO/',$module_node/@status,'&#160;10303-',$module_node/@part)"/>
+                  <item><xsl:value-of select="$stdnumber"/></item>
                 </xsl:if>
               </xsl:when>
               <xsl:otherwise>
@@ -3731,6 +3840,7 @@ $module_ok,' Check the normatives references')"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
+  
   <!-- build a list of normrefs that are used by the module and have terms
      defined in them 
      The list comprises:
diff --git a/src/main/resources/stepmod.base_xsl/res_doc/common.xsl b/src/main/resources/stepmod.base_xsl/res_doc/common.xsl
index 01d8a4b..7a9d47d 100644
--- a/src/main/resources/stepmod.base_xsl/res_doc/common.xsl
+++ b/src/main/resources/stepmod.base_xsl/res_doc/common.xsl
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- <?xml-stylesheet type="text/xsl" href="./document_xsl.xsl" ?> -->
 <!--
-$Id: common.xsl,v 1.33 2008/05/21 20:50:25 abf Exp $
+$Id: common.xsl,v 1.34 2014/05/29 20:31:13 nigelshaw Exp $
 	Author:  Rob Bodington, Eurostep Limited
 	Owner:   Developed by Eurostep and supplied to NIST under contract.
 	Purpose:
@@ -241,6 +242,8 @@ $Id: common.xsl,v 1.33 2008/05/21 20:50:25 abf Exp $
 			<id> if a construct is given, then id is the identifier for the
 					 construct.
 			-->
+			
+	<!-- no element resdoc_ref in XML and DTD -->
 	<xsl:template match="resdoc_ref">
 		<!-- remove all whitespace -->
 		<xsl:variable
diff --git a/src/main/resources/stepmod.base_xsl/res_doc/express_code.xsl b/src/main/resources/stepmod.base_xsl/res_doc/express_code.xsl
index 2440b25..43f8c94 100644
--- a/src/main/resources/stepmod.base_xsl/res_doc/express_code.xsl
+++ b/src/main/resources/stepmod.base_xsl/res_doc/express_code.xsl
@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
+<!-- <?xml-stylesheet type="text/xsl" href="./document_xsl.xsl" ?> -->
 
 <!--
-     $Id: express_code.xsl,v 1.16 2011/03/02 21:30:39 lothartklein Exp $
+     $Id: express_code.xsl,v 1.18 2019/10/09 19:29:30 tom Exp $
 
   Author: Rob Bodington, Eurostep Limited
   Owner:  Developed by Eurostep and supplied to NIST under contract.
@@ -172,7 +173,10 @@
           <xsl:choose>
             <xsl:when test="string-length($reference)>0">
               <xsl:if test="not(starts-with($reference,'ISO 10303-')) and
-                            not(starts-with($reference,'ISO 13584-')) and
+                not(starts-with($reference,'ISO/CD 10303-')) and
+                not(starts-with($reference,'ISO/DIS 10303-')) and
+                not(starts-with($reference,'ISO/FDIS 10303-')) and
+                not(starts-with($reference,'ISO 13584-')) and
                             not(starts-with($reference,'ISO 15926-'))">
               <xsl:call-template name="error_message">
                 <xsl:with-param name="message">
diff --git a/src/main/resources/stepmod.base_xsl/res_doc/express_description.xsl b/src/main/resources/stepmod.base_xsl/res_doc/express_description.xsl
index 5b972d3..756fb02 100644
--- a/src/main/resources/stepmod.base_xsl/res_doc/express_description.xsl
+++ b/src/main/resources/stepmod.base_xsl/res_doc/express_description.xsl
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
+<!-- <?xml-stylesheet type="text/xsl" href="./document_xsl.xsl" ?> -->
 <!--
-$Id: express_description.xsl,v 1.8 2015/08/03 09:40:44 mikeward Exp $
+$Id: express_description.xsl,v 1.9 2016/09/09 13:05:25 mikeward Exp $
 	Author: Rob Bodington, Eurostep Limited
 	Owner:  Developed by Eurostep and supplied to NIST under contract.
 	Purpose: 
@@ -589,6 +590,10 @@ $Id: express_description.xsl,v 1.8 2015/08/03 09:40:44 mikeward Exp $
 
 	<!-- return false if the description does not exist in an external file -->
 	<xsl:template name="check_external_description">
+		<xsl:value-of select="'true'"/>
+	</xsl:template>
+	<!-- checking turned off, because replaced by template templates/resources/schemas.adoc -->
+	<xsl:template name="check_external_description_">
 		<!--
 				 The name of the express schema 
 				 Compulsory parameter -->
diff --git a/src/main/resources/stepmod.base_xsl/res_doc/express_link.xsl b/src/main/resources/stepmod.base_xsl/res_doc/express_link.xsl
index 1ad5ce7..cf93f62 100644
--- a/src/main/resources/stepmod.base_xsl/res_doc/express_link.xsl
+++ b/src/main/resources/stepmod.base_xsl/res_doc/express_link.xsl
@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
+<!-- <?xml-stylesheet type="text/xsl" href="./document_xsl.xsl" ?> -->
 
 <!--
-		 $Id: express_link.xsl,v 1.8 2009/07/03 12:12:31 robbod Exp $
+     $Id: express_link.xsl,v 1.9 2017/10/08 07:37:22 mikeward Exp $
 
 	Author: Rob Bodington, Eurostep Limited
 	Owner:  Developed by Eurostep and supplied to NIST under contract.
diff --git a/src/main/resources/stepmod.base_xsl/res_doc/expressg_icon.xsl b/src/main/resources/stepmod.base_xsl/res_doc/expressg_icon.xsl
index 7bd874a..ea47338 100644
--- a/src/main/resources/stepmod.base_xsl/res_doc/expressg_icon.xsl
+++ b/src/main/resources/stepmod.base_xsl/res_doc/expressg_icon.xsl
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- <?xml-stylesheet type="text/xsl" href="./document_xsl.xsl" ?> -->
 
 <!--
-$Id: expressg_icon.xsl,v 1.1 2003/08/26 05:32:50 thendrix Exp $
+$Id: expressg_icon.xsl,v 1.2 2005/02/18 19:32:02 thendrix Exp $
   Author:  Rob Bodington, Eurostep Limited
   Owner:   Developed by Eurostep
   Purpose: Read the are maps in an image and create a node list. This is
diff --git a/src/main/resources/stepmod.base_xsl/res_doc/resource.xsl b/src/main/resources/stepmod.base_xsl/res_doc/resource.xsl
index a9c20ed..614d140 100644
--- a/src/main/resources/stepmod.base_xsl/res_doc/resource.xsl
+++ b/src/main/resources/stepmod.base_xsl/res_doc/resource.xsl
@@ -627,6 +627,126 @@ Purpose:
 
 	</xsl:template>
 
+	
+	<xsl:template match="resource" mode="comments_to_reader">
+		<xsl:variable name="status" select="string(@status)"/>
+		<xsl:if test="$status='CD-TS' or $status='CD'">
+			<!-- <p> -->
+			<xsl:call-template name="insertParagraph">
+				<xsl:with-param name="text">
+				Recipients of this draft are invited to submit, with their comments,
+				notification of any relevant patent rights of which they are aware and to
+				provide supporting documentation.
+				</xsl:with-param>
+			</xsl:call-template>
+			<!-- </p> -->
+		</xsl:if>
+
+
+		<xsl:variable name="ballot_cycle_or_pub">
+			<xsl:choose>
+				<xsl:when test="$status='CD-TS'">
+		this ballot cycle
+				</xsl:when>
+				<xsl:when test="$status='CD'">
+		this ballot cycle
+				</xsl:when>
+
+				<xsl:when test="$status='TS'">
+		publication
+				</xsl:when>
+				<xsl:when test="$status='FDIS'">
+		publication
+				</xsl:when>
+				<xsl:when test="$status='DIS'">
+		publication
+				</xsl:when>
+				<xsl:when test="$status='IS'">
+		publication
+				</xsl:when>
+			</xsl:choose>
+		</xsl:variable>
+
+
+		<xsl:variable name="test_cl_internal_review">
+			<xsl:call-template name="test_wg_number">
+				<xsl:with-param name="wgnumber" select="./@checklist.internal_review"/>
+			</xsl:call-template>
+		</xsl:variable>
+		
+		<xsl:call-template name="insertParagraph">
+				<xsl:with-param name="text">
+		This document has been reviewed using the internal review checklist 
+		(see <xsl:value-of select="concat('WG12&#160;N',@checklist.internal_review)"/>),
+		<!-- test the checklist WG number for checklist.internal_review -->
+		
+		
+		<xsl:if test="contains($test_cl_internal_review,'Error')">
+			<!-- <p> -->
+				<xsl:call-template name="error_message">
+		<xsl:with-param name="message">
+			<xsl:value-of 
+					select="concat('Error in
+						resource.xml/resource/@checklist.internal_review - ', 
+						$test_cl_internal_review)"/>
+		</xsl:with-param>
+				</xsl:call-template>
+			<!-- </p> -->
+		</xsl:if>
+
+
+		the project leader checklist 
+		(see <xsl:value-of
+		select="concat('WG12&#160;N',@checklist.project_leader)"/>),
+
+		<!-- test the checklist WG number for checklist.project_leader -->
+		<xsl:variable name="test_cl_project_leader">
+			<xsl:call-template name="test_wg_number">
+				<xsl:with-param name="wgnumber" select="./@checklist.project_leader"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:if test="contains($test_cl_project_leader,'Error')">
+			<!-- <p> -->
+				<xsl:call-template name="error_message">
+		<xsl:with-param name="message">
+			<xsl:value-of 
+					select="concat('Error in
+						resource.xml/resource/@checklist.project_leader - ', 
+						$test_cl_project_leader)"/>
+		</xsl:with-param>
+				</xsl:call-template>
+			<!-- </p> -->
+		</xsl:if>
+
+		and the convener checklist
+		(see <xsl:value-of select="concat('WG12&#160;N',@checklist.convener)"/>),
+
+		<!-- test the checklist WG number for checklist.convener -->
+		<xsl:variable name="test_cl_convener">
+			<xsl:call-template name="test_wg_number">
+				<xsl:with-param name="wgnumber" select="./@checklist.convener"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:if test="contains($test_cl_convener,'Error')">
+			<!-- <p> -->
+				<xsl:call-template name="error_message">
+		<xsl:with-param name="message">
+			<xsl:value-of 
+					select="concat('Error in
+						resource.xml/resource/@checklist.convener - ', 
+						$test_cl_convener)"/>
+		</xsl:with-param>
+				</xsl:call-template>
+			<!-- </p> -->
+		</xsl:if>
+		and has been determined to be ready for 
+		<xsl:value-of select="$ballot_cycle_or_pub"/>.
+	
+		</xsl:with-param>
+		</xsl:call-template>
+	
+	</xsl:template>
+
 	<xsl:template match="resource" mode="abstract">
 
 		<xsl:variable name="resdoc_name">
@@ -2522,19 +2642,31 @@ the types, entity specializations, and functions that are specific to this docum
 		</xsl:apply-templates>  
 
 
-		<!-- output the normative references explicitly defined in the resource -->
-		<xsl:apply-templates select="/resources/normrefs/normref">
-			<xsl:with-param name="current_resource" select="$current_resource"/>
-		</xsl:apply-templates>
+		<xsl:variable name="normative_references">
+			<!-- output the normative references explicitly defined in the resource -->
+			<xsl:apply-templates select="/resources/normrefs/normref">
+				<xsl:with-param name="current_resource" select="$current_resource"/>
+			</xsl:apply-templates>
 
 
-		<!-- output the default normative references 
-		-->
+			<!-- output the default normative references 
+			-->
 
-		<xsl:call-template name="output_default_normrefs">
-			<xsl:with-param name="resource_number" select="$resource_number"/>
-			<xsl:with-param name="current_resource" select="$current_resource"/>
-		</xsl:call-template>
+			<xsl:call-template name="output_default_normrefs">
+				<xsl:with-param name="resource_number" select="$resource_number"/>
+				<xsl:with-param name="current_resource" select="$current_resource"/>
+			</xsl:call-template>
+		</xsl:variable>
+		
+		<xsl:copy-of select="$normative_references"/>
+		
+		<xsl:if test="not(contains($normative_references, '* [[[ref10303-2,'))">
+			<!-- * [[[ref10303-2,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 ref="ref10303-2"/></xsl:variable>
+			<xsl:apply-templates select="xalan:nodeset($normref_10303_2)/*">
+				<xsl:with-param name="current_resource" select="."/>
+			</xsl:apply-templates>
+		</xsl:if>
 
 	</xsl:template>
 
@@ -3474,7 +3606,11 @@ test="document('../../data/basic/normrefs.xml')/normref.list/normref[@id=$normre
 						<!-- normref stdnumber are 10303-1107 whereas resource numbers are
 					 1107, so remove the 10303- -->
 						<xsl:variable name="part_no" select="substring-after($normref/stdref/stdnumber,'-')"/>
-						<xsl:if test="$resource_number!=$part_no">
+						<!-- from https://github.com/metanorma/stepmod2mn/issues/145#issuecomment-2076664788 
+							it means all "ISO 10303-*" parts should be omitted, because ISO 10303-2 is a new publication that includes all terms.
+							This means once we include ISO 10303-2 in the source, 
+							we do not need to import any other term from any ISO 10303-* document. -->
+						<xsl:if test="$resource_number!=$part_no and not(contains($stdnumber, 'ISO 10303-'))">
 							<!-- <xsl:value-of select="concat('3.1.',$section_no, ' Terms defined in ',$stdnumber)"/> -->
 							<!-- <h2 level="3" id="{concat('3.1.',$section_no)}">					
 								<xsl:value-of select="concat('Terms defined in ',$stdnumber)"/>
@@ -3568,42 +3704,48 @@ test="document('../../data/basic/normrefs.xml')/normref.list/normref[@id=$normre
 					
 								<!-- check to see if the terms for the resource have been output
 										 as part of normative references -->
+								 <!-- from https://github.com/metanorma/stepmod2mn/issues/145#issuecomment-2076664788 
+										it means all "ISO 10303-*" parts should be omitted, because ISO 10303-2 is a new publication that includes all terms.
+										This means once we include ISO 10303-2 in the source, 
+										we do not need to import any other term from any ISO 10303-* document. -->
 								<xsl:if test="not(contains($normref_ids,$normrefid))">
 									<xsl:variable name="resource_node" select="$resource_xml_document/resource"/>
 									<xsl:variable name="stdnumber" select="concat('ISO/',$resource_node/@status,' 10303-',$resource_node/@part)"/>
-
-						
-						<!-- output the section header for the normative reference
-								 that is defining terms -->              
-						<!-- <xsl:value-of select="concat('3.',$section_no, ' Terms defined in ', $stdnumber)"/> -->
-						<!-- <h2 level="2" id="{concat('3.',$section_no)}">		    
-							<xsl:value-of select="concat('Terms defined in ', $stdnumber)"/>
-						</h2> -->			
-						<xsl:call-template name="insertHeaderADOC">
-							<xsl:with-param name="id" select="concat('sec_3.',$section_no)"/>		
-							<xsl:with-param name="level" select="2"/>
-							<xsl:with-param name="header" select="concat('Terms defined in ', $stdnumber)"/>					
-						</xsl:call-template>
-						
-						<!-- RBN Changed due to request from ISO
-								 For the purposes of document,-->              
-						<xsl:call-template name="insertParagraph">
-							<xsl:with-param name="text">
-								For the purposes of this document, 
-								the following terms defined in 
-								<xsl:value-of select="$stdnumber"/>
-								 apply:
-							 </xsl:with-param>
-						</xsl:call-template>
-						<!-- <ul> -->
+									
+									<xsl:if test="not(contains($stdnumber, 'ISO 10303-'))">
 						
-							<!-- now output the terms -->
-							<xsl:apply-templates 
-						select="/resource/normrefs/normref.inc[@resource.name=$resource]/term.ref" 
-						mode="resource"/>
-						<xsl:text>&#xa;&#xa;</xsl:text>
-					 <!--  </ul> -->
-					</xsl:if>
+										<!-- output the section header for the normative reference
+												 that is defining terms -->              
+										<!-- <xsl:value-of select="concat('3.',$section_no, ' Terms defined in ', $stdnumber)"/> -->
+										<!-- <h2 level="2" id="{concat('3.',$section_no)}">		    
+											<xsl:value-of select="concat('Terms defined in ', $stdnumber)"/>
+										</h2> -->			
+										<xsl:call-template name="insertHeaderADOC">
+											<xsl:with-param name="id" select="concat('sec_3.',$section_no)"/>		
+											<xsl:with-param name="level" select="2"/>
+											<xsl:with-param name="header" select="concat('Terms defined in ', $stdnumber)"/>					
+										</xsl:call-template>
+										
+										<!-- RBN Changed due to request from ISO
+												 For the purposes of document,-->              
+										<xsl:call-template name="insertParagraph">
+											<xsl:with-param name="text">
+												For the purposes of this document, 
+												the following terms defined in 
+												<xsl:value-of select="$stdnumber"/>
+												 apply:
+											 </xsl:with-param>
+										</xsl:call-template>
+										<!-- <ul> -->
+										
+											<!-- now output the terms -->
+											<xsl:apply-templates 
+												select="/resource/normrefs/normref.inc[@resource.name=$resource]/term.ref" 
+												mode="resource"/>
+											<xsl:text>&#xa;&#xa;</xsl:text>
+									 <!--  </ul> -->
+									</xsl:if>
+								</xsl:if>
 							</xsl:when>
 							<xsl:otherwise>
 								<xsl:call-template name="error_message">
@@ -3638,6 +3780,97 @@ test="document('../../data/basic/normrefs.xml')/normref.list/normref[@id=$normre
 
 	</xsl:template>
 
+	<xsl:template name="get_list_normrefs_terms_rec">
+		<xsl:param name="normrefs"/>
+		<xsl:param name="normref_ids"/>
+		<xsl:param name="section"/>
+		<xsl:param name="resource_number"/>
+		<xsl:param name="current_resource"/>
+
+		<xsl:variable name="doctype">
+			<xsl:apply-templates select="$current_resource" mode="doctype"/>
+		</xsl:variable>
+
+		<xsl:choose>
+			<xsl:when test="$normrefs">
+
+				<xsl:variable name="first" select="substring-before(substring-after($normrefs,','),',')"/>
+				<xsl:variable name="section_no" select="$section+1"/>
+				<xsl:variable name="rest" select="substring-after(substring-after($normrefs,','),',')"/>      
+
+				<xsl:choose>
+					<xsl:when test="contains($first,'normref:')">
+						<xsl:variable name="ref" select="substring-after($first,'normref:')"/>
+						<xsl:variable name="normrefs_xml_document" select="document(concat($path, '../../../data/basic/normrefs.xml'))"/>
+						<xsl:variable name="normref" select="$normrefs_xml_document/normref.list/normref[@id=$ref]"/>
+
+						<!-- get the number of the standard -->      
+						<xsl:variable name="stdnumber" select="concat($normref/stdref/orgname, ' ',$normref/stdref/stdnumber)"/>
+						
+						<!-- output the section header for the normative reference that is
+					 defining terms 
+					 IGNORE if the normative ref is referring to this resource
+						-->
+						<!-- normref stdnumber are 10303-1107 whereas resource numbers are
+					 1107, so remove the 10303- -->
+						<xsl:variable name="part_no" select="substring-after($normref/stdref/stdnumber,'-')"/>
+						<xsl:if test="$resource_number!=$part_no">
+							<item><xsl:value-of select="$stdnumber"/></item>
+						</xsl:if>
+					</xsl:when>
+					
+					<!-- a term defined in another resource -->
+					<xsl:when test="contains($first,'resource:')">
+						<xsl:variable name="resource" select="substring-after($first,'resource:')"/>
+
+						<xsl:variable name="resource_dir">
+							<xsl:call-template name="resource_directory">
+								<xsl:with-param name="resource" select="$resource"/>
+							</xsl:call-template>
+						</xsl:variable>
+
+						<xsl:variable name="resource_ok">
+							<xsl:call-template name="check_resource_exists">
+								<xsl:with-param name="schema" select="$resource"/>
+							</xsl:call-template>
+						</xsl:variable>
+
+						<xsl:choose>
+							<xsl:when test="$resource_ok='true'">
+								<xsl:variable name="resource_xml" select="concat($resource_dir,'/resource.xml')"/>
+								<xsl:variable name="resource_xml_document" select="document($resource_xml)"/>
+								<xsl:variable name="normrefid" select="concat('10303-',$resource_xml_document/resource/@part)"/>
+					
+								<!-- check to see if the terms for the resource have been output
+										 as part of normative references -->
+								<xsl:if test="not(contains($normref_ids,$normrefid))">
+									<xsl:variable name="resource_node" select="$resource_xml_document/resource"/>
+									<xsl:variable name="stdnumber" select="concat('ISO/',$resource_node/@status,' 10303-',$resource_node/@part)"/>
+
+									<item><xsl:value-of select="$stdnumber"/></item>
+								</xsl:if>
+							</xsl:when>
+							<xsl:otherwise>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:when>
+				</xsl:choose>
+
+				<xsl:call-template name="get_list_normrefs_terms_rec">
+					<xsl:with-param name="normrefs" select="$rest"/>
+					<xsl:with-param name="normref_ids" select="$normref_ids"/>
+					<xsl:with-param name="section" select="$section_no"/>
+					<xsl:with-param name="resource_number" select="$resource_number"/>
+					<xsl:with-param name="current_resource" select="$current_resource"/>
+				</xsl:call-template>
+
+			</xsl:when>
+			<xsl:otherwise>
+	<!-- end of recursion -->
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>	
+
 	<!--
 		build a list of normrefs that are used by the resource and have terms
 		defined in them The list comprises: All default normrefs listed in
diff --git a/src/main/resources/stepmod.base_xsl/res_doc/sect_3_defs.xsl b/src/main/resources/stepmod.base_xsl/res_doc/sect_3_defs.xsl
index 3d205e0..da05df7 100644
--- a/src/main/resources/stepmod.base_xsl/res_doc/sect_3_defs.xsl
+++ b/src/main/resources/stepmod.base_xsl/res_doc/sect_3_defs.xsl
@@ -10,6 +10,8 @@ $Id: sect_3_defs.xsl,v 1.6 2010/02/03 23:18:57 lothartklein Exp $
 -->
 <!-- Updated: Alexander Dyuzhev, for stepmod2mn tool-->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:xalan="http://xml.apache.org/xalan" 
+	exclude-result-prefixes="xalan"
                 version="1.0">
 
 <!--   <xsl:import href="resource.xsl"/> -->
@@ -62,9 +64,35 @@ $Id: sect_3_defs.xsl,v 1.6 2010/02/03 23:18:57 lothartklein Exp $
 	<xsl:variable name="header">Terms, definitions and abbreviated terms</xsl:variable>
 		
 	<xsl:text>&#xa;</xsl:text>
+	
+	<!-- get a list of normative references that have terms defined -->
+	<xsl:variable name="normrefs">
+		<xsl:call-template name="normrefs_terms_list">
+			<xsl:with-param name="current_resource" select="./@part"/>
+		</xsl:call-template>
+	</xsl:variable>
+	<!-- list of the references -->
+	<xsl:variable name="list_ref">
+		<xsl:call-template name="get_list_normrefs_terms_rec">
+			<xsl:with-param name="normrefs" select="$normrefs"/>
+			<xsl:with-param name="normref_ids" select="$normrefs"/>
+			<xsl:with-param name="section" select="0"/>
+			<xsl:with-param name="resource_number" select="./@part"/>
+			<xsl:with-param name="current_resource" select="."/>
+		</xsl:call-template>
+	</xsl:variable>
+	<!-- debug:<xsl:apply-templates select="xalan:nodeset($list_ref)" mode="print_as_xml"/> -->
+	<!-- from https://github.com/metanorma/stepmod2mn/issues/145#issuecomment-2076664788 
+	 it means all "ISO 10303-*" parts should be omitted, because ISO 10303-2 is a new publication that includes all terms.
+		 This means once we include ISO 10303-2 in the source, 
+		 we do not need to import any other term from any ISO 10303-* document. -->
+	<xsl:variable name="attributes">
+		<xsl:if test="xalan:nodeset($list_ref)//item[contains(., 'ISO 10303-')]">source=ref10303-2</xsl:if>
+	</xsl:variable>
+	
 	<xsl:call-template name="insertHeaderADOC">
 		<xsl:with-param name="id" select="'defns'"/>
-		<!-- <xsl:with-param name="attributes" select="'source=ISO_10303_2'"/> -->
+		<xsl:with-param name="attributes" select="normalize-space($attributes)"/>
 		<xsl:with-param name="level" select="1"/>
 		<xsl:with-param name="header" select="$header"/>					
 	</xsl:call-template>
@@ -75,12 +103,14 @@ $Id: sect_3_defs.xsl,v 1.6 2010/02/03 23:18:57 lothartklein Exp $
       </a>        
     </h2>   -->
 
-	<!-- <xsl:call-template name="insertHeaderADOC">
-		<xsl:with-param name="id" select="'termsdefns'"/>
-		<xsl:with-param name="attributes" select="'heading=terms and definitions'"/>
-		<xsl:with-param name="level" select="2"/>
-		<xsl:with-param name="header" select="'Terms and definitions'"/>					
-	</xsl:call-template> -->
+	<xsl:if test="count(xalan:nodeset($list_ref)//item[contains(., 'ISO 10303-')]) = count(xalan:nodeset($list_ref)//item)">
+		<xsl:call-template name="insertHeaderADOC">
+			<xsl:with-param name="id" select="'termsdefns'"/>
+			<xsl:with-param name="attributes" select="'heading=terms and definitions'"/>
+			<xsl:with-param name="level" select="2"/>
+			<xsl:with-param name="header" select="'Terms and definitions'"/>					
+		</xsl:call-template>
+	</xsl:if>
   
   <xsl:call-template name="output_terms">
     <xsl:with-param name="current_resource" select="."/>
diff --git a/src/main/resources/stepmod.base_xsl/sect_1_scope.xsl b/src/main/resources/stepmod.base_xsl/sect_1_scope.xsl
index d6abea2..a12b340 100644
--- a/src/main/resources/stepmod.base_xsl/sect_1_scope.xsl
+++ b/src/main/resources/stepmod.base_xsl/sect_1_scope.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<?xml-stylesheet type="text/xsl" href="./document_xsl.xsl" ?>
+<!-- <?xml-stylesheet type="text/xsl" href="./document_xsl.xsl" ?> -->
 
 <!--
-$Id: sect_1_scope.xsl,v 1.6 2003/07/15 14:02:51 robbod Exp $
+$Id: sect_1_scope.xsl,v 1.7 2005/07/11 19:51:53 thendrix Exp $
   Author:  Rob Bodington, Eurostep Limited
   Owner:   Developed by Eurostep and supplied to NIST under contract.
   Purpose: Output the Scope section as a web page
@@ -24,7 +24,7 @@ $Id: sect_1_scope.xsl,v 1.6 2003/07/15 14:02:51 robbod Exp $
 
 
 <!-- overwrites the template declared in module.xsl -->
-<xsl:template match="module" mode="scope_module">
+<xsl:template match="module" mode="scope_module"> <!-- called from stepmod2mn.module.adoc.xsl -->
   <!-- <xsl:apply-templates select="." mode="special_header"/>
   <h1>
     Industrial automation systems and integration &#8212; <br/>
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 1292b5a..441e709 100644
--- a/src/main/resources/stepmod.base_xsl/sect_2_refs.xsl
+++ b/src/main/resources/stepmod.base_xsl/sect_2_refs.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<?xml-stylesheet type="text/xsl" href="./document_xsl.xsl" ?>
+<!-- <?xml-stylesheet type="text/xsl" href="./document_xsl.xsl" ?> -->
 
 <!--
-$Id: sect_2_refs.xsl,v 1.21 2018/08/22 23:06:22 mike Exp $
+$Id: sect_2_refs.xsl,v 1.22 2019/03/09 01:29:01 tom Exp $
   Author:  Rob Bodington, Eurostep Limited
   Owner:   Developed by Eurostep .
   Purpose: Output the refs section as a web page
@@ -36,7 +36,7 @@ $Id: sect_2_refs.xsl,v 1.21 2018/08/22 23:06:22 mike Exp $
 
 
   <!-- added by MWD 2016-05-03 -->
-  <xsl:template match="resource" mode="norm_refs_module">
+  <xsl:template match="resource" mode="norm_refs_module"> <!-- called from stepmod2mn.module.adoc.xsl -->
     
     <!-- <h2>2 Normative references</h2> -->
     
@@ -644,20 +644,24 @@ $Id: sect_2_refs.xsl,v 1.21 2018/08/22 23:06:22 mike Exp $
   </xsl:apply-templates>
   <xsl:apply-templates select="normref.resource" mode="check_resources"/>
   
-  <xsl:if test="normref/stdref[@published='n']">
-    <table width="200">
+  <!-- <xsl:if test="normref/stdref[@published='n']">
+    <table width="500">
       <tr>
         <td><hr/></td>
       </tr>
       <tr>
         <td>
           <a name="tobepub">
-            <sup>1)</sup> To be published.
+            <sup>1)</sup> Under preparation. Stage at time of publication:
+	    <xsl:value-of select="concat(normref/stdref/orgname,'/',
+				  normref/stdref/status,' ',
+				  normref/stdref/stdnumber,':',
+				  normref/stdref/pubdate,'.')"/>
           </a>
         </td>
       </tr>
     </table>
-  </xsl:if>
+  </xsl:if> -->
 </xsl:template>
 
   <xsl:template match="normref.resource" mode="check_resources">
@@ -689,8 +693,14 @@ $Id: sect_2_refs.xsl,v 1.21 2018/08/22 23:06:22 mike Exp $
 			<xsl:value-of select="$stdnumber"/>
       <xsl:text>]]]</xsl:text>
         
+        <xsl:variable name="footnote_text" select="concat('Under preparation. Stage at time of publication: ', 
+            stdref/orgname,'/',
+            stdref/status,' ',
+            stdref/stdnumber,':',
+            stdref/pubdate,'.')"/>
+        
         <xsl:if test="stdref[@published='n']">
-          <xsl:text> footnote:[To be published.]</xsl:text><!-- <sup><a href="#tobepub">1</a>)</sup> -->
+          <xsl:text> footnote:[</xsl:text><xsl:value-of select="$footnote_text"/><xsl:text>]</xsl:text><!-- <sup><a href="#tobepub">1</a>)</sup> -->
         </xsl:if><xsl:text>, </xsl:text>
         
         <!-- &#160; <i> -->
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 68ca4fb..41667a2 100644
--- a/src/main/resources/stepmod.base_xsl/sect_3_defs.xsl
+++ b/src/main/resources/stepmod.base_xsl/sect_3_defs.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<?xml-stylesheet type="text/xsl" href="./document_xsl.xsl" ?>
+<!-- <?xml-stylesheet type="text/xsl" href="./document_xsl.xsl" ?> -->
 
 <!--
-$Id: sect_3_defs.xsl,v 1.10 2009/12/24 17:42:03 lothartklein Exp $
+$Id: sect_3_defs.xsl,v 1.11 2010/02/03 12:10:33 robbod Exp $
   Author:  Rob Bodington, Eurostep Limited
   Owner:   Developed by Eurostep and supplied to NIST under contract.
   Purpose:
@@ -10,6 +10,8 @@ $Id: sect_3_defs.xsl,v 1.10 2009/12/24 17:42:03 lothartklein Exp $
 -->
 <!-- Updated: Alexander Dyuzhev, for stepmod2mn tool -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:xalan="http://xml.apache.org/xalan" 
+	exclude-result-prefixes="xalan"
                 version="1.0">
 
   <!-- <xsl:import href="module.xsl"/> -->
@@ -23,7 +25,7 @@ $Id: sect_3_defs.xsl,v 1.10 2009/12/24 17:42:03 lothartklein Exp $
   <!-- <xsl:output method="html"/> -->
 
 <!-- overwrites the template declared in module.xsl -->
-<xsl:template match="module" mode="terms_definitions_module">
+<xsl:template match="module" mode="terms_definitions_module"> <!-- called from stepmod2mn.module.adoc.xsl -->
   <!-- Output the terms identified in the normative references -->
   <!--
        ISO requested:
@@ -56,6 +58,24 @@ $Id: sect_3_defs.xsl,v 1.10 2009/12/24 17:42:03 lothartklein Exp $
   </h2> -->
   
   <xsl:text>&#xa;</xsl:text>
+  
+  <!-- get a list of normative references that have terms defined -->
+  <xsl:variable name="normrefs">
+    <xsl:call-template name="normrefs_terms_list">
+      <xsl:with-param name="current_resource" select="./@part"/>
+    </xsl:call-template>
+  </xsl:variable>
+  <!-- list of the references -->
+	<xsl:variable name="list_ref">
+		<xsl:call-template name="get_list_normrefs_terms_rec">
+			<xsl:with-param name="normrefs" select="$normrefs"/>
+			<xsl:with-param name="normref_ids" select="$normrefs"/>
+			<xsl:with-param name="section" select="0"/>
+			<xsl:with-param name="resource_number" select="./@part"/>
+			<xsl:with-param name="current_resource" select="."/>
+		</xsl:call-template>
+	</xsl:variable>
+  
 	<xsl:call-template name="insertHeaderADOC">
 		<xsl:with-param name="id" select="'defns'"/>		
 		<xsl:with-param name="level" select="1"/>
@@ -68,15 +88,62 @@ $Id: sect_3_defs.xsl,v 1.10 2009/12/24 17:42:03 lothartklein Exp $
       </a>        
     </h2> -->
     
+  <!-- from https://github.com/metanorma/stepmod2mn/issues/145#issuecomment-2076664788 
+  it means all "ISO 10303-*" parts should be omitted, because ISO 10303-2 is a new publication that includes all terms.
+   This means once we include ISO 10303-2 in the source, 
+   we do not need to import any other term from any ISO 10303-* document. -->
+  <xsl:variable name="attributes">
+    <xsl:if test="xalan:nodeset($list_ref)//item[contains(., 'ISO 10303-')]">source=ref10303-2</xsl:if>
+  </xsl:variable>
+  
+  <xsl:call-template name="insertHeaderADOC">
+    <xsl:with-param name="id" select="'termsdefns'"/>		
+    <xsl:with-param name="attributes" select="normalize-space($attributes)"/>
+    <xsl:with-param name="level" select="2"/>
+    <xsl:with-param name="header" select="'Terms and definitions'"/>					
+  </xsl:call-template>
+  
+  <xsl:if test="count(xalan:nodeset($list_ref)//item[contains(., 'ISO 10303-')]) = count(xalan:nodeset($list_ref)//item)">
     <xsl:call-template name="insertHeaderADOC">
-      <xsl:with-param name="id" select="'termsdefns'"/>		
+      <xsl:with-param name="id" select="'termsdefns'"/>
+      <xsl:with-param name="attributes" select="'heading=terms and definitions'"/>
       <xsl:with-param name="level" select="2"/>
       <xsl:with-param name="header" select="'Terms and definitions'"/>					
     </xsl:call-template>
+  </xsl:if>
     
   <xsl:call-template name="output_terms">
     <xsl:with-param name="module_number" select="./@part"/>
   </xsl:call-template>
+  
+  <!-- <p>For the purposes of this document, the terms and definitions given in ISO 10303-2 <sup><a href="#tobepub">1</a>)</sup> apply.</p>
+    <p>ISO and IEC maintain terminology databases for use in standardization
+    at the following addresses:</p>
+    <table>
+      <tr>
+	<td>— ISO Online browsing platform: available at <a href="https://www.iso.org/obp" target="_blank">https://www.iso.org/obp</a>;</td>
+      </tr>
+      <tr>
+	<td>— IEC Electropedia: available at <a href="https://www.electropedia.org/" target="_blank">https://www.electropedia.org/</a>.</td>
+      </tr>
+    </table>
+
+    <xsl:call-template name="output_abbreviations">
+      <xsl:with-param name="section" select="2"/>
+    </xsl:call-template>
+
+    <table width="500">
+      <tr>
+        <td><hr/></td>
+      </tr>
+      <tr>
+        <td>
+          <a name="tobepub">
+            <sup>1)</sup> Under preparation. Stage at time of publication: ISO/FDIS 10303-2:2023</a>
+        </td>
+      </tr>
+    </table> -->
+  
 </xsl:template>
   
 </xsl:stylesheet>
diff --git a/src/main/resources/stepmod2mn.resource.adoc.xsl b/src/main/resources/stepmod2mn.resource.adoc.xsl
index f00c636..7212bd9 100644
--- a/src/main/resources/stepmod2mn.resource.adoc.xsl
+++ b/src/main/resources/stepmod2mn.resource.adoc.xsl
@@ -300,6 +300,23 @@
 	    </xsl:if>
 		</xsl:if>
 		
+		<!-- contacts -->
+		<!--
+		:semantic-metadata-project-leader-firstname:
+		:semantic-metadata-project-leader-lastname:
+		:semantic-metadata-project-leader-address-affiliation:
+		:semantic-metadata-project-leader-address-street:
+		:semantic-metadata-project-leader-address-city:
+		:semantic-metadata-project-leader-address-state:
+		:semantic-metadata-project-leader-address-postcode:
+		:semantic-metadata-project-leader-address-country:
+		:semantic-metadata-project-leader-phone:
+		:semantic-metadata-project-leader-fax:
+		:semantic-metadata-project-leader-email:
+		-->
+		<xsl:apply-templates select="resource/contacts/projlead"/>
+		<xsl:apply-templates select="resource/contacts/editor"/>
+		
 		
 		<!-- commented: https://github.com/metanorma/stepmod2mn/issues/49 -->
 		<!-- uncommented: https://github.com/metanorma/stepmod2mn/issues/138 -->
@@ -317,6 +334,20 @@
 		<xsl:text>&#xa;</xsl:text>
 		<xsl:text>&#xa;</xsl:text>
 		
+		<!-- Comments to reader -->
+		<xsl:variable name="comments_to_reader">
+			<xsl:apply-templates select="resource" mode="comments_to_reader"/>
+		</xsl:variable>
+		<xsl:if test="normalize-space($comments_to_reader) != ''">
+			<xsl:text>////</xsl:text>
+			<xsl:text>&#xa;</xsl:text>
+			<xsl:value-of select="$comments_to_reader"/>
+			<xsl:text>////</xsl:text>
+			<xsl:text>&#xa;</xsl:text>
+			<xsl:text>&#xa;</xsl:text>
+		</xsl:if>
+		
+		
 		<!-- Generation schemas.yaml -->
 		<xsl:call-template name="generateSchemasYaml"/>