metanorma-iec 2.5.6 → 2.5.8

data/lib/isodoc/iec/init.rb

@@ -11,9 +11,8 @@ module IsoDoc
       end
 
       def xref_init(lang, script, _klass, labels, options)
-        @xrefs = Xref.new(lang, script,
-                          HtmlConvert.new(language: lang, script: script),
-                          labels, options)
+        p = HtmlConvert.new(language: lang, script: script)
+        @xrefs = Xref.new(lang, script, p, labels, options)
       end
 
       def i18n_init(lang, script, locale, i18nyaml = nil)

data/lib/isodoc/iec/metadata.rb

@@ -20,25 +20,25 @@ module IsoDoc
         set(:revdate, revdate&.text)
       end
 
-      def doctype(isoxml, _out)
+      def doctype(xml, _out)
         super
-        b = isoxml&.at(ns("//bibdata/ext/doctype#{NOLANG}"))&.text
-        b1 = isoxml&.at(ns("//bibdata/ext/doctype[@language = 'en']"))&.text || b
+        b = xml.at(ns("//bibdata/ext/doctype#{NOLANG}"))&.text
+        b1 = xml.at(ns("//bibdata/ext/doctype[@language = 'en']"))&.text || b
         b1 and set(:doctype_en, status_print(b1))
-        b1 = isoxml&.at(ns("//bibdata/ext/doctype[@language = 'fr']"))&.text || b
+        b1 = xml.at(ns("//bibdata/ext/doctype[@language = 'fr']"))&.text || b
         b1 and set(:doctype_fr, status_print(b1))
-        docfunction(isoxml)
-        dochorizontal(isoxml)
+        docfunction(xml)
+        dochorizontal(xml)
       end
 
-      def docfunction(isoxml)
-        b = isoxml&.at(ns("//bibdata/ext/function#{NOLANG}"))&.text || return
+      def docfunction(xml)
+        b = xml.at(ns("//bibdata/ext/function#{NOLANG}"))&.text || return
         b and set(:function, status_print(b))
-        b1 = isoxml&.at(ns("//bibdata/ext/function#{currlang}"))&.text || b
+        b1 = xml.at(ns("//bibdata/ext/function#{currlang}"))&.text || b
         b1 and set(:function_display, status_print(b1))
-        b1 = isoxml&.at(ns("//bibdata/ext/function[@language = 'en']"))&.text || b
+        b1 = xml.at(ns("//bibdata/ext/function[@language = 'en']"))&.text || b
         b1 and set(:function_en, status_print(b1))
-        b1 = isoxml&.at(ns("//bibdata/ext/function[@language = 'fr']"))&.text || b
+        b1 = xml.at(ns("//bibdata/ext/function[@language = 'fr']"))&.text || b
         b1 and set(:function_fr, status_print(b1))
       end
 
@@ -54,7 +54,7 @@ module IsoDoc
       end
 
       def unpublished(status)
-        status.to_i > 0 && status.to_i < 60
+        status.to_i.positive? && status.to_i < 60
       end
     end
   end

data/lib/isodoc/iec/presentation_terms.rb

@@ -3,9 +3,13 @@ module IsoDoc
     class PresentationXMLConvert < IsoDoc::Iso::PresentationXMLConvert
       def termclause1(elem)
         @is_iev or return clause1(elem)
-        @suppressheadingnumbers || elem["unnumbered"] and return
-        lbl = @xrefs.anchor(elem["id"], :label, true) or return
-        prefix_name(elem, " ", "#{lbl}#{clausedelim}", "title")
+        @suppressheadingnumbers || elem["unnumbered"] or
+        lbl = @xrefs.anchor(elem["id"], :label, true)
+        if lbl
+        prefix_name(elem, { caption: " " }, "#{lbl}#{clausedelim}", "title")
+        else
+        prefix_name(elem, {}, nil, "title")
+        end
       end
 
       def concept(docxml)
@@ -15,9 +19,9 @@ module IsoDoc
 
       def concept_iev(docxml)
         labels = @xrefs.get_anchors.each_with_object({}) do |(k, v), m|
-          m[v[:label]] = k
+          v[:label] and m[v[:label].gsub(%r{</?[^>]+>}, "")] = k
         end
-        docpart = docxml&.at(ns("//bibdata/ext/structuredidentifier/" \
+        docpart = docxml.at(ns("//bibdata/ext/structuredidentifier/" \
                                 "project-number/@part"))&.text or return
         docxml.xpath(ns("//termref[@base = 'IEV']")).each do |t|
           concept_iev1(t, docpart, labels)
@@ -38,15 +42,25 @@ module IsoDoc
         merge_fr_into_en_term(docxml)
       end
 
+      def termdomain(elem)
+        if @is_iev
+          d = elem.at(ns("./domain")) or return
+          d["hidden"] = true
+        else super
+        end
+      end
+
       def merge_fr_into_en_term(docxml)
         @is_iev or return
         docxml.xpath(ns("//term[@language = 'en'][@tag]")).each do |en|
           fr = docxml.at(ns("//term[@language = 'fr'][@tag = '#{en['tag']}']"))
           merge_fr_into_en_term1(en, fr) if fr
+          en.xpath(ns("./fmt-name | ./fmt-xref-label")).each(&:remove)
+          term1(en)
         end
         @xrefs.parse_inclusions(clauses: true).parse docxml
-        docxml.xpath(ns("//term/name")).each(&:remove)
-        term(docxml)
+        #docxml.xpath(ns("//term/fmt-name | //term/fmt-xref")).each(&:remove)
+        #term(docxml)
       end
 
       def merge_fr_into_en_term1(en_term, fr_term)
@@ -69,8 +83,7 @@ module IsoDoc
           .each_with_object([]) do |d, m|
           lg = d["language"]
           d.delete("language")
-          next if lgs.include?(lg)
-
+          lgs.include?(lg) and next
           p = d.parent
           designation_annotate(p, d.at(ns("./name")))
           m << { lang: lg, script: Metanorma::Utils.default_script(lg),
@@ -119,13 +132,13 @@ module IsoDoc
 
       def move_related(term)
         defn = term.at(ns("./definition")) or return
-        term.xpath(ns("./related")).reverse.each do |r|
+        term.xpath(ns("./related")).reverse_each do |r|
           defn.next = r.remove
         end
       end
 
       def related1(node)
-        lg = node&.at("./ancestor::xmlns:term/@language")&.text
+        lg = node.at("./ancestor::xmlns:term/@language")&.text
         @i18n = @i18n_lg[lg] if lg && @i18n_lg[lg]
         p = node.at(ns("./preferred"))
         ref = node.at(ns("./xref | ./eref | ./termref"))
@@ -166,19 +179,26 @@ module IsoDoc
 
       def termexample1(elem)
         lg = elem&.at("./ancestor::xmlns:term/@language")&.text
+        #require "debug"; binding.b
         @i18n = @i18n_lg[lg] if lg && @i18n_lg[lg]
         example1(elem)
         @i18n = @i18n_lg["default"]
       end
 
-      def termnote1(elem)
+      def termnote_label(elem)
         lg = elem&.at("./ancestor::xmlns:term/@language")&.text
         @i18n = @i18n_lg[lg] if lg && @i18n_lg[lg]
 
         val = @xrefs.anchor(elem["id"], :value) || "???"
         lbl = @i18n.termnote.gsub("%", val)
-        prefix_name(elem, "", lower2cap(lbl), "name")
+        ret = @i18n.l10n lbl
         @i18n = @i18n_lg["default"]
+        ret
+      end
+
+      def term1(elem)
+        #require 'debug'; binding.b
+        super
       end
     end
   end

data/lib/isodoc/iec/presentation_xml_convert.rb

@@ -15,17 +15,15 @@ module IsoDoc
       end
 
       def clause(docxml)
-        docxml.xpath(ns("//clause[not(ancestor::annex)] | " \
-                        "//definitions | //references | " \
-                        "//preface/introduction[clause]"))
+        docxml.xpath(ns("//clause | //definitions | //references | //appendix | " \
+                        "//introduction | //foreword | //preface/abstract | " \
+                      "//acknowledgements | //colophon | //indexsect "))
           .each do |f|
           f.parent.name == "annex" &&
             @xrefs.klass.single_term_clause?(f.parent) and next
           clause1(f)
         end
-        docxml.xpath(ns("//terms")).each do |f|
-          termclause1(f)
-        end
+        docxml.xpath(ns("//terms")).each { |f| termclause1(f) }
       end
 
       def clause1(elem)
@@ -65,10 +63,15 @@ module IsoDoc
             <foreword id='_#{UUIDTools::UUID.random_create}'> </foreword>
           CLAUSE
         end
-        f.children.empty? and f.children = " "
-        ins = f.at(ns("./title")) || f.children.first.before(" ").previous
-        ins.next =
-          "<clause type='boilerplate_legal'>#{to_xml(b.children)}</clause>"
+        insert_foreword_boilerplate(f, b)
+      end
+
+      def insert_foreword_boilerplate(elem, boilerplate)
+        elem.children.empty? and elem.children = " "
+        ins = elem.at(ns("./title")) || elem.children.first.before(" ").previous
+        ins.next = <<~CLAUSE
+          <clause type='boilerplate_legal'>#{to_xml(boilerplate.children)}</clause>
+          CLAUSE
       end
 
       def insert_middle_title(docxml)
@@ -118,7 +121,7 @@ module IsoDoc
           <p class='zzSTDTitle2'><strong>#{title2}</strong><p>
         TITLE
         ret += "<p class='zzSTDTitle1'>&#xa0;</p>"
-        s.children.first.previous = ret
+        s.add_first_child ret
       end
 
       include Init

data/lib/isodoc/iec/word_convert.rb

@@ -203,8 +203,7 @@ module IsoDoc
       end
 
       def annex_name(_annex, name, div)
-        return if name.nil?
-
+        name.nil? and return
         div.h1 class: "Annex" do |t|
           name.children.each { |c2| parse(c2, t) }
           clause_parse_subtitle(name, t)
@@ -216,9 +215,9 @@ module IsoDoc
           div.p **attr_code(class: "formula") do |_p|
             insert_tab(div, 1)
             parse(node.at(ns("./stem")), div)
-            if lbl = node&.at(ns("./name"))&.text
+            if lbl = node&.at(ns("./fmt-name"))&.text
               insert_tab(div, 1)
-              div << "(#{lbl})"
+              div << lbl
             end
           end
         end

data/lib/isodoc/iec/xref.rb

@@ -10,7 +10,7 @@ module IsoDoc
       end
 
       def introduction_names(clause)
-        return super unless @is_iev
+        super unless @is_iev
       end
 
       def initial_anchor_names(docxml)
@@ -18,28 +18,41 @@ module IsoDoc
         return unless @is_iev
 
         if @parse_settings.empty? || @parse_settings[:clauses]
+          @terms_iev_names = true
           terms_iev_names(docxml)
+          @terms_iev_names = false
         end
       end
 
       def terms_iev_names(docxml)
         docxml.xpath(ns("//sections/clause/terms")).each_with_index do |t, i|
-          num = "#{@iev_part}-%02d" % [i + 1]
+          num = semx(t, "#{@iev_part}-%02d" % [i + 1])
           @anchors[t["id"]] =
-            { label: num, xref: l10n("#{@labels['section_iev']} #{num}"),
+            { label: num, 
+              #xref: l10n("#{@labels['section_iev']} #{num}"),
+              xref: labelled_autonum(@labels['section_iev'], num),
               level: 2, type: "clause", elem: @labels["section_iev"] }
           t.xpath(ns("./term")).each_with_index do |c, j|
-            num2 = "%02d" % [j + 1]
-            section_names1(c, "#{num}-#{num2}", 3)
+            num2 = semx(c, "%02d" % [j + 1])
+            #section_names1(c, "#{num}#{delim_wrap("-")}#{num2}", 3)
+            section_names1(c, num, num2, 3)
           end
         end
       end
 
+      def clausesep
+        if @terms_iev_names then "-"
+        else super
+        end
+      end
+
       def annex_name_lbl(clause, num)
         obl = l10n("(#{@labels['inform_annex']})")
         clause["obligation"] == "normative" and
           obl = l10n("(#{@labels['norm_annex']})")
-        l10n("<strong>#{@labels['annex']} #{num}</strong><br/>#{obl}")
+        obl = "<span class='fmt-obligation'>#{l10n obl}</fmt>"
+        s = labelled_autonum(@labels['annex'], num)
+        l10n("<strong><span class='fmt-caption-label'>#{s}</span></strong><br/>#{obl}")
       end
     end
   end

data/lib/metanorma/iec/biblio.rng

@@ -1783,9 +1783,21 @@ that the `number` given for the series applies to the second iteration of number
 May be used to differentiate rendering of notes in bibliographies</a:documentation>
         </attribute>
       </optional>
-      <ref name="LocalizedMarkedUpString">
+      <ref name="LocalizedStringAttributes">
         <a:documentation>The content of the note</a:documentation>
       </ref>
+      <choice>
+        <oneOrMore>
+          <ref name="BasicBlockNoId">
+            <a:documentation>Multiple blocks of content</a:documentation>
+          </ref>
+        </oneOrMore>
+        <oneOrMore>
+          <ref name="TextElement">
+            <a:documentation>Single block of content</a:documentation>
+          </ref>
+        </oneOrMore>
+      </choice>
     </element>
   </define>
   <define name="bibabstract">

data/lib/metanorma/iec/front.rb

@@ -166,7 +166,6 @@ module Metanorma
         super
         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

data/lib/metanorma/iec/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.3.4 -->
+<!-- VERSION v1.4.1 -->
 <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">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -326,7 +326,7 @@ normative or informative references, some split references into sections organiz
       <a:documentation>Content of note</a:documentation>
       <oneOrMore>
         <choice>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="ul"/>
           <ref name="ol"/>
           <ref name="dl"/>
@@ -412,7 +412,7 @@ normative or informative references, some split references into sections organiz
       <element name="note">
         <ref name="OptionalId"/>
         <oneOrMore>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
         </oneOrMore>
       </element>
     </define>
@@ -1977,7 +1977,7 @@ used in document amendments</a:documentation>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the verbal representation of the term</a:documentation>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="dl"/>
           <ref name="ol"/>
           <ref name="ul"/>
@@ -2015,7 +2015,7 @@ used in document amendments</a:documentation>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the term note</a:documentation>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="ul"/>
           <ref name="ol"/>
           <ref name="dl"/>
@@ -2037,7 +2037,7 @@ used in document amendments</a:documentation>
           <ref name="dl"/>
           <ref name="quote"/>
           <ref name="sourcecode"/>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="figure"/>
         </choice>
       </oneOrMore>

data/lib/metanorma/iec/relaton-iec.rng

@@ -28,10 +28,10 @@
         <ref name="updates_document_type"/>
       </optional>
       <optional>
-        <ref name="accessibility-color-inside"/>
+        <ref name="price-code"/>
       </optional>
       <optional>
-        <ref name="price-code"/>
+        <ref name="accessibility-color-inside"/>
       </optional>
       <optional>
         <ref name="cen-processing"/>
@@ -75,36 +75,19 @@
         </choice>
       </element>
     </define>
-    <define name="organization">
-      <element name="organization">
-        <oneOrMore>
-          <ref name="orgname"/>
-        </oneOrMore>
-        <optional>
-          <ref name="abbreviation"/>
-        </optional>
-        <optional>
-          <ref name="uri"/>
-        </optional>
-        <zeroOrMore>
-          <ref name="org-identifier"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="contact"/>
-        </zeroOrMore>
-        <optional>
-          <ref name="technical-committee"/>
-        </optional>
-        <optional>
-          <ref name="subcommittee"/>
-        </optional>
-        <optional>
-          <ref name="workgroup"/>
-        </optional>
-        <optional>
-          <ref name="secretariat"/>
-        </optional>
-      </element>
+    <define name="OrganizationType" combine="interleave">
+      <optional>
+        <ref name="technical-committee"/>
+      </optional>
+      <optional>
+        <ref name="subcommittee"/>
+      </optional>
+      <optional>
+        <ref name="workgroup"/>
+      </optional>
+      <optional>
+        <ref name="secretariat"/>
+      </optional>
     </define>
     <define name="DocumentType">
       <choice>

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.5.6".freeze
+    VERSION = "2.5.8".freeze
   end
 end
 

data/metanorma-iec.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-iso", "~> 2.8.0"
+  spec.add_dependency "metanorma-iso", "~> 2.9.1"
   spec.add_dependency "pubid"
 
   spec.add_development_dependency "debug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.5.6
+  version: 2.5.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-28 00:00:00.000000000 Z
+date: 2024-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.9.1
 - !ruby/object:Gem::Dependency
   name: pubid
   requirement: !ruby/object:Gem::Requirement