isodoc 2.5.10 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a73625d6e0b342e44b34e2c93ef6df6126e1694dbcd9475cc52168da86a8cb8b
-  data.tar.gz: 58bed9e6bd9f0a5812a6e7ee46e90ea2c4e2dc4bf1592a66db4302dd4d579f5c
+  metadata.gz: 7b149d913a483c336d7463e587e980fe234f4d1e32d8d683a070d919b0ce7429
+  data.tar.gz: 46e568e2b91f13069f62131ab1b86e28fd74416c55ae0937935575927a578430
 SHA512:
-  metadata.gz: 28274dab0c28284a969ae3caf93e2065447c8b70b9166385e972b610014eb6bdeea8de3ec25273dfa1aea7fb78eaea463e894a0feeef18b82f0be3f2f479ff7c
-  data.tar.gz: 87c56a3f6c1aefd791ae520d2e3c1e0c7d7060b5d81aca3e64096294cd3c5de28cd71d70ad04db8823457bc90773a8f6b1d427a43e1cdd3ed067b5ab72099c29
+  metadata.gz: ae43a3f990e70f7d1929357172ca48b4cbc5db2750e61d1f91768c8087e796f5e333de64b60fc928434862e1fb874151c6a00a0cd41e25d491fe79e8604dfa9d
+  data.tar.gz: 9abab47db0d610e3971c1f9a19af240449dc11d6cd1d8d0f9e1e860f4b00e4a6947cce60d8483ba8701a180472278badaee6d431a07bd32ba1727ea5ad4d9a16

data/isodoc.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   end
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "html2doc", "~> 1.5.3"
+  spec.add_dependency "html2doc", "~> 1.6.0"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   # spec.add_dependency "isodoc-i18n", "~> 1.1.0" # already in relaton-render and mn-requirements
   spec.add_dependency "emf2svg"

data/lib/isodoc/base_style/metanorma_word.css

@@ -1,6 +1,3 @@
-div.table_container {
-  margin-bottom: 14pt; }
-
 ol {
   margin-bottom: 0cm; }
 
@@ -54,3 +51,6 @@ table.rouge-line-table {
 
 td.rouge-code p.Sourcecode {
   margin: 0px; }
+
+div.table_container {
+  margin-bottom: 14pt; }

data/lib/isodoc/base_style/metanorma_word.scss

@@ -1,6 +1,4 @@
-div.table_container {
-  margin-bottom: 14pt;
-}
+
 
 ol      
         {margin-bottom:0cm;}
@@ -53,3 +51,7 @@ table.rouge-line-table {
 td.rouge-code p.Sourcecode {
   margin: 0px;
 }
+
+div.table_container {
+  margin-bottom: 14pt;
+}

data/lib/isodoc/common.rb

@@ -1,16 +1,16 @@
-require_relative "./function/blocks"
-require_relative "./function/cleanup"
-require_relative "./function/form"
-require_relative "./function/inline"
-require_relative "./function/lists"
-require_relative "./function/references"
-require_relative "./function/section"
-require_relative "./function/table"
-require_relative "./function/terms"
-require_relative "./function/to_word_html"
-require_relative "./function/utils"
-require_relative "./function/reqt"
-require_relative "./class_utils"
+require_relative "function/blocks"
+require_relative "function/cleanup"
+require_relative "function/form"
+require_relative "function/inline"
+require_relative "function/lists"
+require_relative "function/references"
+require_relative "function/section"
+require_relative "function/table"
+require_relative "function/terms"
+require_relative "function/to_word_html"
+require_relative "function/utils"
+require_relative "function/reqt"
+require_relative "class_utils"
 
 module IsoDoc
   class Common

data/lib/isodoc/convert.rb

@@ -113,6 +113,8 @@ module IsoDoc
         docxml = Nokogiri::XSLT(x).transform(docxml)
       end
       docxml
+    rescue
+      require "debug"; binding.b
     end
 
     def extract_preprocess_xslt(docxml)
@@ -156,11 +158,11 @@ module IsoDoc
 
     def middle_clause(_docxml = nil)
       "//clause[parent::sections][not(@type = 'scope')]" \
-        "[not(descendant::terms)]"
+        "[not(descendant::terms)][not(descendant::references)]"
     end
 
     def target_pdf(node)
-      if /#/.match?(node["target"]) then node["target"].sub(/#/, ".pdf#")
+      if node["target"].include?("#") then node["target"].sub("#", ".pdf#")
       else "##{node['target']}"
       end
     end

data/lib/isodoc/function/blocks.rb

@@ -5,10 +5,6 @@ module IsoDoc
     module Blocks
       @annotation = false
 
-      def middle_title(_isoxml, out)
-        out.p(class: "zzSTDTitle1") { |p| p << @meta.get[:doctitle] }
-      end
-
       def figure_name_parse(_node, div, name)
         name.nil? and return
         div.p class: "FigureTitle", style: "text-align:center;" do |p|
@@ -140,6 +136,7 @@ module IsoDoc
         if node["type"] == "floating-title"
           classtype = "h#{node['depth']}"
         end
+        classtype ||= node["class"]
         classtype
       end
 

data/lib/isodoc/function/blocks_example_note.rb

@@ -71,7 +71,7 @@ module IsoDoc
       end
 
       def note_parse1(node, div)
-        name = node&.at(ns("./name"))&.remove
+        name = node.at(ns("./name"))&.remove
         name and div.p do |p|
           p.span class: "note_label" do |s|
             name.children.each { |n| parse(n, s) }
@@ -110,12 +110,6 @@ module IsoDoc
         @note = false
       end
 
-      def middle_admonitions(isoxml, out)
-        isoxml.xpath(ns("//sections/note | //sections/admonition")).each do |x|
-          parse(x, out)
-        end
-      end
-
       def admonition_name_parse(_node, div, name)
         div.p class: "AdmonitionTitle", style: "text-align:center;" do |p|
           name.children.each { |n| parse(n, p) }

data/lib/isodoc/function/inline.rb

@@ -38,7 +38,7 @@ module IsoDoc
 
       def xref_parse(node, out)
         target = if /#/.match?(node["target"])
-                   node["target"].sub(/#/, ".html#")
+                   node["target"].sub("#", ".html#")
                  else
                    "##{node['target']}"
                  end
@@ -150,7 +150,7 @@ module IsoDoc
       end
 
       def error_parse(node, out)
-        text = node.to_xml.gsub(/</, "&lt;").gsub(/>/, "&gt;")
+        text = node.to_xml.gsub("<", "&lt;").gsub(">", "&gt;")
         out.para do |p|
           p.b(role: "strong") { |e| e << text }
         end

data/lib/isodoc/function/references.rb

@@ -145,21 +145,20 @@ module IsoDoc
 
       def norm_ref_xpath
         "//bibliography/references[@normative = 'true'] | " \
-          "//bibliography/clause[.//references[@normative = 'true']]"
+          "//bibliography/clause[.//references[@normative = 'true']] | " \
+          "//sections/references[@normative = 'true'] | " \
+          "//sections/clause[.//references[@normative = 'true']]"
       end
 
-      def norm_ref(isoxml, out, num)
-        (f = isoxml.at(ns(norm_ref_xpath)) and f["hidden"] != "true") or
-          return num
+      def norm_ref(node, out)
+        node["hidden"] != "true" or return
         out.div do |div|
-          num += 1
-          clause_name(f, f.at(ns("./title")), div, nil)
-          if f.name == "clause"
-            f.elements.each { |e| parse(e, div) unless e.name == "title" }
-          else biblio_list(f, div, false)
+          clause_name(node, node.at(ns("./title")), div, nil)
+          if node.name == "clause"
+            node.elements.each { |e| parse(e, div) unless e.name == "title" }
+          else biblio_list(node, div, false)
           end
         end
-        num
       end
 
       def bibliography_xpath
@@ -168,15 +167,14 @@ module IsoDoc
           "//bibliography/references[@normative = 'false']"
       end
 
-      def bibliography(isoxml, out)
-        (f = isoxml.at(ns(bibliography_xpath)) and f["hidden"] != "true") or
-          return
+      def bibliography(node, out)
+        node["hidden"] != "true" or return
         page_break(out)
         out.div do |div|
           div.h1 class: "Section3" do |h1|
-            f.at(ns("./title"))&.children&.each { |c2| parse(c2, h1) }
+            node.at(ns("./title"))&.children&.each { |c2| parse(c2, h1) }
           end
-          biblio_list(f, div, true)
+          biblio_list(node, div, true)
         end
       end
 

data/lib/isodoc/function/section.rb

@@ -17,13 +17,11 @@ module IsoDoc
         end
       end
 
-      def clause(isoxml, out)
-        isoxml.xpath(ns(middle_clause(isoxml))).each do |c|
-          out.div **attr_code(clause_attrs(c)) do |s|
-            clause_name(c, c.at(ns("./title")), s, nil)
-            c.elements.reject { |c1| c1.name == "title" }.each do |c1|
-              parse(c1, s)
-            end
+      def clause(node, out)
+        out.div **attr_code(clause_attrs(node)) do |s|
+          clause_name(node, node.at(ns("./title")), s, nil)
+          node.elements.reject { |c1| c1.name == "title" }.each do |c1|
+            parse(c1, s)
           end
         end
       end
@@ -32,44 +30,40 @@ module IsoDoc
         { id: node["id"], class: "Section3" }
       end
 
-      def annex(isoxml, out)
-        isoxml.xpath(ns("//annex")).each do |c|
-          page_break(out)
-          out.div **attr_code(annex_attrs(c)) do |s|
-            c.elements.each do |c1|
-              if c1.name == "title" then annex_name(c, c1, s)
-              else parse(c1, s)
-              end
+      def annex(node, out)
+        page_break(out)
+        out.div **attr_code(annex_attrs(node)) do |s|
+          node.elements.each do |c1|
+            if c1.name == "title" then annex_name(node, c1, s)
+            else parse(c1, s)
             end
           end
         end
       end
 
-      def scope(isoxml, out, num)
-        f = isoxml.at(ns("//clause[@type = 'scope']")) or return num
-        out.div **attr_code(id: f["id"]) do |div|
-          num = num + 1
-          clause_name(f, f&.at(ns("./title")), div, nil)
-          f.elements.each do |e|
+      def indexsect(node, out)
+        clause_parse(node, out)
+      end
+
+      def scope(node, out)
+        out.div **attr_code(id: node["id"]) do |div|
+          clause_name(node, node.at(ns("./title")), div, nil)
+          node.elements.each do |e|
             parse(e, div) unless e.name == "title"
           end
         end
-        num
       end
 
       TERM_CLAUSE = "//sections/terms | " \
                     "//sections/clause[descendant::terms]".freeze
 
-      def terms_defs(isoxml, out, num)
-        f = isoxml.at(ns(TERM_CLAUSE)) or return num
-        out.div **attr_code(id: f["id"]) do |div|
-          num = num + 1
-          clause_name(f, f.at(ns("./title")), div, nil)
-          f.elements.each do |e|
+      def terms_defs(node, out)
+        out.div **attr_code(id: node["id"]) do |div|
+          clause_name(node, node.at(ns("./title")), div, nil)
+          node.elements.each do |e|
             parse(e, div) unless %w{title source}.include? e.name
           end
         end
-        num
       end
 
       # subclause
@@ -77,16 +71,13 @@ module IsoDoc
         clause_parse(isoxml, out)
       end
 
-      def symbols_abbrevs(isoxml, out, num)
-        f = isoxml.at(ns("//sections/definitions")) or return num
-        out.div **attr_code(id: f["id"], class: "Symbols") do |div|
-          num = num + 1
-          clause_name(f, f.at(ns("./title")), div, nil)
-          f.elements.each do |e|
+      def symbols_abbrevs(node, out)
+        out.div **attr_code(id: node["id"], class: "Symbols") do |div|
+          clause_name(node, node.at(ns("./title")), div, nil)
+          node.elements.each do |e|
             parse(e, div) unless e.name == "title"
           end
         end
-        num
       end
 
       # subclause
@@ -171,15 +162,14 @@ module IsoDoc
         end
       end
 
-      def colophon(isoxml, out)
-        isoxml.at(ns("//colophon")) or return
-        page_break(out)
-        isoxml.xpath(ns("//colophon/clause")).each do |f|
-          out.div class: "Section3", id: f["id"] do |div|
-            clause_name(f, f&.at(ns("./title")), div, { class: "IntroTitle" })
-            f.elements.each do |e|
-              parse(e, div) unless e.name == "title"
-            end
+      def colophon(node, out)
+        @seen_colophon or page_break(out)
+        @seen_colophon = true
+        out.div class: "Section3", id: node["id"] do |div|
+          clause_name(node, node.at(ns("./title")), div,
+                      { class: "IntroTitle" })
+          node.elements.each do |e|
+            parse(e, div) unless e.name == "title"
           end
         end
       end
@@ -194,24 +184,6 @@ module IsoDoc
         t.size == 1 && %w(terms definitions references).include?(t[0].name)
       end
 
-      def front(isoxml, out)
-        p = isoxml.at(ns("//preface")) or return
-        p.elements.each do |e|
-          if is_clause?(e.name)
-            case e.name
-            when "abstract" then abstract e, out
-            when "foreword" then foreword e, out
-            when "introduction" then introduction e, out
-            when "executivesummary" then executivesummary e, out
-            when "clause" then preface e, out
-            when "acknowledgements" then acknowledgements e, out
-            end
-          else
-            preface_block(e, out)
-          end
-        end
-      end
-
       def executivesummary(clause, out)
         introduction clause, out
       end

data/lib/isodoc/function/section_titles.rb

@@ -56,7 +56,6 @@ module IsoDoc
 
       # top level clause names
       def clause_name(node, title, div, header_class)
-        preceding_floating_titles(node, div)
         header_class = {} if header_class.nil?
         div.h1 **attr_code(header_class) do |h1|
           if title.is_a?(String) then h1 << title
@@ -69,7 +68,6 @@ module IsoDoc
       end
 
       def annex_name(_annex, name, div)
-        preceding_floating_titles(name, div)
         return if name.nil?
 
         div.h1 class: "Annex" do |t|
@@ -84,18 +82,6 @@ module IsoDoc
           node.children.each { |c| parse(c, p) }
         end
       end
-
-      def preceding_floating_titles(node, div)
-        return if node.nil?
-
-        out = node.xpath("./preceding-sibling::*")
-          .reverse.each_with_object([]) do |p, m|
-          break m unless p.name == "p"
-
-          m << p
-        end or return
-        out.each { |c| parse(c, div) }
-      end
     end
   end
 end

data/lib/isodoc/function/to_word_html.rb

@@ -82,20 +82,57 @@ module IsoDoc
         section_break(body)
       end
 
+      TOP_ELEMENTS =
+        "//preface/*[@displayorder] | //sections/*[@displayorder] | " \
+        "//annex[@displayorder] | //bibliography/*[@displayorder] | " \
+        "//colophon/*[@displayorder] | //indexsect[@displayorder]"
+          .freeze
+
       def make_body3(body, docxml)
         body.div class: "main-section" do |div3|
           boilerplate docxml, div3
-          preface_block docxml, div3
-          abstract docxml, div3
-          foreword docxml, div3
-          introduction docxml, div3
-          acknowledgements docxml, div3
-          middle docxml, div3
+          content(div3, docxml, ns(self.class::TOP_ELEMENTS))
           footnotes div3
           comments div3
         end
       end
 
+      # xpath presumed to list elements with displayorder attribute
+      def content(body, docxml, xpath)
+        docxml.xpath(xpath).sort_by { |c| c["displayorder"].to_i }
+          .each do |c|
+            top_element_render(c, body)
+          end
+      end
+
+      def top_element_render(e, out)
+        case e.name
+        when "abstract" then abstract e, out
+        when "foreword" then foreword e, out
+        when "introduction" then introduction e, out
+        when "executivesummary" then executivesummary e, out
+        when "acknowledgements" then acknowledgements e, out
+        when "annex" then annex e, out
+        when "definitions" then symbols_abbrevs e, out
+        when "indexsect" then indexsect e, out
+        when "references"
+          if e["normative"] == "true" then norm_ref e, out
+          else bibliography e, out
+          end
+        when "clause"
+          if e.parent.name == "preface" then preface e, out
+          elsif e.parent.name == "colophon" then colophon e, out
+          elsif e["type"] == "scope" then scope e, out
+          elsif e.at(ns(".//terms")) then terms_defs e, out
+          elsif e.at(ns(".//references[@normative = 'true']"))
+            norm_ref e, out
+          elsif e.at(ns(".//references")) then bibliography e, out
+          else clause e, out
+          end
+        else parse(e, out)
+        end
+      end
+
       def info(isoxml, out)
         @meta.code_css isoxml, out
         @meta.title isoxml, out
@@ -116,22 +153,8 @@ module IsoDoc
         @meta.get
       end
 
-      def middle(isoxml, out)
-        middle_title(isoxml, out)
-        middle_admonitions(isoxml, out)
-        scope isoxml, out, 0
-        norm_ref isoxml, out, 0
-        terms_defs isoxml, out, 0
-        symbols_abbrevs isoxml, out, 0
-        clause isoxml, out
-        annex isoxml, out
-        bibliography isoxml, out
-        colophon isoxml, out
-      end
-
       def boilerplate(node, out)
-        return if @bare
-
+        @bare and return
         boilerplate = node.at(ns("//boilerplate")) or return
         out.div class: "authority" do |s|
           boilerplate.children.each do |n|

data/lib/isodoc/function/utils.rb

@@ -176,6 +176,7 @@ module IsoDoc
         imgtype = "emf" if emf?("#{imgclass}/#{imgtype}")
         imgtype = imgtype.sub(/\+[a-z0-9]+$/, "") # svg+xml
         imgtype = "png" unless /^[a-z0-9]+$/.match? imgtype
+        imgtype == "postscript" and imgtype = "eps"
         Tempfile.open(["image", ".#{imgtype}"]) do |f|
           f.binmode
           f.write(Base64.strict_decode64(imgdata))

data/lib/isodoc/html_function/footnotes.rb

@@ -36,7 +36,7 @@ module IsoDoc
 
       def make_generic_footnote_text(node, fnid)
         noko do |xml|
-          xml.aside **{ id: "fn:#{fnid}", class: "footnote" } do |div|
+          xml.aside id: "fn:#{fnid}", class: "footnote" do |div|
             node.children.each { |n| parse(n, div) }
           end
         end.join("\n")
@@ -59,7 +59,7 @@ module IsoDoc
         return if @seen_footnote.include?(tid + fn)
 
         @in_footnote = true
-        out.aside **{ class: "footnote" } do |a|
+        out.aside class: "footnote" do |a|
           a << make_table_footnote_text(node, tid + fn, fn)
         end
         @in_footnote = false

data/lib/isodoc/html_function/html.rb

@@ -33,16 +33,6 @@ module IsoDoc
         section_break(body)
       end
 
-      def make_body3(body, docxml)
-        body.div class: "main-section" do |div3|
-          boilerplate docxml, div3
-          front docxml, div3
-          middle docxml, div3
-          footnotes div3
-          comments div3
-        end
-      end
-
       def googlefonts
         <<~HEAD.freeze
           <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet"/>

data/lib/isodoc/init.rb

@@ -21,9 +21,9 @@ module IsoDoc
     def toc_init(docxml)
       x = "//metanorma-extension/presentation-metadata" \
           "[name[text() = 'TOC Heading Levels']]/value"
-      n = docxml.at(ns(x.sub(/TOC/, "DOC TOC"))) and
+      n = docxml.at(ns(x.sub("TOC", "DOC TOC"))) and
         @wordToClevels = n.text.to_i
-      n = docxml.at(ns(x.sub(/TOC/, "HTML TOC"))) and
+      n = docxml.at(ns(x.sub("TOC", "HTML TOC"))) and
         @htmlToClevels = n.text.to_i
     end
 
@@ -93,7 +93,7 @@ module IsoDoc
       @fn_bookmarks = {}
     end
 
-        def init_fonts(options)
+    def init_fonts(options)
       @normalfontsize = options[:normalfontsize]
       @smallerfontsize = options[:smallerfontsize]
       @monospacefontsize = options[:monospacefontsize]
@@ -129,5 +129,13 @@ module IsoDoc
       @toctables = options[:toctables]
       @tocrecommendations = options[:tocrecommendations]
     end
+
+    AGENCIES = %w(ISO IEC ITU IETF NIST OGC IEEE BIPM BSI BS JIS IANA UN W3C
+                  IHO CSA IEV)
+      .freeze
+
+    def agency?(text)
+      self.class::AGENCIES.include?(text)
+    end
   end
 end

data/lib/isodoc/metadata.rb

@@ -1,5 +1,5 @@
-require_relative "./metadata_date"
-require_relative "./metadata_contributor"
+require_relative "metadata_date"
+require_relative "metadata_contributor"
 
 module IsoDoc
   class Metadata
@@ -15,7 +15,7 @@ module IsoDoc
 
     def initialize(lang, script, locale, i18n, fonts_options = {})
       @metadata = { lang: lang, script: script }
-      DATETYPES.each { |w| @metadata["#{w.gsub(/-/, '_')}date".to_sym] = "XXX" }
+      DATETYPES.each { |w| @metadata["#{w.gsub('-', '_')}date".to_sym] = "XXX" }
       @lang = lang
       @script = script
       @locale = locale

data/lib/isodoc/metadata_contributor.rb

@@ -67,7 +67,7 @@ module IsoDoc
       publisher = []
       xml.xpath(ns("//bibdata/contributor[xmlns:role/@type = 'publisher']/" \
                    "organization")).each do |org|
-        name = org.at(ns("./name"))&.text
+        name = extract_variant(org.at(ns("./name")))
         agency1 = org.at(ns("./abbreviation"))&.text || name
         publisher << name if name
         agency = iso?(org) ? "ISO/#{agency}" : "#{agency}#{agency1}/"
@@ -75,6 +75,12 @@ module IsoDoc
       [agency, publisher]
     end
 
+    def extract_variant(node)
+      node.nil? and return node
+      x = node.at(ns("./variant[@language = '#{@lang}']")) and node = x
+      node.text
+    end
+
     def agency(xml)
       agency, publisher = agency1(xml)
       set(:agency, agency.sub(%r{/$}, ""))

data/lib/isodoc/presentation_function/erefs.rb

@@ -4,7 +4,7 @@ module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def expand_citeas(text)
       text.nil? and return text
-      HTMLEntities.new.decode(text.gsub(/&amp;#x/, "&#"))
+      HTMLEntities.new.decode(text.gsub("&amp;#x", "&#"))
     end
 
     def erefstack1(elem)
@@ -84,7 +84,7 @@ module IsoDoc
       locs1 = []
       until locs.empty?
         if locs[1] == "to"
-          locs1 << @i18n.chain_to.sub(/%1/, locs[0]).sub(/%2/, locs[2])
+          locs1 << @i18n.chain_to.sub("%1", locs[0]).sub("%2", locs[2])
           locs.shift(3)
         else locs1 << locs.shift
         end