metanorma-standoc 3.4.4 → 3.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 570260ef8a5c373f4a4f1e7b408095a9242063fdd077b305a8400eb1e8940f36
-  data.tar.gz: 523c7d7ae4073df812bd18c495294606f4cd32b892ea56199a41ac5dc293bca0
+  metadata.gz: aaf337d0f00fc3238db725b4dec6274ba4c68ef9122e1f7c75ff6cd3adf14b1a
+  data.tar.gz: 7d8a11d6b0cc974b5014fdcd06278c082d1c9d6bc69e0635a71010957c2a3eca
 SHA512:
-  metadata.gz: 38e6b4732ad07ae7a901323f179e65ffb85d11a12d584d99ccc875309fd4c5a2e43e49a113bff6a0eb17d1b426cd3f35d74c3ae160c24a9b6a307a5a4b77acfc
-  data.tar.gz: 3345a434337e7c471c9b3cf229c2fd77c1c479672695f5fc376d4defebb15a25a823f0a4260bae443d3ddd8680ea91155324a2b9d67fe60b86136d0007f411d7
+  metadata.gz: ba837ca547627627915fe7e87e93d176c9a6cbc9d9352b6e3efd93cd8a85f6d7c68d7e66fccb187dcfe30348c4f675121268cb950fd62a654b1882cac0f211a7
+  data.tar.gz: d22ad092bcdc4593e8363ab65cdd254821358e4665670d359347f7d7b32ca114f56c1c6aeb7545f57794f255bf074ac92e277b77880fd7c842990d7d8ba4cea1

data/lib/metanorma/cleanup/cleanup.rb

@@ -148,8 +148,7 @@ module Metanorma
         sections_cleanup(xmldoc) # feeds: obligations_cleanup, toc_cleanup,
         # floatingtitle_cleanup
         obligations_cleanup(xmldoc)
-        para_index_cleanup(xmldoc)
-        block_index_cleanup(xmldoc)
+        index_cleanup(xmldoc)
         key_cleanup(xmldoc) # feeds: table_cleanup, figure_cleanup,
         # formula_cleanup
         table_cleanup(xmldoc) # feeds: blocksource_cleanup

data/lib/metanorma/cleanup/index.rb

@@ -1,6 +1,28 @@
 module Metanorma
   module Standoc
     module Index
+      EMPTY_INDEX_XPATH =
+        "//index[not(.//primary[normalize-space(text())]) " \
+        "or .//secondary[. and not(normalize-space(text()))] " \
+        "or .//tertiary[. and not(normalize-space(text()))]]".freeze
+
+      def index_cleanup(xmldoc)
+        para_index_cleanup(xmldoc)
+        block_index_cleanup(xmldoc)
+        index_empty_check(xmldoc)
+      end
+
+      def index_empty_check(xmldoc)
+        xmldoc.xpath(EMPTY_INDEX_XPATH).each do |i|
+          @log.add("STANDOC_64", i, params: [empty_index_context(i)])
+        end
+      end
+
+      def empty_index_context(node)
+        ctx = node.ancestors.find { |a| a["id"] || a["anchor"] }
+        ctx ? (ctx["id"] || ctx["anchor"]) : "(unknown location)"
+      end
+
       def block_index_cleanup(xmldoc)
         xmldoc.xpath("//quote | //td | //th | //formula | //li | //dt | " \
                      "//dd | //example | //note | //figure | //sourcecode | " \

data/lib/metanorma/converter/inline.rb

@@ -89,8 +89,8 @@ module Metanorma
           when :emphasis then xml.em { |s| s << node.text }
           when :strong then xml.strong { |s| s << node.text }
           when :monospaced then xml.tt { |s| s << node.text }
-          when :double then xml << "\"#{node.text}\""
-          when :single then xml << "'#{node.text}'"
+          when :double then xml << "“#{node.text}”"
+          when :single then xml << "‘#{node.text}’"
           when :superscript then xml.sup { |s| s << node.text }
           when :subscript then xml.sub { |s| s << node.text }
           when :asciimath then stem_parse(node.text, xml, :asciimath, node)

data/lib/metanorma/converter/log.rb

@@ -195,6 +195,9 @@ module Metanorma
         STANDOC_63: { category: "Images",
                       error: "Warning on PNG image: %s",
                       severity: 3 },
+        STANDOC_64: { category: "AsciiDoc Input",
+                      error: "Empty index term: %s.",
+                      severity: 0 },
         RELATON_1: { category: "Relaton",
                      error: "(Error from Relaton) %s",
                      severity: 0 },

data/lib/metanorma/converter/macros_nosub.rb

@@ -116,7 +116,7 @@ module Metanorma
         p = Metanorma::Utils::LineStatus.new
         lines = reader.lines.map do |t|
           p.process(t)
-          !p.pass && t.include?("`") ? inlinemonospace(t) : t
+          !p.pass && /(?<!")`(?!")/.match?(t) ? inlinemonospace(t) : t
         end
         ::Asciidoctor::PreprocessorReader.new document, lines
       end
@@ -145,10 +145,20 @@ module Metanorma
       # Regex to match single or double backticks with content
       # Matches: `text` or ``text``
       # Avoids: escaped backticks \`
-      MonospaceRx = /(?<!\\)(`{1,2})(.+?)(?<!\\)\1/
+      # Avoids: the backticks of Asciidoc smart-quote markup "`...`", where a
+      #   backtick abuts an enclosing " (the leading (?<![\\"]) and the (?!")
+      #   guard). The (?!") guard is suppressed when the backtick run sits at a
+      #   genuine monospace boundary (start, whitespace, or opening bracket), so
+      #   monospace whose content itself begins with " — e.g. `"quote" A's` — is
+      #   still protected from character replacements.
+      MonospaceRx = /
+        (?<![\\"]) (`{1,2})
+        (?: (?!") | (?<=[\s(\[{<]`) | (?<=[\s(\[{<]``) | (?<=\A`) | (?<=\A``) )
+        (.+?) (?<!\\) \1
+      /x
 
       def inlinemonospace(text)
-        text.include?("`") or return text
+        /(?<!")`(?!")/.match?(text) or return text
         /^\[.*\]\s*$/.match?(text) and return text
         pass_inline_split(text) do |x|
           monospace_escape(x)

data/lib/metanorma/converter/terms.rb

@@ -66,12 +66,21 @@ module Metanorma
         @definitions = @stashed_definitions.pop
       end
 
+      # dispatch on an explicit role override ([.nonterm], [.terms],
+      # [.boilerplate]); returns true if the role was handled
+      def term_def_subclause_role_parse(attrs, xml, node)
+        case node.role
+        when "nonterm" then nonterm_term_def_subclause_parse(attrs, xml, node)
+        when "terms" then term_def_parse(attrs, xml, node, false)
+        when "boilerplate" then terms_boilerplate_parse(attrs, xml, node)
+        else return false
+        end
+        true
+      end
+
       # subclause contains subclauses
       def term_def_subclause_parse(attrs, xml, node)
-        node.role == "nonterm" and
-          return nonterm_term_def_subclause_parse(attrs, xml, node)
-        node.role == "boilerplate" and
-          return terms_boilerplate_parse(attrs, xml, node)
+        term_def_subclause_role_parse(attrs, xml, node) and return
         @definitions and return symbols_parse(attrs, xml, node)
         term_contains_subclauses(node) and
           return term_def_parse(attrs, xml, node, false)

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "3.4.4".freeze
+    VERSION = "3.4.5".freeze
   end
 end

data/lib/metanorma/validate/validate.rb

@@ -89,6 +89,7 @@ module Metanorma
       def mathml_sanitise(math)
         math.to_xml(encoding: "US-ASCII").gsub(/ xmlns=["'][^"']+["']/, "")
           .gsub(%r{<[^:/>]+:}, "<").gsub(%r{</[^:/>]+:}, "</")
+          .gsub(/>\s*\n\s*</, "><") # strip pretty-print whitespace; see STANDOC_33
       end
 
       def math_validate_error(math, elem, error)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 3.4.4
+  version: 3.4.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-25 00:00:00.000000000 Z
+date: 2026-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable