metanorma-standoc 3.4.6 → 3.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4f541051cf5c4f2d8d09fa2abd0557875da3503bf5475ca4cf6f346d91afe5d
-  data.tar.gz: 9d14d6673be1b03aa241d2dfa2c57cf5c8c5fb2e345959b49aea7a713af0b3a4
+  metadata.gz: b1dfc55e13dc35cba30f131721a669b4d8f4373d9afea12d2a1fd19c178ab9b1
+  data.tar.gz: b1c07c99802d3018f9205e3b68574d2e6557380d81b51f6d33fec5026da355d4
 SHA512:
-  metadata.gz: a2789df5307bf398f4ee3f0c87d1ff4295f4964e036d0dfea922362ff6c390a0fb714b623ca58445d9f7cf1ba73edc5b4936555ffe2a1c211af6cbf773ee98b9
-  data.tar.gz: db9d8f35807bd2dcb2ba96ff93cc6ae2b3434d0d8585a0536f6a4c78c98232c1c7daaad9ed423d21f2f110e80fc300bc54f8e109897a9ad36ad904ce2619de13
+  metadata.gz: 501724517b1124aab3b9be9dc9eece4c4da9671e8ca13b6c4a86f52e45487772ed50b51418cc334280f183241c0d244acc4b7f63040a6b8ecf0ac5e48676e458
+  data.tar.gz: 3b6a32f1e821f68243cc01f3833f6f8fa26f14ac5f6b686e10cf872c6f4cdd968324579540dea0ee481d06ecaa04695390a601888d72977ea1375dabb1b4b789

data/lib/metanorma/cleanup/block.rb

@@ -166,13 +166,22 @@ module Metanorma
         align_callouts_to_annotations(xmldoc)
       end
 
+      # State threaded through {{{ ... }}} sourcecode-markup processing.
+      # open: inside a span; inline: that span opened in the current text node
+      # (so its content is convertible, not merely delimiter-stripped);
+      # buf: the open span's content so far; out: the rebuilt node content.
+      SourcecodeMarkup = Struct.new(:open, :inline, :buf, :out, :node)
+
+      # {{{ ... }}} injects Asciidoc markup into otherwise-verbatim sourcecode.
+      # A span's delimiters can be split across separate text nodes by an
+      # element that subs="macros" injected between them (e.g. an inline
+      # image), so we walk the sourcecode's text nodes in order and carry the
+      # open state across them, rather than processing each node in isolation.
       def sourcecode_cleanup(xmldoc)
         xmldoc.xpath("//sourcecode").each do |x|
-          x.traverse do |n|
-            n.text? or next
-            /#{Regexp.escape(@sourcecode_markup_start)}/.match?(n.text) or next
-            n.replace(sourcecode_markup(n))
-          end
+          open = x.xpath(".//text()")
+            .inject(false) { |acc, node| sourcecode_markup(node, acc) }
+          open and @log.add("STANDOC_65", x, params: [@sourcecode_markup_start])
         end
       end
 
@@ -183,32 +192,78 @@ module Metanorma
         )
       end
 
-      def sourcecode_markup(node)
-        source_markup_prep(node).each_slice(4).map.with_object([]) do |a, acc|
-          acc << safe_noko(a[0], node.document)
-          a.size == 4 or next
-          acc << @conv.isolated_asciidoctor_convert(
-            "{blank} #{a[2]}", doctype: :inline,
-                               backend: @conv.backend&.to_sym || :standoc
-          ).strip
-        end.join
+      # @return [Boolean] whether a {{{ span is still open after this node
+      def sourcecode_markup(node, open)
+        open || sourcecode_markup?(node.text) or return open
+        state = SourcecodeMarkup.new(open, false, [], [], node)
+        sourcecode_markup_split(node.text)
+          .each { |tok| sourcecode_markup_token(tok, state) }
+        sourcecode_markup_flush(state)
+        state.open
       end
 
-      def source_markup_prep(node)
-        ret = node.text.split(/(#{Regexp.escape(@sourcecode_markup_start)}|
-                          #{Regexp.escape(@sourcecode_markup_end)})/x)
-        source_markup_validate(node, ret)
-        ret
+      def sourcecode_markup_flush(state)
+        state.open and
+          state.out << safe_noko(state.buf.join, state.node.document)
+        state.node.replace(state.out.join)
       end
 
-      def source_markup_validate(node, ret)
-        ret.each_slice(4) do |a|
-          a.size == 4 or next
-          a[1] == @sourcecode_markup_start && a[3] == @sourcecode_markup_end or
-            @log.add("STANDOC_61", node, params: [a.join])
+      def sourcecode_markup?(text)
+        text.include?(@sourcecode_markup_start) ||
+          text.include?(@sourcecode_markup_end)
+      end
+
+      def sourcecode_markup_split(text)
+        text.split(/(#{Regexp.escape(@sourcecode_markup_start)}|
+                     #{Regexp.escape(@sourcecode_markup_end)})/x)
+      end
+
+      def sourcecode_markup_token(tok, state)
+        case tok
+        when @sourcecode_markup_start then sourcecode_markup_open(state)
+        when @sourcecode_markup_end then sourcecode_markup_close(state)
+        else sourcecode_markup_content(tok, state)
         end
       end
 
+      # a nested {{{ is improper nesting: STANDOC_61 is fatal
+      def sourcecode_markup_open(state)
+        state.open and
+          return @log.add("STANDOC_61", state.node, params: [state.node.text])
+        state.open = state.inline = true
+      end
+
+      def sourcecode_markup_close(state)
+        state.open or return sourcecode_markup_stray(state)
+        state.out << sourcecode_markup_closed(state)
+        state.open = state.inline = false
+        state.buf = []
+      end
+
+      # a stray }}} with no opener is left as literal text
+      def sourcecode_markup_stray(state)
+        state.out << safe_noko(@sourcecode_markup_end, state.node.document)
+      end
+
+      # a span closed within one node is converted; one split across nodes
+      # (already holding a processed element) is delimiter-stripped only
+      def sourcecode_markup_closed(state)
+        state.inline and return sourcecode_markup_convert(state.buf.join)
+        safe_noko(state.buf.join, state.node.document)
+      end
+
+      def sourcecode_markup_content(tok, state)
+        state.open and return state.buf << tok
+        state.out << safe_noko(tok, state.node.document)
+      end
+
+      def sourcecode_markup_convert(span)
+        @conv.isolated_asciidoctor_convert(
+          "{blank} #{span}", doctype: :inline,
+                             backend: @conv.backend&.to_sym || :standoc
+        ).strip
+      end
+
       def form_cleanup(xmldoc)
         xmldoc.xpath("//select").each do |s|
           while s.next_element&.name == "option"

data/lib/metanorma/converter/blocks_examples.rb

@@ -49,7 +49,8 @@ module Metanorma
       end
 
       def example_attrs(node)
-        attr_code(id_unnum_attrs(node).merge(keep_attrs(node)))
+        attr_code(id_unnum_attrs(node).merge(keep_attrs(node))
+          .merge(collapsible: node.option?("collapsible") ? "true" : nil))
       end
 
       def example_proper(node)

data/lib/metanorma/converter/front_title.rb

@@ -54,7 +54,9 @@ module Metanorma
         part, subpart = node.attr("partnumber")&.split("-")
         { part:, subpart:, amendment: node.attr("amendment-number"),
           corrigendum: node.attr("corrigendum-number"),
-          addendum: node.attr("addendum-number") }
+          addendum: node.attr("addendum-number"),
+          supplement: node.attr("supplement-number"),
+          extract: node.attr("extract-number") }
       end
 
       def title_num_prefix(key, value, xml, lang)

data/lib/metanorma/converter/init.rb

@@ -128,6 +128,7 @@ module Metanorma
         @tocfigures = node.attr("toc-figures")
         @toctables = node.attr("toc-tables")
         @tocrecommendations = node.attr("toc-recommendations")
+        @tocexamples = node.attr("toc-examples")
       end
 
       def toc_default

data/lib/metanorma/converter/log.rb

@@ -198,6 +198,9 @@ module Metanorma
         STANDOC_64: { category: "AsciiDoc Input",
                       error: "Empty index term: %s.",
                       severity: 0 },
+        STANDOC_65: { category: "AsciiDoc Input",
+                      error: "Unbalanced sourcecode markup: unclosed %s",
+                      severity: 0 },
         RELATON_1: { category: "Relaton",
                      error: "(Error from Relaton) %s",
                      severity: 0 },

data/lib/metanorma/converter/ref_queue.rb

@@ -221,6 +221,8 @@ module Metanorma
         global = !@no_isobib_cache && !node.attr("local-cache-only")
         local = node.attr("local-cache") || node.attr("local-cache-only")
         local = nil if @no_isobib_cache
+        flush_bib_caches_force(node) if node.attr("flush-caches") &&
+          @no_isobib_cache
         @bibdb = Relaton::Db.init_bib_caches(
           local_cache: local,
           flush_caches: node.attr("flush-caches"),
@@ -228,6 +230,23 @@ module Metanorma
         )
       end
 
+      # `:flush-caches:` must clear stale cache state regardless of whether
+      # `:no-isobib-cache:` disables caching for *this* compile. When both
+      # are set, the `Relaton::Db.init_bib_caches` path no-ops on the flush
+      # (because it has no cache paths to flush), leaving any previously
+      # cached entries on disk for the next compile that DOES have caching
+      # enabled to pick up. Force-flush the conventional cache locations
+      # here so the flag does what its name says.
+      # Source issue: https://github.com/relaton/relaton-iso/issues/181
+      def flush_bib_caches_force(node)
+        FileUtils.rm_rf "#{Dir.home}/.relaton/cache"
+        lcache_name = node.attr("local-cache") || node.attr("local-cache-only")
+        if lcache_name
+          base = lcache_name.to_s.empty? ? "relaton" : lcache_name
+          FileUtils.rm_rf "#{base}/cache"
+        end
+      end
+
       # Treat empty strings as falsy (they're set by Asciidoctor for some attributes)
       def init_iev_caches(node)
         no_cache = @no_isobib_cache && !@no_isobib_cache.empty?

data/lib/metanorma/converter/render.rb

@@ -41,6 +41,7 @@ module Metanorma
           tocfigures: @tocfigures,
           toctables: @toctables,
           tocrecommendations: @tocrecommendations,
+          tocexamples: @tocexamples,
           fonts: flex_attr_name(node, "fonts"),
           fontlicenseagreement: flex_attr_name(node, "font-license-agreement"),
           localizenumber: flex_attr_name(node, "localize-number"),
@@ -92,6 +93,7 @@ module Metanorma
           tocfigures: @tocfigures,
           toctables: @toctables,
           tocrecommendations: @tocrecommendations,
+          tocexamples: @tocexamples,
           fonts: flex_attr_name(node, "fonts"),
           fontlicenseagreement: flex_attr_name(node, "font-license-agreement"),
         }

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "3.4.6".freeze
+    VERSION = "3.4.7".freeze
   end
 end

data/lib/metanorma/validate/isodoc.rng

@@ -213,6 +213,12 @@ Sources are currently only rendered in metanorma-plateau</a:documentation>
     <define name="ExampleAttributes">
       <ref name="NumberingAttributes"/>
       <ref name="BlockAttributes"/>
+      <optional>
+        <attribute name="collapsible">
+          <a:documentation>Render the example as collapsible (HTML5 details/summary)</a:documentation>
+          <data type="boolean"/>
+        </attribute>
+      </optional>
     </define>
     <define name="ExampleBody">
       <optional>

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 3.4.6
+  version: 3.4.7
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -544,7 +543,6 @@ licenses:
 - BSD-2-Clause
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -559,8 +557,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 4.0.10
 specification_version: 4
 summary: metanorma-standoc realises standards following the Metanorma standoc model
 test_files: []