isodoc 2.4.4 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a2cc598b5e8c9690a42329b2af309d75d281db2767adc8fc00eb21a498f69cf
-  data.tar.gz: 1026ad146597f3e93b46f035506f648e7775bb0cf3e846d6f578d2af029dfb1a
+  metadata.gz: 9cbb9d45ce42c28917d84ebd31912cd4218cd47f633d27cf58f1060396c14d67
+  data.tar.gz: 25872abe5383206f171fadb766688bd46e751cb83852fa0c09848cdb8a4a45a6
 SHA512:
-  metadata.gz: 5923a84bcb2fa4ba407eae39adf36202ebd07902ec425274641717d38b00daea3e035c9c8f12a936f1c6f4126e3d38db68a5184dfe63718adbe08b8c6ed4046d
-  data.tar.gz: 36a2d61a352858557db3c8f8f097b590842bf148b0ffaf48fcf3a5dd45f0781dcfe929000de3704427d9bde7c1a2c74458f931c0976356e4594bb510631c66c7
+  metadata.gz: 8734f21809f2c71d90bbb291c2da8e703cf25e06bebeb83cf3db464d2b97179dd2744be793e11b2657435309c2faf8a08d4d8d48a16c2fad34bdc8fe628a3b1d
+  data.tar.gz: ebbcfc1ca95fe1b7d3c8ec89a73823176ae72ad0cd3b43cdc9061a9eafc6dce8612832c0a6dc1fc3f3be4948367567e74fc8c78eb90d5e234a8bd6fbd9cd467a

data/isodoc.gemspec

@@ -40,7 +40,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "metanorma-utils", "~> 1.4.5"
   spec.add_dependency "mn2pdf"
   spec.add_dependency "mn-requirements", "~> 0.3.1"
-  spec.add_dependency "relaton-cli"
   spec.add_dependency "relaton-render", "~> 0.5.2"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "rouge", "~> 4.0"

data/lib/isodoc/convert.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "isodoc/common"
 require "fileutils"
 require "tempfile"
@@ -161,10 +159,8 @@ module IsoDoc
     end
 
     def init_toc(options)
-      @wordToClevels = (options[:doctoclevels] || options[:toclevels]).to_i
-      @wordToClevels = 2 if @wordToClevels.zero?
-      @htmlToClevels = (options[:htmltoclevels] || options[:toclevels]).to_i
-      @htmlToClevels = 2 if @htmlToClevels.zero?
+      @htmlToClevels = 2
+      @wordToClevels = 2
       @tocfigures = options[:tocfigures]
       @toctables = options[:toctables]
       @tocrecommendations = options[:tocrecommendations]
@@ -218,6 +214,7 @@ module IsoDoc
       convert_i18n_init(docxml)
       metadata_init(@lang, @script, @locale, @i18n)
       xref_init(@lang, @script, self, @i18n, { locale: @locale })
+      toc_init(docxml)
       [docxml, filename, dir]
     end
 

data/lib/isodoc/function/blocks_example_note.rb

@@ -4,7 +4,7 @@ module IsoDoc
       def example_label(_node, div, name)
         return if name.nil?
 
-        div.p **{ class: "example-title" } do |_p|
+        div.p class: "example-title" do |_p|
           name.children.each { |n| parse(n, div) }
         end
       end
@@ -29,7 +29,7 @@ module IsoDoc
 
       def example_table_attr(node)
         attr_code(id: node["id"], class: "example",
-                  style: "border-collapse:collapse;border-spacing:0;"\
+                  style: "border-collapse:collapse;border-spacing:0;" \
                          "#{keep_style(node)}")
       end
 
@@ -60,7 +60,7 @@ module IsoDoc
       def note_p_parse(node, div)
         name = node&.at(ns("./name"))&.remove
         div.p do |p|
-          name and p.span **{ class: "note_label" } do |s|
+          name and p.span class: "note_label" do |s|
             name.children.each { |n| parse(n, s) }
             s << note_delim
           end
@@ -73,7 +73,7 @@ module IsoDoc
       def note_parse1(node, div)
         name = node&.at(ns("./name"))&.remove
         name and div.p do |p|
-          p.span **{ class: "note_label" } do |s|
+          p.span class: "note_label" do |s|
             name.children.each { |n| parse(n, s) }
             s << note_delim
           end
@@ -117,7 +117,7 @@ module IsoDoc
       end
 
       def admonition_name_parse(_node, div, name)
-        div.p **{ class: "AdmonitionTitle", style: "text-align:center;" } do |p|
+        div.p class: "AdmonitionTitle", style: "text-align:center;" do |p|
           name.children.each { |n| parse(n, p) }
         end
       end

data/lib/isodoc/function/section.rb

@@ -152,6 +152,19 @@ 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(nil, f&.at(ns("./title")), div, { class: "IntroTitle" })
+            f.elements.each do |e|
+              parse(e, div) unless e.name == "title"
+            end
+          end
+        end
+      end
+
       def is_clause?(name)
         %w(clause references definitions terms foreword introduction abstract
            acknowledgements).include? name

data/lib/isodoc/function/table.rb

@@ -3,7 +3,7 @@ module IsoDoc
     module Table
       def table_title_parse(node, out)
         name = node.at(ns("./name")) or return
-        out.p **{ class: "TableTitle", style: "text-align:center;" } do |p|
+        out.p class: "TableTitle", style: "text-align:center;" do |p|
           name&.children&.each { |n| parse(n, p) }
         end
       end
@@ -56,7 +56,7 @@ module IsoDoc
         return unless node["summary"]
 
         table.caption do |c|
-          c.span **{ style: "display:none" } do |s|
+          c.span style: "display:none" do |s|
             s << node["summary"]
           end
         end
@@ -66,7 +66,7 @@ module IsoDoc
         colgroup = node.at(ns("./colgroup")) or return
         table.colgroup do |cg|
           colgroup.xpath(ns("./col")).each do |c|
-            cg.col **{ style: "width: #{c['width']};" }
+            cg.col style: "width: #{c['width']};"
           end
         end
       end
@@ -75,16 +75,19 @@ module IsoDoc
         @in_table = true
         table_title_parse(node, out)
         out.table **table_attrs(node) do |t|
-          tcaption(node, t)
-          colgroup(node, t)
-          thead_parse(node, t)
-          tbody_parse(node, t)
-          tfoot_parse(node, t)
+          table_parse_core(node, t)
           (dl = node.at(ns("./dl"))) && parse(dl, out)
           node.xpath(ns("./note")).each { |n| parse(n, out) }
         end
         @in_table = false
-        # out.p { |p| p << "&#xa0;" }
+      end
+
+      def table_parse_core(node, out)
+        tcaption(node, out)
+        colgroup(node, out)
+        thead_parse(node, out)
+        tbody_parse(node, out)
+        tfoot_parse(node, out)
       end
 
       SW = "solid windowtext".freeze

data/lib/isodoc/function/to_word_html.rb

@@ -69,21 +69,21 @@ module IsoDoc
       end
 
       def make_body1(body, _docxml)
-        body.div **{ class: "title-section" } do |div1|
+        body.div class: "title-section" do |div1|
           div1.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
       end
 
       def make_body2(body, _docxml)
-        body.div **{ class: "prefatory-section" } do |div2|
+        body.div class: "prefatory-section" do |div2|
           div2.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
       end
 
       def make_body3(body, docxml)
-        body.div **{ class: "main-section" } do |div3|
+        body.div class: "main-section" do |div3|
           boilerplate docxml, div3
           preface_block docxml, div3
           abstract docxml, div3
@@ -125,13 +125,14 @@ module IsoDoc
         clause isoxml, out
         annex isoxml, out
         bibliography isoxml, out
+        colophon isoxml, out
       end
 
       def boilerplate(node, out)
         return if @bare
 
         boilerplate = node.at(ns("//boilerplate")) or return
-        out.div **{ class: "authority" } do |s|
+        out.div class: "authority" do |s|
           boilerplate.children.each do |n|
             if n.name == "title"
               s.h1 do |h|

data/lib/isodoc/init.rb

@@ -17,5 +17,14 @@ module IsoDoc
     def l10n(expr, lang = @lang, script = @script, locale = @locale)
       @i18n.l10n(expr, lang, script, locale)
     end
+
+    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
+        @wordToClevels = n.text.to_i
+      n = docxml.at(ns(x.sub(/TOC/, "HTML TOC"))) and
+        @htmlToClevels = n.text.to_i
+    end
   end
 end

data/lib/isodoc/metadata_contributor.rb

@@ -20,16 +20,14 @@ module IsoDoc
 
     def extract_person_affiliations(authors)
       authors.reduce([]) do |m, a|
+        pos = a.at(ns("./affiliation/name"))&.text
         name = a.at(ns("./affiliation/organization/name"))&.text
-        subdivs = a.xpath(ns("./affiliation/organization/subdivision"))&.map(&:text)&.join(", ")
-        name and subdivs and !subdivs.empty? and
-          name = l10n("#{name}, #{subdivs}")
-        location = a.at(ns("./affiliation/organization/address/formattedAddress"))&.text
-        m << (if !name.nil? && !location.nil?
-                l10n("#{name}, #{location}")
-              else
-                (name || location || "")
-              end)
+        subdivs = a.xpath(ns("./affiliation/organization/subdivision"))
+          &.map(&:text)&.join(", ")
+        location =
+          a.at(ns("./affiliation/organization/address/formattedAddress"))&.text
+        m << l10n([pos, name, subdivs, location].map { |x| x&.empty? ? nil : x }
+          .compact.join(", "))
         m
       end
     end

data/lib/isodoc/presentation_function/image.rb

@@ -16,8 +16,8 @@ module IsoDoc
     def svg_wrap(elem)
       return if elem.parent.name == "image"
 
-      elem.replace("<image src='' mimetype='image/svg+xml' height='auto' "\
-                   "width='auto'>#{elem.to_xml}</image>")
+      elem.wrap("<image src='' mimetype='image/svg+xml' height='auto' " \
+                "width='auto'></image>")
     end
 
     def svgmap_extract(elem)

data/lib/isodoc/presentation_function/refs.rb

@@ -6,11 +6,16 @@ module IsoDoc
       docxml.xpath(ns("//references/bibitem")).each do |x|
         bibitem(x, renderings)
       end
+      hidden_items(docxml)
+      @xrefs.parse_inclusions(refs: true).parse(docxml)
+    end
+
+    def hidden_items(docxml)
       docxml.xpath(ns("//references[bibitem/@hidden = 'true']")).each do |x|
         x.at(ns("./bibitem[not(@hidden = 'true')]")) and next
+        x.elements.map(&:name).any? { |n| n != "bibitem" } and next
         x["hidden"] = "true"
       end
-      @xrefs.parse_inclusions(refs: true).parse(docxml)
     end
 
     def references_render(docxml)
@@ -125,13 +130,13 @@ module IsoDoc
       ids = @xrefs.klass.bibitem_ref_code(bib)
       idents = @xrefs.klass.render_identifier(ids)
       ret = if biblio then biblio_ref_entry_code(ordinal, idents, ids,
-                                                 standard, datefn)
-            else norm_ref_entry_code(ordinal, idents, ids, standard, datefn)
+                                                 standard, datefn, bib)
+            else norm_ref_entry_code(ordinal, idents, ids, standard, datefn, bib)
             end
       bib << "<biblio-tag>#{ret}</biblio-tag>"
     end
 
-    def norm_ref_entry_code(_ordinal, idents, _ids, _standard, datefn)
+    def norm_ref_entry_code(_ordinal, idents, _ids, _standard, datefn, _bib)
       ret = (idents[:ordinal] || idents[:metanorma] || idents[:sdo]).to_s
       (idents[:ordinal] || idents[:metanorma]) && idents[:sdo] and
         ret += ", #{idents[:sdo]}"
@@ -143,8 +148,8 @@ module IsoDoc
 
     # if ids is just a number, only use that ([1] Non-Standard)
     # else, use both ordinal, as prefix, and ids
-    def biblio_ref_entry_code(ordinal, ids, _id, standard, datefn)
-      standard and id = nil
+    def biblio_ref_entry_code(ordinal, ids, _id, standard, datefn, _bib)
+      #standard and id = nil
       ret = (ids[:ordinal] || ids[:metanorma] || "[#{ordinal}]")
       if ids[:sdo]
         ret = prefix_bracketed_ref(ret)

data/lib/isodoc/presentation_function/section.rb

@@ -28,12 +28,13 @@ module IsoDoc
     def floattitle(docxml)
       docxml.xpath(ns("//clause | //annex | //appendix | //introduction | " \
                       "//foreword | //preface/abstract | //acknowledgements | " \
-                      "//terms | //definitions | //references"))
+                      "//terms | //definitions | //references | //colophon"))
         .each do |f|
         floattitle1(f)
       end
       # top-level
-      docxml.xpath(ns("//sections | //preface")).each { |f| floattitle1(f) }
+      docxml.xpath(ns("//sections | //preface | //colophon"))
+        .each { |f| floattitle1(f) }
     end
 
     def floattitle1(elem)
@@ -119,7 +120,8 @@ module IsoDoc
       i = display_order_xpath(docxml, @xrefs.klass.middle_clause(docxml), i)
       i = display_order_xpath(docxml, "//annex", i)
       i = display_order_xpath(docxml, @xrefs.klass.bibliography_xpath, i)
-      display_order_xpath(docxml, "//indexsect", i)
+      i = display_order_xpath(docxml, "//indexsect", i)
+      display_order_xpath(docxml, "//colophon/*", i)
     end
 
     def clausetitle(docxml); end

data/lib/isodoc/presentation_xml_convert.rb

@@ -108,9 +108,16 @@ module IsoDoc
     end
 
     def embedable_semantic_xml_tags(xml)
-      Nokogiri::XML(to_xml(xml)
-        .sub(/ xmlns=['"][^"']+['"]/, "")
-        .gsub(%r{(</?)([[:alpha:]])}, "\\1semantic__\\2")).root
+      ret = to_xml(xml)
+        .sub(/ xmlns=['"][^"']+['"]/, "") # root XMLNS
+        .split(/(?=[<> \t\r\n\f\v])/).map do |x|
+          case x
+          when /^<[^:]+:/ then x.sub(/:/, ":semantic__")
+          when /^<[^:]+$/ then x.sub(%r{(</?)([[:alpha:]])},
+                                     "\\1semantic__\\2")
+          else x end
+        end
+      Nokogiri::XML(ret.join).root
     end
 
     def embedable_semantic_xml_attributes(xml)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.4.4".freeze
+  VERSION = "2.4.5".freeze
 end

data/lib/isodoc/word_function/table.rb

@@ -89,16 +89,20 @@ module IsoDoc
         table_title_parse(node, out)
         out.div align: "center", class: "table_container" do |div|
           div.table **table_attrs(node) do |t|
-            colgroup(node, t)
-            thead_parse(node, t)
-            tbody_parse(node, t)
-            tfoot_parse(node, t)
+            table_parse_core(node, out)
             (dl = node.at(ns("./dl"))) && parse(dl, out)
             node.xpath(ns("./note")).each { |n| parse(n, out) }
           end
         end
         @in_table = false
       end
+
+      def table_parse_core(node, out)
+        colgroup(node, out)
+        thead_parse(node, out)
+        tbody_parse(node, out)
+        tfoot_parse(node, out)
+      end
     end
   end
 end

data/lib/isodoc/xref/xref_gen.rb

@@ -108,9 +108,7 @@ module IsoDoc
       end
 
       def note_anchor_names1(notes, counter)
-        notes.each do |n|
-          next if @anchors[n["id"]] || blank?(n["id"])
-
+        notes.noblank.each do |n|
           @anchors[n["id"]] =
             anchor_struct(increment_label(notes, n, counter), n,
                           @labels["note_xref"], "note", false)

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -45,10 +45,14 @@ module IsoDoc
         end
       end
 
+      def subfigure_label(subfignum)
+        subfignum.zero? and return ""
+        "-#{subfignum}"
+      end
+
       def sequential_figure_body(subfignum, counter, block, klass)
         label = counter.print
-        label &&= label + (subfignum.zero? ? "" : "-#{subfignum}")
-
+        label &&= label + subfigure_label(subfignum)
         @anchors[block["id"]] = anchor_struct(
           label, nil, @labels[klass] || klass.capitalize, klass,
           block["unnumbered"]
@@ -58,8 +62,7 @@ module IsoDoc
       def sequential_table_names(clause)
         c = Counter.new
         clause.xpath(ns(".//table")).noblank.each do |t|
-          next if labelled_ancestor(t)
-
+          labelled_ancestor(t) and next
           @anchors[t["id"]] = anchor_struct(
             c.increment(t).print, nil,
             @labels["table"], "table", t["unnumbered"]
@@ -117,7 +120,6 @@ module IsoDoc
           block, anchor_struct(id, block,
                                label, klass, block["unnumbered"])
         )
-
         model.permission_parts(block, id, label, klass).each do |n|
           @anchors[n[:id]] = anchor_struct(n[:number], n[:elem], n[:label],
                                            n[:klass], false)
@@ -171,8 +173,7 @@ module IsoDoc
 
       def hierarchical_figure_body(num, subfignum, counter, block, klass)
         label = "#{num}#{hiersep}#{counter.print}" +
-          (subfignum.zero? ? "" : "#{hierfigsep}#{subfignum}")
-
+          subfigure_label(subfignum)
         @anchors[block["id"]] =
           anchor_struct(label, nil, @labels[klass] || klass.capitalize,
                         klass, block["unnumbered"])
@@ -181,8 +182,7 @@ module IsoDoc
       def hierarchical_table_names(clause, num)
         c = Counter.new
         clause.xpath(ns(".//table")).noblank.each do |t|
-          next if labelled_ancestor(t)
-
+          labelled_ancestor(t) and next
           @anchors[t["id"]] =
             anchor_struct("#{num}#{hiersep}#{c.increment(t).print}",
                           nil, @labels["table"], "table", t["unnumbered"])

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -1,17 +1,18 @@
 module IsoDoc
   module XrefGen
     module Sections
-      def back_anchor_names(docxml)
+      def back_anchor_names(xml)
         if @parse_settings.empty? || @parse_settings[:clauses]
           i = Counter.new("@")
-          docxml.xpath(ns("//annex")).each do |c|
+          xml.xpath(ns("//annex")).each do |c|
             annex_names(c, i.increment(c).print)
           end
-          docxml.xpath(ns(@klass.bibliography_xpath)).each do |b|
+          xml.xpath(ns(@klass.bibliography_xpath)).each do |b|
             preface_names(b)
           end
+          xml.xpath(ns("//colophon/clause")).each { |b| preface_names(b) }
         end
-        references(docxml) if @parse_settings.empty? || @parse_settings[:refs]
+        references(xml) if @parse_settings.empty? || @parse_settings[:refs]
       end
 
       def references(docxml)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-07 00:00:00.000000000 Z
+date: 2023-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -136,20 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.1
-- !ruby/object:Gem::Dependency
-  name: relaton-cli
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: relaton-render
   requirement: !ruby/object:Gem::Requirement