isodoc 3.6.6 → 3.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7afaca0661a1ca0321fb479d3f1d1db9b2687bf63d668c69778cb13ac8caaec9
-  data.tar.gz: 822fe85bb3ffd7966aac0ff7f6bbbc5cc8e79759664f81c1df804767e2b1ce86
+  metadata.gz: eb5eaaa62e081fd25bff232ebc2a38ef74f3d73c4207da35cde420169fbfe0b1
+  data.tar.gz: baa0b652f47d32440c93e1f0f823ef2ef734ec78bd351f3112d3e2fc14906c2c
 SHA512:
-  metadata.gz: 4840fd50ec5c71c4bf7202bc9ffcc87bdd1f756ae2c58212b627f78633e87333c935926f921b0c276a83fd4c1ab279ed9d3a3b3b34605ac215261506f59dc600
-  data.tar.gz: 9afda013dcdfb71c8ee962cfe787b2b24e997613b2b1fd644e0e751cf521290aad51ec1c0859254c0c27ba087abe2839ad9419b846c33ae287f5784bb4e6b319
+  metadata.gz: 711a67de087b11beb0fc089d21e9fe62694fbe5e0d8d1bbd6a37a7fb2b0546c7ba43a95da22cb5073ee4263bee4127e57b5455d7cf3c40c7a020f4a490936947
+  data.tar.gz: 64d9a08ecd6e2355a738702b843d8873fcf66e191f359b1ef84eac09c57e9f136535f3edc685a96289339c021c743349d6550e9eac92d3417cb42d18d99851a4

data/.rubocop.yml

@@ -3,8 +3,20 @@
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/main/ci/rubocop.yml
 
+# Rubocop plugins enabled centrally so every metanorma-org gem picks them up
+# on cimas sync — best practice belongs at the shared-template layer, not
+# per-repo. Per ronaldtse feedback on metanorma/ci#332.
+plugins:
+  - rubocop-rspec
+  - rubocop-performance
+  - rubocop-rake
+
 # local repo-specific modifications
 # ...
 
 AllCops:
-  TargetRubyVersion: 3.4
+  # 3.3 matches the org-wide minimum being pushed via #274 (Raise minimum
+  # Ruby version to 3.3 due to EOL of 3.2 on 2026-03-31). Was 3.4 before
+  # this commit — 3.4 was above the org's stated minimum and would have
+  # applied Rubocop rules that fail-close on gems still targeting 3.3.
+  TargetRubyVersion: 3.3

data/isodoc.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
     f.match(%r{^(test|spec|features|bin|.github)/}) \
     || f.match(%r{Rakefile|bin/rspec})
   end
-  spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.3.0")
 
   spec.add_dependency "base64"
   spec.add_dependency "bigdecimal"

data/lib/isodoc/function/blocks.rb

@@ -11,11 +11,16 @@ module IsoDoc
       end
 
       def figure_attrs(node)
-        attr_code(id: node["id"], class: "figure", style: keep_style(node))
+        attr_code(id: node["id"], class: merge_html_class("figure", node),
+                  style: keep_style(node))
       end
 
       def figure_parse(node, out)
-        node["class"] == "pseudocode" || node["type"] == "pseudocode" and
+        # metanorma/metanorma-standoc#1197: "pseudocode" may be one of several
+        # space-separated classes; dispatch on its presence, not equality, so a
+        # custom class alongside it is preserved.
+        node["class"]&.split&.include?("pseudocode") ||
+          node["type"] == "pseudocode" and
           return pseudocode_parse(node, out)
         @in_figure = true
         figure_parse1(node, out)
@@ -32,7 +37,10 @@ module IsoDoc
       end
 
       def pseudocode_attrs(node)
-        attr_code(id: node["id"], class: "pseudocode", style: keep_style(node))
+        classes = node["class"]&.split || []
+        classes.include?("pseudocode") or classes.unshift("pseudocode")
+        attr_code(id: node["id"], class: classes.join(" "),
+                  style: keep_style(node))
       end
 
       def pseudocode_tag
@@ -58,7 +66,8 @@ module IsoDoc
       end
 
       def sourcecode_attrs(node)
-        attr_code(id: node["id"], class: "Sourcecode", style: keep_style(node))
+        attr_code(id: node["id"], class: merge_html_class("Sourcecode", node),
+                  style: keep_style(node))
       end
 
       def sourcecode_parse(node, out)
@@ -151,8 +160,7 @@ module IsoDoc
         classtype = "MsoCommentText" if in_comment
         node["type"] == "floating-title" and
           classtype = "h#{node['depth'] || '1'}"
-        classtype ||= node["class"]
-        classtype
+        merge_html_class(classtype, node)
       end
 
       def para_attrs(node)
@@ -187,7 +195,7 @@ module IsoDoc
       end
 
       def quote_attrs(node)
-        ret = para_attrs(node).merge(class: "Quote")
+        ret = para_attrs(node).merge(class: merge_html_class("Quote", node))
         node["type"] == "newcontent" and
           ret[:class] += " AmendNewcontent"
         ret

data/lib/isodoc/function/blocks_example_note.rb

@@ -13,7 +13,8 @@ module IsoDoc
         margin-left:0pt;vertical-align:top;" }.freeze
 
       def example_div_attr(node)
-        attr_code(id: node["id"], class: "example", style: keep_style(node))
+        attr_code(id: node["id"], class: merge_html_class("example", node),
+                  style: keep_style(node))
       end
 
       # used if we are boxing examples
@@ -130,6 +131,7 @@ module IsoDoc
       def note_attrs(node)
         classes = node["type"]&.split(",") || []
         classes << "Note"
+        node["class"] and classes << node["class"]
         attr_code(id: node["id"], class: classes.join(" "),
                   style: keep_style(node), coverpage: node["coverpage"])
       end
@@ -154,7 +156,11 @@ module IsoDoc
       end
 
       def admonition_class(node)
-        "Admonition #{admonition_subclass(node)}".strip
+        # metanorma/metanorma-standoc#1197: admonition @class is unused by the
+        # type-driven labelling/numbering, so it is repurposed for additive
+        # custom HTML classes appended after the built-in Admonition classes.
+        ["Admonition", admonition_subclass(node), node["class"]]
+          .compact.join(" ").strip
       end
 
       def admonition_subclass(node)

data/lib/isodoc/function/lists.rb

@@ -9,7 +9,7 @@ module IsoDoc
       end
 
       def ul_attrs(node)
-        { id: node["id"], style: keep_style(node) }
+        { id: node["id"], class: node["class"], style: keep_style(node) }
       end
 
       def ul_parse(node, out)
@@ -46,7 +46,7 @@ module IsoDoc
         { # 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)
+          id: node["id"], class: node["class"], style: keep_style(node)
         }
       end
 

data/lib/isodoc/function/table.rb

@@ -46,21 +46,37 @@ 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
+      # Bordering is governed by %plain only, NOT by the presence of a custom
+      # @class (metanorma/metanorma-pdfa#33). A non-plain table -- including one
+      # carrying a custom class, or the internal modspec variant -- keeps the
+      # ISO borders. The internal `rouge-line-table` (sourcecode line numbering)
+      # is the exception: like %plain it is mutually exclusive with MsoISOTable
+      # and takes no ISO border additions.
+      def bordered_table_style(node, klass = nil)
+        node["plain"] == "true" and return ""
+        klass == "rouge-line-table" and return ""
+        "border-width:1px;border-spacing:0;"
       end
 
       def table_attrs(node)
         c = node["class"]
         style = table_attrs_style(node, c)
         attr_code(id: node["id"],
-                  class: node["plain"] == "true" ? "plain" : (c || "MsoISOTable"),
+                  class: table_html_class(node, c),
                   style: style, title: node["alt"])
       end
 
+      # metanorma/metanorma-pdfa#33: a custom @class is ADDITIVE -- it augments
+      # the computed base class (MsoISOTable, or "plain" under %plain) rather
+      # than replacing it, and is orthogonal to bordering. `modspec` and the
+      # sourcecode line-numbering `rouge-line-table` stay grandfathered internal
+      # values with replace semantics (mutually exclusive with MsoISOTable).
+      def table_html_class(node, custom)
+        node["plain"] == "true" and return ["plain", custom].compact.join(" ")
+        %w(modspec rouge-line-table).include?(custom) and return custom
+        ["MsoISOTable", custom].compact.join(" ")
+      end
+
       def table_attrs_style(node, klass)
         width = node["width"] ? "width:#{node['width']};" : nil
         bordered = bordered_table_style(node, klass)
@@ -146,10 +162,14 @@ module IsoDoc
         STYLE
       end
 
+      # Cell bordering follows %plain only, not the custom @class, with
+      # `rouge-line-table` excluded like %plain (see bordered_table_style).
+      # metanorma/metanorma-pdfa#33
       def table_bordered?(node)
-        node.parent.parent["plain"] == "true" and return false
-        c = node.parent.parent["class"]
-        %w(modspec).include?(c) || !c
+        table = node.parent.parent
+        table["plain"] == "true" and return false
+        table["class"] == "rouge-line-table" and return false
+        true
       end
 
       def tr_parse(node, out, ord, totalrows, header)

data/lib/isodoc/function/utils.rb

@@ -38,6 +38,17 @@ module IsoDoc
         end
       end
 
+      # metanorma/metanorma-standoc#1197: render an author's custom @class
+      # additively, augmenting a block's built-in HTML class rather than
+      # replacing it. `base` is the block's hardcoded class ("figure",
+      # "Sourcecode", ...) or nil for blocks with no built-in class; the author
+      # class (if any) is appended. Returns nil when the result is empty, so a
+      # class-less block does not gain an empty class attribute.
+      def merge_html_class(base, node)
+        ret = [base, node["class"]].compact.join(" ")
+        ret.empty? ? nil : ret
+      end
+
       DOCTYPE_HDR = "<!DOCTYPE html SYSTEM " \
                     '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'.freeze
 

data/lib/isodoc/html_function/html.rb

@@ -73,7 +73,8 @@ module IsoDoc
       def sourcecode_parse(node, out)
         tag, child_tag = sourcecode_tag(node)
         s = node.at(ns("./fmt-sourcecode")) || node
-        attr = sourcecode_attrs(node).merge(class: "sourcecode")
+        attr = sourcecode_attrs(node)
+          .merge(class: merge_html_class("sourcecode", node))
         out.send tag, **attr do |div|
           sourcecode_pre_wrap(child_tag, s, div)
           annotation_parse(s, div)

data/lib/isodoc/presentation_function/math.rb

@@ -50,21 +50,46 @@ module IsoDoc
                                   precision: num_precision(num.text))
     end
 
+    # The `data-metanorma-numberformat` options metanorma types, by target
+    # type. The single source of truth lives here in isodoc (metanorma's
+    # concern), not in plurimath.
+    NUMBERFORMAT_INTEGER = %i(precision significant digit_count group_digits
+                              fraction_group_digits base).freeze
+    NUMBERFORMAT_SYMBOL = %i(notation exponent_sign number_sign locale
+                             hex_capital).freeze
+    NUMBERFORMAT_NULLABLE = %i(base_prefix base_suffix).freeze
+    # plurimath options metanorma deliberately passes through unchanged (string)
+    NUMBERFORMAT_PASSTHROUGH = %i(fraction_group decimal group times e).freeze
+    NUMBERFORMAT_KNOWN = (NUMBERFORMAT_INTEGER + NUMBERFORMAT_SYMBOL +
+                          NUMBERFORMAT_NULLABLE + NUMBERFORMAT_PASSTHROUGH).freeze
+
     def numberformat_type(ret)
-      %i(precision significant digit_count group_digits fraction_group_digits
-         base)
-        .each do |i|
-        ret[i] &&= ret[i].to_i
-      end
-      %i(notation exponent_sign number_sign locale hex_capital).each do |i|
-        ret[i] &&= ret[i].to_sym
-      end
-      %i(base_prefix base_suffix).each do |i|
+      numberformat_unclassified_warn
+      NUMBERFORMAT_INTEGER.each { |i| ret[i] &&= ret[i].to_i }
+      NUMBERFORMAT_SYMBOL.each { |i| ret[i] &&= ret[i].to_sym }
+      NUMBERFORMAT_NULLABLE.each do |i|
         ["", "nil"].include?(ret[i]) and ret[i] = nil
       end
       ret
     end
 
+    # Union plurimath's option defaults against metanorma's known lists, and
+    # warn (once) on anything plurimath exposes that metanorma has not
+    # classified -- e.g. a passthrough option added upstream (potentially via a
+    # direct Peter Wyatt request) that we would otherwise be none the wiser of.
+    # DEFAULT_OPTIONS is the passthrough watch-point, not plurimath's entire
+    # option surface. See metanorma/basicdoc-models#35.
+    def numberformat_unclassified_warn
+      @numberformat_warned and return
+      @numberformat_warned = true
+      unknown = Plurimath::Formatter::Standard::DEFAULT_OPTIONS.keys -
+        NUMBERFORMAT_KNOWN
+      unknown.empty? and return
+      warn "[isodoc] plurimath number-format options not classified by " \
+           "metanorma (treated as string passthrough): #{unknown.join(', ')}. " \
+           "Classify them in IsoDoc numberformat_type."
+    end
+
     def explicit_number_formatter(num, locale, options)
       ret = numberformat_type(csv_attribute_extract(options))
       l = ret[:locale] || locale

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.6.6".freeze
+  VERSION = "3.6.7".freeze
 end

data/lib/isodoc/word_function/table.rb

@@ -84,12 +84,18 @@ module IsoDoc
         super.merge(attr_code(ret))
       end
 
+      # %plain or an explicit @style still suppresses the default border; a
+      # custom @class no longer nulls it. The class is HTML-only and is not
+      # emitted to Word output (Word CSS is too inflexible), but a custom-class
+      # table must still render as a normal bordered ISO table.
+      # Exception: the internal `rouge-line-table` (sourcecode line numbering)
+      # takes no ISO border and keeps its own class -- returning nil drops the
+      # Word MsoISOTable override (see table_attrs) so the HTML super class
+      # survives. metanorma/metanorma-pdfa#33
       def table_border_css(node)
-        c = node["class"]
         style = "border-spacing:0;border-width:1px;"
         node["style"] || node["plain"] == "true" and style = ""
-        (%w(modspec).include?(c) || !c) or style = nil
-        node["plain"] == "true" and style = ""
+        node["class"] == "rouge-line-table" and style = nil
         style
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.6.6
+  version: 3.6.7
 platform: ruby
 authors:
 - Ribose Inc.
@@ -330,7 +330,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="