metanorma-iec 2.8.1 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6defcf38222ffe2ca5af4f9369778ff3e879196a8bbde0c348d0c45f8a522d3
-  data.tar.gz: f1ee1d7a0938499d67c20dedc74a3a88e6ee7064afc5ab186885784ce037417a
+  metadata.gz: c64bdf87681ec10077febc189e97626a27c0ad4f4dc1c5451e124e39fd6b690d
+  data.tar.gz: ac2c5f7cca5de90d6132a2b495fbf3cfdc8051d571d6d31df2299b4a0fb74d09
 SHA512:
-  metadata.gz: 0dd0dc87b5fcd7caba2e46bbe57a66b8a1e126d78d7f2a5ef44f466afa70630aacc0495d2478f9a052117cb4452d2171f9b73ee4615c5013284dd86d4cfa918c
-  data.tar.gz: 4a821ea60263a1f5a76be53b4732693e2e1e048ae7e927461691a7b077d7dbf32fdb3255bc28185ba579b7325657bd3533e286023ee54bc25b6e030bbec10d72
+  metadata.gz: fbe45a98f96ee98445773f2b1e8a84255210c3f692867002be724e536d34517307bb1ed8e69c2d42499d5e5e8fe1f4f2740acf8685536c6886b02270865af576
+  data.tar.gz: '0978d0d444231659059fbad63c0501c78c6675bc44e232b228715a8d0ab4e484e25aab202b130bc8dbb645a358964cdd81aca52d01e282fb6c247f2505f7e797'

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

@@ -319,6 +319,11 @@ svg {
   display: block; /* ← removes unwanted inline spacing */
 }
 
+/* style dfn by override in flavor */
+dfn {
+  font-style: inherit;
+}
+
 #standard-band {
   background-color: #0AC442;
 }

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

@@ -1334,7 +1334,7 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 										</xsl:call-template>
 										<xsl:text> </xsl:text>
 										<fo:inline keep-together.within-line="always" role="SKIP">
-											<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
+											<fo:leader xsl:use-attribute-sets="toc-leader-style"><xsl:call-template name="refine_toc-leader-style"/></fo:leader>
 											<fo:inline role="SKIP"><fo:wrapper role="artifact"><fo:page-number-citation ref-id="{@id}"/></fo:wrapper></fo:inline>
 										</fo:inline>
 									</fo:basic-link>
@@ -1370,7 +1370,7 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 			<fo:basic-link internal-destination="{@id}" fox:alt-text="{$alt_text}"> <!-- {local-name()} {@id} -->
 				<xsl:apply-templates select="." mode="contents"/>
 				<fo:inline keep-together.within-line="always" role="SKIP">
-					<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
+					<fo:leader xsl:use-attribute-sets="toc-leader-style"><xsl:call-template name="refine_toc-leader-style"/></fo:leader>
 					<fo:wrapper role="artifact">
 						<fo:page-number-citation ref-id="{@id}"/>
 					</fo:wrapper>
@@ -1436,19 +1436,10 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 
 		<xsl:for-each select=".//mn:page_sequence[parent::mn:preface][normalize-space() != '' or .//mn:image or .//*[local-name() = 'svg']]">
 
-			<fo:page-sequence master-reference="document" format="1" force-page-count="no-force">
-
-				<xsl:attribute name="master-reference">
-					<xsl:text>document</xsl:text>
-					<xsl:call-template name="getPageSequenceOrientation"/>
-				</xsl:attribute>
-
-				<xsl:if test="position() = 1 and $num = '1'">
-					<xsl:attribute name="initial-page-number">2</xsl:attribute>
-				</xsl:if>
-				<xsl:if test="$isIEV = 'true'">
-					<xsl:attribute name="format">I</xsl:attribute>
-				</xsl:if>
+			<fo:page-sequence xsl:use-attribute-sets="page-sequence-preface">
+				<xsl:call-template name="refine_page-sequence-preface">
+					<xsl:with-param name="num" select="$num"/>
+				</xsl:call-template>
 
 				<xsl:call-template name="insertHeaderFooter"/>
 
@@ -1469,16 +1460,8 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 
 		<xsl:for-each select=".//mn:page_sequence[not(parent::mn:preface)][normalize-space() != '' or .//mn:image or .//*[local-name() = 'svg']]">
 
-			<fo:page-sequence master-reference="document" force-page-count="no-force">
-
-				<xsl:attribute name="master-reference">
-					<xsl:text>document</xsl:text>
-					<xsl:call-template name="getPageSequenceOrientation"/>
-				</xsl:attribute>
-
-				<xsl:if test="position() = 1 and $isIEV = 'true'">
-					<xsl:attribute name="initial-page-number">1</xsl:attribute>
-				</xsl:if>
+			<fo:page-sequence xsl:use-attribute-sets="page-sequence-main">
+				<xsl:call-template name="refine_page-sequence-main"/>
 
 				<xsl:call-template name="insertFootnoteSeparatorCommon"/>
 
@@ -1859,7 +1842,9 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 
 	<xsl:template match="mn:indexsect"/>
 	<xsl:template match="mn:indexsect" mode="index">
-		<fo:page-sequence master-reference="document" force-page-count="no-force">
+		<fo:page-sequence xsl:use-attribute-sets="page-sequence-main">
+			<xsl:call-template name="refine_page-sequence-main"/>
+
 			<xsl:call-template name="insertHeaderFooter"/>
 			<fo:flow flow-name="xsl-region-body">
 				<fo:block id="{@id}" span="all">
@@ -2455,20 +2440,43 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 	</xsl:variable>
 
 	<xsl:attribute-set name="page-sequence-preface">
-		<xsl:attribute name="format">i</xsl:attribute>
-	</xsl:attribute-set>
+		<xsl:attribute name="format">1</xsl:attribute>
+		<xsl:attribute name="force-page-count">no-force</xsl:attribute>
+		<xsl:attribute name="master-reference">document</xsl:attribute>
+	</xsl:attribute-set> <!-- page-sequence-preface -->
 
 	<xsl:template name="refine_page-sequence-preface">
 		<xsl:param name="layoutVersion"/>
-	</xsl:template>
+		<xsl:param name="doctype"/>
+		<xsl:param name="num"/>
+		<xsl:param name="skip_force_page_count">false</xsl:param>
+		<xsl:attribute name="master-reference">
+			<xsl:text>document</xsl:text>
+			<xsl:call-template name="getPageSequenceOrientation"/>
+		</xsl:attribute>
+		<xsl:if test="position() = 1 and $num = '1'">
+			<xsl:attribute name="initial-page-number">2</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="$isIEV = 'true'">
+			<xsl:attribute name="format">I</xsl:attribute>
+		</xsl:if>
+	</xsl:template> <!-- refine_page-sequence-preface -->
 
 	<xsl:attribute-set name="page-sequence-main">
-
-	</xsl:attribute-set>
+		<xsl:attribute name="force-page-count">no-force</xsl:attribute>
+	</xsl:attribute-set> <!-- page-sequence-main -->
 
 	<xsl:template name="refine_page-sequence-main">
 		<xsl:param name="layoutVersion"/>
-	</xsl:template>
+		<xsl:param name="doctype"/>
+		<xsl:attribute name="master-reference">
+			<xsl:text>document</xsl:text>
+			<xsl:call-template name="getPageSequenceOrientation"/>
+		</xsl:attribute>
+		<xsl:if test="position() = 1 and $isIEV = 'true' and not(self::mn:indexsect)">
+			<xsl:attribute name="initial-page-number">1</xsl:attribute>
+		</xsl:if>
+	</xsl:template> <!-- refine_page-sequence-main -->
 
 	<xsl:variable name="font_noto_sans">Noto Sans, Noto Sans HK, Noto Sans JP, Noto Sans KR, Noto Sans SC, Noto Sans TC</xsl:variable>
 	<xsl:variable name="font_noto_sans_mono">Noto Sans Mono, Noto Sans Mono CJK HK, Noto Sans Mono CJK JP, Noto Sans Mono CJK KR, Noto Sans Mono CJK SC, Noto Sans Mono CJK TC</xsl:variable>
@@ -13374,6 +13382,7 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_toc-style">
+		<xsl:copy-of select="@id"/>
 	</xsl:template>
 
 	<xsl:attribute-set name="toc-title-style">
@@ -13477,13 +13486,13 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 
 	<xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:variable name="nodes_preface_">
-			<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
+			<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]"> <!--  or @type = 'toc' -->
 				<node id="{@id}"/>
 			</xsl:for-each>
 		</xsl:variable>
 		<xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
 
-		<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
+		<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]"> <!--  or @type = 'toc' -->
 			<xsl:sort select="@displayorder" data-type="number"/>
 
 			<!-- process Section's title -->
@@ -13496,6 +13505,23 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 		</xsl:for-each>
 	</xsl:template>
 
+	<xsl:template match="*[@type = 'toc'][mn:title or mn:fmt-title]" mode="contents" priority="2">
+		<xsl:variable name="title">
+			<xsl:call-template name="getName"/>
+		</xsl:variable>
+		<xsl:variable name="root">
+			<xsl:if test="ancestor-or-self::mn:preface">preface</xsl:if>
+			<xsl:if test="ancestor-or-self::mn:annex">annex</xsl:if>
+		</xsl:variable>
+		<mnx:item id="{@id}" level="1" section="" type="toc" root="{$root}" display="false">
+			<mnx:title>
+				<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item">
+					<xsl:with-param name="element" select="$root"/>
+				</xsl:apply-templates>
+			</mnx:title>
+		</mnx:item>
+	</xsl:template>
+
 	<xsl:template name="processMainSectionsDefault_Contents">
 
 		<xsl:variable name="nodes_sections_">
@@ -15319,16 +15345,17 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 	<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
 	<xsl:template name="insert_basic_link">
 		<xsl:param name="element"/>
+		<xsl:param name="wrapper">true</xsl:param>
 		<xsl:variable name="element_node" select="xalan:nodeset($element)"/>
 		<xsl:variable name="external-destination" select="normalize-space(count($element_node/fo:basic-link/@external-destination[. != '']) = 1)"/>
 		<xsl:variable name="internal-destination" select="normalize-space(count($element_node/fo:basic-link/@internal-destination[. != '']) = 1)"/>
 		<xsl:choose>
-			<xsl:when test="$internal-destination = 'true'">
+			<xsl:when test="$internal-destination = 'true' and $wrapper = 'true'">
 				<fo:wrapper role="Reference">
 					<xsl:copy-of select="$element_node"/>
 				</fo:wrapper>
 			</xsl:when>
-			<xsl:when test="$external-destination = 'true'">
+			<xsl:when test="$internal-destination = 'true' or $external-destination = 'true'">
 				<xsl:copy-of select="$element_node"/>
 			</xsl:when>
 			<xsl:otherwise>

data/lib/metanorma/iec/biblio.rng

@@ -1939,10 +1939,10 @@ Detailed in https://www.relaton.org/model/relations/</a:documentation>
       <value>hasAnnotation</value>
       <value>draftOf</value>
       <value>hasDraft</value>
-      <value>preliminaryDraftOf</value>
-      <value>hasPreliminaryDraft</value>
-      <value>revisionDraftOf</value>
-      <value>hasRevisionDraft</value>
+      <value>predecessorDraftOf</value>
+      <value>hasPredecessorDraft</value>
+      <value>successorDraftOf</value>
+      <value>hasSuccessorDraft</value>
       <value>editionOf</value>
       <value>hasEdition</value>
       <value>updates</value>

data/lib/metanorma/iec/isodoc.rng

@@ -641,8 +641,85 @@ This is done if the footnote reference is already presented in some other form,
         </ref>
       </zeroOrMore>
     </define>
+    <define name="altsource">
+      <a:documentation>Alternative file to use as media</a:documentation>
+      <element name="altsource">
+        <ref name="MediaAttributes"/>
+        <optional>
+          <attribute name="tag">
+            <a:documentation>Comma-delimited tag to indicate when the alternate file is to be used, 
+at minimum allows contain `html`, `doc`, `pdf` as the main target formats of Metanorma,
+and `default` for the fallback. The presence of an altsource tagged `default` is required</a:documentation>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="media">
+            <a:documentation>CSS media query to indicate when the alternate file is to be used</a:documentation>
+          </attribute>
+        </optional>
+      </element>
+    </define>
+    <define name="image">
+      <a:documentation>Container for image content</a:documentation>
+      <choice>
+        <element name="image">
+          <ref name="RequiredId"/>
+          <ref name="ImageAttributes">
+            <a:documentation>When specified along with altsource, ImageAttributes give the default image to be rendered</a:documentation>
+          </ref>
+          <ref name="ImageBody"/>
+        </element>
+        <element name="svg">
+          <a:documentation>Add svg mark up to image</a:documentation>
+          <oneOrMore>
+            <choice>
+              <text/>
+              <ref name="AnyElement"/>
+            </choice>
+          </oneOrMore>
+        </element>
+      </choice>
+    </define>
+    <define name="ImageAttributes">
+      <optional>
+        <ref name="MediaAttributes">
+          <a:documentation>If the image contains altsource, the media attributes are given on each of the altsource elements instead of the root node</a:documentation>
+        </ref>
+      </optional>
+      <ref name="MediaAccessibilityAttributes"/>
+      <optional>
+        <attribute name="width">
+          <a:documentation>Height of image</a:documentation>
+          <ref name="ImageSize"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="height">
+          <a:documentation>Width of image</a:documentation>
+          <ref name="ImageSize"/>
+        </attribute>
+      </optional>
+    </define>
   </include>
   <!-- end overrides -->
+  <define name="ImageBody">
+    <optional>
+      <element name="svg">
+        <a:documentation>image can contain SVG XML, which is used to access its identifiers within the Metanorma XML</a:documentation>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </optional>
+    <zeroOrMore>
+      <ref name="altsource">
+        <a:documentation>Alternative files to use as media</a:documentation>
+      </ref>
+    </zeroOrMore>
+  </define>
   <define name="key">
     <a:documentation>Key to a table, figure, or formula</a:documentation>
     <element name="key">
@@ -930,34 +1007,6 @@ titlecase, or lowercase</a:documentation>
       <ref name="ReducedBibliographicItem"/>
     </element>
   </define>
-  <define name="image" combine="choice">
-    <choice>
-      <element name="image">
-        <ref name="RequiredId"/>
-        <ref name="ImageAttributes"/>
-        <optional>
-          <element name="svg">
-            <a:documentation>Allow svg in image/svg, for consistency</a:documentation>
-            <oneOrMore>
-              <choice>
-                <text/>
-                <ref name="AnyElement"/>
-              </choice>
-            </oneOrMore>
-          </element>
-        </optional>
-      </element>
-      <element name="svg">
-        <a:documentation>Add svg mark up to image</a:documentation>
-        <oneOrMore>
-          <choice>
-            <text/>
-            <ref name="AnyElement"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </choice>
-  </define>
   <define name="ParagraphFnBody" combine="interleave">
     <ref name="BlockSource">
       <a:documentation>Bibliographic source for the information in the paragraph

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.8.1".freeze
+    VERSION = "2.8.2".freeze
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-02 00:00:00.000000000 Z
+date: 2026-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso