metanorma-ieee 1.6.5 → 1.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a117b31e48253553a2fbbce5cb2ab6f5e166174942081fbba58980cdfc66f148
-  data.tar.gz: 7613e9dbdb444981cf6913ef953782393a03f6a02942a324c1dfd7b85f6e23bd
+  metadata.gz: 2dd71904ed39cf33217f1b53dbc5ed4bc10e54b282e4889f7db7200ce8c911b3
+  data.tar.gz: 7591b738d3cdac2bab2d77493e85e082403838a2d6b5c1a3a448dd09e38765f9
 SHA512:
-  metadata.gz: 57109cb2c025e0aa75ea7fbaf3c2afa6c1720e4e68f5f16250ffedd9b4661e5066c04a3c4c7d1f92b76d6728f3e8ef8c01cfeda5769b35559451a86179fcf44e
-  data.tar.gz: c6c1860fc24914300523889cae42c25823742adec3c402709e7bf89de45caa275b885ca5053f9d9897b233affd0f0140078104e48dadf40994b967afaf9883b3
+  metadata.gz: fd178cb19b16da4d7ab2f65c74eb8bdfb8934a89acfe91b53c052e67e0959ead14ae1667f776d0925e9138b919899db57e9a576fd5d745d2dc92bdc0451b308f
+  data.tar.gz: c34996899332716f34e1aba35e5d20e9789ed8c768393ab71120af634591590937b599a7a638cd8d6b4a82354d0f4faffacef8228cdebb4dbad29d57a38fa949

data/lib/isodoc/ieee/html/wordstyle.css

@@ -3381,7 +3381,7 @@ span.Char {
   mso-fareast-language: JA;
 }
 
-span.2Char {
+span.\32 Char {
   mso-style-name: "Body Text 2 Char";
   mso-style-unhide: no;
   mso-style-locked: yes;
@@ -3391,7 +3391,7 @@ span.2Char {
   mso-fareast-language: JA;
 }
 
-span.3Char {
+span.\33 Char {
   mso-style-name: "Body Text 3 Char";
   mso-style-unhide: no;
   mso-style-locked: yes;
@@ -3422,7 +3422,7 @@ span.Char1 {
   mso-fareast-language: JA;
 }
 
-span.2Char0 {
+span.\32 Char0 {
   mso-style-name: "Body Text First Indent 2 Char";
   mso-style-unhide: no;
   mso-style-locked: yes;
@@ -3432,7 +3432,7 @@ span.2Char0 {
   mso-fareast-language: JA;
 }
 
-span.2Char1 {
+span.\32 Char1 {
   mso-style-name: "Body Text Indent 2 Char";
   mso-style-unhide: no;
   mso-style-locked: yes;
@@ -3442,7 +3442,7 @@ span.2Char1 {
   mso-fareast-language: JA;
 }
 
-span.3Char0 {
+span.\33 Char0 {
   mso-style-name: "Body TextIndent 3 Char";
   mso-style-unhide: no;
   mso-style-locked: yes;

data/lib/isodoc/ieee/html/wordstyle.scss

@@ -3035,7 +3035,7 @@ span.Char
 	mso-style-link:"Body Text";
 	mso-ansi-font-size:12.0pt;
 	mso-fareast-language:JA;}
-span.2Char
+span.\32 Char
 	{mso-style-name:"Body Text 2 Char";
 	mso-style-unhide:no;
 	mso-style-locked:yes;
@@ -3043,7 +3043,7 @@ span.2Char
 	mso-style-link:"Body Text 2";
 	mso-ansi-font-size:12.0pt;
 	mso-fareast-language:JA;}
-span.3Char
+span.\33 Char
 	{mso-style-name:"Body Text 3 Char";
 	mso-style-unhide:no;
 	mso-style-locked:yes;
@@ -3068,7 +3068,7 @@ span.Char1
 	mso-style-link:"Body Text Indent";
 	mso-ansi-font-size:12.0pt;
 	mso-fareast-language:JA;}
-span.2Char0
+span.\32 Char0
 	{mso-style-name:"Body Text First Indent 2 Char";
 	mso-style-unhide:no;
 	mso-style-locked:yes;
@@ -3076,7 +3076,7 @@ span.2Char0
 	mso-style-link:"Body Text First Indent 2";
 	mso-ansi-font-size:12.0pt;
 	mso-fareast-language:JA;}
-span.2Char1
+span.\32 Char1
 	{mso-style-name:"Body Text Indent 2 Char";
 	mso-style-unhide:no;
 	mso-style-locked:yes;
@@ -3084,7 +3084,7 @@ span.2Char1
 	mso-style-link:"Body Text Indent 2";
 	mso-ansi-font-size:12.0pt;
 	mso-fareast-language:JA;}
-span.3Char0
+span.\33 Char0
 	{mso-style-name:"Body TextIndent 3 Char";
 	mso-style-unhide:no;
 	mso-style-locked:yes;

data/lib/isodoc/ieee/html/wordstyle_wp.css

@@ -3383,7 +3383,7 @@ span.Char {
   mso-fareast-language: JA;
 }
 
-span.2Char {
+span.\32 Char {
   mso-style-name: "Body Text 2 Char";
   mso-style-unhide: no;
   mso-style-locked: yes;
@@ -3393,7 +3393,7 @@ span.2Char {
   mso-fareast-language: JA;
 }
 
-span.3Char {
+span.\33 Char {
   mso-style-name: "Body Text 3 Char";
   mso-style-unhide: no;
   mso-style-locked: yes;
@@ -3424,7 +3424,7 @@ span.Char1 {
   mso-fareast-language: JA;
 }
 
-span.2Char0 {
+span.\32 Char0 {
   mso-style-name: "Body Text First Indent 2 Char";
   mso-style-unhide: no;
   mso-style-locked: yes;
@@ -3434,7 +3434,7 @@ span.2Char0 {
   mso-fareast-language: JA;
 }
 
-span.2Char1 {
+span.\32 Char1 {
   mso-style-name: "Body Text Indent 2 Char";
   mso-style-unhide: no;
   mso-style-locked: yes;
@@ -3444,7 +3444,7 @@ span.2Char1 {
   mso-fareast-language: JA;
 }
 
-span.3Char0 {
+span.\33 Char0 {
   mso-style-name: "Body TextIndent 3 Char";
   mso-style-unhide: no;
   mso-style-locked: yes;

data/lib/isodoc/ieee/html/wordstyle_wp.scss

@@ -3010,7 +3010,7 @@ span.Char
 	mso-style-link:"Body Text";
 	mso-ansi-font-size:12.0pt;
 	mso-fareast-language:JA;}
-span.2Char
+span.\32 Char
 	/**/{mso-style-name:"Body Text 2 Char";
 	mso-style-unhide:no;
 	mso-style-locked:yes;
@@ -3018,7 +3018,7 @@ span.2Char
 	mso-style-link:"Body Text 2";
 	mso-ansi-font-size:12.0pt;
 	mso-fareast-language:JA;}
-span.3Char
+span.\33 Char
 	/**/{mso-style-name:"Body Text 3 Char";
 	mso-style-unhide:no;
 	mso-style-locked:yes;
@@ -3043,7 +3043,7 @@ span.Char1
 	mso-style-link:"Body Text Indent";
 	mso-ansi-font-size:12.0pt;
 	mso-fareast-language:JA;}
-span.2Char0
+span.\32 Char0
 	/**/{mso-style-name:"Body Text First Indent 2 Char";
 	mso-style-unhide:no;
 	mso-style-locked:yes;
@@ -3051,7 +3051,7 @@ span.2Char0
 	mso-style-link:"Body Text First Indent 2";
 	mso-ansi-font-size:12.0pt;
 	mso-fareast-language:JA;}
-span.2Char1
+span.\32 Char1
 	/**/{mso-style-name:"Body Text Indent 2 Char";
 	mso-style-unhide:no;
 	mso-style-locked:yes;
@@ -3059,7 +3059,7 @@ span.2Char1
 	mso-style-link:"Body Text Indent 2";
 	mso-ansi-font-size:12.0pt;
 	mso-fareast-language:JA;}
-span.3Char0
+span.\33 Char0
 	/**/{mso-style-name:"Body TextIndent 3 Char";
 	mso-style-unhide:no;
 	mso-style-locked:yes;

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

@@ -2053,6 +2053,9 @@
 			<xsl:variable name="title">
 				<xsl:call-template name="getName"/>
 			</xsl:variable>
+			<xsl:variable name="variant_title">
+				<xsl:copy-of select="mn:variant-title[@type = 'toc']/node()"/>
+			</xsl:variable>
 
 			<xsl:variable name="root">
 				<xsl:if test="ancestor-or-self::mn:preface">preface</xsl:if>
@@ -2064,9 +2067,18 @@
 					<xsl:attribute name="level">1</xsl:attribute>
 				</xsl:if>
 				<mnx:title>
-					<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item">
-						<xsl:with-param name="mode">contents</xsl:with-param>
-					</xsl:apply-templates>
+					<xsl:choose>
+						<xsl:when test="normalize-space($variant_title) != ''">
+							<xsl:apply-templates select="xalan:nodeset($variant_title)" mode="contents_item">
+								<xsl:with-param name="mode">contents</xsl:with-param>
+							</xsl:apply-templates>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item">
+								<xsl:with-param name="mode">contents</xsl:with-param>
+							</xsl:apply-templates>
+						</xsl:otherwise>
+					</xsl:choose>
 				</mnx:title>
 				<xsl:if test="$type != 'index'">
 					<xsl:apply-templates mode="contents"/>
@@ -4311,7 +4323,24 @@
 	<xsl:template match="mn:metanorma-extension/*[local-name() = 'UnitsML']" mode="update_xml_step1"/>
 
 	<!-- remove image/emf -->
-	<xsl:template match="mn:image/mn:emf" mode="update_xml_step1"/>
+	<xsl:template match="mn:image//mn:emf" mode="update_xml_step1"/>
+
+	<!-- https://github.com/metanorma/metanorma/issues/540 -->
+	<xsl:template match="mn:image[mn:altsource]" priority="3" mode="update_xml_step1">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="update_xml_step1"/>
+			<xsl:choose>
+				<xsl:when test="mn:altsource[contains(@tag, 'pdf')]">
+					<xsl:apply-templates select="mn:altsource[contains(@tag, 'pdf')]/@*" mode="update_xml_step1"/>
+					<xsl:apply-templates select="mn:altsource[contains(@tag, 'pdf')]/node()" mode="update_xml_step1"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates select="mn:altsource[contains(@tag, 'default')]/@*" mode="update_xml_step1"/>
+					<xsl:apply-templates select="mn:altsource[contains(@tag, 'default')]/node()" mode="update_xml_step1"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:copy>
+	</xsl:template>
 
 	<!-- remove preprocess-xslt -->
 	<xsl:template match="mn:preprocess-xslt" mode="update_xml_step1"/>
@@ -4539,6 +4568,15 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<!-- https://github.com/metanorma/metanorma-iso/issues/1535 -->
+	<xsl:template match="mn:ol[mn:fmt-ol]" mode="update_xml_step1">
+		<xsl:apply-templates select="mn:fmt-ol" mode="update_xml_step1"/>
+	</xsl:template>
+
+	<xsl:template match="mn:ul[mn:fmt-ul]" mode="update_xml_step1">
+		<xsl:apply-templates select="mn:fmt-ul" mode="update_xml_step1"/>
+	</xsl:template>
+
 	<!-- li/fmt-name -->
 	<xsl:template match="mn:li/mn:fmt-name" priority="2" mode="update_xml_step1">
 		<xsl:attribute name="label"><xsl:value-of select="."/></xsl:attribute>
@@ -7959,6 +7997,8 @@
 		</xsl:if>
 
 		<xsl:call-template name="setBordersTableArray"/>
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-style -->
 
 	<xsl:attribute-set name="table-number-style">
@@ -8000,12 +8040,16 @@
 		<xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
 			<xsl:attribute name="border-bottom">0.5 solid black</xsl:attribute>
 		</xsl:if>
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-header-row-style -->
 
 	<xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_table-footer-row-style">
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-footer-row-style -->
 
 	<xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style">
@@ -8018,6 +8062,8 @@
 		</xsl:if>
 
 		<xsl:call-template name="setBordersTableArray"/>
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-body-row-style -->
 
 	<xsl:attribute-set name="table-header-cell-style">
@@ -8038,6 +8084,16 @@
 		</xsl:if>
 
 		<xsl:call-template name="setTableCellAttributes"/>
+
+		<xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
+			<xsl:attribute name="display-align">before</xsl:attribute>
+			<xsl:attribute name="text-align">left</xsl:attribute>
+			<xsl:if test="following-sibling::*">
+				<xsl:attribute name="padding-right">4mm</xsl:attribute>
+			</xsl:if>
+			<xsl:call-template name="setNoBordersForTableList"/>
+		</xsl:if>
+
 	</xsl:template> <!-- refine_table-header-cell-style -->
 
 	<xsl:attribute-set name="table-cell-style">
@@ -8062,6 +8118,15 @@
 
 		<xsl:call-template name="setBordersTableArray"/>
 
+		<xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
+			<xsl:attribute name="display-align">before</xsl:attribute>
+			<xsl:attribute name="text-align">left</xsl:attribute>
+			<xsl:if test="following-sibling::*">
+				<xsl:attribute name="padding-right">4mm</xsl:attribute>
+			</xsl:if>
+			<xsl:call-template name="setNoBordersForTableList"/>
+		</xsl:if>
+
 	</xsl:template> <!-- refine_table-cell-style -->
 
 	<xsl:attribute-set name="table-footer-cell-style">
@@ -8073,6 +8138,8 @@
 	</xsl:attribute-set> <!-- table-footer-cell-style -->
 
 	<xsl:template name="refine_table-footer-cell-style">
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-footer-cell-style -->
 
 	<xsl:attribute-set name="table-note-style">
@@ -8120,6 +8187,16 @@
 	<xsl:template name="refine_table-fn-body-style">
 	</xsl:template>
 
+	<xsl:template name="setNoBordersForTableList">
+		<xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
+			<xsl:attribute name="border">none</xsl:attribute>
+			<xsl:attribute name="border-top">none</xsl:attribute>
+			<xsl:attribute name="border-bottom">none</xsl:attribute>
+			<xsl:attribute name="border-left">none</xsl:attribute>
+			<xsl:attribute name="border-right">none</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<!-- ========================== -->
 	<!-- END Table styles -->
 	<!-- ========================== -->
@@ -13722,6 +13799,10 @@
 		</fo:list-item>
 	</xsl:template>
 
+	<xsl:template match="mn:fmt-ol | mn:fmt-ul">
+		<xsl:apply-templates/>
+	</xsl:template>
+
 	<!-- ===================================== -->
 	<!-- END Lists processing -->
 	<!-- ===================================== -->

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

@@ -2053,6 +2053,9 @@
 			<xsl:variable name="title">
 				<xsl:call-template name="getName"/>
 			</xsl:variable>
+			<xsl:variable name="variant_title">
+				<xsl:copy-of select="mn:variant-title[@type = 'toc']/node()"/>
+			</xsl:variable>
 
 			<xsl:variable name="root">
 				<xsl:if test="ancestor-or-self::mn:preface">preface</xsl:if>
@@ -2064,9 +2067,18 @@
 					<xsl:attribute name="level">1</xsl:attribute>
 				</xsl:if>
 				<mnx:title>
-					<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item">
-						<xsl:with-param name="mode">contents</xsl:with-param>
-					</xsl:apply-templates>
+					<xsl:choose>
+						<xsl:when test="normalize-space($variant_title) != ''">
+							<xsl:apply-templates select="xalan:nodeset($variant_title)" mode="contents_item">
+								<xsl:with-param name="mode">contents</xsl:with-param>
+							</xsl:apply-templates>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item">
+								<xsl:with-param name="mode">contents</xsl:with-param>
+							</xsl:apply-templates>
+						</xsl:otherwise>
+					</xsl:choose>
 				</mnx:title>
 				<xsl:if test="$type != 'index'">
 					<xsl:apply-templates mode="contents"/>
@@ -4311,7 +4323,24 @@
 	<xsl:template match="mn:metanorma-extension/*[local-name() = 'UnitsML']" mode="update_xml_step1"/>
 
 	<!-- remove image/emf -->
-	<xsl:template match="mn:image/mn:emf" mode="update_xml_step1"/>
+	<xsl:template match="mn:image//mn:emf" mode="update_xml_step1"/>
+
+	<!-- https://github.com/metanorma/metanorma/issues/540 -->
+	<xsl:template match="mn:image[mn:altsource]" priority="3" mode="update_xml_step1">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="update_xml_step1"/>
+			<xsl:choose>
+				<xsl:when test="mn:altsource[contains(@tag, 'pdf')]">
+					<xsl:apply-templates select="mn:altsource[contains(@tag, 'pdf')]/@*" mode="update_xml_step1"/>
+					<xsl:apply-templates select="mn:altsource[contains(@tag, 'pdf')]/node()" mode="update_xml_step1"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates select="mn:altsource[contains(@tag, 'default')]/@*" mode="update_xml_step1"/>
+					<xsl:apply-templates select="mn:altsource[contains(@tag, 'default')]/node()" mode="update_xml_step1"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:copy>
+	</xsl:template>
 
 	<!-- remove preprocess-xslt -->
 	<xsl:template match="mn:preprocess-xslt" mode="update_xml_step1"/>
@@ -4539,6 +4568,15 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<!-- https://github.com/metanorma/metanorma-iso/issues/1535 -->
+	<xsl:template match="mn:ol[mn:fmt-ol]" mode="update_xml_step1">
+		<xsl:apply-templates select="mn:fmt-ol" mode="update_xml_step1"/>
+	</xsl:template>
+
+	<xsl:template match="mn:ul[mn:fmt-ul]" mode="update_xml_step1">
+		<xsl:apply-templates select="mn:fmt-ul" mode="update_xml_step1"/>
+	</xsl:template>
+
 	<!-- li/fmt-name -->
 	<xsl:template match="mn:li/mn:fmt-name" priority="2" mode="update_xml_step1">
 		<xsl:attribute name="label"><xsl:value-of select="."/></xsl:attribute>
@@ -7959,6 +7997,8 @@
 		</xsl:if>
 
 		<xsl:call-template name="setBordersTableArray"/>
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-style -->
 
 	<xsl:attribute-set name="table-number-style">
@@ -8000,12 +8040,16 @@
 		<xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
 			<xsl:attribute name="border-bottom">0.5 solid black</xsl:attribute>
 		</xsl:if>
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-header-row-style -->
 
 	<xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_table-footer-row-style">
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-footer-row-style -->
 
 	<xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style">
@@ -8018,6 +8062,8 @@
 		</xsl:if>
 
 		<xsl:call-template name="setBordersTableArray"/>
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-body-row-style -->
 
 	<xsl:attribute-set name="table-header-cell-style">
@@ -8038,6 +8084,16 @@
 		</xsl:if>
 
 		<xsl:call-template name="setTableCellAttributes"/>
+
+		<xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
+			<xsl:attribute name="display-align">before</xsl:attribute>
+			<xsl:attribute name="text-align">left</xsl:attribute>
+			<xsl:if test="following-sibling::*">
+				<xsl:attribute name="padding-right">4mm</xsl:attribute>
+			</xsl:if>
+			<xsl:call-template name="setNoBordersForTableList"/>
+		</xsl:if>
+
 	</xsl:template> <!-- refine_table-header-cell-style -->
 
 	<xsl:attribute-set name="table-cell-style">
@@ -8062,6 +8118,15 @@
 
 		<xsl:call-template name="setBordersTableArray"/>
 
+		<xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
+			<xsl:attribute name="display-align">before</xsl:attribute>
+			<xsl:attribute name="text-align">left</xsl:attribute>
+			<xsl:if test="following-sibling::*">
+				<xsl:attribute name="padding-right">4mm</xsl:attribute>
+			</xsl:if>
+			<xsl:call-template name="setNoBordersForTableList"/>
+		</xsl:if>
+
 	</xsl:template> <!-- refine_table-cell-style -->
 
 	<xsl:attribute-set name="table-footer-cell-style">
@@ -8073,6 +8138,8 @@
 	</xsl:attribute-set> <!-- table-footer-cell-style -->
 
 	<xsl:template name="refine_table-footer-cell-style">
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-footer-cell-style -->
 
 	<xsl:attribute-set name="table-note-style">
@@ -8120,6 +8187,16 @@
 	<xsl:template name="refine_table-fn-body-style">
 	</xsl:template>
 
+	<xsl:template name="setNoBordersForTableList">
+		<xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
+			<xsl:attribute name="border">none</xsl:attribute>
+			<xsl:attribute name="border-top">none</xsl:attribute>
+			<xsl:attribute name="border-bottom">none</xsl:attribute>
+			<xsl:attribute name="border-left">none</xsl:attribute>
+			<xsl:attribute name="border-right">none</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<!-- ========================== -->
 	<!-- END Table styles -->
 	<!-- ========================== -->
@@ -13722,6 +13799,10 @@
 		</fo:list-item>
 	</xsl:template>
 
+	<xsl:template match="mn:fmt-ol | mn:fmt-ul">
+		<xsl:apply-templates/>
+	</xsl:template>
+
 	<!-- ===================================== -->
 	<!-- END Lists processing -->
 	<!-- ===================================== -->

data/lib/isodoc/ieee/presentation_xml_convert.rb

@@ -22,24 +22,21 @@ module IsoDoc
         "—"
       end
 
-      def annex1(elem)
-        if @doctype == "whitepaper"
-          annex1_whitepaper(elem)
-        else
-          super
+      def annex1_title_fmt(elem)
+        if (@doctype == "whitepaper") && (t = elem.at(ns("./title")))
+          t.next = to_xml(t)
+          v = t.next
+          v.name = "variant-title"
+          v["type"] = "sub"
         end
+        super
       end
 
-      def annex1_whitepaper(elem)
-        lbl = @xrefs.anchor(elem["id"], :label)
-        if t = elem.at(ns("./title"))
-          d = t.dup
-          # TODO fmt-variant-title
-          d.name = "variant-title"
-          d["type"] = "sub"
-          t.next = d
+      def annex1_title_fmt_inline(title)
+        if @doctype == "whitepaper"
+          to_xml(title.children)
+        else super
         end
-        elem.add_first_child "<fmt-title>#{lbl}</fmt-title>"
       end
 
       def annex_delim(_elem)
@@ -81,15 +78,10 @@ module IsoDoc
         warn "Failure to convert MathML to LaTeX\n#{node.parent.to_xml}\n#{e}"
       end
 
-      #def ol(docxml)
-        #ol_prep(docxml)
-      #  docxml.xpath(ns("//ol/li")).each { |f| ol_label(f) }
-      #end
-
       def ol_numbering_containers
         "//clause | //annex | //foreword | //acknowledgements | " \
-            "//introduction | //preface/abstract | //appendix | //terms | " \
-            "//term | //definitions | //references | //colophon"
+          "//introduction | //preface/abstract | //appendix | //terms | " \
+          "//term | //definitions | //references | //colophon"
       end
 
       def ol_numbering(docxml)

data/lib/isodoc/ieee/word_convert.rb

@@ -157,7 +157,8 @@ module IsoDoc
 
       def annex_name(_annex, name, div)
         name.nil? and return
-        name&.at(ns(".//strong"))&.remove # supplied by CSS list numbering
+        @doctype != "whitepaper" and # there is a prefix
+          name&.at(ns(".//strong"))&.remove # supplied by CSS list numbering
         div.h1 class: "Annex" do |t|
           # annex_name1(name, t)
           children_parse(name, t)
@@ -207,12 +208,12 @@ module IsoDoc
       # are provided by Word styles instead.
       # Retain the em-dash delimiting caption
       def strip_caption_semx(name)
-        name.xpath(".//xmlns:semx[@element = 'autonum']/"\
+        name.xpath(".//xmlns:semx[@element = 'autonum']/" \
                    "preceding-sibling::text()[normalize-space() = '']")
           .each do |s|
-            s.ancestors("fn").empty? and s.remove
+          s.ancestors("fn").empty? and s.remove
         end
-        name.xpath(ns(".//span[@class = 'fmt-element-name']  | "\
+        name.xpath(ns(".//span[@class = 'fmt-element-name']  | " \
                       ".//semx[@element = 'autonum']")).each do |s|
                         s.ancestors("fn").empty? and s.remove
                       end

data/lib/isodoc/ieee/word_wp_convert.rb

@@ -111,6 +111,7 @@ module IsoDoc
 
       def variant_title(node, out)
         node.parent.name == "annex" or return super
+        node["type"] == "sub" or return super
         out.p { |e| e << "&#xa0;" }
         out.p **attr_code(class: "Unnumberedheading") do |p|
           node.children.each { |c| parse(c, p) }

data/lib/metanorma/ieee/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ieee
-    VERSION = "1.6.5".freeze
+    VERSION = "1.6.7".freeze
   end
 end

data/lib/relaton/render/config.yml

@@ -17,16 +17,16 @@ extenttemplate:
 template:
   # skip authoritative_identifier, it is inserted in front of formattedref within metanorma
   standard: "{{ title }}{% if home_standard %}{%else%}$$$ {% if uri %}{{ uri }}{% else %}{% if doi %}DOI: {{ doi | join: '$$$ ' }}{% endif %}{% endif %}{% endif %}$$$"
-  article: "{{creatornames}}$$$ “{{title}}$$$|” <em>{{ series }}</em>$$$ {{ extent }}$$$ {{ date }}$$$ {{ labels['viewed'] }}_{{date_accessed}}$$$ {% if uri %}{{ uri }}{% else %}{% if doi %}DOI: {{ doi | join: '$$$ ' }}{% endif %}{% endif %} $$$"
-  book: "{{creatornames}}$$$ <em>{{title}}</em>$$$ {{ edition }}$$$ {{place}}: {{publisher}}$$$ {{date}}$$$ {{ labels['viewed'] }}_{{date_accessed}}$$$ {% if uri %}{{ uri }}{% else %}{% if doi %}DOI: {{ doi | join: '$$$ ' }}{% endif %}{% endif %} $$$"
+  article: "{{creatornames}}$$$ “{{title}}$$$|” <em>{{ series }}</em>$$$ {{ extent }}$$$ {{ disambiguated_date }}$$$ {{ labels['viewed'] }}_{{date_accessed}}$$$ {% if uri %}{{ uri }}{% else %}{% if doi %}DOI: {{ doi | join: '$$$ ' }}{% endif %}{% endif %} $$$"
+  book: "{{creatornames}}$$$ <em>{{title}}</em>$$$ {{ edition }}$$$ {{place}}: {{publisher}}$$$ {{disambiguated_date}}$$$ {{ labels['viewed'] }}_{{date_accessed}}$$$ {% if uri %}{{ uri }}{% else %}{% if doi %}DOI: {{ doi | join: '$$$ ' }}{% endif %}{% endif %} $$$"
   techreport: book
   booklet: book
   manual: book
   proceedings: book
-  inproceedings: "{{ creatornames }}$$$ “{{ title }}$$$|” <em>{{host_title}}</em>$$$ {{place}}$$$ {{extent}}$$$ {{date}}$$$ {{ labels['viewed'] }}_{{date_accessed}}$$$ {% if uri %}{{ uri }}{% else %}{% if doi %}DOI: {{ doi | join: '$$$ ' }}{% endif %}{% endif %} $$$"
-  inbook: "{{ creatornames }}$$$ “{{ title }}$$$|” {{ labels['in'] }} {{ host_creatornames}} ({{ host_role}}) : <em>{{host_title}}</em>$$$ {{place}}: {{publisher}}$$$ {{date}}$$$ {{extent}}$$$ {{ labels['viewed'] }}_{{date_accessed}}$$$ {% if uri %}{{ uri }}{% else %}{% if doi %}DOI: {{ doi | join: '$$$ ' }}{% endif %}{% endif %} $$$"
+  inproceedings: "{{ creatornames }}$$$ “{{ title }}$$$|” <em>{{host_title}}</em>$$$ {{place}}$$$ {{extent}}$$$ {{disambiguated_date}}$$$ {{ labels['viewed'] }}_{{date_accessed}}$$$ {% if uri %}{{ uri }}{% else %}{% if doi %}DOI: {{ doi | join: '$$$ ' }}{% endif %}{% endif %} $$$"
+  inbook: "{{ creatornames }}$$$ “{{ title }}$$$|” {{ labels['in'] }} {{ host_creatornames}} ({{ host_role}}) : <em>{{host_title}}</em>$$$ {{place}}: {{publisher}}$$$ {{disambiguated_date}}$$$ {{extent}}$$$ {{ labels['viewed'] }}_{{date_accessed}}$$$ {% if uri %}{{ uri }}{% else %}{% if doi %}DOI: {{ doi | join: '$$$ ' }}{% endif %}{% endif %} $$$"
   incollection: inbook
-  thesis: "{{ creatornames }} $$$ “{{ title }}$$$|” {{ medium | capitalize }}$$$ {{ publisher }}$$$ {{ date }}$$$ {{ labels['viewed'] }}_{{date_accessed}}$$$ {% if uri %}{{ uri }}{% else %}{% if doi %}DOI: {{ doi | join: '$$$ ' }}{% endif %}{% endif %} $$$"
+  thesis: "{{ creatornames }} $$$ “{{ title }}$$$|” {{ medium | capitalize }}$$$ {{ publisher }}$$$ {{ disambiguated_date }}$$$ {{ labels['viewed'] }}_{{date_accessed}}$$$ {% if uri %}{{ uri }}{% else %}{% if doi %}DOI: {{ doi | join: '$$$ ' }}{% endif %}{% endif %} $$$"
   unpublished: thesis
   misc: thesis
   website: thesis

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ieee
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-16 00:00:00.000000000 Z
+date: 2026-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc