metanorma-iec 2.7.4 → 2.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d44c93bc0343ca32b346dabc3b029491596459d858b242c0ce0d8407f9c1b69
-  data.tar.gz: ee2876f29173c50e9f12b62ed1388f145e99d606c9b77f6ae3b6f052118337cb
+  metadata.gz: ec8091b9a14353c9b9607ffdc0caf1587f68bbcfaeddd6011269319eebbc29d0
+  data.tar.gz: e5cf6489c24d5bca999c7e8be61c1faa2250b523f4ef4c514c75cf257b76e1fd
 SHA512:
-  metadata.gz: b9ab2199d883f661cfad4894629c33af3267a57f90c7203365bcc4360282f19d215bb0dfd83fb25dfe4cd6f26ed749e0534919c753c2bc26daaa68b42b081a4b
-  data.tar.gz: f19a0ce7b0df07abd413dbea5fc4de0f88bf474c526a942a168df4e481fed7126fe013544cfd0a01bd9cbe1bb3a438c7bf85eb6dcd093f374b66c87a4e096b75
+  metadata.gz: 30cee0844430c28a14c39527a2a3720cce28bea6aeb1c8f89f9c61d1bf6110e970a63935194befad7c6ae52d232f3fd1a85e2d2bbb54240231416e5524b6b991
+  data.tar.gz: 0d79fe546085c839d6d4dfea54e49bb04f2929116420c14527716ea1bf574c75fa7ebafeea398bf18968237b709d929f446f10830c461ca5efd577fe63b861f4

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

@@ -145,16 +145,6 @@ div.document-stage-band, div.document-type-band {
   background-color: #333333;
 }
 
-a.FootnoteRef + a.FootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
-a.TableFootnoteRef + a.TableFootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
 a.TableFootnoteRef, span.TableFootnoteRef,
 a.FootnoteRef, span.FootnoteRef {
   vertical-align: super;
@@ -699,10 +689,6 @@ p.TermNum {
   }
 }
 
-#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
-  font-family: {{bodyfont}};
-  font-weight: 400;
-}
 #toc ul, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
   margin: 0;
   padding: 0;
@@ -754,6 +740,10 @@ p.TermNum {
     color: black;
   }
 }
+#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+  font-family: {{bodyfont}};
+  font-weight: 400;
+}
 @media screen and (max-width: 768px) {
   #toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
     padding: 0 1.5em;
@@ -1165,6 +1155,13 @@ p.NormRef {
 /*
 3.6 Source Code + figures
 */
+.figure .SourceTitle,
+pre .SourceTitle,
+.pseudocode .SourceTitle {
+  font-weight: 700;
+  font-size: 1em;
+  text-align: center;
+}
 .figure,
 pre,
 .pseudocode {
@@ -1176,13 +1173,6 @@ pre,
   overflow: auto;
   font-size: {{monospacefontsize}};
 }
-.figure .SourceTitle,
-pre .SourceTitle,
-.pseudocode .SourceTitle {
-  font-weight: 700;
-  font-size: 1em;
-  text-align: center;
-}
 
 pre {
   font-family: {{monospacefont}};
@@ -1250,18 +1240,22 @@ pre {
   padding: 0.5em;
   margin: 2em 0 1em 0;
   text-align: left;
-  color: #424242;
-  padding-left: 2em;
-  text-align: left;
 }
 .example p {
   margin: 0;
 }
+.example {
+  color: #424242;
+  padding-left: 2em;
+}
 .example .example-title {
   font-weight: 700;
   text-transform: uppercase;
   margin-left: -1.5em;
 }
+.example {
+  text-align: left;
+}
 .example .example-title {
   margin-top: 0;
 }
@@ -1283,7 +1277,6 @@ table {
   margin-left: auto;
   margin-right: auto;
   padding-right: 2em;
-  text-align: center;
 }
 table, table th, table td {
   border: 1px solid black;
@@ -1295,6 +1288,9 @@ table th, table td {
 table td.header {
   font-weight: 400;
 }
+table {
+  text-align: center;
+}
 table td,
 table th {
   font-size: 0.95em;

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

@@ -2514,6 +2514,7 @@
 	<xsl:variable name="en_dash">–</xsl:variable>
 	<xsl:variable name="em_dash">—</xsl:variable>
 	<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
+	<xsl:variable name="nonbreak_space_em_dash"> —</xsl:variable>
 	<xsl:variable name="cr">&#13;</xsl:variable>
 	<xsl:variable name="lf">
 </xsl:variable>
@@ -3056,6 +3057,7 @@
 	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="update_xml_step1"/>
 	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]" mode="update_xml_step1"/>
 	<xsl:template match="mn:section-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
+	<xsl:template match="mn:floating-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
 	<!-- <xsl:template match="mn:preferred[following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
 	<xsl:template match="mn:preferred" mode="update_xml_step1"/>
 	<!-- <xsl:template match="mn:admitted[following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
@@ -3070,10 +3072,10 @@
 
 	<xsl:template match="mn:term[@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
 
-	<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title]]" mode="update_xml_step1">
+	<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]]" mode="update_xml_step1">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="update_xml_step1"/>
-			<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title]/@depth"/>
+			<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]/@depth"/>
 			<xsl:apply-templates select="node()" mode="update_xml_step1"/>
 		</xsl:copy>
 	</xsl:template>
@@ -4187,6 +4189,12 @@
 	<xsl:template name="refine_sourcecode-style">
 	</xsl:template> <!-- refine_sourcecode-style -->
 
+	<xsl:attribute-set name="sourcecode-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_sourcecode-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="sourcecode-name-style">
 		<xsl:attribute name="font-size">11pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -5574,6 +5582,12 @@
 	<xsl:template name="refine_term-name-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="preferred-style">
+	</xsl:attribute-set> <!-- preferred-style -->
+
+	<xsl:template name="refine_preferred-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="preferred-block-style">
 		<xsl:attribute name="line-height">1.1</xsl:attribute>
 		<xsl:attribute name="space-before">14pt</xsl:attribute>
@@ -6229,6 +6243,12 @@
 		<xsl:call-template name="setBordersTableArray"/>
 	</xsl:template> <!-- refine_table-style -->
 
+	<xsl:attribute-set name="table-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_table-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="table-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
@@ -6711,7 +6731,7 @@
 
 			</fo:block>
 
-			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
+			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'iec' or $namespace = 'iso'"> -->
 			<xsl:if test="$continued = 'true'">
 
 				<!-- to prevent the error 'THead element may contain only TR elements' -->
@@ -9897,6 +9917,12 @@
 	<xsl:template name="refine_figure-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="figure-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_figure-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="figure-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -12486,7 +12512,7 @@
 
 			<fo:list-item>
 				<fo:list-item-label end-indent="label-end()">
-					<fo:block role="SKIP">
+					<fo:block role="SKIP" id="__internal_layout__bibitem_{@id}_{generate-id()}">
 						<fo:inline role="SKIP">
 							<xsl:apply-templates select="mn:biblio-tag">
 								<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
@@ -14802,10 +14828,17 @@
 			</xsl:choose>
 	</xsl:template>
 
+	<xsl:attribute-set name="clause-style">
+
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_clause-style">
+	</xsl:template>
+
 	<!-- main sections -->
 	<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
 		<xsl:call-template name="setNamedDestination"/>
-		<fo:block>
+		<fo:block role="Sect">
 			<xsl:call-template name="setId"/>
 
 			<xsl:call-template name="sections_element_style"/>
@@ -14929,6 +14962,10 @@
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
 	</xsl:template>
 
+	<!-- for case when update_xml_step1 (common.updatexml.xsl) doesn't apply when $table_if = 'true' -->
+	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]"/>
+	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
+
 	<!-- 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"/>

data/lib/isodoc/iec/presentation_xml_convert.rb

@@ -67,7 +67,8 @@ module IsoDoc
         CLAUSE
       end
 
-      def insert_middle_title(docxml)
+      # KILL
+      def insert_middle_titlex(docxml)
         ins = docxml.at(ns("//preface/clause[@type = 'toc']")) or return
         title1, title2 = middle_title_parts
         title2out = ""
@@ -84,6 +85,27 @@ module IsoDoc
         OUTPUT
       end
 
+      def insert_middle_title(docxml)
+        ins = docxml.at(ns("//preface/clause[@type = 'toc']")) or return
+        title = populate_template(preface_title_template, nil) or return
+        ins.next = title
+      end
+
+      def preface_title_template
+        <<~OUTPUT
+          <pagebreak/><p class="zzSTDTitle1">{{ labels["IEC"] }}</p>
+          <p class="zzSTDTitle1">____________</p><p class="zzSTDTitle1">&#xa0;</p>
+          <p class='zzSTDTitle1'><strong>{% if doctitleintro %}{{ doctitleintro | upcase -}}
+          &#x2014; {% endif %}{{ doctitlemain | upcase }}{% if doctitlepart %} &#x2014;{% endif %}</strong></p>
+          {% if doctitlepart %}<p class='zzSTDTitle1'>&#xa0;</p>
+          <p class='zzSTDTitle2'><strong>{% if doctitlepartlabel %}{{ doctitlepartlabel }}: {% endif -%}
+          {{ doctitlepart }}</strong><p>
+          {% endif %}
+          <p class='zzSTDTitle1'>&#xa0;</p>
+        OUTPUT
+      end
+
+      # KILL
       def middle_title_parts
         title1 = @meta.get[:doctitlemain]&.sub(/\s+$/, "")
         @meta.get[:doctitleintro] and
@@ -103,7 +125,8 @@ module IsoDoc
         [title1, title2]
       end
 
-      def middle_title(docxml)
+      # KILL
+      def middle_titlex(docxml)
         s = docxml.at(ns("//sections")) or return
         title1, title2 = middle_title_parts
         title1 || title2 or return
@@ -117,6 +140,18 @@ module IsoDoc
         s.add_first_child ret
       end
 
+      def middle_title_template
+        <<~OUTPUT
+          <p class='zzSTDTitle1'><strong>{% if doctitleintro %}{{ doctitleintro -}}
+          &#x2014; {% endif %}{{ doctitlemain }}{% if doctitlepart %} &#x2014;{% endif %}</strong></p>
+          {% if doctitlepart %}<p class='zzSTDTitle1'>&#xa0;</p>
+          <p class='zzSTDTitle2'><strong>{% if doctitlepartlabel %}{{ doctitlepartlabel }}: {% endif -%}
+          {{ doctitlepart }}</strong><p>
+          {% endif %}
+          <p class='zzSTDTitle1'>&#xa0;</p>
+        OUTPUT
+      end
+
       def ul_label_list(_elem)
         %w(&#x2022; &#x2014; &#x6f;)
       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.2 -->
+<!-- VERSION v2.1.3 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -455,14 +455,7 @@ normative or informative references, some split references into sections organiz
           </ref>
         </zeroOrMore>
         <zeroOrMore>
-          <ref name="doc_bibitem">
-            <a:documentation>Bibliographic item cited in the document</a:documentation>
-          </ref>
-          <zeroOrMore>
-            <ref name="note">
-              <a:documentation>Annotation of the bibliographic item</a:documentation>
-            </ref>
-          </zeroOrMore>
+          <ref name="ReferenceEntry"/>
         </zeroOrMore>
         <zeroOrMore>
           <ref name="references">
@@ -604,18 +597,21 @@ gives an explicit page orientation</a:documentation>
         </element>
       </optional>
     </define>
-  </include>
-  <!-- end overrides -->
-  <define name="FnAttributes" combine="interleave">
-    <ref name="RequiredId"/>
-    <optional>
-      <attribute name="hiddenref">
-        <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
+    <define name="FnAttributes">
+      <ref name="RequiredId"/>
+      <optional>
+        <attribute name="hiddenref">
+          <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
 This is done if the footnote reference is already presented in some other form, e.g. within a figure image.</a:documentation>
-        <data type="boolean"/>
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <attribute name="reference">
+        <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
       </attribute>
-    </optional>
-  </define>
+    </define>
+  </include>
+  <!-- end overrides -->
   <define name="TdAttributes" combine="interleave">
     <ref name="RequiredId"/>
     <optional>
@@ -853,6 +849,17 @@ titlecase, or lowercase</a:documentation>
       <value>informative</value>
     </choice>
   </define>
+  <define name="ReferenceEntry">
+    <a:documentation>Entry in bibliography</a:documentation>
+    <ref name="doc_bibitem">
+      <a:documentation>Bibliographic item cited in the document</a:documentation>
+    </ref>
+    <zeroOrMore>
+      <ref name="note">
+        <a:documentation>Annotation of the bibliographic item</a:documentation>
+      </ref>
+    </zeroOrMore>
+  </define>
   <define name="doc_bibitem">
     <a:documentation>Standardisation document representation of bibliographic entry</a:documentation>
     <element name="bibitem">

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.7.4".freeze
+    VERSION = "2.7.5".freeze
   end
 end
 

metadata

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