metanorma-iec 1.2.11 → 1.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 757f304ffb697a9e1ac4cbea8cb23bd97d1c84919c79330c850c185147e87dea
-  data.tar.gz: c9abb1c90c14b852382dc58cceb438292a06221a027d00f50f7b10b234193db9
+  metadata.gz: ec393e69e6f5bde6672652cdd455bd95ba7475e9de5672d05df4d1bd4940e7a7
+  data.tar.gz: a29da879a00bb09c7f0f35d06916c1163317809225eb49ac5abc8cb265c2d049
 SHA512:
-  metadata.gz: '09f9d546277d03635c47c8ec61c2a19c3170605e0edd6e1632f62258d2d1d1f6e458bdf781bf95b3e9b0c8995072cb003f8c60ecf885b7d9f9b0fb1168c8210c'
-  data.tar.gz: e327cf4c18dc4e20fe836829ac9428492edb163e46e4f864e67c42a1affb33d72e366a10c59cc750e1274eff26fde85ae9193a84b0941c94e9e6e054c08d253b
+  metadata.gz: 96679dbdd734fdfaeaa14381b7b52195178fe649da053e0c05f64ff71d5fffa0ea69f49d9249a29fe8e30781c4b2fb019018aad6d0f705a6882a90a64f1c0b35
+  data.tar.gz: 0a0dab99cdb0060ccbadfb5dad707a62cce04b7e587f371e5408f1b0319120ff235400b054f6eaf7893ef878830f8d1d2612d3316b704ef1a997b02de09fc89e

data/.github/workflows/rake.yml

@@ -36,6 +36,9 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
 
+      - if: matrix.os == 'macos-latest'
+        run: brew install autoconf automake libtool
+
       - uses: actions/cache@v2
         with:
           path: vendor/bundle

data/lib/asciidoctor/iec/converter.rb

@@ -80,6 +80,23 @@ module Asciidoctor
         super
         @is_iev and replace_title(x, "//introduction", @i18n&.introduction_iev)
       end
+
+      def note(n)
+        if n.title == "Note from TC/SC Officers"
+          noko do |xml|
+            xml.tc_sc_officers_note do |c|
+              wrap_in_para(n, c)
+            end
+          end.join("\n")
+        else
+          super
+        end
+      end
+
+      def note_cleanup(xmldoc)
+        super
+        n = xmldoc.at("//tc-sc-officers-note") and xmldoc.at("//bibdata/ext").add_child(n.remove)
+      end
     end
   end
 end

data/lib/asciidoctor/iec/front.rb

@@ -183,8 +183,7 @@ module Asciidoctor
 
       def get_stage(node)
         stage = node.attr("status") || node.attr("docstage") || "60"
-        m = /([0-9])CD$/.match(stage) and
-          node.set_attr("iteration", m[1])
+        m = /([0-9])CD$/.match(stage) and node.set_attr("iteration", m[1])
         STAGE_CODES[stage] and stage = STAGE_CODES[stage][0..1]
         stage
       end
@@ -193,9 +192,7 @@ module Asciidoctor
         st = node.attr("status") || node.attr("docstage")
         stage = get_stage(node)
         node.attr("docsubstage") ||
-          ( stage == "60" ? "60" :
-           STAGE_CODES[st] ? STAGE_CODES[st][2..3] :
-           "00" )
+          ( stage == "60" ? "60" : STAGE_CODES[st] ? STAGE_CODES[st][2..3] : "00" )
       end
 
       def id_stage_abbr(stage, substage, node)
@@ -211,8 +208,7 @@ module Asciidoctor
         xml.status do |s|
           s.stage stage, **attr_code(abbreviation: stage_abbr(stage, substage))
           s.substage substage,
-            **attr_code(abbreviation: status_abbrev1(stage, substage,
-                                                     node.attr("iteration"), 
+            **attr_code(abbreviation: status_abbrev1(stage, substage, node.attr("iteration"), 
                                                      doctype(node),node.attr("draft")))
           node.attr("iteration") && (s.iteration node.attr("iteration"))
         end
@@ -229,6 +225,8 @@ module Asciidoctor
         a = node.attr("accessibility-color-inside") and xml.accessibility_color_inside a
         a = node.attr("price-code") and xml.price_code 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
       end
     end
   end

data/lib/asciidoctor/iec/iec.rng

@@ -43,6 +43,15 @@
       <optional>
         <ref name="cen-processing"/>
       </optional>
+      <optional>
+        <ref name="secretary"/>
+      </optional>
+      <optional>
+        <ref name="interest-to-committees"/>
+      </optional>
+      <optional>
+        <ref name="tc-sc-officers-note"/>
+      </optional>
     </define>
   </include>
   <!-- end overrides -->
@@ -71,6 +80,23 @@
       <data type="boolean"/>
     </element>
   </define>
+  <define name="secretary">
+    <element name="secretary">
+      <text/>
+    </element>
+  </define>
+  <define name="interest-to-committees">
+    <element name="interest-to-committees">
+      <text/>
+    </element>
+  </define>
+  <define name="tc-sc-officers-note">
+    <element name="tc-sc-officers-note">
+      <zeroOrMore>
+        <ref name="BasicBlock"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <!--
     We display the Normative References between scope and terms; but to keep the
     grammar simple, we keep the references together

data/lib/asciidoctor/iec/iec_intro_en.xml

@@ -1,6 +1,13 @@
 <boilerplate>
   <copyright-statement>
-    <clause>
+    <clause>  
+      {% if unpublished %}
+      <p><strong>Copyright © {{ docyear }} International Electrotechnical Commission, IEC.</strong>
+        All rights reserved. It is permitted to download this electronic file, to make a copy and to
+        print out the content for the sole purpose of preparing National Committee positions. You
+        may not copy or "mirror" the file or printed version of the document, or any part of it,
+        for any other purpose without permission in writing from IEC.
+      {% else %}
       <p id="boilerplate-year">
         © {{ agency }} {{ docyear }}, Published in Switzerland
       </p>
@@ -20,6 +27,7 @@
         Fax&#xa0;&#xa0;+ 41 22 919 03 00<br/>
         info@iec.ch<br/>
         www.iec.ch
+      {% endif %}
       </p>
     </clause>
   </copyright-statement>
@@ -41,21 +49,37 @@
   {% if unpublished %}
   <license-statement>
     <clause>
-      <title>Warning for CDs, CDVs and FDISs</title>
-
-      <p>This
-        document is not an IEC International Standard. It is distributed for review and
-        comment. It is subject to change without notice and may not be referred to as
-        an International Standard.</p>
-
-      <p>Recipients
-        of this draft are invited to submit, with their comments, notification of any
-        relevant patent rights of which they are aware and to provide supporting
-        documentation.</p>
+      {% if stage_int < 50 %}
+      <p>This document is still under study and subject to change. It should not be used for reference purposes.</p>
+      until published as such.</p>
+    {% endif %}
+      {% if stage_int >= 50 %}
+      <p>This document is a draft distributed for approval. It may not be referred to as an International Standard
+        until published as such.</p>
+      {% endif %}
+      {% if stage_int >= 50 %}
+      <p>In addition to their evaluation as being acceptable for industrial, technological, commercial and user
+        purposes, Final Draft International Standards may on occasion have to be considered in the light of their
+        potential to become standards to which reference may be made in national regulations.</p>
+      {% endif %}
+      <p>Recipients of this document are invited to submit, with their comments, notification of any relevant
+        patent rights of which they are aware and to provide supporting documentation.</p>
     </clause>
   </license-statement>
   {% endif %}
   <feedback-statement>
+    {% if unpublished %}
+    <clause id="boilerplate-cenelec-attention">
+      <title>Attention IEC-CENELEC parallel voting</title>
+      <p>The attention of IEC National Committees, members of CENELEC, is drawn to the fact that this
+        {% if stage_int >= 30 and stage_int < 40 %}Committee Draft{% endif %}
+        {% if stage_int >= 40 and stage_int < 50 %}Committee Draft For Vote{% endif %}
+        {% if stage_int >= 50 and stage_int < 60 %}Final Draft International Standard{% endif %}
+        ({{ stageabbr }})
+        is submitted for parallel voting.</p>
+      <p>The CENELEC members are invited to vote through the CENELEC voting system.</p>
+    </clause>
+    {% else %}
     <clause>
       <title>About the IEC</title>
       <p>The International Electrotechnical Commission (IEC) is the leading global organization that prepares and publishes International Standards for all electrical, electronic and related technologies.</p>
@@ -85,6 +109,7 @@
         <p>If you wish to give us your feedback on this publication or need further assistance, please contact the Customer Service Centre: <link target="mailto://csc@iec.ch">csc@iec.ch</link>.</p>
       </clause>
     </clause>
+    {% endif %}
   </feedback-statement>
 </boilerplate>
 

data/lib/asciidoctor/iec/iec_intro_fr.xml

@@ -1,6 +1,13 @@
 <boilerplate>
   <copyright-statement>
     <clause>
+      {% if unpublished %}
+      <p><strong>Copyright © {{ docyear }} International Electrotechnical Commission, IEC.</strong>
+        All rights reserved. It is permitted to download this electronic file, to make a copy and to
+        print out the content for the sole purpose of preparing National Committee positions. You
+        may not copy or "mirror" the file or printed version of the document, or any part of it,
+        for any other purpose without permission in writing from IEC.
+      {% else %}
       <p id="boilerplate-year">
     © {{ agency }} {{ docyear }}, Publié en Suisse
   </p>
@@ -23,6 +30,7 @@ l’adresse ci-après ou au comité membre de l’IEC dans le pays du demandeur.
     info@iec.ch<br/>
     www.iec.ch
   </p>
+  {% endif %}
 </clause>
 </copyright-statement>
 <legal-statement>
@@ -42,15 +50,38 @@ l’adresse ci-après ou au comité membre de l’IEC dans le pays du demandeur.
 </legal-statement>
  {% if unpublished %}
 <license-statement>
-  <clause>
-  <title>Avertissement</title>
-
-<p>Ce document n'est pas une Norme internationale de l'ISO. Il est distribué pour examen et observations. Il est susceptible de modification sans préavis et ne peut être cité comme Norme internationale.</p>
-<p>Les destinataires du présent projet sont invités à présenter, avec leurs observations, notification des droits de propriété dont ils auraient éventuellement connaissance et à fournir une documentation explicative.</p>
-</clause>
+    <clause>
+      {% if stage_int < 40 %}
+      <p>This document is still under study and subject to change. It should not be used for reference purposes.</p>
+      until published as such.</p>
+    {% endif %}
+      {% if stage_int >= 40 %}
+      <p>This document is a draft distributed for approval. It may not be referred to as an International Standard
+        until published as such.</p>
+      {% endif %}
+      {% if stage_int >= 50 %}
+      <p>In addition to their evaluation as being acceptable for industrial, technological, commercial and user
+        purposes, Final Draft International Standards may on occasion have to be considered in the light of their
+        potential to become standards to which reference may be made in national regulations.</p>
+      {% endif %}
+      <p>Recipients of this document are invited to submit, with their comments, notification of any relevant
+        patent rights of which they are aware and to provide supporting documentation.</p>
+    </clause>
 </license-statement>
 {% endif %}
 <feedback-statement>
+  {% if unpublished %}
+    <clause id="boilerplate-cenelec-attention">
+      <title>Attention IEC-CENELEC parallel voting</title>
+      <p>The attention of IEC National Committees, members of CENELEC, is drawn to the fact that this
+        {% if stage_int >= 30 and stage_int < 40 %}Committee Draft{% endif %}
+        {% if stage_int >= 40 and stage_int < 50 %}Committee Draft For Vote{% endif %}
+        {% if stage_int >= 50 and stage_int < 60 %}Final Draft International Standard{% endif %}
+        ({{ stageabbr }})
+        is submitted for parallel voting.</p>
+      <p>The CENELEC members are invited to vote through the CENELEC voting system.</p>
+    </clause>
+    {% else %}
 <clause>
   <title>A propos de l'IEC</title>
   <p>La Commission Electrotechnique Internationale (IEC) est la première organisation mondiale qui élabore et publie des Normes internationales pour tout ce qui a trait à l'électricité, à l'électronique et aux technologies apparentées.</p>
@@ -80,6 +111,7 @@ l’adresse ci-après ou au comité membre de l’IEC dans le pays du demandeur.
     <p>Si vous désirez nous donner des commentaires sur cette publication ou si vous avez des questions contactez-nous: <link target="mailto://csc@iec.ch">csc@iec.ch</link>.</p>
   </clause>
 </clause>
+{% endif %}
 </feedback-statement>
 </boilerplate>
 

data/lib/asciidoctor/iec/isodoc.rng

@@ -253,6 +253,9 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="width"/>
+        </optional>
         <optional>
           <ref name="colgroup"/>
         </optional>
@@ -836,6 +839,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -891,9 +897,11 @@
       <element name="code">
         <text/>
       </element>
-      <element name="text">
-        <text/>
-      </element>
+      <optional>
+        <element name="text">
+          <text/>
+        </element>
+      </optional>
     </element>
   </define>
   <define name="standard-document">
@@ -1063,6 +1071,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
     <optional>
       <attribute name="type"/>
     </optional>
@@ -1116,6 +1127,9 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1218,6 +1232,9 @@
       <optional>
         <attribute name="type"/>
       </optional>
+      <optional>
+        <attribute name="number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -1546,6 +1563,7 @@
           <value>add</value>
           <value>modify</value>
           <value>delete</value>
+          <value>replace</value>
         </choice>
       </attribute>
       <optional>
@@ -1576,6 +1594,11 @@
       </optional>
       <optional>
         <element name="newcontent">
+          <optional>
+            <attribute name="id">
+              <data type="ID"/>
+            </attribute>
+          </optional>
           <zeroOrMore>
             <ref name="BasicBlock"/>
           </zeroOrMore>

data/lib/asciidoctor/iec/isostandard.rng

@@ -140,22 +140,28 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <ref name="section-title"/>
       </optional>
-      <choice>
-        <group>
-          <oneOrMore>
-            <ref name="BasicBlock"/>
-          </oneOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
+      <group>
+        <choice>
+          <group>
+            <oneOrMore>
+              <ref name="BasicBlock"/>
+            </oneOrMore>
+            <zeroOrMore>
+              <ref name="note"/>
+            </zeroOrMore>
+          </group>
+          <ref name="amend"/>
+        </choice>
         <oneOrMore>
           <ref name="clause-subsection"/>
         </oneOrMore>
-      </choice>
+      </group>
     </define>
     <define name="term">
       <element name="term">

data/lib/isodoc/iec/base_convert.rb

@@ -13,7 +13,7 @@ module IsoDoc
         b = isoxml.at(ns("//boilerplate/legal-statement"))
         page_break(out)
         iec_orgname(out)
-        middle_title(out)
+        middle_title(isoxml, out)
         out.div **attr_code(id: f ? f["id"] : "") do |s|
           s.h1(**{ class: "ForewordTitle" }) { |h1| h1 << @i18n.foreword }
           @meta.get[:doctype] == "Amendment" or
@@ -30,7 +30,7 @@ module IsoDoc
         out.p(**{ class: "zzSTDTitle1" }) { |p| p << "&nbsp;" }
       end
 
-      def middle_title(out)
+      def middle_title(_isoxml, out)
         title1 = @meta.get[:doctitlemain]&.sub(/\s+$/, "")
         @meta.get[:doctitleintro] and
           title1 = "#{@meta.get[:doctitleintro]} &mdash; #{title1}"

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

@@ -2994,7 +2994,12 @@
 			
 			<xsl:variable name="table_attributes">
 				<attribute name="table-layout">fixed</attribute>
-				<attribute name="width">100%</attribute>
+				<attribute name="width">
+					<xsl:choose>
+						<xsl:when test="@width"><xsl:value-of select="@width"/></xsl:when>
+						<xsl:otherwise>100%</xsl:otherwise>
+					</xsl:choose>
+				</attribute>
 				<attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute>
 				<attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute>
 				
@@ -4239,6 +4244,10 @@
 			</xsl:if>
 			<xsl:apply-templates/>
 		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name()='underline']">
+		<fo:inline text-decoration="underline">
+			<xsl:apply-templates/>
+		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='del']">
 		<fo:inline font-size="10pt" color="red" text-decoration="line-through">
 			<xsl:apply-templates/>
@@ -5807,6 +5816,8 @@
 		<xsl:value-of select="translate(.,'. ','')"/>
 	</xsl:template><xsl:template match="*[local-name() = 'name']/*[local-name() = 'forename']/text()" mode="strip">
 		<xsl:value-of select="substring(.,1,1)"/>
+	</xsl:template><xsl:template match="*[local-name() = 'title']" mode="title">
+		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>
@@ -6084,6 +6095,11 @@
 			<xsl:call-template name="getLang"/>
 		</xsl:variable>
 		
-		<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+		<xsl:choose>
+			<xsl:when test="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]">
+				<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+			</xsl:when>
+			<xsl:otherwise><xsl:value-of select="$key"/></xsl:otherwise>
+		</xsl:choose>
 		
 	</xsl:template></xsl:stylesheet>