metanorma-iec 2.7.8 → 2.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7eefcc773e3048b7ab34be286c4afa430ca40b7308fd9aea8ff214a9f19f83d
-  data.tar.gz: dfc318182ef7651aa5c1bc7c19b379674202aabe5ff5937e100207cd43211682
+  metadata.gz: 166fc172babb1d1d0faca61bee2ce568fea3fd81b121d70914e6ab93a6b970d6
+  data.tar.gz: 98d3ed3445ccfd6990ca0a677d2041076417652c949c48b4eb3e865444309f0f
 SHA512:
-  metadata.gz: 647149621b1a03d206edbfebbb5b0531382de436c1bbb33d902a8f53a4b1f3fc5626e2e01127b488225917c77fd34c34aa0aba108d7dfc5e4222cf3f4acb0baa
-  data.tar.gz: 670560402ec2a70e21a802156f1df0a45a99e00a9fc1c15d9654bc0b7ba78b7eb211f6861eae93807e0acf4f622da4770880719c031dcc2160dd6f0bc6efd265
+  metadata.gz: 3e21b51702068630a1d9d59246af61ff7da096a1ef77b8deb8a896b97dd22155e70ebcc4c8d4cfdecff59f256e658580e0f6779bd70e8ed55b0d5284e464f3c5
+  data.tar.gz: 3a33cc8d361ea0511310937cccff1f6063313d08682cc066f8d0d64261f9905bdaf158363b93559e1e5927cdbf7c21a684cdbedeb4171bf83551fb820c11de42

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

@@ -1823,34 +1823,14 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 	<!-- ====== -->
 	<!-- title      -->
 	<!-- ====== -->
-	<xsl:template match="mn:introduction/mn:fmt-title">
-		<fo:block font-size="12pt" text-align="center" margin-bottom="12pt" role="H1">
-			<xsl:apply-templates/>
-			<xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
-		</fo:block>
-	</xsl:template>
+	<!-- Introduction title text spacing -->
 	<xsl:template match="mn:introduction/mn:fmt-title/text()">
 		<xsl:call-template name="addLetterSpacing">
 			<xsl:with-param name="text" select="."/>
 		</xsl:call-template>
 	</xsl:template>
 
-	<xsl:template match="mn:annex/mn:fmt-title">
-		<xsl:call-template name="setNamedDestination"/>
-		<fo:block xsl:use-attribute-sets="annex-title-style">
-			<xsl:call-template name="refine_annex-title-style"/>
-
-			<xsl:apply-templates/>
-			<xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
-		</fo:block>
-	</xsl:template>
-
-	<!-- Bibliography -->
-	<xsl:template match="mn:references[not(@normative='true')]/mn:fmt-title">
-		<fo:block xsl:use-attribute-sets="references-non-normative-title-style">
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template>
+	<!-- Bibliography title text spacing -->
 	<xsl:template match="mn:references[not(@normative='true')]/mn:fmt-title/text()">
 		<xsl:call-template name="addLetterSpacing">
 			<xsl:with-param name="text" select="."/>
@@ -3428,7 +3408,7 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 	<xsl:variable name="non_white_space">[^\s\u3000-\u9FFF]</xsl:variable>
 	<xsl:variable name="regex_dots_units">((\b((<xsl:value-of select="$non_white_space"/>{1,3}\.<xsl:value-of select="$non_white_space"/>+)|(<xsl:value-of select="$non_white_space"/>+\.<xsl:value-of select="$non_white_space"/>{1,3}))\b)|(\.<xsl:value-of select="$non_white_space"/>{1,3})\b)</xsl:variable>
 
-	<xsl:template match="text()[not(ancestor::mn:bibdata or      ancestor::mn:fmt-link[not(contains(normalize-space(),' '))] or      ancestor::mn:sourcecode or      ancestor::*[local-name() = 'math'] or     ancestor::*[local-name() = 'svg'] or     ancestor::mn:name or ancestor::mn:fmt-name or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') or normalize-space() = '' )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
+	<xsl:template match="text()[not(ancestor::mn:bibdata or      ancestor::mn:fmt-link[not(contains(normalize-space(),' '))] or      ancestor::mn:sourcecode or      (ancestor::mn:tt and ancestor::mn:table and string-length() &gt; 20) or     ancestor::*[local-name() = 'math'] or     ancestor::*[local-name() = 'svg'] or     ancestor::mn:name or ancestor::mn:fmt-name or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') or normalize-space() = '' )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
 
 		<xsl:variable name="parent" select="local-name(..)"/>
 
@@ -12339,15 +12319,18 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 	<!-- END Admonition -->
 	<!-- ================ -->
 
-	<xsl:attribute-set name="references-non-normative-title-style">
+	<xsl:attribute-set name="bibliography-title-style">
 		<xsl:attribute name="font-size">12pt</xsl:attribute>
+		<xsl:attribute name="font-weight">normal</xsl:attribute>
 		<xsl:attribute name="text-align">center</xsl:attribute>
+		<xsl:attribute name="space-before">0pt</xsl:attribute>
+		<xsl:attribute name="margin-top">0pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="role">H1</xsl:attribute>
 	</xsl:attribute-set>
 
-	<xsl:template name="refine_references-non-normative-title-style">
+	<xsl:template name="refine_bibliography-title-style">
 	</xsl:template>
 
 	<!-- bibitem in Normative References (references/@normative="true") -->
@@ -14459,15 +14442,16 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 	<!-- ===================================== -->
 
 	<xsl:attribute-set name="annex-title-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="font-size">12pt</xsl:attribute>
+		<xsl:attribute name="font-weight">normal</xsl:attribute>
 		<xsl:attribute name="text-align">center</xsl:attribute>
+		<xsl:attribute name="space-before">0</xsl:attribute>
 		<xsl:attribute name="margin-bottom">32pt</xsl:attribute>
-		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="role">H1</xsl:attribute>
 	</xsl:attribute-set> <!-- annex-title-style -->
 
 	<xsl:template name="refine_annex-title-style">
-		<!-- <xsl:call-template name="setIDforNamedDestination"/> -->
 	</xsl:template>
 
 	<xsl:attribute-set name="p-zzSTDTitle1-style">
@@ -14529,6 +14513,15 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 		<xsl:if test="(ancestor::mn:sections and $level = 1) or     (ancestor::mn:annex and $level &lt;= 2) or     (ancestor::mn:references[not (preceding-sibling::mn:references)])">
 			<xsl:attribute name="font-size">11pt</xsl:attribute>
 		</xsl:if>
+		<xsl:if test="$level = 1">
+			<xsl:if test="ancestor::mn:introduction">
+				<xsl:attribute name="font-size">12pt</xsl:attribute>
+				<xsl:attribute name="font-weight">normal</xsl:attribute>
+				<xsl:attribute name="text-align">center</xsl:attribute>
+				<xsl:attribute name="space-before">0pt</xsl:attribute>
+				<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+			</xsl:if>
+		</xsl:if>
 		<xsl:if test="$level &gt;= 2">
 			<xsl:attribute name="space-before">10pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">5pt</xsl:attribute>
@@ -14544,15 +14537,29 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 				<xsl:attribute name="space-before">5pt</xsl:attribute>
 			</xsl:if>
 		</xsl:if>
-
+		<xsl:if test="parent::mn:references[not(@normative='true')]"><!-- Bibliography section title -->
+			<xsl:variable name="bibliography_title_styles">
+				<styles xsl:use-attribute-sets="bibliography-title-style"><xsl:call-template name="refine_bibliography-title-style"/></styles>
+			</xsl:variable>
+			<xsl:copy-of select="xalan:nodeset($bibliography_title_styles)/styles/@*"/>
+		</xsl:if>
+		<xsl:if test="parent::mn:annex"><!-- Annex title -->
+			<xsl:variable name="annex_title_styles">
+				<styles xsl:use-attribute-sets="annex-title-style"><xsl:call-template name="refine_annex-title-style"/></styles>
+			</xsl:variable>
+			<xsl:copy-of select="xalan:nodeset($annex_title_styles)/styles/@*"/>
+		</xsl:if>
 		<!-- $namespace = 'iec' -->
 		<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
 	</xsl:template> <!-- refine_title-style -->
 
 	<xsl:template name="processPrefaceSectionsDefault">
+		<xsl:param name="num"/>
 		<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]">
 			<xsl:sort select="@displayorder" data-type="number"/>
-			<xsl:apply-templates select="."/>
+			<xsl:apply-templates select=".">
+				<xsl:with-param name="num" select="$num"/>
+			</xsl:apply-templates>
 		</xsl:for-each>
 	</xsl:template>
 

data/lib/metanorma/iec/biblio.rng

@@ -466,11 +466,11 @@ Editorial and advisory groups are represented as consecutive subdivisions of the
         <a:documentation>Contact information for the organization, including address, phone number, and email</a:documentation>
       </ref>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="logo">
         <a:documentation>A logo for the organization</a:documentation>
       </ref>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="orgname">
     <element name="name">
@@ -502,6 +502,11 @@ Editorial and advisory groups are represented as consecutive subdivisions of the
   </define>
   <define name="logo">
     <element name="logo">
+      <optional>
+        <attribute name="type">
+          <a:documentation>The type of logo</a:documentation>
+        </attribute>
+      </optional>
       <ref name="image-no-id"/>
     </element>
   </define>
@@ -513,6 +518,11 @@ Editorial and advisory groups are represented as consecutive subdivisions of the
           <a:documentation>Description of what is being depicted</a:documentation>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="type">
+          <a:documentation>Description of what kind of depiction this</a:documentation>
+        </attribute>
+      </optional>
       <zeroOrMore>
         <ref name="image-no-id">
           <a:documentation>A visual depiction of the bibliographic item</a:documentation>
@@ -690,7 +700,7 @@ Examples include GRID, LEI, CrossRef, and Ringgold</a:documentation>
   <define name="CitationType">
     <attribute name="bibitemid">
       <a:documentation>Bibliographic item that the citation applies to, referenced as the anchor of a bibliographic description</a:documentation>
-      <data type="IDREF"/>
+      <ref name="IdRefType"/>
     </attribute>
     <choice>
       <zeroOrMore>
@@ -1236,9 +1246,9 @@ Refer to `BibliographicItem` for definitions</a:documentation>
     <optional>
       <ref name="validity"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="depiction"/>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="btitle">
     <a:documentation>A title of a bibliographic item, associated with a type of title</a:documentation>
@@ -1296,17 +1306,17 @@ for which this claim of validity is made, if applicable</a:documentation>
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="TypedTitleString">

data/lib/metanorma/iec/front.rb

@@ -23,8 +23,11 @@ module Metanorma
       def metadata_status(node, xml)
         x = iso_id_default(iso_id_params(node)).stage
         xml.status do |s|
-          s.stage x.harmonized_code.stage, **attr_code(abbreviation: x.abbr)
-          s.substage x.harmonized_code.substage
+          add_noko_elem(s, "stage", x.harmonized_code.stage,
+                        abbreviation: x.abbr)
+          # s.stage x.harmonized_code.stage, **attr_code(abbreviation: x.abbr)
+          add_noko_elem(s, "substage", x.harmonized_code.substage)
+          # s.substage x.harmonized_code.substage
         end
       rescue *STAGE_ERROR
         report_illegal_stage(get_stage(node), get_substage(node))
@@ -88,23 +91,38 @@ module Metanorma
       end
 
       def iso_id_out_common(xml, params, _with_prf)
-        xml.docidentifier iso_id_default(params).to_s,
-                          **attr_code(type: "ISO", primary: "true")
-        xml.docidentifier iso_id_reference(params).to_s,
-                          **attr_code(type: "iso-reference")
+        add_noko_elem(xml, "docidentifier", iso_id_default(params).to_s,
+                      type: "ISO", primary: "true")
+        # xml.docidentifier iso_id_default(params).to_s,
+        #                  **attr_code(type: "ISO", primary: "true")
+        add_noko_elem(xml, "docidentifier", iso_id_reference(params).to_s,
+                      type: "iso-reference")
+        # xml.docidentifier iso_id_reference(params).to_s,
+        #                   **attr_code(type: "iso-reference")
         @id_revdate and
-          xml.docidentifier iso_id_revdate(params.merge(year: @id_revdate))
-            .to_s(with_edition_month_date: true),
-                            **attr_code(type: "iso-revdate")
-        xml.docidentifier iso_id_reference(params).urn,
-                          **attr_code(type: "URN")
+          add_noko_elem(xml, "docidentifier",
+                        iso_id_revdate(params.merge(year: @id_revdate)).to_s(
+                          with_edition_month_date: true,
+                        ),
+                        type: "iso-revdate")
+        # xml.docidentifier iso_id_revdate(params.merge(year: @id_revdate))
+        #  .to_s(with_edition_month_date: true),
+        #                  **attr_code(type: "iso-revdate")
+        add_noko_elem(xml, "docidentifier", iso_id_reference(params).urn,
+                      type: "URN")
+        # xml.docidentifier iso_id_reference(params).urn,
+        #                  **attr_code(type: "URN")
       end
 
       def iso_id_out_non_amd(xml, params, _with_prf)
-        xml.docidentifier iso_id_undated(params).to_s,
-                          **attr_code(type: "iso-undated")
-        xml.docidentifier iso_id_with_lang(params).to_s,
-                          **attr_code(type: "iso-with-lang")
+        add_noko_elem(xml, "docidentifier", iso_id_undated(params).to_s,
+                      type: "iso-undated")
+        # xml.docidentifier iso_id_undated(params).to_s,
+        #                  **attr_code(type: "iso-undated")
+        add_noko_elem(xml, "docidentifier", iso_id_with_lang(params).to_s,
+                      type: "iso-with-lang")
+        # xml.docidentifier iso_id_with_lang(params).to_s,
+        #                   **attr_code(type: "iso-with-lang")
       end
 
       def iso_id_revdate(params)
@@ -158,12 +176,19 @@ module Metanorma
 
       def metadata_ext(node, xml)
         super
-        a = node.attr("function") and xml.function a
-        a = node.attr("accessibility-color-inside") and
-          xml.accessibility_color_inside a
-        a = node.attr("cen-processing") and xml.cen_processing a
-        a = node.attr("secretary") and xml.secretary a
-        a = node.attr("interest-to-committees") and xml.interest_to_committees a
+        add_noko_elem(xml, "function", node.attr("function"))
+        # a = node.attr("function") and xml.function a
+        add_noko_elem(xml, "accessibility_color_inside",
+                      node.attr("accessibility-color-inside"))
+        # a = node.attr("accessibility-color-inside") and
+        #  xml.accessibility_color_inside a
+        add_noko_elem(xml, "cen_processing", node.attr("cen-processing"))
+        # a = node.attr("cen-processing") and xml.cen_processing a
+        add_noko_elem(xml, "secretary", node.attr("secretary"))
+        # a = node.attr("secretary") and xml.secretary a
+        add_noko_elem(xml, "interest_to_committees",
+                      node.attr("interest-to-committees"))
+        # a = node.attr("interest-to-committees") and xml.interest_to_committees a
       end
     end
   end

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.3 -->
+<!-- VERSION v2.1.5 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -905,15 +905,32 @@ titlecase, or lowercase</a:documentation>
     </element>
   </define>
   <define name="image" combine="choice">
-    <element name="svg">
-      <a:documentation>Add svg mark up to image</a:documentation>
-      <oneOrMore>
-        <choice>
-          <text/>
-          <ref name="AnyElement"/>
-        </choice>
-      </oneOrMore>
-    </element>
+    <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">

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.7.8".freeze
+    VERSION = "2.7.10".freeze
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.7.8
+  version: 2.7.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-03 00:00:00.000000000 Z
+date: 2025-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso