metanorma-iec 1.4.1 → 1.4.5

data/lib/isodoc/iec/presentation_xml_convert.rb

@@ -4,6 +4,14 @@ require "isodoc"
 module IsoDoc
   module Iec
     class PresentationXMLConvert < IsoDoc::Iso::PresentationXMLConvert
+      def i18n_init(lang, script, i18nyaml = nil)
+        super
+        @i18n_lg = {}
+        @i18n_lg["en"] = I18n.new("en", "Latn", i18nyaml || @i18nyaml)
+        @i18n_lg["fr"] = I18n.new("fr", "Latn", i18nyaml || @i18nyaml)
+        @i18n_lg["default"] = @i18n
+      end
+
       def clause(docxml)
         docxml.xpath(ns("//clause[not(ancestor::annex)] | "\
                         "//definitions | //references | "\
@@ -29,16 +37,196 @@ module IsoDoc
           .call(elem)
       end
 
+      DICT_PATHS = { doctype_dict: "./ext/doctype", stage_dict: "./status/stage",
+                     substage_dict: "./status/substage",
+                     function_dict: "./ext/function",
+                     horizontal_dict: "./ext/horizontal" }.freeze
+
       def bibdata_i18n(bib)
         fr = IsoDoc::Iec::I18n.new("fr", "Latn")
         en = IsoDoc::Iec::I18n.new("en", "Latn")
         [{ lang: "en", i18n: en }, { lang: "fr", i18n: fr }].each do |v|
-          { doctype_dict: "./ext/doctype", stage_dict: "./status/stage",
-            substage_dict: "./status/substage", function_dict: "./ext/function",
-            horizontal_dict: "./ext/horizontal" }.each do |lbl, xpath|
-              hash_translate(bib, v[:i18n].get[lbl.to_s], xpath, v[:lang])
-            end
+          DICT_PATHS.each do |lbl, xpath|
+            hash_translate(bib, v[:i18n].get[lbl.to_s], xpath, v[:lang])
+          end
+        end
+      end
+
+      def concept(docxml)
+        @is_iev and concept_iev(docxml)
+        super
+      end
+
+      def concept_iev(docxml)
+        labels = @xrefs.get_anchors.each_with_object({}) do |(k, v), m|
+          m[v[:label]] = k
+        end
+        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)
+        end
+      end
+
+      def concept_iev1(termref, docpart, labels)
+        /^#{docpart}-/.match?(termref["target"]) or return
+        newtarget = labels[termref["target"]] or return
+        termref.name = "xref"
+        termref.delete("base")
+        termref["target"] = newtarget
+      end
+
+      def terms(docxml)
+        otherlang_designations(docxml)
+        super
+        merge_fr_into_en_term(docxml)
+      end
+
+      def merge_fr_into_en_term(docxml)
+        return unless @is_iev
+
+        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
+        end
+        @xrefs.parse docxml
+        docxml.xpath(ns("//term/name")).each(&:remove)
+        term(docxml)
+      end
+
+      def merge_fr_into_en_term1(en_term, fr_term)
+        dl = en_term&.at(ns("./dl[@type = 'other-lang']"))&.remove
+        en_term << fr_term.remove.children
+        en_term << dl if dl
+        en_term["language"] = "en,fr"
+        en_term.delete("tag")
+      end
+
+      def otherlang_designations(docxml)
+        return unless @is_iev
+
+        docxml.xpath(ns("//term")).each do |t|
+          otherlang_designations1(t, t["language"]&.split(/,/) || %w(en fr))
+        end
+      end
+
+      def extract_otherlang_designations(term, lgs)
+        term.xpath(ns(".//preferred/expression[@language]"))
+          .each_with_object([]) do |d, m|
+          lg = d["language"]
+          d.delete("language")
+          next if lgs.include?(lg)
+
+          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).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?
+
+          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 = 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]}'>"\
+            "#{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]
+        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
+
+      def termsource_modification(node)
+        lg = node&.at("./ancestor::xmlns:term/@language")&.text
+        @i18n = @i18n_lg[lg] if lg && @i18n_lg[lg]
+        super
+        @i18n = @i18n_lg["default"]
+      end
+
+      def termsource1(node)
+        lg = node&.at("./ancestor::xmlns:term/@language")&.text
+        @i18n = @i18n_lg[lg] if lg && @i18n_lg[lg]
+        if @is_iev then termsource1_iev(node)
+        else super
+        end
+        @i18n = @i18n_lg["default"]
+      end
+
+      def termsource1_iev(elem)
+        while elem&.next_element&.name == "termsource"
+          elem << l10n("; #{elem.next_element.remove.children.to_xml}")
+        end
+        elem.children = l10n("#{@i18n.source}: #{elem.children.to_xml.strip}")
+      end
+
+      def termexample(docxml)
+        docxml.xpath(ns("//termexample")).each do |f|
+          termexample1(f)
+        end
+      end
+
+      def termexample1(elem)
+        lg = elem&.at("./ancestor::xmlns:term/@language")&.text
+        @i18n = @i18n_lg[lg] if lg && @i18n_lg[lg]
+        example1(elem)
+        @i18n = @i18n_lg["default"]
+      end
+
+      def termnote1(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")
+        @i18n = @i18n_lg["default"]
       end
 
       include Init

data/lib/metanorma/iec/processor.rb

@@ -3,8 +3,7 @@ require "metanorma/processor"
 module Metanorma
   module Iec
     class Processor < Metanorma::Processor
-
-      def initialize
+      def initialize # rubocop:disable Lint/MissingSuper
         @short = :iec
         @input_format = :asciidoc
         @asciidoctor_backend = :iec
@@ -14,7 +13,8 @@ module Metanorma
         super.merge(
           html: "html",
           doc: "doc",
-          pdf: "pdf"
+          pdf: "pdf",
+          sts: "sts.xml",
         )
       end
 
@@ -33,16 +33,23 @@ module Metanorma
         "Metanorma::Iec #{Metanorma::Iec::VERSION}"
       end
 
-      def output(isodoc_node, inname, outname, format, options={})
+      def output(isodoc_node, inname, outname, format, options = {})
         case format
         when :html
-          IsoDoc::Iec::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Iec::HtmlConvert.new(options).convert(inname, isodoc_node,
+                                                        nil, outname)
         when :doc
-          IsoDoc::Iec::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Iec::WordConvert.new(options).convert(inname, isodoc_node,
+                                                        nil, outname)
         when :pdf
-          IsoDoc::Iec::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Iec::PdfConvert.new(options).convert(inname, isodoc_node,
+                                                       nil, outname)
+        when :sts
+          IsoDoc::Iso::StsConvert.new(options).convert(inname, isodoc_node,
+                                                       nil, outname)
         when :presentation
-          IsoDoc::Iec::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Iec::PresentationXMLConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         else
           super
         end

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "1.4.1".freeze
+    VERSION = "1.4.5".freeze
   end
 end
 

data/metanorma-iec.gemspec

@@ -30,11 +30,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "metanorma-iso", "~> 1.10.0"
   spec.add_dependency "ruby-jing"
 
-  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
-  spec.add_development_dependency "iev", "~> 0.2.0"
+  spec.add_development_dependency "iev", "~> 0.3.0"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "~> 1.5.2"

data/spec/asciidoctor/base_spec.rb

@@ -166,7 +166,6 @@ RSpec.describe Asciidoctor::Iec do
           </relation>
           <ext>
             <doctype>article</doctype>
-            <horizontal>false</horizontal>
             <editorialgroup>
               <technical-committee number='1' type='A'>TC</technical-committee>
               <technical-committee number='11' type='A1'>TC1</technical-committee>
@@ -675,7 +674,6 @@ RSpec.describe Asciidoctor::Iec do
         </copyright>
         <ext>
           <doctype>article</doctype>
-                   <horizontal>false</horizontal>
           <editorialgroup>
             <technical-committee/>
             <subcommittee/>
@@ -879,7 +877,6 @@ RSpec.describe Asciidoctor::Iec do
         </copyright>
         <ext>
           <doctype>article</doctype>
-                   <horizontal>false</horizontal>
           <editorialgroup>
             <technical-committee/>
             <subcommittee/>
@@ -947,7 +944,6 @@ RSpec.describe Asciidoctor::Iec do
         </copyright>
         <ext>
           <doctype>article</doctype>
-                   <horizontal>false</horizontal>
           <editorialgroup>
             <technical-committee/>
             <subcommittee/>