metanorma-iec 1.4.4 → 2.0.2

data/lib/isodoc/iec/presentation_xml_convert.rb

@@ -63,7 +63,7 @@ module IsoDoc
         end
         docpart = docxml&.at(ns("//bibdata/ext/structuredidentifier/"\
                                 "project-number/@part"))&.text or return
-        docxml.xpath(ns("//concept/termref[@base = 'IEV']")).each do |t|
+        docxml.xpath(ns("//termref[@base = 'IEV']")).each do |t|
           concept_iev1(t, docpart, labels)
         end
       end
@@ -120,36 +120,66 @@ module IsoDoc
           p = d.parent
           designation_annotate(p, d.at(ns("./name")))
           m << { lang: lg, script: Metanorma::Utils.default_script(lg),
-                 designation: l10n_recursive(p.remove, lg) }
+                 designation: l10n_recursive(p.remove, lg).to_xml.strip }
         end
       end
 
       def l10n_recursive(xml, lang)
         script = Metanorma::Utils.default_script(lang)
+        c = HTMLEntities.new
         xml.traverse do |x|
           next unless x.text?
 
-          x.replace(l10n(x, lang, script))
+          text = c.encode(c.decode(x.text), :hexadecimal)
+          x.replace(cleanup_entities(l10n(text, lang, script), is_xml: false))
         end
         xml
       end
 
+      def merge_otherlang_designations(desgn)
+        h = desgn.each_with_object({}) do |e, m|
+          if m[e[:lang]]
+            m[e[:lang]][:designation] += e[:designation]
+          else m[e[:lang]] = e
+          end
+        end
+        h.keys.sort.each_with_object([]) { |k, m| m << h[k] }
+      end
+
       def otherlang_designations1(term, lgs)
-        pr = extract_otherlang_designations(term, lgs)
+        pr = merge_otherlang_designations(
+          extract_otherlang_designations(term, lgs),
+        )
         return if pr.empty?
 
         prefs = pr.map do |p|
           "<dt>#{p[:lang]}</dt>"\
             "<dd language='#{p[:lang]}' script='#{p[:script]}'>"\
-            "#{p[:designation].to_xml}</dd>"
+            "#{cleanup_entities(p[:designation])}</dd>"
         end
         term << "<dl type='other-lang'>#{prefs.join}</dl>"
       end
 
+      def related(docxml)
+        docxml.xpath(ns("//term[related]")).each { |f| move_related(f) }
+        super
+      end
+
+      def move_related(term)
+        defn = term.at(ns("./definition")) or return
+        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
         @i18n = @i18n_lg[lg] if lg && @i18n_lg[lg]
-        super
+        p = node.at(ns("./preferred"))
+        ref = node.at(ns("./xref | ./eref | ./termref"))
+        label = @i18n.relatedterms[node["type"]].upcase
+        node.replace(l10n("<p>#{label}: "\
+                          "#{p.children.to_xml} (#{ref.to_xml})</p>"))
         @i18n = @i18n_lg["default"]
       end
 
@@ -171,7 +201,7 @@ module IsoDoc
 
       def termsource1_iev(elem)
         while elem&.next_element&.name == "termsource"
-          elem << "; #{elem.next_element.remove.children.to_xml}"
+          elem << l10n("; #{elem.next_element.remove.children.to_xml}")
         end
         elem.children = l10n("#{@i18n.source}: #{elem.children.to_xml.strip}")
       end

data/lib/isodoc/iec/word_convert.rb

@@ -221,10 +221,12 @@ module IsoDoc
       end
 
       def annex_name(_annex, name, div)
+        preceding_floating_titles(name, div)
         return if name.nil?
 
         div.h1 **{ class: "Annex" } do |t|
           name.children.each { |c2| parse(c2, t) }
+          clause_parse_subtitle(name, t)
         end
       end
 

data/lib/isodoc/iec/xref.rb

@@ -16,6 +16,7 @@ module IsoDoc
       def initial_anchor_names(d)
         super
         return unless @is_iev
+
         terms_iev_names(d)
         middle_section_asset_names(d)
         termnote_anchor_names(d)
@@ -24,21 +25,21 @@ module IsoDoc
 
       def terms_iev_names(d)
         d.xpath(ns("//sections/clause/terms")).each_with_index do |t, i|
-          num = "#{@iev_part}-%02d" % [i+1]
+          num = "#{@iev_part}-%02d" % [i + 1]
           @anchors[t["id"]] =
-            { label: num, xref: l10n("#{@labels["section_iev"]}-#{num}"), level: 2,
-              type: "clause" }
-          t.xpath(ns("./term")).each_with_index do |c, i|
-            num2 = "%02d" % [i+1]
+            { label: num, xref: l10n("#{@labels['section_iev']} #{num}"),
+              level: 2, type: "clause" }
+          t.xpath(ns("./term")).each_with_index do |c, j|
+            num2 = "%02d" % [j + 1]
             section_names1(c, "#{num}-#{num2}", 3)
           end
         end
       end
 
       def annex_name_lbl(clause, num)
-        obl = l10n("(#{@labels["inform_annex"]})")
-        obl = l10n("(#{@labels["norm_annex"]})") if clause["obligation"] == "normative"
-        l10n("<strong>#{@labels["annex"]} #{num}</strong><br/>#{obl}")
+        obl = l10n("(#{@labels['inform_annex']})")
+        obl = l10n("(#{@labels['norm_annex']})") if clause["obligation"] == "normative"
+        l10n("<strong>#{@labels['annex']} #{num}</strong><br/>#{obl}")
       end
     end
   end

data/lib/{asciidoctor → metanorma}/iec/biblio.rng

@@ -401,9 +401,9 @@
       <choice>
         <!-- iso191606 TODO -->
         <group>
-          <oneOrMore>
+          <zeroOrMore>
             <ref name="street"/>
-          </oneOrMore>
+          </zeroOrMore>
           <ref name="city"/>
           <optional>
             <ref name="state"/>

data/lib/{asciidoctor → metanorma}/iec/converter.rb

@@ -1,8 +1,9 @@
 require "asciidoctor"
 require "metanorma-iso"
+require "metanorma/iso/converter"
 require_relative "./front"
 
-module Asciidoctor
+module Metanorma
   module Iec
     class Converter < ISO::Converter
       XML_ROOT_TAG = "iec-standard".freeze
@@ -81,13 +82,6 @@ module Asciidoctor
         end
       end
 
-      def norm_ref_preface(node)
-        return super unless @is_iev
-
-        node.at("./title").next =
-          "<p>#{@i18n.norm_empty_pref}</p>"
-      end
-
       def term_defs_boilerplate(div, source, term, preface, isodoc)
         return super unless @is_iev
       end
@@ -117,6 +111,26 @@ module Asciidoctor
       end
 
       def image_name_validate(xmldoc); end
+
+      def toc_cleanup(xmldoc)
+        toc_iev_cleanup(xmldoc) if @is_iev
+        super
+      end
+
+      def toc_iev_cleanup(xmldoc)
+        iev_variant_titles(xmldoc)
+      end
+
+      def iev_variant_titles(xmldoc)
+        id = xmldoc&.at("//bibdata/docidentifier[@type = 'ISO']")&.text
+        m = /60050-(\d+)/.match(id) or return
+        xmldoc.xpath("//sections/clause/terms/title").each_with_index do |t, i|
+          num = "%02d" % [i + 1]
+          t.next = "<variant-title type='toc'>"\
+                   "#{@i18n.section_iev} #{m[1]}-#{num} &#x2013; "\
+                   "#{t.children.to_xml}</variant-title>"
+        end
+      end
     end
   end
 end

data/lib/{asciidoctor → metanorma}/iec/front.rb

@@ -1,4 +1,4 @@
-module Asciidoctor
+module Metanorma
   module Iec
     class Converter < ISO::Converter
       def metadata_author(node, xml)

data/lib/{asciidoctor → metanorma}/iec/iec.rng

@@ -57,6 +57,54 @@
         <ref name="tc-sc-officers-note"/>
       </optional>
     </define>
+    <define name="term">
+      <element name="term">
+        <optional>
+          <attribute name="id">
+            <data type="ID"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="language"/>
+        </optional>
+        <optional>
+          <attribute name="script"/>
+        </optional>
+        <optional>
+          <attribute name="tag"/>
+        </optional>
+        <optional>
+          <attribute name="multilingual-rendering">
+            <ref name="MultilingualRenderingType"/>
+          </attribute>
+        </optional>
+        <oneOrMore>
+          <ref name="preferred"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="admitted"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="deprecates"/>
+        </zeroOrMore>
+        <optional>
+          <ref name="termdomain"/>
+        </optional>
+        <ref name="termdefinition"/>
+        <zeroOrMore>
+          <ref name="termnote"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="termexample"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="termsource"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="term"/>
+        </zeroOrMore>
+      </element>
+    </define>
   </include>
   <!-- end overrides -->
   <define name="function">

data/lib/{asciidoctor → metanorma}/iec/isodoc.rng

@@ -32,6 +32,56 @@
         <ref name="DocumentType"/>
       </element>
     </define>
+    <define name="index">
+      <element name="index">
+        <optional>
+          <attribute name="to">
+            <data type="IDREF"/>
+          </attribute>
+        </optional>
+        <element name="primary">
+          <oneOrMore>
+            <choice>
+              <ref name="PureTextElement"/>
+              <ref name="stem"/>
+            </choice>
+          </oneOrMore>
+        </element>
+        <optional>
+          <element name="secondary">
+            <oneOrMore>
+              <choice>
+                <ref name="PureTextElement"/>
+                <ref name="stem"/>
+              </choice>
+            </oneOrMore>
+          </element>
+        </optional>
+        <optional>
+          <element name="tertiary">
+            <oneOrMore>
+              <choice>
+                <ref name="PureTextElement"/>
+                <ref name="stem"/>
+              </choice>
+            </oneOrMore>
+          </element>
+        </optional>
+      </element>
+    </define>
+    <define name="bibitem">
+      <element name="bibitem">
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="hidden">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <ref name="BibliographicItem"/>
+      </element>
+    </define>
     <define name="section-title">
       <element name="title">
         <zeroOrMore>
@@ -690,6 +740,7 @@
             <ref name="terms"/>
             <ref name="term-clause"/>
             <ref name="definitions"/>
+            <ref name="floating-title"/>
           </choice>
         </oneOrMore>
       </element>
@@ -1013,6 +1064,26 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="sub">
+      <element name="sub">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="sup">
+      <element name="sup">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="pagebreak">
       <element name="pagebreak">
         <optional>
@@ -1680,6 +1751,7 @@
           <ref name="clause-subsection"/>
           <ref name="terms"/>
           <ref name="definitions"/>
+          <ref name="floating-title"/>
         </choice>
       </oneOrMore>
     </choice>
@@ -1722,6 +1794,7 @@
           <ref name="terms"/>
           <ref name="definitions"/>
           <ref name="references"/>
+          <ref name="floating-title"/>
         </choice>
       </zeroOrMore>
     </group>
@@ -1973,7 +2046,11 @@
       </optional>
       <element name="name">
         <zeroOrMore>
-          <ref name="PureTextElement"/>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
         </zeroOrMore>
       </element>
       <optional>
@@ -1987,7 +2064,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammar-info">
+        <element name="grammar">
           <ref name="Grammar"/>
         </element>
       </optional>
@@ -2196,7 +2273,18 @@
           <ref name="MultilingualRenderingType"/>
         </attribute>
       </optional>
-      <ref name="paragraph"/>
+      <oneOrMore>
+        <choice>
+          <ref name="formula"/>
+          <ref name="ul"/>
+          <ref name="ol"/>
+          <ref name="dl"/>
+          <ref name="quote"/>
+          <ref name="sourcecode"/>
+          <ref name="paragraph"/>
+          <ref name="figure"/>
+        </choice>
+      </oneOrMore>
     </element>
   </define>
   <define name="termsource">
@@ -2530,4 +2618,17 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="floating-title">
+    <element name="floating-title">
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+      <attribute name="depth">
+        <data type="int"/>
+      </attribute>
+      <zeroOrMore>
+        <ref name="TextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
 </grammar>

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "1.4.4".freeze
+    VERSION = "2.0.2".freeze
   end
 end
 

data/lib/metanorma-iec.rb

@@ -1,5 +1,5 @@
 require "asciidoctor" unless defined? Asciidoctor::Converter
-require_relative "asciidoctor/iec/converter"
+require_relative "metanorma/iec/converter"
 require_relative "metanorma/iec/version"
 require "isodoc/iec/html_convert"
 require "isodoc/iec/word_convert"

data/metanorma-iec.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "metanorma-iso", "~> 1.10.0"
+  spec.add_dependency "metanorma-iso", "~> 2.0.0"
   spec.add_dependency "ruby-jing"
 
   spec.add_development_dependency "debug"

data/spec/isodoc/i18n_spec.rb

@@ -83,7 +83,7 @@ RSpec.describe IsoDoc do
       <docnumber>1</docnumber>
       <language current="true">en</language>
       <ext>
-      <doctype language="">international-standard</doctype><doctype language="fr">Norme international</doctype><doctype language="en">International Standard</doctype>
+      <doctype language="">international-standard</doctype><doctype language="fr">Norme internationale</doctype><doctype language="en">International Standard</doctype>
       <horizontal language="">true</horizontal><horizontal language="fr">Norme horizontale</horizontal><horizontal language="en">Horizontal Standard</horizontal>
       <function language="">emc</function><function language="fr">Publication fondamentale en CEM</function><function language="en">Basic EMC Publication</function>
       </ext>
@@ -444,7 +444,7 @@ RSpec.describe IsoDoc do
       <bibdata>
       <language current="true">fr</language>
       <ext>
-      <doctype language="">international-standard</doctype><doctype language="fr">Norme international</doctype><doctype language="en">International Standard</doctype>
+      <doctype language="">international-standard</doctype><doctype language="fr">Norme internationale</doctype><doctype language="en">International Standard</doctype>
       <horizontal language="">false</horizontal>
       <function language="">emc</function><function language="fr">Publication fondamentale en CEM</function><function language="en">Basic EMC Publication</function>
       </ext>