metanorma-iec 2.8.6 → 2.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3f4f5353e4610b6e003d791b6f79298ed76879b907b65509e9c1c79d0d77f1f
-  data.tar.gz: 5341fe473fda7b5d713bf05081379cabc0670253374f250de792ed1e47dcf3fa
+  metadata.gz: ac19342ac00ffd2864809a234ebe386440f6e3c8ed183d9adba35377d5285f37
+  data.tar.gz: 645567607413485c04a70c83cda7ac93f2450b2a42d856994e5d72f5c379f231
 SHA512:
-  metadata.gz: bf5cebae8b73d84939f32e9acfb4165ea63877c66a821fc31fa903227e3bdff71d68dd67e76b857c552f7f5f17ddba5d7583737b6e2c6c116b0caf7676d4d7b2
-  data.tar.gz: f8612a188177c30fc0b14b72a5ee9d540b28e870cd7e3734b5cbb2e47520fb2e91401db0f8b2d419655d31cbd33694d0a99bdae367ac9dee3fc6bbf0032c09a4
+  metadata.gz: 796f8b1d9c80314e4bf1a28223d6fca4435d418c29b13ceb5343dbab15e44fb678efadb25c5a59ee8ca05d3d44b9250c68b20b5f6267ba1164dff67459e321b2
+  data.tar.gz: 5ac701fa60ad88317901f25b108af1bddd63d5648e96b4364713268676ace86e71d7344fc15aa09529d01e96a974be85834fa5e5bb068c41f219a05b6f654d18

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

@@ -673,7 +673,9 @@ p.TermNum {
     background-color: #f5faff;
     color: black !important;
     cursor: pointer;
-    z-index: 100;
+    left: 0;
+    top: 0;
+    z-index: 103;
   }
   #toggle span {
     text-align: center;

data/lib/isodoc/iec/iec.international-standard.xsl

@@ -1362,6 +1362,13 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 			<xsl:call-template name="insertListOf_Item"/>
 		</xsl:for-each>
 
+		<xsl:for-each select="$contents//mnx:examples/mnx:example">
+			<xsl:if test="position() = 1">
+				<fo:block margin-bottom="5pt" role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block>
+			</xsl:if>
+			<xsl:call-template name="insertListOf_Item"/>
+		</xsl:for-each>
+
 			<!-- </fo:block>
 		</fo:block-container> -->
 	</xsl:template> <!-- END: insertTOCpages -->
@@ -1403,6 +1410,7 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 
 	<xsl:template match="mn:preface//mn:clause[@type = 'toc']/mn:fmt-title" priority="3">
 		<fo:block xsl:use-attribute-sets="toc-title-style">
+			<xsl:call-template name="refine_toc-title-style"/>
 			<xsl:call-template name="addLetterSpacing">
 				<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new(.))"/>
 			</xsl:call-template>
@@ -2343,6 +2351,16 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 		</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"/>
@@ -3226,6 +3244,14 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 
 	<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 -->
 
 	<!-- =========================================================================== -->
@@ -3263,6 +3289,7 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 			<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')">
@@ -4176,6 +4203,7 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 	</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">
@@ -4914,10 +4942,38 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 	<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"/>
@@ -6149,6 +6205,7 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 	     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">
@@ -6159,6 +6216,7 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 
 			<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>
+				<xsl:if test="normalize-space($example_display_in) != ''"><xsl:value-of select="$example_display_in"/></xsl:if>
 						<xsl:choose>
 							<!-- if example contains only one (except 'name') element (paragraph for example), then display it on the same line as EXAMPLE title -->
 							<xsl:when test="count(*[not(self::mn:fmt-name)]) = 1">inline</xsl:when>
@@ -13586,7 +13644,7 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 	<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-set>
 
@@ -13688,6 +13746,9 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 		<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">
@@ -13734,7 +13795,29 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 		</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>
@@ -13743,40 +13826,40 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 
 	<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>
 
@@ -14009,6 +14092,11 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 											<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>
@@ -14027,6 +14115,11 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 										<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>
@@ -14043,6 +14136,11 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 							<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>
 
@@ -14132,6 +14230,53 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 			</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:attribute name="internal-destination">
+						<xsl:value-of select="$contents_nodes//mnx:examples/mnx:example[1]/@id"/>
+					</xsl:attribute>
+
+				<xsl:variable name="bookmark-title">
+							<xsl:choose>
+								<xsl:when test="$lang = 'fr'">Exemples</xsl:when>
+								<xsl:otherwise>Examples</xsl:otherwise>
+							</xsl:choose>
+
+				</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/iec/init.rb

@@ -32,8 +32,8 @@ module IsoDoc
         super
       end
 
-      def std_docid_semantic(text)
-        text
+      def annotate_docid?(_id)
+        false
       end
     end
   end

data/lib/metanorma/iec/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/iec/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/iec/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/iec/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/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.8.6".freeze
+    VERSION = "2.8.9".freeze
   end
 end
 

data/lib/relaton/render-iec/config.yml

@@ -20,23 +20,23 @@ template:
   # skip standardidentifier, it is inserted in front of formattedref within metanorma
   standard: "{% if home_standard %}<em><span_class='stddocTitle'>{{ title }}</span></em> ,_{{ extent }}{% else %}<smallcap>{{ creatornames }}</smallcap>. <em><span_class='stddocTitle'>{{ title }}</span></em> ,_{{ extent }} .  {{ labels['version'] | capitalize }}_{{ edition_raw }}. {{labels['updated'] | capitalize }}_{{date_updated}}. {{status | capitalize}}. {{ authorizer }}. {{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>.{% endif %}" 
   website: "<smallcap>{{ creatornames }}</smallcap> ({{ role }}) . <em><span_class='stddocTitle'>{{ title }}</span></em> [website]. {{ labels['version'] | capitalize }}_{{ edition_raw }}. {{place}}: {{ publisher }}. {{date}}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. [{{ labels['viewed'] }}:_{{date_accessed}}]. "
-  book: "<smallcap>{{ creatornames }}</smallcap> ({{role}}) . <em>{{ title }}</em> . {{ edition | capitalize_first }}. ({{ series }}). {% if place %}{{place}}{%else%}{{ labels['no_place']}}{%endif%}: {{publisher}}. {{date}}. {{size}}. {{extent}}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  book: "<smallcap>{{ creatornames }}</smallcap> ({{role}}) . <em>{{ title }}</em> . {{ edition | capitalize_first }}. ({{ series }}). {% if place %}{{place}}{%else%}{{ labels['no_place']}}{%endif%}: {{publisher}}. {{date}}. {{size}}. {{extent}}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. {{ labels['at_url'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
   booklet: book
   manual: book
   techreport: book
   proceedings: book
-  inbook: "<smallcap>{{ creatornames }}</smallcap> ({{role}}) . {{ title }} . <em>{{host_title}}</em> ({{host_role}} {{ host_creatornames}}). {{ edition | capitalize_first }}. ({{ series }}). {% if place %}{{place}}{%else%}{{ labels['no_place']}}{%endif%}: {{publisher}}. {{date}}. {{size}}. {{extent}}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  inbook: "<smallcap>{{ creatornames }}</smallcap> ({{role}}) . {{ title }} . <em>{{host_title}}</em> ({{host_role}} {{ host_creatornames}}). {{ edition | capitalize_first }}. ({{ series }}). {% if place %}{{place}}{%else%}{{ labels['no_place']}}{%endif%}: {{publisher}}. {{date}}. {{size}}. {{extent}}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. {{ labels['at_url'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
   inproceedings: inbook
   incollection: inbook
-  journal: "<em>{{ title}}</em> . {{ edition | capitalize_first }}. {{place}}: {{publisher}}. {{date}}. {{size}}. {{extent}}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
-  article: "<smallcap>{{ creatornames }}</smallcap> ({{role}}) . {{ title }}. {{ series }} . {{date}}, {{ extent }}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  journal: "<em>{{ title}}</em> . {{ edition | capitalize_first }}. {{place}}: {{publisher}}. {{date}}. {{size}}. {{extent}}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. {{ labels['at_url'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  article: "<smallcap>{{ creatornames }}</smallcap> ({{role}}) . {{ title }}. {{ series }} . {{date}}, {{ extent }}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. {{ labels['at_url'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
   software: "<smallcap>{{ creatornames }}</smallcap> ({{ role}}) . <em>{{ title }}</em> . {{ labels['version'] | capitalize }}_{{ edition_raw }}. {{medium | capitalize}}. {{place}}: {{publisher}}. {{date}}. {{size}}. {{extent}}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. [{{ labels['viewed'] }}:_{{date_accessed}}]. "
   electronic resource:  software
-  dataset: "<smallcap>{{ creatornames }}</smallcap> ({{ role }}) . <em>{{ title }}</em> . {{ labels['version'] | capitalize }}_{{ edition_raw }}. {{medium | capitalize }}. {{ labels['in'] | capitalize }}:_{{series}}. {{date}}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. {{ authoritative_identifier | join '. ' }}. {{ other_identifier | join '. ' }}.  ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. {{ size }}. {{ extent}}. [{{ labels['viewed'] }}:_{{date_accessed}}]. "
+  dataset: "<smallcap>{{ creatornames }}</smallcap> ({{ role }}) . <em>{{ title }}</em> . {{ labels['version'] | capitalize }}_{{ edition_raw }}. {{medium | capitalize }}. {{ labels['in_series'] | capitalize }}:_{{series}}. {{date}}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. {{ authoritative_identifier | join '. ' }}. {{ other_identifier | join '. ' }}.  ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. {{ size }}. {{ extent}}. [{{ labels['viewed'] }}:_{{date_accessed}}]. "
   webresource: website
-  unpublished: "<smallcap>{{ creatornames }}</smallcap> ({{ role }}) . <em>{{ title }}</em> . {{ medium | capitalize }}. {{ date }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  unpublished: "<smallcap>{{ creatornames }}</smallcap> ({{ role }}) . <em>{{ title }}</em> . {{ medium | capitalize }}. {{ date }}. {{ labels['at_url'] | capitalize}}:_{{ access_location }}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. [{{ labels['viewed'] }}:_{{date_accessed}}]."
   presentation: unpublished
-  thesis: "<smallcap>{{ creatornames }}</smallcap> ({{ role }}) . <em>{{ title }}</em> . {{ medium | capitalize }}. {{place}}: {{ publisher }}. {{ date }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  thesis: "<smallcap>{{ creatornames }}</smallcap> ({{ role }}) . <em>{{ title }}</em> . {{ medium | capitalize }}. {{place}}: {{ publisher }}. {{ date }}. {{ labels['at_url'] | capitalize}}:_{{ access_location }}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. [{{ labels['viewed'] }}:_{{date_accessed}}]."
   misc:  "<smallcap>{{ creatornames }}</smallcap> ({{ role }}) . <em>{{ title }}</em> . {{ date }}."
   # following are # unsupported types:
   map: misc

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.8.6
+  version: 2.8.9
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
 bindir: bin
 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-iso
@@ -290,7 +289,6 @@ homepage: https://github.com/metanorma/metanorma-iec
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -305,8 +303,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-iec lets you write IEC standards in AsciiDoc.
 test_files: []