metanorma-ieee 1.6.10 → 1.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ae3dc5271b5b6922a7c4d5c97a069467a8abe8b932eebe915288b3919bb570a
-  data.tar.gz: 2813a9169b01737e54bb8bd30b3efc67f313f3b737390434293a8a636611c76a
+  metadata.gz: 040d8a4d5f82f4885d3c664a2e578d1fe09779d9d9d859b99ddb6c255063fc1b
+  data.tar.gz: 85f374a9a188ac0c19b20aff633689cd73bccb8d11b87fef93ab7f789f6de18a
 SHA512:
-  metadata.gz: 9ae22a0ab171d82c4f62c00ecb21acbd527830595f2742f6f0c56ab1472d9b5a217f1c9c22a3b9aeb555718ee45493127300338e708d150dec61696ddb3c2812
-  data.tar.gz: 1f82da62388754f1e997341350d05f26eb71f662520475734f4f689dce1c6e8ba3076671f807d9e08db24953ff60bdc2b5d31308d77dcba990754107d47ecdd6
+  metadata.gz: 4b55c48a11df1184e7862227459744e16eeb255b25b5f8d35cddf5833d7c19fa93b814a2f16291d90d7f10426f9d90485bd2891a84bd7f91ce22e04e36d338e8
+  data.tar.gz: dde948124ac484a17882783a1504bc14f2f0fb15d549c90ebd9e313298a9bdfe460d0d64b7040717ef499462a00b586c16201071d54439a371ed277cdbcd3039

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

@@ -931,7 +931,9 @@ nav {
     background-color: black;
     color: white !important;
     cursor: pointer;
-    z-index: 100;
+    left: 0;
+    top: 0;
+    z-index: 103;
   }
   #toggle span {
     text-align: center;

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

@@ -1469,6 +1469,18 @@
 								</xsl:if>
 								<xsl:call-template name="insertListOf_Item"/>
 							</xsl:for-each>
+
+							<!-- List of Examples -->
+							<xsl:for-each select="$contents//mnx:examples/mnx:example">
+								<xsl:if test="position() = 1">
+									<!-- <fo:block break-after="page"/> -->
+									<xsl:call-template name="insertListOf_Title">
+										<xsl:with-param name="title" select="$title-list-examples"/>
+									</xsl:call-template>
+								</xsl:if>
+								<xsl:call-template name="insertListOf_Item"/>
+							</xsl:for-each>
+
 						</xsl:when> <!-- 'standard' or 'draft' -->
 
 						<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
@@ -1482,14 +1494,14 @@
 								</xsl:choose>
 							</xsl:variable>
 
-							<xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:item[@display = 'true'][@level &lt;= $toc_level or @type = 'figure' or @type = 'table']">
+							<xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:item[@display = 'true'][@level &lt;= $toc_level or @type = 'figure' or @type = 'table' or @type = 'example']">
 								<fo:block role="TOCI">
 									<xsl:if test="@level = 1">
 										<xsl:attribute name="margin-top">12pt</xsl:attribute>
 										<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 									</xsl:if>
 
-									<xsl:if test="@type = 'figure' or @type = 'table' and preceding-sibling::mnx:item[1][@type = 'figure' or @type = 'table']">
+									<xsl:if test="@type = 'figure' or @type = 'table' or @type = 'example' and preceding-sibling::mnx:item[1][@type = 'figure' or @type = 'table' or @type = 'example']">
 										<xsl:attribute name="margin-top">0pt</xsl:attribute>
 										<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
 									</xsl:if>
@@ -1546,9 +1558,7 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<fo:block xsl:use-attribute-sets="toc-title-style">
-					<xsl:if test="($current_template = 'standard' or $current_template = 'draft') and        ($stage = 'published' or $stage = 'approved' or $stage_published = 'true')">
-						<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-					</xsl:if>
+					<xsl:call-template name="refine_toc-title-style"/>
 					<!-- Contents -->
 					<xsl:apply-templates/>
 				</fo:block>
@@ -3911,6 +3921,16 @@
 		</xsl:if>
 	</xsl:variable>
 
+	<xsl:variable name="title-list-examples">
+		<xsl:variable name="toc_example_title" select="//mn:metanorma/mn:metanorma-extension/mn:toc[@type='example']/mn:title"/>
+		<xsl:value-of select="$toc_example_title"/>
+		<xsl:if test="normalize-space($toc_example_title) = ''">
+			<xsl:call-template name="getLocalizedString">
+				<xsl:with-param name="key">toc_examples</xsl:with-param>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:variable>
+
 	<xsl:variable name="title-list-recommendations">
 		<xsl:variable name="toc_requirement_title" select="//mn:metanorma/mn:metanorma-extension/mn:toc[@type='requirement']/mn:title"/>
 		<xsl:value-of select="$toc_requirement_title"/>
@@ -4774,6 +4794,14 @@
 
 	<xsl:template match="@semx-id | @anchor" mode="update_xml_step1"/>
 
+	<xsl:template match="mn:pagebreak" mode="update_xml_step1">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="update_xml_step1"/>
+			<xsl:attribute name="from_source_xml">true</xsl:attribute>
+			<xsl:apply-templates select="node()" mode="update_xml_step1"/>
+		</xsl:copy>
+	</xsl:template>
+
 	<!-- END: update new Presentation XML -->
 
 	<!-- =========================================================================== -->
@@ -4811,6 +4839,7 @@
 			<xsl:for-each select="ancestor-or-self::*[ancestor::mn:preface or ancestor::mn:sections or ancestor-or-self::mn:annex]">
 				<xsl:if test="following-sibling::*">false</xsl:if>
 			</xsl:for-each>
+			<xsl:if test="@from_source_xml = 'true'">false</xsl:if>
 		</xsl:variable>
 
 		<xsl:if test="contains($isLast, 'false')">
@@ -5856,6 +5885,7 @@
 	</xsl:attribute-set> <!-- sourcecode-style -->
 
 	<xsl:template name="refine_sourcecode-style">
+		<xsl:call-template name="setKeepAttributes"/>
 	</xsl:template> <!-- refine_sourcecode-style -->
 
 	<xsl:attribute-set name="sourcecode-number-style">
@@ -6595,10 +6625,38 @@
 	<xsl:template name="refine_strike-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="hr-block-style">
+		<xsl:attribute name="font-size">1pt</xsl:attribute>
+		<xsl:attribute name="keep-with-previous">always</xsl:attribute>
+		<xsl:attribute name="role">SKIP</xsl:attribute>
+		<xsl:attribute name="padding-top">-2pt</xsl:attribute>
+		<xsl:attribute name="space-after">4pt</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_hr-block-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="hr-style">
+		<xsl:attribute name="leader-pattern">rule</xsl:attribute>
+		<xsl:attribute name="leader-length">100%</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_hr-style">
+	</xsl:template>
+
 	<xsl:template match="mn:br">
 		<xsl:value-of select="$linebreak"/>
 	</xsl:template>
 
+	<xsl:template match="mn:hr">
+		<fo:block xsl:use-attribute-sets="hr-block-style">
+			<xsl:call-template name="refine_hr-block-style"/>
+			<fo:leader xsl:use-attribute-sets="hr-style">
+				<xsl:call-template name="refine_hr-style"/>
+			</fo:leader>
+		</fo:block>
+	</xsl:template>
+
 	<xsl:template match="mn:em">
 		<fo:inline xsl:use-attribute-sets="em-style">
 			<xsl:call-template name="refine_em_style"/>
@@ -7833,6 +7891,7 @@
 	     text line 1
 			 text line 2
 	-->
+	<xsl:variable name="example_display_in"><!-- don't change here, only for override xsl --></xsl:variable> <!-- block or inline -->
 	<xsl:template match="mn:example" name="example">
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
@@ -7842,7 +7901,8 @@
 			<xsl:call-template name="refine_example-style"/>
 
 			<xsl:variable name="fo_element">
-				<xsl:if test=".//mn:table or .//mn:dl or *[not(self::mn:fmt-name)][1][self::mn:sourcecode]">block</xsl:if>block
+				<xsl:if test=".//mn:table or .//mn:dl or *[not(self::mn:fmt-name)][1][self::mn:sourcecode]">block</xsl:if>
+				<xsl:if test="normalize-space($example_display_in) != ''"><xsl:value-of select="$example_display_in"/></xsl:if>block
 			</xsl:variable>
 
 			<fo:block-container margin-left="0mm" role="SKIP">
@@ -15227,6 +15287,9 @@
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_toc-title-style">
+		<xsl:if test="($current_template = 'standard' or $current_template = 'draft') and      ($stage = 'published' or $stage = 'approved' or $stage_published = 'true')">
+			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:attribute-set name="toc-title-page-style">
@@ -15264,7 +15327,7 @@
 	<xsl:template name="refine_toc-pagenumber-style">
 	</xsl:template>
 
-	<!-- List of Figures, Tables -->
+	<!-- List of Figures, Tables, Examples -->
 	<xsl:attribute-set name="toc-listof-title-style">
 			<xsl:attribute name="role">TOCI</xsl:attribute>
 			<xsl:attribute name="space-before">18pt</xsl:attribute>
@@ -15375,6 +15438,9 @@
 		<xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:toc[@type='figure']/mn:title) or normalize-space($always) = 'true'">
 			<xsl:call-template name="processFigures_Contents"/>
 		</xsl:if>
+		<xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:toc[@type='example']/mn:title)">
+			<xsl:call-template name="processExamples_Contents"/>
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:template name="processTables_Contents">
@@ -15421,7 +15487,29 @@
 		</mnx:figures>
 	</xsl:template>
 
-	<xsl:template match="mn:figure/mn:name | mnx:figure/mn:name |                mn:table/mn:name | mnx:table/mn:name |               mn:permission/mn:name | mnx:permission/mn:name |               mn:recommendation/mn:name | mnx:recommendation/mn:name |               mn:requirement/mn:name | mnx:requirement/mn:name" mode="contents">
+	<xsl:template name="processExamples_Contents">
+		<mnx:examples>
+			<xsl:for-each select="//mn:example[@id and mn:fmt-name and not(@unnumbered = 'true') and normalize-space(@id) != '']">
+				<xsl:choose>
+					<xsl:when test="mn:fmt-name">
+						<xsl:variable name="fmt_name">
+							<xsl:apply-templates select="mn:fmt-name" mode="update_xml_step1"/>
+						</xsl:variable>
+						<mnx:example id="{@id}" alt-text="{normalize-space($fmt_name)}">
+							<xsl:copy-of select="$fmt_name"/>
+						</mnx:example>
+					</xsl:when>
+					<xsl:otherwise>
+						<mnx:example id="{@id}" alt-text="{mn:name}">
+							<xsl:copy-of select="mn:name"/>
+						</mnx:example>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:for-each>
+		</mnx:examples>
+	</xsl:template>
+
+	<xsl:template match="mn:figure/mn:name | mnx:figure/mn:name |                mn:table/mn:name | mnx:table/mn:name |               mn:example/mn:name | mnx:example/mn:name |               mn:permission/mn:name | mnx:permission/mn:name |               mn:recommendation/mn:name | mnx:recommendation/mn:name |               mn:requirement/mn:name | mnx:requirement/mn:name" mode="contents">
 		<xsl:if test="not(following-sibling::*[1][self::mn:fmt-name])">
 			<xsl:apply-templates mode="contents"/>
 			<xsl:text> </xsl:text>
@@ -15430,40 +15518,40 @@
 
 	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="contents"/>
 
-	<xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name |               mn:table/mn:fmt-name | mnx:table/mn:fmt-name |               mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name |               mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name |               mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name" mode="contents">
+	<xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name |               mn:table/mn:fmt-name | mnx:table/mn:fmt-name |               mn:example/mn:fmt-name | mnx:example/mn:fmt-name |               mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name |               mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name |               mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name" mode="contents">
 		<xsl:apply-templates mode="contents"/>
 		<xsl:text> </xsl:text>
 	</xsl:template>
 
-	<xsl:template match="mn:figure/mn:name | mnx:figure/mn:name |                mn:table/mn:name | mnx:table/mn:name |               mn:permission/mn:name | mnx:permission/mn:name |               mn:recommendation/mn:name | mnx:recommendation/mn:name |               mn:requirement/mn:name | mnx:requirement/mn:name |               mn:sourcecode/mn:name" mode="bookmarks">
+	<xsl:template match="mn:figure/mn:name | mnx:figure/mn:name |                mn:table/mn:name | mnx:table/mn:name |               mn:example/mn:name | mnx:example/mn:name |               mn:permission/mn:name | mnx:permission/mn:name |               mn:recommendation/mn:name | mnx:recommendation/mn:name |               mn:requirement/mn:name | mnx:requirement/mn:name |               mn:sourcecode/mn:name" mode="bookmarks">
 		<xsl:if test="not(following-sibling::*[1][self::mn:fmt-name])">
 			<xsl:apply-templates mode="bookmarks"/>
 			<xsl:text> </xsl:text>
 		</xsl:if>
 	</xsl:template>
 
-	<xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name |                mn:table/mn:fmt-name | mnx:table/mn:fmt-name |                mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name |                mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name |                mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name |                mn:sourcecode/mn:fmt-name | mnx:sourcecode/mn:fmt-name" mode="bookmarks">
+	<xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name |                mn:table/mn:fmt-name | mnx:table/mn:fmt-name |                mn:example/mn:fmt-name | mnx:example/mn:fmt-name |                mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name |                mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name |                mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name |                mn:sourcecode/mn:fmt-name | mnx:sourcecode/mn:fmt-name" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
 		<xsl:text> </xsl:text>
 	</xsl:template>
 
-	<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:name/text() |    *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:name/text()" mode="contents" priority="2">
+	<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:example or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:name/text() |    *[self::mnx:figure or self::mnx:table or self::mnx:example or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:name/text()" mode="contents" priority="2">
 		<xsl:if test="not(../following-sibling::*[1][self::mn:fmt-name])">
 			<xsl:value-of select="."/>
 		</xsl:if>
 	</xsl:template>
 
-	<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:fmt-name/text() |   *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:fmt-name/text()" mode="contents" priority="2">
+	<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:example or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:fmt-name/text() |   *[self::mnx:figure or self::mnx:table or self::mnx:example or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:fmt-name/text()" mode="contents" priority="2">
 		<xsl:value-of select="."/>
 	</xsl:template>
 
-	<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:name//text() |    *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:name//text()" mode="bookmarks" priority="2">
+	<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:example or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:name//text() |    *[self::mnx:figure or self::mnx:table or self::mnx:example or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:name//text()" mode="bookmarks" priority="2">
 		<xsl:if test="not(../following-sibling::*[1][self::mn:fmt-name])">
 			<xsl:value-of select="."/>
 		</xsl:if>
 	</xsl:template>
 
-	<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:fmt-name//text() |    *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:fmt-name//text()" mode="bookmarks" priority="2">
+	<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:example or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:fmt-name//text() |    *[self::mnx:figure or self::mnx:table or self::mnx:example or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:fmt-name//text()" mode="bookmarks" priority="2">
 		<xsl:value-of select="."/>
 	</xsl:template>
 
@@ -15696,6 +15784,11 @@
 											<xsl:with-param name="lang" select="@lang"/>
 										</xsl:call-template>
 
+										<xsl:call-template name="insertExampleBookmarks">
+											<xsl:with-param name="contents" select="mnx:contents"/>
+											<xsl:with-param name="lang" select="@lang"/>
+										</xsl:call-template>
+
 									</fo:bookmark>
 
 								</xsl:for-each>
@@ -15714,6 +15807,11 @@
 										<xsl:with-param name="lang" select="@lang"/>
 									</xsl:call-template>
 
+									<xsl:call-template name="insertExampleBookmarks">
+										<xsl:with-param name="contents" select="mnx:contents"/>
+										<xsl:with-param name="lang" select="@lang"/>
+									</xsl:call-template>
+
 								</xsl:for-each>
 							</xsl:otherwise>
 						</xsl:choose>
@@ -15730,6 +15828,11 @@
 							<xsl:with-param name="lang" select="@lang"/>
 						</xsl:call-template>
 
+						<xsl:call-template name="insertExampleBookmarks">
+							<xsl:with-param name="contents" select="$contents_nodes/mnx:contents"/>
+							<xsl:with-param name="lang" select="@lang"/>
+						</xsl:call-template>
+
 					</xsl:otherwise>
 				</xsl:choose>
 
@@ -15810,6 +15913,46 @@
 			</fo:bookmark>
 		</xsl:if>
 	</xsl:template> <!-- insertTableBookmarks -->
+
+		<xsl:template name="insertExampleBookmarks">
+		<xsl:param name="contents"/>
+		<xsl:param name="lang"/>
+		<xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
+		<xsl:if test="$contents_nodes/mnx:example">
+			<fo:bookmark internal-destination="{$contents_nodes/mnx:example[1]/@id}" starting-state="hide">
+				<fo:bookmark-title>
+					<xsl:choose>
+						<xsl:when test="$lang = 'fr'">Exemples</xsl:when>
+						<xsl:otherwise>Examples</xsl:otherwise>
+					</xsl:choose>
+				</fo:bookmark-title>
+				<xsl:for-each select="$contents_nodes/mnx:example">
+					<fo:bookmark internal-destination="{@id}">
+						<fo:bookmark-title>
+							<xsl:value-of select="normalize-space(mnx:title)"/>
+						</fo:bookmark-title>
+					</fo:bookmark>
+				</xsl:for-each>
+			</fo:bookmark>
+		</xsl:if>
+		<xsl:if test="$contents_nodes//mnx:examples/mnx:example">
+			<fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
+
+				<xsl:variable name="bookmark-title">
+							<xsl:value-of select="$title-list-examples"/>
+				</xsl:variable>
+
+				<fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
+
+				<xsl:for-each select="$contents_nodes//mnx:examples/mnx:example">
+					<fo:bookmark internal-destination="{@id}">
+						<!-- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title> -->
+						<fo:bookmark-title><xsl:apply-templates mode="bookmark_clean"/></fo:bookmark-title>
+					</fo:bookmark>
+				</xsl:for-each>
+			</fo:bookmark>
+		</xsl:if>
+	</xsl:template> <!-- insertExampleBookmarks -->
 	<!-- End Bookmarks -->
 
 	<!-- ============================ -->

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

@@ -1469,6 +1469,18 @@
 								</xsl:if>
 								<xsl:call-template name="insertListOf_Item"/>
 							</xsl:for-each>
+
+							<!-- List of Examples -->
+							<xsl:for-each select="$contents//mnx:examples/mnx:example">
+								<xsl:if test="position() = 1">
+									<!-- <fo:block break-after="page"/> -->
+									<xsl:call-template name="insertListOf_Title">
+										<xsl:with-param name="title" select="$title-list-examples"/>
+									</xsl:call-template>
+								</xsl:if>
+								<xsl:call-template name="insertListOf_Item"/>
+							</xsl:for-each>
+
 						</xsl:when> <!-- 'standard' or 'draft' -->
 
 						<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
@@ -1482,14 +1494,14 @@
 								</xsl:choose>
 							</xsl:variable>
 
-							<xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:item[@display = 'true'][@level &lt;= $toc_level or @type = 'figure' or @type = 'table']">
+							<xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:item[@display = 'true'][@level &lt;= $toc_level or @type = 'figure' or @type = 'table' or @type = 'example']">
 								<fo:block role="TOCI">
 									<xsl:if test="@level = 1">
 										<xsl:attribute name="margin-top">12pt</xsl:attribute>
 										<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 									</xsl:if>
 
-									<xsl:if test="@type = 'figure' or @type = 'table' and preceding-sibling::mnx:item[1][@type = 'figure' or @type = 'table']">
+									<xsl:if test="@type = 'figure' or @type = 'table' or @type = 'example' and preceding-sibling::mnx:item[1][@type = 'figure' or @type = 'table' or @type = 'example']">
 										<xsl:attribute name="margin-top">0pt</xsl:attribute>
 										<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
 									</xsl:if>
@@ -1546,9 +1558,7 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<fo:block xsl:use-attribute-sets="toc-title-style">
-					<xsl:if test="($current_template = 'standard' or $current_template = 'draft') and        ($stage = 'published' or $stage = 'approved' or $stage_published = 'true')">
-						<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-					</xsl:if>
+					<xsl:call-template name="refine_toc-title-style"/>
 					<!-- Contents -->
 					<xsl:apply-templates/>
 				</fo:block>
@@ -3911,6 +3921,16 @@
 		</xsl:if>
 	</xsl:variable>
 
+	<xsl:variable name="title-list-examples">
+		<xsl:variable name="toc_example_title" select="//mn:metanorma/mn:metanorma-extension/mn:toc[@type='example']/mn:title"/>
+		<xsl:value-of select="$toc_example_title"/>
+		<xsl:if test="normalize-space($toc_example_title) = ''">
+			<xsl:call-template name="getLocalizedString">
+				<xsl:with-param name="key">toc_examples</xsl:with-param>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:variable>
+
 	<xsl:variable name="title-list-recommendations">
 		<xsl:variable name="toc_requirement_title" select="//mn:metanorma/mn:metanorma-extension/mn:toc[@type='requirement']/mn:title"/>
 		<xsl:value-of select="$toc_requirement_title"/>
@@ -4774,6 +4794,14 @@
 
 	<xsl:template match="@semx-id | @anchor" mode="update_xml_step1"/>
 
+	<xsl:template match="mn:pagebreak" mode="update_xml_step1">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="update_xml_step1"/>
+			<xsl:attribute name="from_source_xml">true</xsl:attribute>
+			<xsl:apply-templates select="node()" mode="update_xml_step1"/>
+		</xsl:copy>
+	</xsl:template>
+
 	<!-- END: update new Presentation XML -->
 
 	<!-- =========================================================================== -->
@@ -4811,6 +4839,7 @@
 			<xsl:for-each select="ancestor-or-self::*[ancestor::mn:preface or ancestor::mn:sections or ancestor-or-self::mn:annex]">
 				<xsl:if test="following-sibling::*">false</xsl:if>
 			</xsl:for-each>
+			<xsl:if test="@from_source_xml = 'true'">false</xsl:if>
 		</xsl:variable>
 
 		<xsl:if test="contains($isLast, 'false')">
@@ -5856,6 +5885,7 @@
 	</xsl:attribute-set> <!-- sourcecode-style -->
 
 	<xsl:template name="refine_sourcecode-style">
+		<xsl:call-template name="setKeepAttributes"/>
 	</xsl:template> <!-- refine_sourcecode-style -->
 
 	<xsl:attribute-set name="sourcecode-number-style">
@@ -6595,10 +6625,38 @@
 	<xsl:template name="refine_strike-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="hr-block-style">
+		<xsl:attribute name="font-size">1pt</xsl:attribute>
+		<xsl:attribute name="keep-with-previous">always</xsl:attribute>
+		<xsl:attribute name="role">SKIP</xsl:attribute>
+		<xsl:attribute name="padding-top">-2pt</xsl:attribute>
+		<xsl:attribute name="space-after">4pt</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_hr-block-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="hr-style">
+		<xsl:attribute name="leader-pattern">rule</xsl:attribute>
+		<xsl:attribute name="leader-length">100%</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_hr-style">
+	</xsl:template>
+
 	<xsl:template match="mn:br">
 		<xsl:value-of select="$linebreak"/>
 	</xsl:template>
 
+	<xsl:template match="mn:hr">
+		<fo:block xsl:use-attribute-sets="hr-block-style">
+			<xsl:call-template name="refine_hr-block-style"/>
+			<fo:leader xsl:use-attribute-sets="hr-style">
+				<xsl:call-template name="refine_hr-style"/>
+			</fo:leader>
+		</fo:block>
+	</xsl:template>
+
 	<xsl:template match="mn:em">
 		<fo:inline xsl:use-attribute-sets="em-style">
 			<xsl:call-template name="refine_em_style"/>
@@ -7833,6 +7891,7 @@
 	     text line 1
 			 text line 2
 	-->
+	<xsl:variable name="example_display_in"><!-- don't change here, only for override xsl --></xsl:variable> <!-- block or inline -->
 	<xsl:template match="mn:example" name="example">
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
@@ -7842,7 +7901,8 @@
 			<xsl:call-template name="refine_example-style"/>
 
 			<xsl:variable name="fo_element">
-				<xsl:if test=".//mn:table or .//mn:dl or *[not(self::mn:fmt-name)][1][self::mn:sourcecode]">block</xsl:if>block
+				<xsl:if test=".//mn:table or .//mn:dl or *[not(self::mn:fmt-name)][1][self::mn:sourcecode]">block</xsl:if>
+				<xsl:if test="normalize-space($example_display_in) != ''"><xsl:value-of select="$example_display_in"/></xsl:if>block
 			</xsl:variable>
 
 			<fo:block-container margin-left="0mm" role="SKIP">
@@ -15227,6 +15287,9 @@
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_toc-title-style">
+		<xsl:if test="($current_template = 'standard' or $current_template = 'draft') and      ($stage = 'published' or $stage = 'approved' or $stage_published = 'true')">
+			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:attribute-set name="toc-title-page-style">
@@ -15264,7 +15327,7 @@
 	<xsl:template name="refine_toc-pagenumber-style">
 	</xsl:template>
 
-	<!-- List of Figures, Tables -->
+	<!-- List of Figures, Tables, Examples -->
 	<xsl:attribute-set name="toc-listof-title-style">
 			<xsl:attribute name="role">TOCI</xsl:attribute>
 			<xsl:attribute name="space-before">18pt</xsl:attribute>
@@ -15375,6 +15438,9 @@
 		<xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:toc[@type='figure']/mn:title) or normalize-space($always) = 'true'">
 			<xsl:call-template name="processFigures_Contents"/>
 		</xsl:if>
+		<xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:toc[@type='example']/mn:title)">
+			<xsl:call-template name="processExamples_Contents"/>
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:template name="processTables_Contents">
@@ -15421,7 +15487,29 @@
 		</mnx:figures>
 	</xsl:template>
 
-	<xsl:template match="mn:figure/mn:name | mnx:figure/mn:name |                mn:table/mn:name | mnx:table/mn:name |               mn:permission/mn:name | mnx:permission/mn:name |               mn:recommendation/mn:name | mnx:recommendation/mn:name |               mn:requirement/mn:name | mnx:requirement/mn:name" mode="contents">
+	<xsl:template name="processExamples_Contents">
+		<mnx:examples>
+			<xsl:for-each select="//mn:example[@id and mn:fmt-name and not(@unnumbered = 'true') and normalize-space(@id) != '']">
+				<xsl:choose>
+					<xsl:when test="mn:fmt-name">
+						<xsl:variable name="fmt_name">
+							<xsl:apply-templates select="mn:fmt-name" mode="update_xml_step1"/>
+						</xsl:variable>
+						<mnx:example id="{@id}" alt-text="{normalize-space($fmt_name)}">
+							<xsl:copy-of select="$fmt_name"/>
+						</mnx:example>
+					</xsl:when>
+					<xsl:otherwise>
+						<mnx:example id="{@id}" alt-text="{mn:name}">
+							<xsl:copy-of select="mn:name"/>
+						</mnx:example>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:for-each>
+		</mnx:examples>
+	</xsl:template>
+
+	<xsl:template match="mn:figure/mn:name | mnx:figure/mn:name |                mn:table/mn:name | mnx:table/mn:name |               mn:example/mn:name | mnx:example/mn:name |               mn:permission/mn:name | mnx:permission/mn:name |               mn:recommendation/mn:name | mnx:recommendation/mn:name |               mn:requirement/mn:name | mnx:requirement/mn:name" mode="contents">
 		<xsl:if test="not(following-sibling::*[1][self::mn:fmt-name])">
 			<xsl:apply-templates mode="contents"/>
 			<xsl:text> </xsl:text>
@@ -15430,40 +15518,40 @@
 
 	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="contents"/>
 
-	<xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name |               mn:table/mn:fmt-name | mnx:table/mn:fmt-name |               mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name |               mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name |               mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name" mode="contents">
+	<xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name |               mn:table/mn:fmt-name | mnx:table/mn:fmt-name |               mn:example/mn:fmt-name | mnx:example/mn:fmt-name |               mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name |               mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name |               mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name" mode="contents">
 		<xsl:apply-templates mode="contents"/>
 		<xsl:text> </xsl:text>
 	</xsl:template>
 
-	<xsl:template match="mn:figure/mn:name | mnx:figure/mn:name |                mn:table/mn:name | mnx:table/mn:name |               mn:permission/mn:name | mnx:permission/mn:name |               mn:recommendation/mn:name | mnx:recommendation/mn:name |               mn:requirement/mn:name | mnx:requirement/mn:name |               mn:sourcecode/mn:name" mode="bookmarks">
+	<xsl:template match="mn:figure/mn:name | mnx:figure/mn:name |                mn:table/mn:name | mnx:table/mn:name |               mn:example/mn:name | mnx:example/mn:name |               mn:permission/mn:name | mnx:permission/mn:name |               mn:recommendation/mn:name | mnx:recommendation/mn:name |               mn:requirement/mn:name | mnx:requirement/mn:name |               mn:sourcecode/mn:name" mode="bookmarks">
 		<xsl:if test="not(following-sibling::*[1][self::mn:fmt-name])">
 			<xsl:apply-templates mode="bookmarks"/>
 			<xsl:text> </xsl:text>
 		</xsl:if>
 	</xsl:template>
 
-	<xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name |                mn:table/mn:fmt-name | mnx:table/mn:fmt-name |                mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name |                mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name |                mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name |                mn:sourcecode/mn:fmt-name | mnx:sourcecode/mn:fmt-name" mode="bookmarks">
+	<xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name |                mn:table/mn:fmt-name | mnx:table/mn:fmt-name |                mn:example/mn:fmt-name | mnx:example/mn:fmt-name |                mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name |                mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name |                mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name |                mn:sourcecode/mn:fmt-name | mnx:sourcecode/mn:fmt-name" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
 		<xsl:text> </xsl:text>
 	</xsl:template>
 
-	<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:name/text() |    *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:name/text()" mode="contents" priority="2">
+	<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:example or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:name/text() |    *[self::mnx:figure or self::mnx:table or self::mnx:example or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:name/text()" mode="contents" priority="2">
 		<xsl:if test="not(../following-sibling::*[1][self::mn:fmt-name])">
 			<xsl:value-of select="."/>
 		</xsl:if>
 	</xsl:template>
 
-	<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:fmt-name/text() |   *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:fmt-name/text()" mode="contents" priority="2">
+	<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:example or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:fmt-name/text() |   *[self::mnx:figure or self::mnx:table or self::mnx:example or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:fmt-name/text()" mode="contents" priority="2">
 		<xsl:value-of select="."/>
 	</xsl:template>
 
-	<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:name//text() |    *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:name//text()" mode="bookmarks" priority="2">
+	<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:example or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:name//text() |    *[self::mnx:figure or self::mnx:table or self::mnx:example or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:name//text()" mode="bookmarks" priority="2">
 		<xsl:if test="not(../following-sibling::*[1][self::mn:fmt-name])">
 			<xsl:value-of select="."/>
 		</xsl:if>
 	</xsl:template>
 
-	<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:fmt-name//text() |    *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:fmt-name//text()" mode="bookmarks" priority="2">
+	<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:example or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:fmt-name//text() |    *[self::mnx:figure or self::mnx:table or self::mnx:example or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:fmt-name//text()" mode="bookmarks" priority="2">
 		<xsl:value-of select="."/>
 	</xsl:template>
 
@@ -15696,6 +15784,11 @@
 											<xsl:with-param name="lang" select="@lang"/>
 										</xsl:call-template>
 
+										<xsl:call-template name="insertExampleBookmarks">
+											<xsl:with-param name="contents" select="mnx:contents"/>
+											<xsl:with-param name="lang" select="@lang"/>
+										</xsl:call-template>
+
 									</fo:bookmark>
 
 								</xsl:for-each>
@@ -15714,6 +15807,11 @@
 										<xsl:with-param name="lang" select="@lang"/>
 									</xsl:call-template>
 
+									<xsl:call-template name="insertExampleBookmarks">
+										<xsl:with-param name="contents" select="mnx:contents"/>
+										<xsl:with-param name="lang" select="@lang"/>
+									</xsl:call-template>
+
 								</xsl:for-each>
 							</xsl:otherwise>
 						</xsl:choose>
@@ -15730,6 +15828,11 @@
 							<xsl:with-param name="lang" select="@lang"/>
 						</xsl:call-template>
 
+						<xsl:call-template name="insertExampleBookmarks">
+							<xsl:with-param name="contents" select="$contents_nodes/mnx:contents"/>
+							<xsl:with-param name="lang" select="@lang"/>
+						</xsl:call-template>
+
 					</xsl:otherwise>
 				</xsl:choose>
 
@@ -15810,6 +15913,46 @@
 			</fo:bookmark>
 		</xsl:if>
 	</xsl:template> <!-- insertTableBookmarks -->
+
+		<xsl:template name="insertExampleBookmarks">
+		<xsl:param name="contents"/>
+		<xsl:param name="lang"/>
+		<xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
+		<xsl:if test="$contents_nodes/mnx:example">
+			<fo:bookmark internal-destination="{$contents_nodes/mnx:example[1]/@id}" starting-state="hide">
+				<fo:bookmark-title>
+					<xsl:choose>
+						<xsl:when test="$lang = 'fr'">Exemples</xsl:when>
+						<xsl:otherwise>Examples</xsl:otherwise>
+					</xsl:choose>
+				</fo:bookmark-title>
+				<xsl:for-each select="$contents_nodes/mnx:example">
+					<fo:bookmark internal-destination="{@id}">
+						<fo:bookmark-title>
+							<xsl:value-of select="normalize-space(mnx:title)"/>
+						</fo:bookmark-title>
+					</fo:bookmark>
+				</xsl:for-each>
+			</fo:bookmark>
+		</xsl:if>
+		<xsl:if test="$contents_nodes//mnx:examples/mnx:example">
+			<fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
+
+				<xsl:variable name="bookmark-title">
+							<xsl:value-of select="$title-list-examples"/>
+				</xsl:variable>
+
+				<fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
+
+				<xsl:for-each select="$contents_nodes//mnx:examples/mnx:example">
+					<fo:bookmark internal-destination="{@id}">
+						<!-- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title> -->
+						<fo:bookmark-title><xsl:apply-templates mode="bookmark_clean"/></fo:bookmark-title>
+					</fo:bookmark>
+				</xsl:for-each>
+			</fo:bookmark>
+		</xsl:if>
+	</xsl:template> <!-- insertExampleBookmarks -->
 	<!-- End Bookmarks -->
 
 	<!-- ============================ -->

data/lib/isodoc/ieee/init.rb

@@ -29,47 +29,6 @@ module IsoDoc
       def fileloc(loc)
         File.join(File.dirname(__FILE__), loc)
       end
-
-      def std_docid_semantic(id)
-        id.nil? and return nil
-        ret = Nokogiri::XML.fragment(id)
-        ret.traverse do |x|
-          x.text? or next
-          x.replace(std_docid_semantic1(x.text))
-        end
-        to_xml(ret)
-      end
-
-      def std_docid_semantic1(id)
-        ids = id.split(/\p{Zs}/)
-        agency?(ids[0].sub(%r{^([^/]+)/.*$}, "\\1")) or return id
-        std_docid_semantic_full(id)
-      end
-
-      # AGENCY+ TYPE NUMBER YEAR
-      def std_docid_semantic_full(ident)
-        m = ident.match(%r{(?<text>[^0-9]+\p{Zs})
-                        (?<num>[0-9]+[^:]*)
-                        (?:[:](?<yr>(?:19|20)\d\d))?}x)
-        m or return ident
-        ret = std_docid_sdo(m[:text]) +
-          "<span class='std_docNumber'>#{m[:num]}</span>"
-        m[:yr] and ret += ":<span class='std_year'>#{m[:yr]}</span>"
-        ret.gsub(%r{</span>(\p{Zs}+)<}, "\\1</span><")
-      end
-
-      def std_docid_sdo(text)
-        found = false
-        text.split(%r{([\p{Zs}|/]+)}).reverse.map do |x|
-          if /[A-Za-z]/.match?(x)
-            k = if found || agency?(x) then "std_publisher"
-                else "std_documentType"
-                end
-            found = true
-            "<span class='#{k}'>#{x}</span>"
-          else x end
-        end.reverse.join.gsub(%r{</span>(\p{Zs}+)<}, "\\1</span><")
-      end
     end
   end
 end

data/lib/isodoc/ieee/presentation_ref.rb

@@ -1,3 +1,5 @@
+require "pubid"
+
 module IsoDoc
   module Ieee
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
@@ -98,6 +100,18 @@ module IsoDoc
         std_docid_semantic(super)
       end
 
+      def annotate_docid?(_id)
+        true
+      end
+
+      def std_docid_span_classes(id)
+        id.gsub('class="publisher"', 'class="std_publisher"')
+          .gsub('class="doctype"', 'class="std_documentType"')
+          .gsub('class="docnumber"', 'class="std_docNumber"')
+          .gsub('class="part"', 'class="std_docNumber"')
+          .gsub('class="year"', 'class="std_year"')
+      end
+
       def eref_localities_conflated(refs, target, node)
         droploc = node["droploc"]
         node["droploc"] = true

data/lib/isodoc/ieee/word_cleanup_blocks.rb

@@ -105,7 +105,7 @@ module IsoDoc
       def note_style_cleanup(docxml)
         docxml.xpath("//span[@class = 'note_label']").each do |s|
           multi = /^#{@i18n.note}\s+[A-Z0-9.]+/.match?(s.text)
-          div = s.at("./ancestor::div[@class = 'Note']")
+          div = s.at("./ancestor::div[contains(concat(' ', normalize-space(@class), ' '), ' Note ')]")
           if multi
             s.remove
             seq = notesequence(div)

data/lib/metanorma/ieee/basicdoc.rng

@@ -187,6 +187,15 @@ Applicable to modify and delete</a:documentation>
         <a:documentation>Optional caption of this block</a:documentation>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="position">
+        <a:documentation>For an "add" change, whether the change is added before or after the location</a:documentation>
+        <choice>
+          <value>before</value>
+          <value>after</value>
+        </choice>
+      </attribute>
+    </optional>
     <optional>
       <element name="location">
         <a:documentation>The location(s) in the original document which have undergone the change described in this block</a:documentation>

data/lib/metanorma/ieee/biblio.rng

@@ -1142,11 +1142,11 @@ NOTE: This should preferably be encoded as  a URI or short identifier, rather th
         <a:documentation>Information about how long the current description of the bibliographic item is valid for</a:documentation>
       </ref>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="depiction">
         <a:documentation>Depiction of the bibliographic item, typically an image</a:documentation>
       </ref>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="ReducedBibliographicItem">
     <a:documentation>Reduced description of a bibliographic resource, without mandatory title and docidentifier, used for document relations
@@ -2015,15 +2015,11 @@ provided that it is not the entire bibliographic item that is so related</a:docu
     <a:documentation>A version of the bibliographic item (within an edition). Can be used for drafts</a:documentation>
     <element name="version">
       <optional>
-        <ref name="revision-date">
-          <a:documentation>The date at which the current version of the bibliographic item was produced</a:documentation>
-        </ref>
-      </optional>
-      <optional>
-        <ref name="draft">
-          <a:documentation>The identifier for the current draft of the bibliographic item</a:documentation>
-        </ref>
+        <attribute name="type">
+          <a:documentation>Versioning scheme, in case of multiple versioning schemes</a:documentation>
+        </attribute>
       </optional>
+      <text/>
     </element>
   </define>
   <define name="vedition">
@@ -2063,13 +2059,13 @@ provided that it is not the entire bibliographic item that is so related</a:docu
           <ref name="LocalizedString"/>
         </element>
       </optional>
-      <oneOrMore>
+      <zeroOrMore>
         <element name="taxon">
           <a:documentation>The keywords as a hierarchical taxonomy. For example, the sequence of `taxon` elements
 `pump`, `centrifugal pump`, `line shaft pump` represents a taxonomic classification</a:documentation>
           <ref name="LocalizedString"/>
         </element>
-      </oneOrMore>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="vocabid">
           <a:documentation>Identifiers for the keyword as a controlled vocabulary</a:documentation>

data/lib/metanorma/ieee/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-<!-- VERSION v2.1.5 -->
+<!-- VERSION v2.1.6 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -164,6 +164,9 @@ Sources are currently only rendered in metanorma-plateau</a:documentation>
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <ref name="DisplayDirective"/>
+      </optional>
     </define>
     <define name="DlAttributes">
       <ref name="BlockAttributes"/>
@@ -210,6 +213,12 @@ Sources are currently only rendered in metanorma-plateau</a:documentation>
     <define name="ExampleAttributes">
       <ref name="NumberingAttributes"/>
       <ref name="BlockAttributes"/>
+      <optional>
+        <attribute name="collapsible">
+          <a:documentation>Render the example as collapsible (HTML5 details/summary)</a:documentation>
+          <data type="boolean"/>
+        </attribute>
+      </optional>
     </define>
     <define name="ExampleBody">
       <optional>
@@ -814,6 +823,9 @@ titlecase, or lowercase</a:documentation>
   </define>
   <define name="UlAttributes" combine="interleave">
     <ref name="BlockAttributes"/>
+    <optional>
+      <ref name="DisplayDirective"/>
+    </optional>
   </define>
   <define name="TableAttributes" combine="interleave">
     <optional>
@@ -1968,7 +1980,7 @@ used in document amendments</a:documentation>
           <a:documentation>Zero or more examples of how the term is to be used</a:documentation>
         </ref>
       </zeroOrMore>
-      <ref name="TermSource">
+      <ref name="TermSources">
         <a:documentation>Bibliographic references for the managed term</a:documentation>
       </ref>
     </element>
@@ -2077,7 +2089,7 @@ used in document amendments</a:documentation>
         <a:documentation>Information about how the designation is to be used</a:documentation>
       </ref>
     </optional>
-    <ref name="TermSource">
+    <ref name="TermSources">
       <a:documentation>Bibliographic references for this designation of the managed term</a:documentation>
     </ref>
   </define>
@@ -2348,7 +2360,7 @@ used in document amendments</a:documentation>
           <ref name="formula"/>
         </choice>
       </oneOrMore>
-      <ref name="TermSource">
+      <ref name="TermSources">
         <a:documentation>Bibliographic references for this designation of the managed term</a:documentation>
       </ref>
     </element>
@@ -2365,7 +2377,7 @@ used in document amendments</a:documentation>
           <ref name="formula"/>
         </choice>
       </oneOrMore>
-      <ref name="TermSource">
+      <ref name="TermSources">
         <a:documentation>Bibliographic references for this designation of the managed term</a:documentation>
       </ref>
     </element>
@@ -2788,6 +2800,26 @@ to span across both columns</a:documentation>
       </attribute>
     </optional>
   </define>
+  <define name="DisplayDirective">
+    <a:documentation>Directive on how to render a block in Presentation XML </a:documentation>
+    <optional>
+      <attribute name="display">
+        <a:documentation>Display style for block.
+If the block is `ol` or `ul` and dispay is `table`, 
+the list is to be rendered as a table, with a column for each nested level, and a row for each terminal sublist</a:documentation>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="display-directives">
+        <a:documentation>display-directives is a key-value set of attributes, guiding how the rendering of the block should happen. 
+The key-value set is comma-delimited, and encoded as `key1='value1',key2='value'`, 
+as with stem//mn/@data-metanorma-numberformat
+*  If the block is `ol` or `ul` and dispay is `table`,  display-directives can have the value `colgroup='col1,col2,...coln'`, 
+where each col value is a percentage width of the column in the output table (with no % suffix). 
+e.g. `colgroup='50,33.3,16.7'`  </a:documentation>
+      </attribute>
+    </optional>
+  </define>
   <define name="ReferencesAttributes">
     <optional>
       <attribute name="obligation">
@@ -2800,7 +2832,7 @@ Normative References contents contain normative references, but as a clause in t
       <data type="boolean"/>
     </attribute>
   </define>
-  <define name="TermSource">
+  <define name="TermSources">
     <zeroOrMore>
       <ref name="termsource"/>
     </zeroOrMore>

data/lib/metanorma/ieee/reqt.rng

@@ -47,7 +47,15 @@ the tag name of the top level containers</a:documentation>
     </optional>
     <optional>
       <attribute name="model">
-        <a:documentation>Model of requirements realised by this requirement, e.g. "ogc" for Modspec</a:documentation>
+        <a:documentation>Model of requirements realised by this requirement, e.g. "ogc" for Modspec.
+Current legal values: ogc, default</a:documentation>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="render">
+        <a:documentation>Rendering of requirements realised by this requirement. Current legal values:
+default:: default, inline
+ogc:: default</a:documentation>
       </attribute>
     </optional>
     <optional>

data/lib/metanorma/ieee/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ieee
-    VERSION = "1.6.10".freeze
+    VERSION = "1.6.13".freeze
   end
 end

data/lib/relaton/render/config.yml

@@ -24,7 +24,7 @@ template:
   manual: book
   proceedings: book
   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 %} $$$"
+  inbook: "{{ creatornames }}$$$ “{{ title }}$$$|” {{ labels['in_document'] }} {{ 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 }}$$$ {{ disambiguated_date }}$$$ {{ labels['viewed'] }}_{{date_accessed}}$$$ {% if uri %}{{ uri }}{% else %}{% if doi %}DOI: {{ doi | join: '$$$ ' }}{% endif %}{% endif %} $$$"
   unpublished: thesis

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ieee
 version: !ruby/object:Gem::Version
-  version: 1.6.10
+  version: 1.6.13
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -359,7 +358,6 @@ homepage: https://github.com/metanorma/metanorma-ieee
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -374,8 +372,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Metanorma for the IEEE
 test_files: []