metanorma-iso 1.10.0 → 1.10.4

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
@@ -163,17 +163,27 @@ 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
+
       include Init
     end
   end

data/lib/isodoc/iso/sections.rb

@@ -49,12 +49,14 @@ module IsoDoc
 
       def foreword(isoxml, out)
         f = isoxml.at(ns("//foreword")) || return
+        @foreword = true
         page_break(out)
         out.div **attr_code(id: f["id"]) do |s|
           clause_name(nil, f.at(ns("./title")) || @i18n.foreword, s,
                       { class: "ForewordTitle" })
           f.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
+        @foreword = false
       end
     end
   end

data/lib/isodoc/iso/sts_convert.rb

@@ -19,8 +19,11 @@ 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_cleanup.rb

@@ -0,0 +1,94 @@
+module IsoDoc
+  module Iso
+    class WordConvert < IsoDoc::WordConvert
+      def figure_cleanup(xml)
+        super
+        xml.xpath("//div[@class = 'figure']//table[@class = 'dl']").each do |t|
+          t["class"] = "figdl"
+          d = t.add_previous_sibling("<div class='figdl' "\
+                                     "style='page-break-after:avoid;'/>")
+          t.parent = d.first
+        end
+      end
+
+      # force Annex h2 down to be p.h2Annex, so it is not picked up by ToC
+      def word_annex_cleanup1(docxml, lvl)
+        docxml.xpath("//h#{lvl}[ancestor::*[@class = 'Section3']]").each do |h2|
+          h2.name = "p"
+          h2["class"] = "h#{lvl}Annex"
+        end
+      end
+
+      def word_annex_cleanup(docxml)
+        (2..6).each { |i| word_annex_cleanup1(docxml, i) }
+      end
+
+      def word_annex_cleanup_h1(docxml)
+        docxml.xpath("//h1[@class = 'Annex']").each do |h|
+          h.name = "p"
+          h["class"] = "ANNEX"
+        end
+        %w(BiblioTitle ForewordTitle IntroTitle).each do |s|
+          docxml.xpath("//*[@class = '#{s}']").each do |h|
+            h.name = "p"
+          end
+        end
+      end
+
+      def style_cleanup(docxml)
+        word_annex_cleanup_h1(docxml)
+        style_cleanup1(docxml)
+      end
+
+      def style_cleanup1(docxml)
+        docxml.xpath("//*[@class = 'example']").each do |p|
+          p["class"] = "Example"
+        end
+      end
+
+      def authority_hdr_cleanup(docxml)
+        docxml&.xpath("//div[@class = 'boilerplate-license']")&.each do |d|
+          d.xpath(".//h1").each do |p|
+            p.name = "p"
+            p["class"] = "zzWarningHdr"
+          end
+        end
+        docxml&.xpath("//div[@class = 'boilerplate-copyright']")&.each do |d|
+          d.xpath(".//h1").each do |p|
+            p.name = "p"
+            p["class"] = "zzCopyrightHdr"
+          end
+        end
+      end
+
+      def authority_cleanup(docxml)
+        insert = docxml.at("//div[@id = 'boilerplate-license-destination']")
+        auth = docxml&.at("//div[@class = 'boilerplate-license']")&.remove
+        auth&.xpath(".//p[not(@class)]")&.each { |p| p["class"] = "zzWarning" }
+        auth and insert.children = auth
+        insert = docxml.at("//div[@id = 'boilerplate-copyright-destination']")
+        auth = docxml&.at("//div[@class = 'boilerplate-copyright']")&.remove
+        auth&.xpath(".//p[not(@class)]")&.each do |p|
+          p["class"] = "zzCopyright"
+        end
+        auth&.xpath(".//p[@id = 'boilerplate-message']")&.each do |p|
+          p["class"] = "zzCopyright1"
+        end
+        auth&.xpath(".//p[@id = 'boilerplate-address']")&.each do |p|
+          p["class"] = "zzAddress"
+        end
+        auth&.xpath(".//p[@id = 'boilerplate-place']")&.each do |p|
+          p["class"] = "zzCopyright1"
+        end
+        auth and insert.children = auth
+      end
+
+      def word_cleanup(docxml)
+        authority_hdr_cleanup(docxml)
+        super
+        style_cleanup(docxml)
+        docxml
+      end
+    end
+  end
+end

data/lib/isodoc/iso/word_convert.rb

@@ -1,6 +1,7 @@
 require_relative "base_convert"
 require "isodoc"
 require_relative "init"
+require_relative "word_cleanup"
 
 module IsoDoc
   module Iso
@@ -59,92 +60,11 @@ module IsoDoc
         return if !stage.nil? && stage < 60
 
         body.br **{ clear: "all", style: "page-break-before:left;"\
-                    "mso-break-type:section-break" }
+                                         "mso-break-type:section-break" }
         body.div **{ class: "colophon" } do |div|
         end
       end
 
-      def figure_cleanup(xml)
-        super
-        xml.xpath("//div[@class = 'figure']//table[@class = 'dl']").each do |t|
-          t["class"] = "figdl"
-          d = t.add_previous_sibling("<div class='figdl' "\
-                                     "style='page-break-after:avoid;'/>")
-          t.parent = d.first
-        end
-      end
-
-      # force Annex h2 down to be p.h2Annex, so it is not picked up by ToC
-      def word_annex_cleanup1(docxml, lvl)
-        docxml.xpath("//h#{lvl}[ancestor::*[@class = 'Section3']]").each do |h2|
-          h2.name = "p"
-          h2["class"] = "h#{lvl}Annex"
-        end
-      end
-
-      def word_annex_cleanup(docxml)
-        (2..6).each { |i| word_annex_cleanup1(docxml, i) }
-      end
-
-      def word_annex_cleanup_h1(docxml)
-        docxml.xpath("//h1[@class = 'Annex']").each do |h|
-          h.name = "p"
-          h["class"] = "ANNEX"
-        end
-        %w(BiblioTitle ForewordTitle IntroTitle).each do |s|
-          docxml.xpath("//*[@class = '#{s}']").each do |h|
-            h.name = "p"
-          end
-        end
-      end
-
-      def style_cleanup(docxml)
-        word_annex_cleanup_h1(docxml)
-        style_cleanup1(docxml)
-      end
-
-      def style_cleanup1(docxml)
-        docxml.xpath("//*[@class = 'example']").each do |p|
-          p["class"] = "Example"
-        end
-      end
-
-      def authority_hdr_cleanup(docxml)
-        docxml&.xpath("//div[@class = 'boilerplate-license']")&.each do |d|
-          d.xpath(".//h1").each do |p|
-            p.name = "p"
-            p["class"] = "zzWarningHdr"
-          end
-        end
-        docxml&.xpath("//div[@class = 'boilerplate-copyright']")&.each do |d|
-          d.xpath(".//h1").each do |p|
-            p.name = "p"
-            p["class"] = "zzCopyrightHdr"
-          end
-        end
-      end
-
-      def authority_cleanup(docxml)
-        insert = docxml.at("//div[@id = 'boilerplate-license-destination']")
-        auth = docxml&.at("//div[@class = 'boilerplate-license']")&.remove
-        auth&.xpath(".//p[not(@class)]")&.each { |p| p["class"] = "zzWarning" }
-        auth and insert.children = auth
-        insert = docxml.at("//div[@id = 'boilerplate-copyright-destination']")
-        auth = docxml&.at("//div[@class = 'boilerplate-copyright']")&.remove
-        auth&.xpath(".//p[not(@class)]")&.each { |p| p["class"] = "zzCopyright" }
-        auth&.xpath(".//p[@id = 'boilerplate-message']")&.each { |p| p["class"] = "zzCopyright1" }
-        auth&.xpath(".//p[@id = 'boilerplate-address']")&.each { |p| p["class"] = "zzAddress" }
-        auth&.xpath(".//p[@id = 'boilerplate-place']")&.each { |p| p["class"] = "zzCopyright1" }
-        auth and insert.children = auth
-      end
-
-      def word_cleanup(docxml)
-        authority_hdr_cleanup(docxml)
-        super
-        style_cleanup(docxml)
-        docxml
-      end
-
       def word_toc_preface(level)
         <<~TOC.freeze
           <span lang="EN-GB"><span
@@ -166,7 +86,7 @@ module IsoDoc
       end
 
       def bibliography(xml, out)
-        f = xml.at(ns(bibliography_xpath)) and f["hidden"] != "true" or return
+        (f = xml.at(ns(bibliography_xpath)) and f["hidden"] != "true") or return
         page_break(out)
         out.div do |div|
           div.h1 **bibliography_attrs do |h1|
@@ -185,13 +105,16 @@ module IsoDoc
         end
       end
 
+      def definition_parse(node, out)
+        @definition = true
+        super
+        @definition = false
+      end
+
       def para_class(node)
-        if !node.ancestors("definition").empty? && !@in_footnote
-          "Definition"
-        elsif !node.ancestors("foreword").empty? && !@in_footnote
-          "ForewordText"
-        else
-          super
+        if @definition && !@in_footnote then "Definition"
+        elsif @foreword && !@in_footnote then "ForewordText"
+        else super
         end
       end
 
@@ -201,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.0".freeze
+    VERSION = "1.10.4".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"