metanorma-standoc 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7e924f78d6a7faa7600c28fc8c620014dd16ea0246ab146fdbc96a3053a7763
-  data.tar.gz: 903657557475a6c7dde6657427f2a56456ad10c7587c40981cca2429b9f44e8c
+  metadata.gz: 982e6533abd03671b4c76ba32204915843cdc0c644b06ec0e8a34798a5d50d1d
+  data.tar.gz: c12cb3a77574fef2d8aa219dae15470ed14ee50e3d7ca55c527f54dc73242a4e
 SHA512:
-  metadata.gz: 183934838205bfca5d8d94bd540eefc23e6fcf552086f730d779e1fc4e7b2b292bbf10fd934f281336ad999c4bd9331444f729d825319ee5be5945a1c26f8147
-  data.tar.gz: 2a859472f86af39724db162280a4e3aff7775a88398e1b859a81cc7fa982eab255f5b7e60100d7ad143cfa3f2535093f201bd3446984474e949d8932bc8497e2
+  metadata.gz: eec8efe148aeef9f65007f135aed6ad0a91c7c8c0a94749d75c1946d53e0877a3c8840c32679e20d01048fee434d35949453dcfd7335417f049f225eab31afdf
+  data.tar.gz: 8e2dc0a69568e2f460dcf39fa081756ed0d5610b00c02516c02ffd14bb84682a03dc07a29dc261651f65576175c36561d53a80cea8889c9519b8053c3051c612

data/lib/metanorma/standoc/blocks.rb

@@ -211,12 +211,13 @@ module Metanorma
       end
 
       def pass(node)
+        format = node.attr("format") || "metanorma"
         noko do |xml|
-          xml.passthrough **attr_code(formats:
-                                      node.attr("format") || "metanorma") do |p|
+          xml.passthrough **attr_code(formats: format) do |p|
             content = @c.encode(node.content, :basic, :hexadecimal)
             p << content
-            passthrough_validate(node, node.content, content)
+            format == "metanorma" and
+              passthrough_validate(node, node.content, content)
           end
         end
       end

data/lib/metanorma/standoc/cleanup_maths.rb

@@ -166,8 +166,7 @@ module Metanorma
           return
         end
         f == "default" or return f
-        if @numberfmt_default.empty?
-          "notation='basic'"
+        if @numberfmt_default.empty? then "notation='basic'"
         else @numberfmt_default&.map { |k, v| "#{k}='#{v}'" }&.join(",")
         end
       end

data/lib/metanorma/standoc/cleanup_review.rb

@@ -15,36 +15,52 @@ module Metanorma
         parent = review.parent
         children = parent.children
         index = children.index(review)
-        x = previous_review_siblings(children, index) ||
-          following_review_siblings(children, index)
-        ins = if x then x.at(".//text()")
-              else review.before("<p> </p>").previous.at(".//text()")
-              end
+        x = find_review_sibling(children, index, :previous) ||
+          find_review_sibling(children, index, :following)
+        ins = x || review.before("<p> </p>").previous.at(".//text()")
         ins.previous = "<bookmark id='#{id}'/>"
       end
 
-      def previous_review_siblings(children, index)
-        x = nil
-        (index - 1).downto(0) do |i|
-          node = children[i]
-          if node.element? && node.name != "review" && node.text.strip != ""
-            x = node
+      # we know node is a block: dig for a place bookmark can go
+      def available_bookmark_destination(node)
+        ret = case node.name
+              when "title", "name", "p" then node
+              when "sourcecode" then node.at(".//name")
+              when "admonition", "note", "example", "li", "quote", "dt", "dd",
+                "permission", "requirement", "recommendation"
+                node.at(".//p | .//name") || node
+              when "formula"
+                node.at(".//p | .//name | .//dt")
+              when "ol", "ul" then node.at(".//p | .//name") || node.at("./li")
+              when "dl" then node.at(".//p | .//name") || node.at("./dt | ./dd")
+              when "table" then node.at(".//td[text()] | .//th[text()]")
+              end or return nil
+        first_non_stem_text(ret)
+      end
+
+      def first_non_stem_text(ret)
+        first_non_stem_text = nil
+        ret.traverse do |n|
+          if n.text? && n.ancestors("stem").empty? && !n.text.strip.empty?
+            first_non_stem_text = n
             break
           end
         end
-        x
+        first_non_stem_text
       end
 
-      def following_review_siblings(children, index)
-        x = nil
-        (index + 1).upto(children.size - 1) do |i|
+      def find_review_sibling(children, index, direction = :previous)
+        range = if direction == :previous then (index - 1).downto(0)
+                else (index + 1).upto(children.size - 1)
+                end
+        range.each do |i|
           node = children[i]
-          if node.element? && node.name != "review" && node.text.strip != ""
-            x = node
-            break
+          if node.element? && !node.text.empty? && node.text.strip != "" &&
+              ret = available_bookmark_destination(node)
+            return ret
           end
         end
-        x
+        nil
       end
 
       def review_set_location(review)

data/lib/metanorma/standoc/lists.rb

@@ -45,6 +45,7 @@ module Metanorma
       end
 
       def olist_style(style)
+        style = style&.to_s
         return "alphabet" if style == "loweralpha"
         return "roman" if style == "lowerroman"
         return "roman_upper" if style == "upperroman"

data/lib/metanorma/standoc/regex.rb

@@ -2,7 +2,7 @@ module Metanorma
   module Standoc
     module Regex
       # https://medium.com/@rickwang_wxc/in-ruby-given-a-string-detect-if-it-is-valid-numeric-c58275eace60
-      NUMERIC_REGEX = %r{^((\+|-)?\d*\.?\d+)([eE](\+|-){1}\d+)?$}
+      NUMERIC_REGEX = %r{\A((\+|-)?\d*\.?\d+)([eE](\+|-){1}\d+)?\Z}
 
       # extending localities to cover ISO referencing
       CONN_REGEX_STR = "(?<conn>and|or|from|to)!".freeze

data/lib/metanorma/standoc/utils.rb

@@ -40,16 +40,18 @@ module Metanorma
           .map { |x| @c.encode(x, :basic, :hexadecimal) }
       end
 
+      # quoted strings: key="va,lue",
       def quoted_csv_split(text, delim = ",", eql = "=")
-        # quoted strings: key="va,lue",
         c = HTMLEntities.new
-        text = c.decode(text).gsub(/([a-zA-Z_]+)#{eql}(["'])(.+?)\2/,
-                                   %("\\1#{eql}\\3"))
-        Metanorma::Utils::csv_split(text, delim)
-          .map do |x|
-            c.encode(x.sub(/^(["'])(.+)\1$/, "\\2"),
-                     :basic, :hexadecimal)
-          end
+        text = c.decode(text).gsub(/([a-zA-Z_]+)#{eql}(["'])(.*?)\2/) do |_|
+          key = Regexp.last_match(1)
+          value = Regexp.last_match(3).gsub(" ", " ")
+          "\"#{key}#{eql}#{value}\""
+        end
+        Metanorma::Utils::csv_split(text, delim).map do |x|
+          c.encode(x.sub(/^(["'])(.*?)\1$/, "\\2"),
+                   :basic, :hexadecimal)
+        end
       end
 
       def kv_parse(text, delim = ",", eql = "=")
@@ -118,7 +120,7 @@ module Metanorma
 
       SECTION_CONTAINERS =
         %w(foreword introduction acknowledgements abstract
-           clause references terms definitions annex appendix indexsect 
+           clause references terms definitions annex appendix indexsect
            executivesummary).freeze
 
       def section_containers

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "3.0.5".freeze
+    VERSION = "3.0.6".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-14 00:00:00.000000000 Z
+date: 2025-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable