metanorma-ieee 1.3.8 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fcdee8a51301c3df48c602dd91eed680ec3225d7c29962d9e5be525e049a99f
-  data.tar.gz: 41506b613379f537e090002267a82857eb23570bec07db98b36fcc66ebce8b0e
+  metadata.gz: ab36d0a51a7e7658f28802e6b30a87c4ca819cb0a50f88d8b17d4ff289d45234
+  data.tar.gz: 96779fe34b793774df397097420fbaea4046658b506f2550102bed5d8ce6d211
 SHA512:
-  metadata.gz: d4d4bb35f51417c6a4797ac41dca9269a74771f599e30fc9610e0a2cedc1ec0310700897ad48d9f559d41a2e1580346f75ba414ebcd63bd705f3b7a2957e8a6b
-  data.tar.gz: 55407e26370a1745bb9a0361b0bf2f43f6ca6a1e4b5ca76a36a9887c7e82bc418b895c6b116a051393e8951d6f5f5ff7c7dd4e5eb0307b4e187d886a2d2c1763
+  metadata.gz: 4f2110189a9dd35f8589ab4ac13b064c179492a9fa9cbd13e01b01dfa1018137dad9be4f81c96e11f2ef40c7c90cbcc3956a783a63cc3cfdc2341f9a096c16f4
+  data.tar.gz: 2c87f9b7f67cd7d8b38dde3e60b05fffd9298996287cc01a2830bfa1ea4ecdd5f44a9a663a62f3831eaaf4c9b012559ec86bb43ea9b575cf8e8ecb7e626f100d

data/lib/isodoc/ieee/ieee.amendment.xsl

@@ -5024,6 +5024,9 @@
 
 	</xsl:attribute-set>
 
+	<xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
+	</xsl:attribute-set>
+
 	<xsl:attribute-set name="definition-style">
 
 	</xsl:attribute-set>
@@ -7300,7 +7303,9 @@
 					<xsl:with-param name="element">
 						<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}"> <!-- note: role="Lbl" removed in https://github.com/metanorma/mn2pdf/issues/291 -->
 							<fo:inline role="Lbl"> <!-- need for https://github.com/metanorma/metanorma-iso/issues/1003 -->
+
 								<xsl:copy-of select="$current_fn_number_text"/>
+
 							</fo:inline>
 						</fo:basic-link>
 					</xsl:with-param>
@@ -7319,8 +7324,7 @@
 
 						<fo:block-container xsl:use-attribute-sets="fn-container-body-style" role="SKIP">
 
-							<fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
-
+							<xsl:variable name="fn_block">
 								<xsl:call-template name="refine_fn-body-style"/>
 
 								<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style" role="Lbl">
@@ -7328,9 +7332,15 @@
 									<xsl:call-template name="refine_fn-body-num-style"/>
 
 									<xsl:value-of select="$current_fn_number_text"/>
+
 								</fo:inline>
 								<xsl:apply-templates/>
-							</fo:block>
+							</xsl:variable>
+
+									<fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
+										<xsl:copy-of select="$fn_block"/>
+									</fo:block>
+
 						</fo:block-container>
 					</fo:footnote-body>
 				</fo:footnote>
@@ -13360,14 +13370,17 @@
 		</fo:block>
 	</xsl:template>
 
-	<xsl:template match="*[local-name() = 'domain']">
+	<!-- <xsl:template match="*[local-name() = 'domain']"> -->
 		<!-- https://github.com/metanorma/isodoc/issues/607 
 		<fo:inline xsl:use-attribute-sets="domain-style">&lt;<xsl:apply-templates/>&gt;</fo:inline>
 		<xsl:text> </xsl:text> -->
-		<xsl:if test="not(@hidden = 'true')">
+		<!-- <xsl:if test="not(@hidden = 'true')">
 			<xsl:apply-templates/>
 		</xsl:if>
-	</xsl:template>
+	</xsl:template> -->
+
+	<!-- https://github.com/metanorma/isodoc/issues/632#issuecomment-2567163931 -->
+	<xsl:template match="*[local-name() = 'domain']"/>
 
 	<xsl:template match="*[local-name() = 'admitted']">
 		<fo:block xsl:use-attribute-sets="admitted-style">
@@ -13382,9 +13395,11 @@
 	</xsl:template>
 
 	<xsl:template name="setStyle_preferred">
-		<xsl:if test="*[local-name() = 'strong']">
-			<xsl:attribute name="font-weight">normal</xsl:attribute>
-		</xsl:if>
+
+				<xsl:if test="*[local-name() = 'strong']">
+					<xsl:attribute name="font-weight">normal</xsl:attribute>
+				</xsl:if>
+
 	</xsl:template>
 
 	<!-- regarding ISO 10241-1:2011,  If there is more than one preferred term, each preferred term follows the previous one on a new line. -->
@@ -13394,6 +13409,17 @@
 	</xsl:template>
 	<!--  End Preferred, admitted, deprecated -->
 
+	<xsl:template match="*[local-name() = 'fmt-related']">
+		<fo:block role="SKIP" xsl:use-attribute-sets="related-block-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-related']/*[local-name() = 'p']" priority="4">
+		<fo:block>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
 	<!-- ========== -->
 	<!-- definition -->
 	<!-- ========== -->
@@ -14302,6 +14328,7 @@
 
 	<!-- Normative references -->
 	<xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
+		<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
 
 				<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
 
@@ -15070,7 +15097,8 @@
 			<!-- add @id - first element with @id plus '_element_name' -->
 			<xsl:variable name="prefix_id_" select="(.//*[@id])[1]/@id"/>
 			<xsl:variable name="prefix_id"><xsl:value-of select="$prefix_id_"/><xsl:if test="normalize-space($prefix_id_) = ''"><xsl:value-of select="generate-id()"/></xsl:if></xsl:variable>
-			<xsl:attribute name="id"><xsl:value-of select="$prefix_id"/>_<xsl:value-of select="local-name()"/></xsl:attribute>
+			<xsl:variable name="document_suffix" select="ancestor::*[contains(local-name(), '-standard')]/@document_suffix"/>
+			<xsl:attribute name="id"><xsl:value-of select="concat($prefix_id, '_', local-name(), '_', $document_suffix)"/></xsl:attribute>
 		</xsl:if>
 	</xsl:template>
 
@@ -15127,6 +15155,31 @@
 	<xsl:template match="*[local-name() = 'name'][following-sibling::*[1][local-name() = 'fmt-name']]" mode="update_xml_pres"/>
 	<xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
 	<xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_pres"/>
+	<!-- <xsl:template match="*[local-name() = 'preferred'][following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
+	<xsl:template match="*[local-name() = 'preferred']" mode="update_xml_step1"/>
+	<!-- <xsl:template match="*[local-name() = 'preferred'][following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_pres"/> -->
+	<xsl:template match="*[local-name() = 'preferred']" mode="update_xml_pres"/>
+	<!-- <xsl:template match="*[local-name() = 'admitted'][following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
+	<xsl:template match="*[local-name() = 'admitted']" mode="update_xml_step1"/>
+	<!-- <xsl:template match="*[local-name() = 'admitted'][following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_pres"/> -->
+	<xsl:template match="*[local-name() = 'admitted']" mode="update_xml_pres"/>
+	<!-- <xsl:template match="*[local-name() = 'deprecates'][following-sibling::*[not(local-name() = 'deprecates')][1][local-name() = 'fmt-deprecates']]" mode="update_xml_step1"/> -->
+	<xsl:template match="*[local-name() = 'deprecates']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'related']" mode="update_xml_step1"/>
+	<!-- <xsl:template match="*[local-name() = 'deprecates'][following-sibling::*[not(local-name() = 'deprecates')][1][local-name() = 'fmt-deprecates']]" mode="update_xml_pres"/> -->
+	<xsl:template match="*[local-name() = 'deprecates']" mode="update_xml_pres"/>
+	<xsl:template match="*[local-name() = 'related']" mode="update_xml_pres"/>
+	<!-- <xsl:template match="*[local-name() = 'definition'][following-sibling::*[1][local-name() = 'fmt-definition']]" mode="update_xml_step1"/> -->
+	<xsl:template match="*[local-name() = 'definition']" mode="update_xml_step1"/>
+	<!-- <xsl:template match="*[local-name() = 'definition'][following-sibling::*[1][local-name() = 'fmt-definition']]" mode="update_xml_pres"/> -->
+	<xsl:template match="*[local-name() = 'definition']" mode="update_xml_pres"/>
+	<!-- <xsl:template match="*[local-name() = 'termsource'][following-sibling::*[1][local-name() = 'fmt-termsource']]" mode="update_xml_step1"/> -->
+	<xsl:template match="*[local-name() = 'termsource']" mode="update_xml_step1"/>
+	<!-- <xsl:template match="*[local-name() = 'termsource'][following-sibling::*[1][local-name() = 'fmt-termsource']]" mode="update_xml_pres"/> -->
+	<xsl:template match="*[local-name() = 'termsource']" mode="update_xml_pres"/>
+
+	<xsl:template match="*[local-name() = 'term'][@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'term'][@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_pres"/>
 
 	<xsl:template match="*[local-name() = 'p'][@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][local-name() = 'section-title']]" mode="update_xml_step1">
 		<xsl:copy>
@@ -15171,6 +15224,94 @@
 		</xsl:element>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'fmt-preferred']"/>
+	<xsl:template match="*[local-name() = 'fmt-preferred'][*[local-name() = 'p']]" mode="update_xml_step1">
+		<xsl:apply-templates mode="update_xml_step1"/>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-preferred'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-preferred']/*[local-name() = 'p']" mode="update_xml_step1">
+		<xsl:element name="preferred" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-preferred'][*[local-name() = 'p']]" mode="update_xml_pres">
+		<xsl:apply-templates mode="update_xml_pres"/>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-preferred'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-preferred']/*[local-name() = 'p']" mode="update_xml_pres">
+		<xsl:element name="preferred" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-admitted']"/>
+	<xsl:template match="*[local-name() = 'fmt-admitted'][*[local-name() = 'p']]" mode="update_xml_step1">
+		<xsl:apply-templates mode="update_xml_step1"/>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-admitted'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-admitted']/*[local-name() = 'p']" mode="update_xml_step1">
+		<xsl:element name="admitted" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-admitted'][*[local-name() = 'p']]" mode="update_xml_pres">
+		<xsl:apply-templates mode="update_xml_pres"/>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-admitted'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-admitted']/*[local-name() = 'p']" mode="update_xml_pres">
+		<xsl:element name="admitted" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-deprecates']"/>
+	<xsl:template match="*[local-name() = 'fmt-deprecates'][*[local-name() = 'p']]" mode="update_xml_step1">
+		<xsl:apply-templates mode="update_xml_step1"/>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-deprecates'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-deprecates']/*[local-name() = 'p']" mode="update_xml_step1">
+		<xsl:element name="deprecates" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-deprecates'][*[local-name() = 'p']]" mode="update_xml_pres">
+		<xsl:apply-templates mode="update_xml_pres"/>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-deprecates'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-deprecates']/*[local-name() = 'p']" mode="update_xml_pres">
+		<xsl:element name="deprecates" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-definition']"/>
+	<xsl:template match="*[local-name() = 'fmt-definition']" mode="update_xml_step1">
+		<xsl:element name="definition" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-definition']" mode="update_xml_pres">
+		<xsl:element name="definition" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-termsource']"/>
+	<xsl:template match="*[local-name() = 'fmt-termsource']" mode="update_xml_step1">
+		<xsl:element name="termsource" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-termsource']" mode="update_xml_pres">
+		<xsl:element name="termsource" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'span'][                @class = 'fmt-caption-label' or                 @class = 'fmt-element-name' or                @class = 'fmt-caption-delim' or                @class = 'fmt-autonum-delim']" mode="update_xml_step1" priority="3">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
@@ -16404,7 +16545,7 @@
 	</xsl:template>
 
 	<xsl:template name="namespaceCheck">
-		<xsl:variable name="documentNS" select="namespace-uri(/*)"/>
+		<xsl:variable name="documentNS" select="$namespace_full"/> <!-- namespace-uri(/*) -->
 		<xsl:variable name="XSLNS">
 
 				<xsl:value-of select="document('')//*/namespace::ieee"/>
@@ -16494,6 +16635,9 @@
 				<xsl:when test="$formatted = 'true' and string-length($bibdata_updated) != ''">
 					<xsl:apply-templates select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
 				</xsl:when>
+				<xsl:when test="string-length($bibdata_updated) != ''">
+					<xsl:value-of select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+				</xsl:when>
 				<xsl:when test="$formatted = 'true'">
 					<xsl:apply-templates select="xalan:nodeset($bibdata)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
 				</xsl:when>

data/lib/isodoc/ieee/ieee.standard.xsl

@@ -5024,6 +5024,9 @@
 
 	</xsl:attribute-set>
 
+	<xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
+	</xsl:attribute-set>
+
 	<xsl:attribute-set name="definition-style">
 
 	</xsl:attribute-set>
@@ -7300,7 +7303,9 @@
 					<xsl:with-param name="element">
 						<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}"> <!-- note: role="Lbl" removed in https://github.com/metanorma/mn2pdf/issues/291 -->
 							<fo:inline role="Lbl"> <!-- need for https://github.com/metanorma/metanorma-iso/issues/1003 -->
+
 								<xsl:copy-of select="$current_fn_number_text"/>
+
 							</fo:inline>
 						</fo:basic-link>
 					</xsl:with-param>
@@ -7319,8 +7324,7 @@
 
 						<fo:block-container xsl:use-attribute-sets="fn-container-body-style" role="SKIP">
 
-							<fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
-
+							<xsl:variable name="fn_block">
 								<xsl:call-template name="refine_fn-body-style"/>
 
 								<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style" role="Lbl">
@@ -7328,9 +7332,15 @@
 									<xsl:call-template name="refine_fn-body-num-style"/>
 
 									<xsl:value-of select="$current_fn_number_text"/>
+
 								</fo:inline>
 								<xsl:apply-templates/>
-							</fo:block>
+							</xsl:variable>
+
+									<fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
+										<xsl:copy-of select="$fn_block"/>
+									</fo:block>
+
 						</fo:block-container>
 					</fo:footnote-body>
 				</fo:footnote>
@@ -13360,14 +13370,17 @@
 		</fo:block>
 	</xsl:template>
 
-	<xsl:template match="*[local-name() = 'domain']">
+	<!-- <xsl:template match="*[local-name() = 'domain']"> -->
 		<!-- https://github.com/metanorma/isodoc/issues/607 
 		<fo:inline xsl:use-attribute-sets="domain-style">&lt;<xsl:apply-templates/>&gt;</fo:inline>
 		<xsl:text> </xsl:text> -->
-		<xsl:if test="not(@hidden = 'true')">
+		<!-- <xsl:if test="not(@hidden = 'true')">
 			<xsl:apply-templates/>
 		</xsl:if>
-	</xsl:template>
+	</xsl:template> -->
+
+	<!-- https://github.com/metanorma/isodoc/issues/632#issuecomment-2567163931 -->
+	<xsl:template match="*[local-name() = 'domain']"/>
 
 	<xsl:template match="*[local-name() = 'admitted']">
 		<fo:block xsl:use-attribute-sets="admitted-style">
@@ -13382,9 +13395,11 @@
 	</xsl:template>
 
 	<xsl:template name="setStyle_preferred">
-		<xsl:if test="*[local-name() = 'strong']">
-			<xsl:attribute name="font-weight">normal</xsl:attribute>
-		</xsl:if>
+
+				<xsl:if test="*[local-name() = 'strong']">
+					<xsl:attribute name="font-weight">normal</xsl:attribute>
+				</xsl:if>
+
 	</xsl:template>
 
 	<!-- regarding ISO 10241-1:2011,  If there is more than one preferred term, each preferred term follows the previous one on a new line. -->
@@ -13394,6 +13409,17 @@
 	</xsl:template>
 	<!--  End Preferred, admitted, deprecated -->
 
+	<xsl:template match="*[local-name() = 'fmt-related']">
+		<fo:block role="SKIP" xsl:use-attribute-sets="related-block-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-related']/*[local-name() = 'p']" priority="4">
+		<fo:block>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
 	<!-- ========== -->
 	<!-- definition -->
 	<!-- ========== -->
@@ -14302,6 +14328,7 @@
 
 	<!-- Normative references -->
 	<xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
+		<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
 
 				<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
 
@@ -15070,7 +15097,8 @@
 			<!-- add @id - first element with @id plus '_element_name' -->
 			<xsl:variable name="prefix_id_" select="(.//*[@id])[1]/@id"/>
 			<xsl:variable name="prefix_id"><xsl:value-of select="$prefix_id_"/><xsl:if test="normalize-space($prefix_id_) = ''"><xsl:value-of select="generate-id()"/></xsl:if></xsl:variable>
-			<xsl:attribute name="id"><xsl:value-of select="$prefix_id"/>_<xsl:value-of select="local-name()"/></xsl:attribute>
+			<xsl:variable name="document_suffix" select="ancestor::*[contains(local-name(), '-standard')]/@document_suffix"/>
+			<xsl:attribute name="id"><xsl:value-of select="concat($prefix_id, '_', local-name(), '_', $document_suffix)"/></xsl:attribute>
 		</xsl:if>
 	</xsl:template>
 
@@ -15127,6 +15155,31 @@
 	<xsl:template match="*[local-name() = 'name'][following-sibling::*[1][local-name() = 'fmt-name']]" mode="update_xml_pres"/>
 	<xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
 	<xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_pres"/>
+	<!-- <xsl:template match="*[local-name() = 'preferred'][following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
+	<xsl:template match="*[local-name() = 'preferred']" mode="update_xml_step1"/>
+	<!-- <xsl:template match="*[local-name() = 'preferred'][following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_pres"/> -->
+	<xsl:template match="*[local-name() = 'preferred']" mode="update_xml_pres"/>
+	<!-- <xsl:template match="*[local-name() = 'admitted'][following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
+	<xsl:template match="*[local-name() = 'admitted']" mode="update_xml_step1"/>
+	<!-- <xsl:template match="*[local-name() = 'admitted'][following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_pres"/> -->
+	<xsl:template match="*[local-name() = 'admitted']" mode="update_xml_pres"/>
+	<!-- <xsl:template match="*[local-name() = 'deprecates'][following-sibling::*[not(local-name() = 'deprecates')][1][local-name() = 'fmt-deprecates']]" mode="update_xml_step1"/> -->
+	<xsl:template match="*[local-name() = 'deprecates']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'related']" mode="update_xml_step1"/>
+	<!-- <xsl:template match="*[local-name() = 'deprecates'][following-sibling::*[not(local-name() = 'deprecates')][1][local-name() = 'fmt-deprecates']]" mode="update_xml_pres"/> -->
+	<xsl:template match="*[local-name() = 'deprecates']" mode="update_xml_pres"/>
+	<xsl:template match="*[local-name() = 'related']" mode="update_xml_pres"/>
+	<!-- <xsl:template match="*[local-name() = 'definition'][following-sibling::*[1][local-name() = 'fmt-definition']]" mode="update_xml_step1"/> -->
+	<xsl:template match="*[local-name() = 'definition']" mode="update_xml_step1"/>
+	<!-- <xsl:template match="*[local-name() = 'definition'][following-sibling::*[1][local-name() = 'fmt-definition']]" mode="update_xml_pres"/> -->
+	<xsl:template match="*[local-name() = 'definition']" mode="update_xml_pres"/>
+	<!-- <xsl:template match="*[local-name() = 'termsource'][following-sibling::*[1][local-name() = 'fmt-termsource']]" mode="update_xml_step1"/> -->
+	<xsl:template match="*[local-name() = 'termsource']" mode="update_xml_step1"/>
+	<!-- <xsl:template match="*[local-name() = 'termsource'][following-sibling::*[1][local-name() = 'fmt-termsource']]" mode="update_xml_pres"/> -->
+	<xsl:template match="*[local-name() = 'termsource']" mode="update_xml_pres"/>
+
+	<xsl:template match="*[local-name() = 'term'][@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'term'][@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_pres"/>
 
 	<xsl:template match="*[local-name() = 'p'][@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][local-name() = 'section-title']]" mode="update_xml_step1">
 		<xsl:copy>
@@ -15171,6 +15224,94 @@
 		</xsl:element>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'fmt-preferred']"/>
+	<xsl:template match="*[local-name() = 'fmt-preferred'][*[local-name() = 'p']]" mode="update_xml_step1">
+		<xsl:apply-templates mode="update_xml_step1"/>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-preferred'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-preferred']/*[local-name() = 'p']" mode="update_xml_step1">
+		<xsl:element name="preferred" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-preferred'][*[local-name() = 'p']]" mode="update_xml_pres">
+		<xsl:apply-templates mode="update_xml_pres"/>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-preferred'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-preferred']/*[local-name() = 'p']" mode="update_xml_pres">
+		<xsl:element name="preferred" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-admitted']"/>
+	<xsl:template match="*[local-name() = 'fmt-admitted'][*[local-name() = 'p']]" mode="update_xml_step1">
+		<xsl:apply-templates mode="update_xml_step1"/>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-admitted'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-admitted']/*[local-name() = 'p']" mode="update_xml_step1">
+		<xsl:element name="admitted" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-admitted'][*[local-name() = 'p']]" mode="update_xml_pres">
+		<xsl:apply-templates mode="update_xml_pres"/>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-admitted'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-admitted']/*[local-name() = 'p']" mode="update_xml_pres">
+		<xsl:element name="admitted" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-deprecates']"/>
+	<xsl:template match="*[local-name() = 'fmt-deprecates'][*[local-name() = 'p']]" mode="update_xml_step1">
+		<xsl:apply-templates mode="update_xml_step1"/>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-deprecates'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-deprecates']/*[local-name() = 'p']" mode="update_xml_step1">
+		<xsl:element name="deprecates" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-deprecates'][*[local-name() = 'p']]" mode="update_xml_pres">
+		<xsl:apply-templates mode="update_xml_pres"/>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-deprecates'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-deprecates']/*[local-name() = 'p']" mode="update_xml_pres">
+		<xsl:element name="deprecates" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-definition']"/>
+	<xsl:template match="*[local-name() = 'fmt-definition']" mode="update_xml_step1">
+		<xsl:element name="definition" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-definition']" mode="update_xml_pres">
+		<xsl:element name="definition" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-termsource']"/>
+	<xsl:template match="*[local-name() = 'fmt-termsource']" mode="update_xml_step1">
+		<xsl:element name="termsource" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-termsource']" mode="update_xml_pres">
+		<xsl:element name="termsource" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'span'][                @class = 'fmt-caption-label' or                 @class = 'fmt-element-name' or                @class = 'fmt-caption-delim' or                @class = 'fmt-autonum-delim']" mode="update_xml_step1" priority="3">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
@@ -16404,7 +16545,7 @@
 	</xsl:template>
 
 	<xsl:template name="namespaceCheck">
-		<xsl:variable name="documentNS" select="namespace-uri(/*)"/>
+		<xsl:variable name="documentNS" select="$namespace_full"/> <!-- namespace-uri(/*) -->
 		<xsl:variable name="XSLNS">
 
 				<xsl:value-of select="document('')//*/namespace::ieee"/>
@@ -16494,6 +16635,9 @@
 				<xsl:when test="$formatted = 'true' and string-length($bibdata_updated) != ''">
 					<xsl:apply-templates select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
 				</xsl:when>
+				<xsl:when test="string-length($bibdata_updated) != ''">
+					<xsl:value-of select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+				</xsl:when>
 				<xsl:when test="$formatted = 'true'">
 					<xsl:apply-templates select="xalan:nodeset($bibdata)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
 				</xsl:when>

data/lib/isodoc/ieee/presentation_terms.rb

@@ -1,78 +1,172 @@
 module IsoDoc
   module Ieee
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
-      def multidef(elem)
-       # require "debug"; binding.b
-        number_multidef(elem)
-        collapse_multidef(elem)
+      def multidef(elem, defn, fmt_defn)
+        ctr = IsoDoc::XrefGen::Counter.new("@")
+        coll = defn.each_with_object([]) do |d, m|
+          ctr.increment(d)
+          ret = semx_fmt_dup(d)
+          ret.at(ns("./verbal-definition | ./non-verbal-definition")).elements
+            .first.add_first_child("<strong>(#{ctr.print})</strong>&#xa0;")
+          m << ret
+        end
+        #require "debug"; binding.b
+        fmt_defn << coll.map { |c| to_xml(c) }.join(" ")
+        #coll.each { |x| unwrap_definition1(x) }
+        #fmt_defn << unwrap_multidef(coll)
       end
 
-      def number_multidef(elem)
-        c = IsoDoc::XrefGen::Counter.new("@")
-        elem.xpath(ns("./definition")).each do |d|
-          c.increment(d)
-          d.elements.first.add_first_child "<strong>(#{c.print})</strong>&#xa0;"
+      def unwrap_multidef(coll)
+        if coll.all? do |c|
+          c.elements.size == 1 && c.elements.first.name == "p"
+        end
+        ret = coll.map do |c|
+          c.children = c.elements.first.children
+        end
+        return "<p>#{ret.map { |x| to_xml(x) }.join}</p>"
         end
+        coll.map { |c| to_xml(c.children) }.join(" ")
       end
 
-      def collapse_multidef(elem)
-        ins = elem.at(ns("./definition")).previous_element
-        coll = elem.xpath(ns("./definition"))
-        coll.each(&:remove)
-        ins.next = "<definition>#{unwrap_multidef(coll)}</definition>"
+=begin
+    def unwrap_definition(elem)
+      elem.xpath(ns("./definition")).each do |d|
+        %w(verbal-definition non-verbal-representation).each do |e|
+          v = d&.at(ns("./#{e}"))
+          v&.replace(v.children)
+        end
       end
+    end
 
-      def unwrap_multidef(coll)
-        if coll.all? do |c|
-             c.elements.size == 1 && c.elements.first.name == "p"
-           end
-          ret = coll.map { |c| to_xml(c.elements.first.children) }
-          return "<p>#{ret.join}</p>"
+    to
+
+      def unwrap_definition(_elem, fmt_defn)
+      fmt_defn.xpath(ns(".//semx[@element = 'definition']")).each do |d|
+        %w(verbal-definition non-verbal-representation).each do |e|
+          v = d&.at(ns("./#{e}"))
+          v&.replace(v.children)
         end
-        coll.map { |c| to_xml(c.children) }.join
       end
+    en
+
+=end
+
+def designation(docxml)
+  super
+end
+
+def deprecates(desgn)
+  desgn.remove
+end
+
+    def designation_boldface(desgn)
+      #desgn["element"] == "preferred" or return
+      name = desgn.at(ns("./expression/name | ./letter-symbol/name")) or return
+      name.children = "<strong>#{name.children}</strong>"
+    end
 
       def unwrap_definition(docxml)
         docxml.xpath(ns(".//definition/verbal-definition")).each do |v|
           v.elements.all? { |e| %w(termsource p).include?(e.name) } or next
           p = v.xpath(ns("./p"))
           s = v.xpath(ns('./termsource'))
-          s.empty? or 
-          s = " (#{s.map { |x| to_xml(x) }.join("\n")})"
+          s.empty? or s = " (#{s.map { |x| to_xml(x) }.join("\n")})"
           v.children =
             "<p>#{p.map(&:children).map { |x| to_xml(x) }.join("\n")}#{s}</p>"
         end
         super
       end
 
+      def unwrap_definition(_elem, fmt_defn)
+        fmt_defn.xpath(ns(".//semx[@element = 'definition']")).each do |d|
+          unwrap_definition1(d)
+        end
+      end
+
+      def unwrap_definition1(d)
+          %w(verbal-definition non-verbal-representation).each do |e|
+            v = d.at(ns("./#{e}")) or next
+            if v.elements.all? { |e| %w(termsource p).include?(e.name) }
+              p = v.xpath(ns("./p"))
+              s = v.xpath(ns('./termsource'))
+              s.empty? or s = " (#{s.map { |x| to_xml(x) }.join()})"
+              v.children =
+                "#{p.map(&:children).map { |x| to_xml(x) }.join("\n")}#{s}"
+            else
+              s = v.xpath(ns('./termsource'))
+              unless s.empty?
+                s[0].previous = " ("
+                s[-1].next = ")"
+              end
+            end
+            v.replace(v.children)
+          end
+      end
+
+      def related_designation1(desgn)
+        super
+      end
+
       def related(docxml)
-        docxml.xpath(ns("//term[related]")).each { |f| related_term(f) }
+        insert_related_type(docxml)
+        admitted_to_related docxml
+        term_reorder(docxml)
+        docxml.xpath(ns("//term[fmt-related/semx]")).each { |f| related_term(f) }
+      end
+
+      # temporarily insert related/@type to fmt-related/semx, for sorting
+      def insert_related_type(docxml)
+        docxml.xpath(ns("//fmt-related/semx")).each do |r|
+          orig = semx_orig(r)
+          r["type"] = orig["type"]
+        end
       end
 
       def related_term(term)
-        coll = term_related_reorder(term.xpath(ns("./related")))
-        term_related_collapse(coll)
+        #require "debug"; binding.b
+        #coll = term_related_reorder(term.xpath(ns("./fmt-related/semx")))
+        r = term.at(ns("./fmt-related"))
+        r.xpath(ns(".//xref | .//eref | .//termref")).each(&:remove)
+        coll = sort_related(r.xpath(ns("./semx")))
+        r.children = term_related_collapse(coll)
       end
 
       def term_related_collapse(coll)
         prev = 0
+        coll[0].wrap("<p></p>")
         coll[1..-1].each_with_index do |r, i|
           if coll[prev]["type"] != r["type"]
-            prev = i and next
+            prev = i
+            r.wrap("<p></p>")
+            next
           end
 
-          coll[prev].at(ns("./preferred")) << "; #{to_xml(r.at(ns('./preferred'))
-              .children)}"
+          #coll[prev].at(ns("./preferred")) << "; #{to_xml(r.at(ns('./preferred'))
+          #.children)}"
+          coll[prev] << "; #{to_xml(r)}"
           r.remove
         end
       end
 
+      def term_related_collapse(coll)
+        prev = 0
+        ret = [[coll[0]]]
+        coll[1..-1].each do |r|
+        if ret[-1][0]["type"] != r["type"]
+            ret << [r]
+            next
+          end
+          ret[-1] << r
+        end
+        ret.map { |x| x.map { |y| to_xml(y) }.join("; ") }.map { |x| "<p>#{x}</p>" }.join("\n")
+      end
+
       def sort_terms_key(term)
         d = term.at(ns("./preferred/expression/name | " \
                        "./preferred/letter-symbol/name | " \
                        "./preferred/graphical-symbol/figure/name | " \
                        "./preferred/graphical-symbol/figure/@id | " \
-                       "./preferred"))
+                       "./preferred | ./fmt-preferred//semx"))
         f = term.at(ns("./field-of-application")) || term.at(ns("./domain"))
         @c.decode("#{sort_terms_key1(d)} :: #{sort_terms_key1(f)}")
       end
@@ -84,6 +178,7 @@ module IsoDoc
         dup.text&.strip&.downcase || "zzzz"
       end
 
+      #KILL
       def term_related_reorder(coll)
         ins = coll.first.previous_element
         ret = sort_related(coll)
@@ -109,24 +204,28 @@ module IsoDoc
         "#{type} :: #{sort_terms_key(related)}"
       end
 
-      def terms(docxml)
-        admitted_to_related docxml
-        super
+      def termcleanup(docxml)
         collapse_term docxml
+        docxml.xpath(ns("//term//semx[@type]")).each { |x| x.delete("type") } # temp attribute from insert_related_type
+        super
       end
 
       def admitted_to_related(docxml)
         docxml.xpath(ns("//term")).each do |t|
-          t.xpath(ns("./admitted | ./preferred")).each_with_index do |a, i|
+          t.xpath(ns("./fmt-admitted/semx | ./fmt-preferred/semx")).each_with_index do |a, i|
+            orig = semx_orig(a)
             (i.zero? ||
-             a.at(ns("./abbreviation-type | ./graphical-symbol"))) and next
-            admitted_to_related1(a, t.at(ns("./preferred")))
+             orig.at(ns("./abbreviation-type | ./graphical-symbol"))) and next
+            out = t.at(ns("./fmt-related")) || t.at(ns("./definition")).before("<fmt-related/>").previous
+            admitted_to_related1(a, t.at(ns("./fmt-preferred/semx")), out)
+            a.parent.name == "fmt-preferred" and a.remove
           end
+          t.at(ns("./fmt-admitted"))&.remove
         end
-        term_reorder(docxml)
+        #term_reorder(docxml)
       end
 
-      def admitted_to_related1(adm, pref)
+      def admitted_to_related1(adm, pref, out)
         new = adm.dup
         adm["type"] = "equivalent"
         adm.name = "related"
@@ -137,6 +236,33 @@ module IsoDoc
         TERM
       end
 
+      def admitted_to_related1(adm, pref, out)
+      out << <<~TERM
+<semx element='related' source='#{adm['source']}' type='equivalent'><fmt-preferred>#{to_xml(adm)}</p></semx></fmt-preferred>
+TERM
+        out.parent.next = <<~TERM
+          <term><fmt-preferred>#{to_xml(adm)}</fmt-preferred>
+          <fmt-related>
+            <semx element="related" source="#{pref['source']}" type="see"><fmt-preferred>#{to_xml(pref)}</fmt-preferred></semx>
+          </fmt-related>
+          <fmt-definition></fmt-definition></term>
+        TERM
+      end
+
+      #KILL
+      def related1(node)
+       require "debug"; binding.b
+      p, ref, orig = related1_prep(node)
+      label = @i18n.relatedterms[orig["type"]].upcase
+      if p
+        node.children =(l10n("<p><strong>#{label}:</strong> " \
+                          "<em>#{to_xml(p)}</em></p>"))
+      else
+        node.children = (l10n("<p><strong>#{label}:</strong> " \
+                          "<strong>**RELATED TERM NOT FOUND**</strong></p>"))
+      end
+    end
+
       def term_reorder(xmldoc)
         xmldoc.xpath(ns("//terms")).each { |t| term_reorder1(t) }
       end
@@ -155,19 +281,35 @@ module IsoDoc
         end
       end
 
+      def termcontainers(docxml)
+        super
+        docxml.xpath(ns("//term[not(./fmt-definition)]")).each do |t|
+          t << "<fmt-definition></fmt-definition>"
+        end
+      end
+
       def collapse_term(docxml)
         docxml.xpath(ns("//term")).each { |t| collapse_term1(t) }
       end
 
       def collapse_term1(term)
+        #pref = term.xpath(ns("./fmt-preferred//semx")).each_with_index.with_object([]) do |(a, i), m|
+            #orig = semx_orig(a, term)
+#if i.zero? || orig.at(ns("./abbreviation-type | ./graphical-symbol"))
+  #m << a
+#end
+        #end
+
         ret = collapse_term_template(
-          pref: term.at(ns("./preferred"))&.remove,
-          def: term.at(ns("./definition")),
-          rels: term.xpath(ns("./related")).map(&:remove),
-          source: term.at(ns("./termsource")),
+          pref: term.at(ns("./fmt-preferred")),
+          def: term.at(ns("./fmt-definition")),
+          rels: term.at(ns("./fmt-related"))&.remove,
+          source: term.at(ns("./fmt-termsource"))&.remove,
         )
-        (ins = term.elements.first and ins.previous = ret) or
-          term << ret
+        term.at(ns("./fmt-preferred"))&.remove
+        term.at(ns("./fmt-admitted"))&.remove
+        ins = term.at(ns("./fmt-definition")) and
+          ins.children = ret
       end
 
       def collapse_term_related(rels)
@@ -180,29 +322,71 @@ module IsoDoc
         ret
       end
 
+      def collapse_term_related(rels)
+        rels or return
+        rels.xpath(ns("./p")).each do |p|
+          #require "debug"; binding.b
+          orig = p.at(ns(".//semx[@element = 'related']"))
+          reln = "<em>#{@i18n.relatedterms[orig['type']]}:</em> "
+          p.add_first_child reln
+          p.xpath(ns(".//semx[@element = 'related']")).each do |r|
+            r.at(ns("./fmt-preferred")) or r.add_first_child "**RELATED TERM NOT FOUND**"
+          end
+        end
+        ret = rels.xpath(ns("./p")).map { |x| to_xml(x.children).strip }.join(". ")
+        ret += "." unless ret.empty?
+        ret
+      end
+
       def collapse_term_template(opt)
-        defn = collapse_unwrap_definition(opt[:def])
+        defn, multiblock = collapse_unwrap_definition(opt[:def])
+        #require "debug"; binding.b
         src = nil
         opt[:source] and src = "(#{to_xml(opt[:source].remove.children).strip})"
-        t = opt[:pref] ? to_xml(opt[:pref].children) : "**TERM NOT FOUND**"
+        t = collapse_term_pref(opt)
+        #require "debug"; opt[:pref].nil? and binding.b
+        #require "debug"; opt[:rels].empty? or binding.b
+        tail = "#{collapse_term_related(opt[:rels])} #{src}"
+        if multiblock
+          tail = tail.strip.empty? ? "" : "<p>#{tail}</p>"
+        <<~TERM
+          <p>#{t}:</p> #{defn}#{tail}
+        TERM
+        else
         <<~TERM
-          <p>#{t}: #{defn} #{collapse_term_related(opt[:rels])} #{src}</p>
+          <p>#{t}: #{defn} #{tail}</p>
         TERM
+        end
+      end
+
+      def collapse_term_pref(opt)
+        p = opt[:pref]
+        p.text.strip.empty? and return "**TERM NOT FOUND**"
+        s = p.xpath(ns(".//semx[@element = 'termsource']"))
+        unless s.empty?
+          s[0].previous = " ("
+          s[-1].next = ")"
+        end
+        p.xpath(ns(".//fmt-termsource")).each { |x| x.replace(x.children) }
+        to_xml(p.children).strip
+
       end
 
       def collapse_unwrap_definition(defn)
-        defn.nil? and return nil
-        s = defn.remove.xpath(ns("./termsource"))
-        p = defn.at(ns("./p"))
+        #require "debug"; binding.b
+        defn.nil? and return nil, nil
+        s = defn.xpath(ns(".//fmt-termsource"))
+        p = defn.at(ns(".//p"))
         !s.empty? && p and p << s.map(&:remove).map(&:children)
           .map { |x| to_xml(x) }.join
-        if defn.elements.size == 1 && defn.elements.first.name == "p"
-          defn.elements.first.children
-        else defn.elements
-        end
+        # fmt-definition/semx/p
+        elems = defn.at(ns("./semx")) || defn
+        multiblock = elems.at(ns("./table | ./formula | ./dl | ./ol | ./ul")) || elems.xpath(ns("./p")).size > 1
+        [defn.elements, multiblock]
       end
 
-      def termsource1(elem)
+      # KILL
+      def termsource1xx(elem)
         while elem&.next_element&.name == "termsource"
           elem << "; #{to_xml(elem.next_element.remove.children)}"
         end
@@ -210,6 +394,12 @@ module IsoDoc
           elem.children = l10n("#{adapt}#{to_xml(elem.children).strip}")
       end
 
+      def termsource_label(elem, sources)
+      adapt = termsource_adapt(elem["status"]) and
+        sources = "#{adapt}#{sources}"
+      elem.replace(l10n(sources))
+    end
+
       def termsource_adapt(status)
         case status
         when "adapted" then @i18n.adapted_from
@@ -217,17 +407,17 @@ module IsoDoc
       end
 
       # domain is rendered in designation_field instead
-      def termdomain(elem)
-        d = elem.at(ns(".//domain")) or return
-        d["hidden"] = "true"
+      def termdomain(elem, domain)
+        #d = elem.at(ns(".//domain")) or return
+        #d["hidden"] = "true"
       end
 
-      # TODO wrap domain not in <domain>, but <span class="domain"> or equivalent
-      def designation_field(desgn, name)
-        if desgn.name == "preferred"
-          f = desgn.xpath(ns("./../domain | ./../subject")).map(&:remove)
-            .map { |u| to_xml(u.children) }.join(", ")
-          name << ", &#x3c;#{f}&#x3e;" unless f.empty?
+      def designation_field(desgn, name, orig)
+        if desgn["element"] == "preferred"
+          f = orig.parent.xpath(ns("./domain | ./subject"))
+            .map { |u| to_xml(semx_fmt_dup(u)) }.join(", ")
+          #require 'debug'; binding.b
+          name << "<span class='fmt-designation-field'>, &#x3c;#{f}&#x3e;</span>" unless f.empty?
         end
         super
       end
@@ -244,6 +434,27 @@ module IsoDoc
         pref << " (#{tail})"
       end
 
+      def merge_second_preferred(term)
+        term.name == "fmt-admitted" and return
+        pref =
+          term.parent.at(ns("./preferred[not(abbreviation-type)][expression/name]"))
+        x = term.parent.xpath(ns("./preferred[expression/name][abbreviation-type] | " \
+                          "./admitted[expression/name][abbreviation-type]"))
+        (pref && !x.empty?) or return
+fmt_pref = term.parent.at(ns(".//semx[@source = '#{pref['id']}']"))
+fdf = fmt_pref.at(ns(".//span[@class = 'fmt-designation-field']"))&.text
+        out = to_xml(fmt_pref)
+        tail = x.map do |p|
+          #require "debug"; binding.b
+          ret = term.parent.at(ns(".//semx[@source = '#{p['id']}']")).remove
+          fdf1 = ret.at(ns(".//span[@class = 'fmt-designation-field']"))
+          fdf1 && (fdf1&.text == fdf) and fdf1.remove # repetition of domain suppressed
+          to_xml(ret).strip
+        end.join(", ")
+        out += " (#{tail})"
+        term.children = out
+      end
+
       def termnote1(elem)
         lbl = termnote_label(elem)
         prefix_name(elem, { label: block_delim }, lower2cap(lbl), "name")
@@ -258,7 +469,7 @@ module IsoDoc
 
       def concept1(node)
         concept_render(node, ital: "false", ref: "false", bold: "false",
-                             linkref: "false", linkmention: "false")
+                       linkref: "false", linkmention: "false")
       end
     end
   end

data/lib/metanorma/ieee/biblio.rng

@@ -267,11 +267,11 @@ Detailed in https://www.relaton.org/model/creator/</a:documentation>
           <a:documentation>An identifier of the person according to an international identifier scheme</a:documentation>
         </ref>
       </zeroOrMore>
-      <zeroOrMore>
+      <optional>
         <ref name="contact">
           <a:documentation>Contact information for the person, including URI, address, phone number, and email</a:documentation>
         </ref>
-      </zeroOrMore>
+      </optional>
     </element>
   </define>
   <define name="fullname">
@@ -454,11 +454,11 @@ real names (if the person is named with a pseudonym or user name); previous lega
         <a:documentation>An identifier of the organization according to an international identifier scheme</a:documentation>
       </ref>
     </zeroOrMore>
-    <zeroOrMore>
+    <optional>
       <ref name="contact">
         <a:documentation>Contact information for the organization, including address, phone number, and email</a:documentation>
       </ref>
-    </zeroOrMore>
+    </optional>
     <optional>
       <ref name="logo">
         <a:documentation>A logo for the organization</a:documentation>
@@ -540,12 +540,18 @@ real names (if the person is named with a pseudonym or user name); previous lega
   <!-- TODO may change -->
   <define name="contact">
     <a:documentation>Contact information for a person or organization</a:documentation>
-    <choice>
+    <zeroOrMore>
       <ref name="address"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="phone"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="email"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="uri"/>
-    </choice>
+    </zeroOrMore>
   </define>
   <define name="phone">
     <a:documentation>The phone number associated with a person or organization</a:documentation>
@@ -1271,17 +1277,17 @@ for which this claim of validity is made, if applicable</a:documentation>
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <ref name="ISO8601DateTime"/>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <ref name="ISO8601DateTime"/>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <ref name="ISO8601DateTime"/>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="TypedTitleString">

data/lib/metanorma/ieee/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ieee
-    VERSION = "1.3.8".freeze
+    VERSION = "1.3.9".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ieee
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-07 00:00:00.000000000 Z
+date: 2025-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc