metanorma-iso 1.10.1 → 1.10.5

data/lib/isodoc/iso/isosts_convert.rb

@@ -22,8 +22,12 @@ module IsoDoc
             f.path
           end
         FileUtils.rm_rf dir
-        MnConvert.convert(input_fname, output_fname || "#{fname}.#{@suffix}",
-                          MnConvert::InputFormat::MN, { output_format: :iso })
+        MnConvert.convert(input_fname,
+                          {
+                            input_format: MnConvert::InputFormat::MN,
+                            output_file: output_fname || "#{fname}.#{@suffix}",
+                            output_format: :iso,
+                          })
       end
     end
   end

data/lib/isodoc/iso/metadata.rb

@@ -21,9 +21,8 @@ module IsoDoc
           stage = "DTS" if stage == "DIS"
           stage = "FDTS" if stage == "FDIS"
         end
-        if %w(PWI NWIP WD CD).include?(stage) && iter
+        %w(PWI NWIP WD CD).include?(stage) && iter and
           stage += iter
-        end
         stage = "Pre#{stage}" if /^0\./.match?(draft)
         stage
       end
@@ -31,20 +30,25 @@ module IsoDoc
       def docstatus(isoxml, _out)
         docstatus = isoxml.at(ns("//bibdata/status/stage"))
         set(:unpublished, false)
-        if docstatus
-          set(:stage, docstatus.text)
-          set(:stage_int, docstatus.text.to_i)
-          set(:unpublished, unpublished(docstatus.text))
-          set(:statusabbr, status_abbrev(docstatus["abbreviation"] || "??",
-                                         isoxml&.at(ns("//bibdata/status/substage"))&.text,
-                                         isoxml&.at(ns("//bibdata/status/iteration"))&.text,
-                                         isoxml&.at(ns("//bibdata/version/draft"))&.text,
-                                         isoxml&.at(ns("//bibdata/ext/doctype"))&.text))
-          unpublished(docstatus.text) and
-            set(:stageabbr, docstatus["abbreviation"])
-        end
         revdate = isoxml.at(ns("//bibdata/version/revision-date"))
         set(:revdate, revdate&.text)
+        if docstatus
+          docstatus1(isoxml, docstatus)
+        end
+      end
+
+      def docstatus1(isoxml, docstatus)
+        set(:stage, docstatus.text)
+        set(:stage_int, docstatus.text.to_i)
+        set(:unpublished, unpublished(docstatus.text))
+        set(:statusabbr,
+            status_abbrev(docstatus["abbreviation"] || "??",
+                          isoxml&.at(ns("//bibdata/status/substage"))&.text,
+                          isoxml&.at(ns("//bibdata/status/iteration"))&.text,
+                          isoxml&.at(ns("//bibdata/version/draft"))&.text,
+                          isoxml&.at(ns("//bibdata/ext/doctype"))&.text))
+        unpublished(docstatus.text) and
+          set(:stageabbr, docstatus["abbreviation"])
       end
 
       def unpublished(status)
@@ -73,8 +77,7 @@ module IsoDoc
 
       def amd_label(lang)
         case lang
-        when "en" then "AMENDMENT"
-        when "fr" then "AMENDMENT"
+        when "en", "fr" then "AMENDMENT"
         end
       end
 
@@ -183,10 +186,10 @@ module IsoDoc
       end
 
       def tc(xml)
-        tc_num = xml.at(ns("//bibdata/ext/editorialgroup/technical-committee/@number"))
-        tc_type = xml.at(ns("//bibdata/ext/editorialgroup/technical-committee/@type"))
-          &.text || "TC"
-        if tc_num
+        tc_type = xml.at(ns("//bibdata/ext/editorialgroup/technical-committee/"\
+                            "@type"))&.text || "TC"
+        if tc_num = xml.at(ns("//bibdata/ext/editorialgroup/"\
+                              "technical-committee/@number"))
           tcid = "#{tc_type} #{tc_num.text}"
           set(:tc,  tcid)
           set(:editorialgroup, get[:editorialgroup] << tcid)
@@ -195,7 +198,8 @@ module IsoDoc
 
       def sc(xml)
         sc_num = xml.at(ns("//bibdata/ext/editorialgroup/subcommittee/@number"))
-        sc_type = xml.at(ns("//bibdata/ext/editorialgroup/subcommittee/@type"))&.text || "SC"
+        sc_type = xml.at(ns("//bibdata/ext/editorialgroup/subcommittee/"\
+                            "@type"))&.text || "SC"
         if sc_num
           scid = "#{sc_type} #{sc_num.text}"
           set(:sc, scid)
@@ -205,7 +209,8 @@ module IsoDoc
 
       def wg(xml)
         wg_num = xml.at(ns("//bibdata/ext/editorialgroup/workgroup/@number"))
-        wg_type = xml.at(ns("//bibdata/ext/editorialgroup/workgroup/@type"))&.text || "WG"
+        wg_type = xml.at(ns("//bibdata/ext/editorialgroup/workgroup/"\
+                            "@type"))&.text || "WG"
         if wg_num
           wgid = "#{wg_type} #{wg_num.text}"
           set(:wg, wgid)

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -57,7 +57,7 @@ module IsoDoc
         ret += " 第#{from.text}" if from
         ret += "–#{upto.text}" if upto
         loc = (@i18n.locality[type] || type.sub(/^locality:/, "").capitalize)
-        ret += " #{loc}" unless subsection && type == "clause" ||
+        ret += " #{loc}" unless (subsection && type == "clause") ||
           type == "list" || target.match(/^IEV$|^IEC 60050-/) ||
           node["droploc"] == "true"
         ret += ")" if type == "list"
@@ -73,8 +73,8 @@ module IsoDoc
           return l10n(eref_localities1_zh(target, type, from, upto, node,
                                           delim))
         ret = eref_delim(delim, type)
-        ret += eref_locality_populate(type, node) unless subsection &&
-          type == "clause" || type == "list" ||
+        ret += eref_locality_populate(type, node) unless (subsection &&
+          type == "clause") || type == "list" ||
           target.match(/^IEV$|^IEC 60050-/)
         ret += " #{from.text}" if from
         ret += "–#{upto.text}" if upto
@@ -113,28 +113,29 @@ module IsoDoc
       end
 
       def concept(docxml)
-        docxml.xpath(ns("//term//concept")).each_with_object({}) do |f, m|
-          concept_term(f, m)
-        end
+        concept_term(docxml)
         docxml.xpath(ns("//concept")).each do |node|
-          concept_render(node, ital: node["ital"] || "false",
-                               ref: node["ref"] || "false",
-                               linkref: node["linkref"] || "true",
-                               linkmention: node["linkmention"] || "false")
+          concept_render(node, ital: "false", ref: "false",
+                               linkref: "true", linkmention: "false")
         end
       end
 
-      def concept_term(node, seen)
+      def concept_term(docxml)
+        docxml.xpath(ns("//term")).each do |f|
+          m = {}
+          f.xpath(ns(".//concept")).each do |c|
+            concept_term1(c, m)
+          end
+        end
+      end
+
+      def concept_term1(node, seen)
         term = node&.at(ns("./refterm"))&.to_xml
         if term && seen[term]
-          concept_render(node, ital: node["ital"] || "false",
-                               ref: node["ref"] || "false",
-                               linkref: node["linkref"] || "true",
-                               linkmention: node["linkmention"] || "false")
-        else concept_render(node, ital: node["ital"] || "true",
-                                  ref: node["ref"] || "true",
-                                  linkref: node["linkref"] || "true",
-                                  linkmention: node["linkmention"] || "false")
+          concept_render(node, ital: "false", ref: "false",
+                               linkref: "true", linkmention: "false")
+        else concept_render(node, ital: "true", ref: "true",
+                                  linkref: "true", linkmention: "false")
         end
         seen[term] = true if term
         seen
@@ -163,17 +164,51 @@ module IsoDoc
         i = display_order_xpath(docxml, "//preface/*", i)
         i = display_order_at(docxml, "//clause[@type = 'scope']", i)
         i = display_order_at(docxml, @xrefs.klass.norm_ref_xpath, i)
-        # i = display_order_at(docxml, "//sections/terms | "\
-        # "//sections/clause[descendant::terms]", i)
-        # i = display_order_at(docxml, "//sections/definitions", i)
-        # i = display_order_xpath(docxml, @xrefs.klass.middle_clause(docxml), i)
-        i = display_order_xpath(docxml, "//sections/clause[not(@type = 'scope')] | "\
-                                        "//sections/terms | //sections/definitions", i)
+        i = display_order_xpath(docxml,
+                                "//sections/clause[not(@type = 'scope')] | "\
+                                "//sections/terms | //sections/definitions", i)
         i = display_order_xpath(docxml, "//annex", i)
         i = display_order_xpath(docxml, @xrefs.klass.bibliography_xpath, i)
         display_order_xpath(docxml, "//indexsect", i)
       end
 
+      def termdefinition1(elem)
+        prefix_domain_to_definition(elem)
+        super
+      end
+
+      def prefix_domain_to_definition(elem)
+        ((d = elem.at(ns("./domain"))) &&
+          (v = elem.at(ns("./definition/verbal-definition"))) &&
+          v.elements.first.name == "p") or return
+        v.elements.first.children.first.previous =
+          "<#{d.remove.children.to_xml}> "
+      end
+
+      def insertall_after_here(node, insert, name)
+        node.children.each do |n|
+          next unless n.name == name
+
+          insert.next = n.remove
+          insert = n
+        end
+        insert
+      end
+
+      def termexamples_before_termnotes(node)
+        return unless insert = node.at(ns("./definition"))
+
+        insert = insertall_after_here(node, insert, "termexample")
+        insertall_after_here(node, insert, "termnote")
+      end
+
+      def terms(docxml)
+        docxml.xpath(ns("//term[termnote][termexample]")).each do |node|
+          termexamples_before_termnotes(node)
+        end
+        super
+      end
+
       include Init
     end
   end

data/lib/isodoc/iso/sts_convert.rb

@@ -19,8 +19,9 @@ module IsoDoc
             f.path
           end
         FileUtils.rm_rf dir
-        MnConvert.convert(in_fname, out_fname || "#{filename}.#{@suffix}",
-                          MnConvert::InputFormat::MN)
+        MnConvert.convert(in_fname,
+                          { input_format: MnConvert::InputFormat::MN,
+                            output_file: out_fname || "#{filename}.#{@suffix}" })
       end
     end
   end

data/lib/isodoc/iso/word_convert.rb

@@ -124,9 +124,7 @@ module IsoDoc
 
       def termref_parse(node, out)
         out.p **termref_attrs do |p|
-          p << "[TERMREF]"
           node.children.each { |n| parse(n, p) }
-          p << "[/TERMREF]"
         end
       end
 

data/lib/metanorma/iso/processor.rb

@@ -4,7 +4,7 @@ module Metanorma
   module Iso
     class Processor < Metanorma::Processor
 
-      def initialize
+      def initialize # rubocop:disable Lint/MissingSuper
         @short = :iso
         @input_format = :asciidoc
         @asciidoctor_backend = :iso
@@ -17,7 +17,7 @@ module Metanorma
           doc: "doc",
           pdf: "pdf",
           sts: "sts.xml",
-          isosts: "iso.sts.xml"
+          isosts: "iso.sts.xml",
         )
       end
 

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.10.1".freeze
+    VERSION = "1.10.5".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -30,16 +30,16 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "metanorma-standoc", "~> 1.11.0"
-  spec.add_dependency "mnconvert", "~> 1.8.0"
+  spec.add_dependency "mnconvert", "~> 2.0"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "tokenizer", "~> 0.3.0"
   spec.add_dependency "twitter_cldr"
 
-  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"