isodoc 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3b8a9f7427b4df55cade247b1f292beb41b47d1ae684c9e1d3a7afe547c303f
-  data.tar.gz: e7bd73e5b3a1078f67c9b4f959e0a0255d524a600757d064353ddd941c8165c7
+  metadata.gz: a1528432b5d869e42077b250498452e276bd3c774dbe55adbb375157c4c61f87
+  data.tar.gz: 16608e9fd9e1d2dd682667db8455bf63737d79e346f689c49c11628519f661e2
 SHA512:
-  metadata.gz: 241e2e7855b90c61d4d17955125f3f2025a8b4bd986bc32192355e9eee1af51a931d039b07520bb1403ae0dac1b6b14d6969c62815be3d502935198efc9fb124
-  data.tar.gz: f8a77cad3f2a0b46679c0cc980180911574b6e4d7649979c58bb29c7024c26c0a8b2ea380d60b97de62a29f85a71e2441291f0e00907789f7c999d0f1f67dc46
+  metadata.gz: 8c230460e11f2d68b5a844629947e8ee4fbdc4b23dd58d0ecbac85b2adaebeedf4fbde0b5eb434e51717449e3835cd202fefe5c7edfe217724cd5b41683e190b
+  data.tar.gz: 98fc8b60f2d0ebeddf9a2040fedba22b592e4af190cb055bb58c88fca0107daecfe9833c7552f76365a532591ea0e007ee6a228bbd41af21e25b9d5b5546871a

data/lib/isodoc/function/cleanup.rb

@@ -105,9 +105,9 @@ module IsoDoc
         table.at(".//tr").xpath("./td | ./th").each do |td|
           cols += (td["colspan"] ? td["colspan"].to_i : 1)
         end
-        style =
-          %{border-top:0pt;border-bottom:#{IsoDoc::Function::Table::SW} 1.5pt;}
-        tfoot.add_child("<tr><td colspan='#{cols}' style='#{style}'/></tr>")
+        table["class"].nil? or # = plain table
+          s = "style='border-top:0pt;border-bottom:#{IsoDoc::Function::Table::SW} 1.5pt;'"
+        tfoot.add_child("<tr><td colspan='#{cols}' #{s}/></tr>")
         tfoot.xpath(".//td").last
       end
 

data/lib/isodoc/function/table.rb

@@ -40,16 +40,28 @@ module IsoDoc
         end
       end
 
+      def bordered_table_style(node, klass)
+        bordered = "border-width:1px;border-spacing:0;"
+        (node["plain"] != "true" && (%w(modspec).include?(klass) || !klass)) or
+          bordered = ""
+        bordered
+      end
+
       def table_attrs(node)
-        width = node["width"] ? "width:#{node['width']};" : nil
         c = node["class"]
-        bordered = "border-width:1px;border-spacing:0;"
-        (%w(modspec).include?(c) || !c) or bordered = ""
-        style = node["style"] ? "" : "#{bordered}#{width}"
+        style = table_attrs_style(node, c)
         attr_code(id: node["id"],
-                  class: c || "MsoISOTable",
-                  style: "#{style}#{keep_style(node)}",
-                  title: node["alt"])
+                  class: node["plain"] == "true" ? nil : (c || "MsoISOTable"),
+                  style: style, title: node["alt"])
+      end
+
+      def table_attrs_style(node, klass)
+        width = node["width"] ? "width:#{node['width']};" : nil
+        bordered = bordered_table_style(node, klass)
+        style = node["style"] ? "" : "#{bordered}#{width}"
+        style += keep_style(node) || ""
+        style.empty? and style = nil
+        style
       end
 
       def tcaption(node, table)
@@ -125,6 +137,7 @@ module IsoDoc
       end
 
       def table_bordered?(node)
+        node.parent.parent["plain"] == "true" and return false
         c = node.parent.parent["class"]
         %w(modspec).include?(c) || !c
       end

data/lib/isodoc/function/utils.rb

@@ -1,5 +1,4 @@
 require "metanorma-utils"
-require_relative "../../nokogiri/xml/node"
 
 module IsoDoc
   module Function

data/lib/isodoc/html_function/html.rb

@@ -96,7 +96,10 @@ module IsoDoc
 
       def table_attrs(node)
         ret = super
-        node.at(ns("./colgroup")) and ret[:style] += "table-layout:fixed;"
+        if node.at(ns("./colgroup"))
+          ret[:style] ||= ""
+          ret[:style] += "table-layout:fixed;"
+        end
         ret
       end
 

data/lib/isodoc/presentation_function/autonum.rb

@@ -30,7 +30,7 @@ module IsoDoc
     end
 
     def prefix_name_labels(node)
-      @new_ids ||= {}
+      #@new_ids ||= {}
       id = "_#{UUIDTools::UUID.random_create}"
       @new_ids[id] = nil
       { elem: node["id"], name: id }

data/lib/isodoc/presentation_function/ids.rb

@@ -77,7 +77,6 @@ module IsoDoc
     end
 
     def provide_ids(docxml)
-      @new_ids = {} # guids assigned within Presentation XML
       anchor_sanitise(docxml)
       populate_id(docxml)
       add_missing_id(docxml)
@@ -120,10 +119,12 @@ module IsoDoc
     end
 
     def add_new_contenthash_id(docxml, ids)
+      suffix = "" # for disambiguation in Metanorma Collections
+      docxml["document_suffix"] and suffix = "_#{docxml['document_suffix']}"
       %w(original-id id).each do |k|
         docxml.xpath("//*[@#{k}]").each do |x|
           ids.has_key?(x[k]) or next
-          new_id = contenthash(x)
+          new_id = Metanorma::Utils::contenthash(x) + suffix
           ids[x[k]] = new_id
           x[k] = new_id
         end
@@ -134,17 +135,10 @@ module IsoDoc
       Metanorma::Utils::anchor_attributes(presxml: true).each do |e|
         docxml.xpath("//xmlns:#{e[0]}[@#{e[1]}]").each do |x|
           ids.has_key?(x[e[1]]) or next
-          #require "debug"; binding.b unless ids[x[e[1]]] 
           ids[x[e[1]]] or next
           x[e[1]] = ids[x[e[1]]]
         end
       end
     end
-
-    # TODO duplicate of standoc
-    def contenthash(elem)
-      Digest::MD5.hexdigest("#{elem.path}////#{elem.text}")
-        .sub(/^(.{8})(.{4})(.{4})(.{4})(.{12})$/, "_\\1-\\2-\\3-\\4-\\5")
-    end
   end
 end

data/lib/isodoc/presentation_xml_convert.rb

@@ -20,6 +20,7 @@ module IsoDoc
     def initialize(options)
       @format = :presentation
       @suffix = "presentation.xml"
+      @new_ids = {} # guids assigned within Presentation XML
       super
     end
 

data/lib/isodoc/version.rb

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

data/lib/isodoc/word_function/table.rb

@@ -15,9 +15,10 @@ module IsoDoc
         table.at(".//tr").xpath("./td | ./th").each do |td|
           cols += (td["colspan"] ? td["colspan"].to_i : 1)
         end
-        style = "border-top:0pt;mso-border-top-alt:0pt;" \
-                "border-bottom:#{SW1} 1.5pt;mso-border-bottom-alt:#{SW1} 1.5pt;"
-        tfoot.add_child("<tr><td colspan='#{cols}' style='#{style}'/></tr>")
+        table["plain"] == "true" or
+          s = "style='border-top:0pt;mso-border-top-alt:0pt;" \
+              "border-bottom:#{SW1} 1.5pt;mso-border-bottom-alt:#{SW1} 1.5pt;'"
+        tfoot.add_child("<tr><td colspan='#{cols}' #{s}/></tr>")
         tfoot.xpath(".//td").last
       end
 
@@ -72,7 +73,7 @@ module IsoDoc
 
       def table_attrs(node)
         c = node["class"]
-        style = node["style"] ? '' : "border-spacing:0;border-width:1px;"
+        style = node["style"] || node["plain"] == "true" ? "" : "border-spacing:0;border-width:1px;"
         (%w(modspec).include?(c) || !c) or style = nil
         ret =
           { summary: node["summary"], width: node["width"],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-05 00:00:00.000000000 Z
+date: 2025-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -488,7 +488,6 @@ files:
 - lib/metanorma/output/base.rb
 - lib/metanorma/output/utils.rb
 - lib/metanorma/output/xslfo.rb
-- lib/nokogiri/xml/node.rb
 - lib/relaton/render-isodoc/config.yml
 - lib/relaton/render-isodoc/general.rb
 homepage: https://github.com/metanorma/isodoc

data/lib/nokogiri/xml/node.rb

@@ -1,14 +0,0 @@
-module Nokogiri
-  module XML
-    class Node
-      def add_first_child(content)
-        if children.empty?
-          add_child(content)
-        else
-          children.first.previous = content
-        end
-        self
-      end
-    end
-  end
-end