isodoc 3.1.12 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ce8e37bf69e8622cfac604ad54ea06088dea5c9eec91226d8d9e3f3761693c4
-  data.tar.gz: 033de119ca1a8300891954739f892434955f9830ac3becdd0d87f479b8914ba2
+  metadata.gz: a3b8a9f7427b4df55cade247b1f292beb41b47d1ae684c9e1d3a7afe547c303f
+  data.tar.gz: e7bd73e5b3a1078f67c9b4f959e0a0255d524a600757d064353ddd941c8165c7
 SHA512:
-  metadata.gz: 4d7bf496ad23e75d105f5bdacf73f0d21e537f0d559f53914e78b3da631044500c5887f544290003b3d2508f7926f860ff846857b8ca0a434f23b3f6143033e5
-  data.tar.gz: 6644b38d8a81476e6ac6e11b7884685f2942c0b7ee69d5078ee48276eaba30c3e901fcf112594c8202a6fd41bb81e4e7d149e14de9c59350a1fa0b312344580f
+  metadata.gz: 241e2e7855b90c61d4d17955125f3f2025a8b4bd986bc32192355e9eee1af51a931d039b07520bb1403ae0dac1b6b14d6969c62815be3d502935198efc9fb124
+  data.tar.gz: f8a77cad3f2a0b46679c0cc980180911574b6e4d7649979c58bb29c7024c26c0a8b2ea380d60b97de62a29f85a71e2441291f0e00907789f7c999d0f1f67dc46

data/isodoc.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "base64"
   spec.add_dependency "bigdecimal"
-  spec.add_dependency "html2doc", "~> 1.9.0"
+  spec.add_dependency "html2doc", "~> 1.10.0"
   # spec.add_dependency "isodoc-i18n", "~> 1.1.0" # already in relaton-render and mn-requirements
   # spec.add_dependency "relaton-cli"
   # spec.add_dependency "metanorma-utils", "~> 1.5.0" # already in isodoc-i18n

data/lib/isodoc/function/footnotes.rb

@@ -58,7 +58,7 @@ module IsoDoc
         end
       end
 
-      def fmt_review_body_parse(node, out); end
+      def fmt_annotation_body_parse(node, out); end
     end
   end
 end

data/lib/isodoc/function/inline.rb

@@ -226,11 +226,11 @@ module IsoDoc
         children_parse(node, out)
       end
 
-      def fmt_review_start_parse(node, out)
+      def fmt_annotation_start_parse(node, out)
         children_parse(node, out)
       end
 
-      def fmt_review_end_parse(node, out)
+      def fmt_annotation_end_parse(node, out)
         children_parse(node, out)
       end
     end

data/lib/isodoc/function/inline_simple.rb

@@ -96,7 +96,7 @@ module IsoDoc
       def svgmap_parse(node, out); end
       def amend_parse(node, out); end
       def semx_sourcecode_parse(node, out); end
-      def review_note_parse(node, out); end
+      def annotation_note_parse(node, out); end
       def semx_source_parse(node, out); end
     end
   end

data/lib/isodoc/function/lists.rb

@@ -37,6 +37,7 @@ module IsoDoc
       def ol_attrs(node)
         { # type: node["type"] ? ol_style(node["type"].to_sym) : ol_depth(node),
           type: ol_style(node["type"]&.to_sym),
+          start: node["start"],
           id: node["id"], style: keep_style(node) }
       end
 

data/lib/isodoc/function/table.rb

@@ -45,17 +45,15 @@ module IsoDoc
         c = node["class"]
         bordered = "border-width:1px;border-spacing:0;"
         (%w(modspec).include?(c) || !c) or bordered = ""
-        attr_code(
-          id: node["id"],
-          class: c || "MsoISOTable",
-          style: "#{bordered}#{width}#{keep_style(node)}",
-          title: node["alt"],
-        )
+        style = node["style"] ? "" : "#{bordered}#{width}"
+        attr_code(id: node["id"],
+                  class: c || "MsoISOTable",
+                  style: "#{style}#{keep_style(node)}",
+                  title: node["alt"])
       end
 
       def tcaption(node, table)
-        return unless node["summary"]
-
+        node["summary"] or return
         table.caption do |c|
           c.span style: "display:none" do |s|
             s << node["summary"]

data/lib/isodoc/function/to_word_html.rb

@@ -157,7 +157,7 @@ module IsoDoc
           when "fmt-source" then source_parse(node, out)
           when "tr" then tr_parse(node, out)
           when "note" then note_parse(node, out)
-          when "review" then review_note_parse(node, out)
+          when "annotation" then annotation_note_parse(node, out)
           when "admonition" then admonition_parse(node, out)
           when "formula" then formula_parse(node, out)
           when "table" then table_parse(node, out)
@@ -237,9 +237,9 @@ module IsoDoc
           when "fmt-fn-body" then fmt_fn_body_parse(node, out)
           when "fmt-fn-label" then fmt_fn_label_parse(node, out)
           when "fmt-footnote-container" then fmt_footnote_container_parse(node, out)
-          when "fmt-review-start" then fmt_review_start_parse(node, out)
-          when "fmt-review-end" then fmt_review_end_parse(node, out)
-          when "fmt-review-body" then fmt_review_body_parse(node, out)
+          when "fmt-annotation-start" then fmt_annotation_start_parse(node, out)
+          when "fmt-annotation-end" then fmt_annotation_end_parse(node, out)
+          when "fmt-annotation-body" then fmt_annotation_body_parse(node, out)
           else error_parse(node, out)
           end
         end

data/lib/isodoc/metadata_contributor.rb

@@ -102,9 +102,30 @@ module IsoDoc
       set(:agency, agency)
       set(:publisher, connectives_strip(@i18n.boolean_conj(publisher, "and")))
       set(:copublisher_logos, logos)
+      set(:copublisher_logo_attrs, copublisher_logo_attrs(xml))
       agency_addr(xml)
     end
 
+    def copublisher_logo_attrs(xml)
+      xml.xpath(ns("//metanorma-extension/presentation-metadata/*"))
+        .each_with_object([]) do |x, m|
+          copublisher_logo_attr?(x) or next
+          p = x.name.split(/[_-]/)
+          idx = (p[4] || "1").to_i - 1
+          m[idx] ||= {}
+          m[idx][p[2]] ||= {}
+          m[idx][p[2]][p[3]] = x.text
+        end
+    end
+
+    def copublisher_logo_attr?(elem)
+      elem.name.start_with?("logo-publisher-") or return false
+      p = elem.name.split(/[_-]/)
+      %w(doc html).include?(p[2]) &&
+        %w(height width).include?(p[3]) &&
+        (!p[4] || /^\d+/.match?(p[4]))
+    end
+
     def agency_addr(xml)
       a = xml.at(ns("//bibdata/contributor[xmlns:role/@type = 'publisher'][1]/" \
                     "organization")) or return

data/lib/isodoc/presentation_function/autonum.rb

@@ -1,7 +1,7 @@
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def prefix_name(node, delims, label, elem)
-      label, delims = prefix_name_defaults(node, delims, label)
+      label, delims = prefix_name_defaults(node, delims, label, elem)
       name, ins, ids, number = prefix_name_prep(node, elem)
       ins.next = fmt_xref_label(label, number, ids)
       # autonum can be empty, e.g single note in clause: "NOTE []"
@@ -11,8 +11,11 @@ module IsoDoc
       prefix_name_postprocess(node, elem)
     end
 
-    def prefix_name_defaults(_node, delims, label)
+    def prefix_name_defaults(node, delims, label, elem)
       label&.empty? and label = nil
+      node["unnumbered"] == "true" && !node.at(ns("./#{elem}")) &&
+        node.name != "admonition" and label = nil
+      # do not caption unnumbered uncaptioned blocks, other than admonitions
       delims.nil? and delims = {}
       [label, delims]
     end

data/lib/isodoc/presentation_function/block.rb

@@ -112,7 +112,7 @@ module IsoDoc
 
     def table_css(elem)
       parser = IsoDoc::CssBorderParser::BorderParser.new
-      elem.xpath(ns(".//tr | .//th | .//td")).each do |n|
+      elem.xpath(ns(".//tr | .//th | .//td | .//table")).each do |n|
         n["style"] or next
         parsed_properties = parser.parse_declaration(n["style"])
         new_style = parser.to_css_string(parsed_properties)

data/lib/isodoc/presentation_function/cleanup.rb

@@ -0,0 +1,23 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def cleanup(docxml)
+      docxml["type"] = "presentation"
+      empty_elements_remove(docxml)
+    end
+
+    # allow fmt-link to be empty
+    def empty_elements_remove(docxml)
+      %w(fmt-name fmt-xref-label fmt-source fmt-xref fmt-eref fmt-origin
+         fmt-concept fmt-related fmt-preferred fmt-deprecates
+         fmt-admitted fmt-termsource fmt-definition fmt-footnote-container
+         fmt-fn-body fmt-fn-label fmt-annotation-body fmt-provision
+         fmt-identifier fmt-date).each do |e|
+           docxml.xpath(ns("//#{e}")).each do |n|
+             n.text.strip.empty? or next
+             n.elements.empty? or next
+             n.remove
+           end
+         end
+    end
+  end
+end

data/lib/isodoc/presentation_function/concepts.rb

@@ -193,8 +193,7 @@ module IsoDoc
       out = desgn.parent.at(ns("./fmt-#{desgn.name}"))
       d1 = semx_fmt_dup(desgn)
       s = d1.at(ns("./source"))
-      s0 = desgn.at(ns("./source"))
-      modification_dup_align(s0, s)
+      modification_dup_align(desgn.at(ns("./source")), s)
       name = d1.at(ns("./expression/name | ./letter-symbol/name | " \
                          "./graphical-symbol")) or return
       designation_annotate(d1, name, desgn)
@@ -227,9 +226,8 @@ module IsoDoc
 
     def designation_grammar(desgn, name)
       g = desgn.at(ns("./expression/grammar")) or return
-      ret = []
-      g.xpath(ns("./gender | ./number")).each do |x|
-        ret << @i18n.grammar_abbrevs[x.text]
+      ret = g.xpath(ns("./gender | ./number")).each_with_object([]) do |x, m|
+        m << @i18n.grammar_abbrevs[x.text]
       end
       %w(isPreposition isParticiple isAdjective isVerb isAdverb isNoun)
         .each do |x|
@@ -252,9 +250,7 @@ module IsoDoc
     end
 
     def designation_bookmarks(desgn, name)
-      desgn.xpath(ns(".//bookmark")).each do |b|
-        name << b.remove
-      end
+      desgn.xpath(ns(".//bookmark")).each { |b| name << b.remove }
     end
   end
 end

data/lib/isodoc/presentation_function/footnotes.rb

@@ -139,14 +139,22 @@ module IsoDoc
     end
 
     def comments(docxml)
-      docxml.xpath(ns("//review")).each do |c|
+      global_display = display_comments_global?(docxml)
+      docxml.xpath(ns("//annotation")).each do |c|
+        global_display || display_comment_override?(c) or next
         c1 = comment_body(c)
         comment_bookmarks(c1)
       end
     end
 
+    # if false, then decision on displaying comment is only dependent on
+    # display_comments_global? . display_comment_override? overrides that
+    def display_comment_override?(_comment)
+      false
+    end
+
     def comment_body(elem)
-      c1 = elem.after("<fmt-review-body/>").next
+      c1 = elem.after("<fmt-annotation-body/>").next
       elem.attributes.each_key { |k| k == "id" or c1[k] = elem[k] }
       add_id(c1)
       c1 << semx_fmt_dup(elem)
@@ -162,7 +170,7 @@ module IsoDoc
 
     # Do not insert a comment bookmark inside another comment bookmark
     AVOID_COMMENT_BOOKMARKS = <<~XPATH.freeze
-      [not(ancestor::xmlns:fmt-review-start)][not(ancestor::xmlns:fmt-review-end)]
+      [not(ancestor::xmlns:fmt-annotation-start)][not(ancestor::xmlns:fmt-annotation-end)]
     XPATH
 
     def comment_bookmarks_locate(elem)
@@ -181,7 +189,7 @@ module IsoDoc
     end
 
     def comment_bookmark_start(from, elem)
-      ret = from.before("<fmt-review-start/>").previous
+      ret = from.before("<fmt-annotation-start/>").previous
       add_id(ret)
       ret["source"] = elem["from"]
       comment_to_bookmark_attrs(elem, ret, start: true)
@@ -190,7 +198,7 @@ module IsoDoc
     end
 
     def comment_bookmark_end(to, elem)
-      ret = to.after("<fmt-review-end/>").next
+      ret = to.after("<fmt-annotation-end/>").next
       add_id(ret)
       ret["source"] = elem["to"]
       comment_to_bookmark_attrs(elem, ret, start: false)
@@ -205,5 +213,11 @@ module IsoDoc
     def comment_bookmark_end_label(_elem)
       ""
     end
+
+    def display_comments_global?(docxml)
+      m = docxml.at(ns("//presentation-metadata/render-document-annotations"))
+      m&.text and return m.text != "false"
+      @meta.get[:unpublished]
+    end
   end
 end

data/lib/isodoc/presentation_function/ids.rb

@@ -100,7 +100,7 @@ module IsoDoc
 
     def add_missing_id(docxml)
       docxml.xpath(ns("//source | //modification | //erefstack | //fn | " \
-        "//review | //floating-title | //li | //executivesummary | " \
+        "//annotation | //floating-title | //li | //executivesummary | " \
         "//preface/abstract | //foreword | //introduction | //annex | " \
         "//acknowledgements | //clause | //references | //terms | " \
         "//preferred | //deprecates | //admitted | //related")).each do |s|

data/lib/isodoc/presentation_function/inline.rb

@@ -219,7 +219,7 @@ module IsoDoc
     end
 
     def ruby1(elem)
-      v = elem.at(ns("./pronunciation | ./annotation")).remove
+      v = elem.at(ns("./ruby-pronunciation | ./ruby-annotation")).remove
       elem.xpath(ns("./ruby")).each do |r|
         ruby1(r)
       end

data/lib/isodoc/presentation_function/metadata.rb

@@ -1,14 +1,41 @@
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def metadata(docxml)
+      preprocess_metadata(docxml)
       toc_metadata(docxml)
       fonts_metadata(docxml)
       attachments_extract(docxml)
-      localized_strings(docxml)
       a = docxml.at(ns("//metanorma-extension")) or return
       a.elements.empty? and a.remove
     end
 
+    def preprocess_metadata(docxml)
+      localized_strings(docxml)
+      logo_expand_pres_metadata(docxml)
+    end
+
+    # logo-{role}-{format}-{height/width}-{number}
+    def logo_expand_pres_metadata(docxml)
+      docxml.xpath(ns("//metanorma-extension/presentation-metadata/*"))
+        .each do |x|
+        logo_size_pres_metadata_incomplete?(x) or next
+        parts = x.name.split("-")
+        @output_formats.each_key do |f|
+          tagname = "logo-#{parts[1]}-#{f}-#{parts[2..].join('-')}"
+          x.parent.next = <<~XML
+            <presentation-metadata><#{tagname}>#{x.text}</#{tagname}></presentation-metadata>
+          XML
+        end
+      end
+    end
+
+    def logo_size_pres_metadata_incomplete?(elem)
+      parts = elem.name.split("-")
+      elem.name.start_with?("logo-") &&
+        %w(author editor publisher authorizer distrbutor).include?(parts[1]) &&
+        %w(height width).include?(parts[2])
+    end
+
     def localized_strings(docxml)
       a = docxml.at(ns("//bibdata")) or return
       a.next =

data/lib/isodoc/presentation_function/sourcecode.rb

@@ -68,9 +68,9 @@ module IsoDoc
     end
 
     def annotations(elem, fmt_elem)
-      elem.at(ns("./annotation")) or return
+      elem.at(ns("./callout-annotation")) or return
       ret = ""
-      elem.xpath(ns("./annotation")).each do |a|
+      elem.xpath(ns("./callout-annotation")).each do |a|
         id = a["original-id"]
         dd = semx_fmt_dup(a)
         dd["source"] = a["id"]
@@ -79,7 +79,7 @@ module IsoDoc
           <dd>#{to_xml dd}</dd>
         OUT
       end
-      fmt_elem.xpath(ns("./annotation")).each(&:remove)
+      fmt_elem.xpath(ns("./callout-annotation")).each(&:remove)
       fmt_elem << "<dl><name>#{@i18n.key}</name>#{ret}</dl>"
     end
 
@@ -104,7 +104,7 @@ module IsoDoc
     end
 
     def source_remove_annotations(ret, elem)
-      ret[:ann] = elem.xpath(ns("./annotation")).each(&:remove)
+      ret[:ann] = elem.xpath(ns("./callout-annotation")).each(&:remove)
       ret[:call] = elem.xpath(ns("./callout")).each_with_object([]) do |c, m|
         m << { xml: c.remove, line: c.line - elem.line }
       end

data/lib/isodoc/presentation_xml_convert.rb

@@ -13,6 +13,7 @@ require_relative "presentation_function/bibdata"
 require_relative "presentation_function/metadata"
 require_relative "presentation_function/footnotes"
 require_relative "presentation_function/ids"
+require_relative "presentation_function/cleanup"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -25,8 +26,8 @@ module IsoDoc
     def convert1(docxml, filename, dir)
       presxml_convert_init(docxml, filename, dir)
       conversions(docxml)
-      docxml.root["type"] = "presentation"
-      id_validate(docxml.root)
+      cleanup(docxml.root)
+      validate(docxml.root)
       docxml.to_xml.gsub("&lt;", "&#x3c;").gsub("&gt;", "&#x3e;")
     end
 
@@ -44,6 +45,10 @@ module IsoDoc
       counter_init
     end
 
+    def validate(docxml)
+      id_validate(docxml)
+    end
+
     def bibitem_lookup(docxml)
       @bibitem_lookup ||= docxml.xpath(ns("//references/bibitem"))
         .each_with_object({}) do |b, m|

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.1.12".freeze
+  VERSION = "3.2.0".freeze
 end

data/lib/isodoc/word_function/comments.rb

@@ -2,7 +2,7 @@ module IsoDoc
   module WordFunction
     module Comments
       def comments(docxml, out)
-        c = docxml.xpath(ns("//fmt-review-body"))
+        c = docxml.xpath(ns("//fmt-annotation-body"))
         c.empty? and return
         out.div style: "mso-element:comment-list" do |div|
           @in_comment = true
@@ -17,7 +17,7 @@ module IsoDoc
           to: node["end"] }
       end
 
-      def fmt_review_start_parse(node, out)
+      def fmt_annotation_start_parse(node, out)
         make_comment_link(out, node["target"], node)
       end
 
@@ -42,7 +42,7 @@ module IsoDoc
         end
       end
 
-      def fmt_review_body_parse(node, out)
+      def fmt_annotation_body_parse(node, out)
         out.div style: "mso-element:comment", id: node["id"] do |div|
           div.span style: %{mso-comment-author:"#{node['reviewer']}"}
           make_comment_target(div)

data/lib/isodoc/word_function/lists.rb

@@ -61,10 +61,15 @@ module IsoDoc
         ddef.children[1..].each { |n| parse(n, out) }
       end
 
+      def dl_table_attrs(node)
+        { id: node["id"],
+          align: node["class"] == "formula_dl" ? "left" : nil,
+          class: node["class"] || "dl" }
+      end
+
       def dl_parse_table(node, out)
         list_title_parse(node, out)
-        out.table **attr_code(id: node["id"],
-                              class: node["class"] || "dl") do |v|
+        out.table **attr_code(dl_table_attrs(node)) do |v|
           node.elements.select { |n| dt_dd?(n) }
             .each_slice(2) do |dt, dd|
             dl_parse_table1(v, dt, dd)

data/lib/isodoc/word_function/table.rb

@@ -39,7 +39,7 @@ module IsoDoc
           border-top:#{top}mso-border-top-alt:#{top}
           border-bottom:#{bottom}mso-border-bottom-alt:#{bottom}
         STYLE
-        opt[:bordered] or ret = ""
+        opt[:bordered] && !cell["style"] or ret = ""
         pb = keep_rows_together(cell, rowmax, totalrows, opt) ? "avoid" : "auto"
         "#{ret}page-break-after:#{pb};"
       end
@@ -72,15 +72,14 @@ module IsoDoc
 
       def table_attrs(node)
         c = node["class"]
-        bordered = "border-spacing:0;border-width:1px;"
-        (%w(modspec).include?(c) || !c) or bordered = nil
-        ret = {
-          summary: node["summary"], width: node["width"],
-          style: "mso-table-anchor-horizontal:column;mso-table-overlap:never;" \
-                 "#{bordered}#{keep_style(node)}",
-          class: (node.text.length > 4000 ? "MsoISOTableBig" : "MsoISOTable")
-        }
-        bordered or ret.delete(:class)
+        style = node["style"] ? '' : "border-spacing:0;border-width:1px;"
+        (%w(modspec).include?(c) || !c) or style = nil
+        ret =
+          { summary: node["summary"], width: node["width"],
+            style: "mso-table-anchor-horizontal:column;mso-table-overlap:never;" \
+                 "#{style}#{keep_style(node)}",
+            class: (node.text.length > 4000 ? "MsoISOTableBig" : "MsoISOTable") }
+        style or ret.delete(:class)
         super.merge(attr_code(ret))
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.1.12
+  version: 3.2.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-23 00:00:00.000000000 Z
+date: 2025-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: mn2pdf
   requirement: !ruby/object:Gem::Requirement
@@ -438,6 +438,7 @@ files:
 - lib/isodoc/presentation_function/autonum.rb
 - lib/isodoc/presentation_function/bibdata.rb
 - lib/isodoc/presentation_function/block.rb
+- lib/isodoc/presentation_function/cleanup.rb
 - lib/isodoc/presentation_function/concepts.rb
 - lib/isodoc/presentation_function/docid.rb
 - lib/isodoc/presentation_function/erefs.rb