metanorma-standoc 3.5.9 → 3.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea3e2fa0c63ac0260f6d1d1d43b4d711494094c811a6784701977bdb3da5e746
-  data.tar.gz: 00a47e62f0a808dff717048a0795d2b48c9e8c42ec61c16656899e8a8dd9ca4b
+  metadata.gz: 59b66af0a957fc5c8af49a88b81b59d7bb5d02edeb88beae9289696063e406ef
+  data.tar.gz: 560e72bd9e7f32ef4cce3e787a75522df36cda27c87df497dfbe72f91a6f483f
 SHA512:
-  metadata.gz: f5f0a0f9a6f4508a28a9f59a31ef375cee6ad12218d12ad7db3a6f9575433e8234226d0fa5f9579e486cf49b41f0bb172d48ac57883ce5f945f41eb75d99b355
-  data.tar.gz: 0a195fdf207ba3d6c25f6424ce8bfb3b4dc0584b6ef1180c06aba9283091a11e5e519a9f78ed4a53730bf9029f34917653d42bd6a8b97b31fa491cb9459ca332
+  metadata.gz: fde7a1d249a4070705f23f6fddfaa81bd95c198e697b955a81e4486cb72afb02636e7c412480588e9ac4240b7b078b8b9fa2c317258c64283e0dba569da0938a
+  data.tar.gz: c6fd770b5d164283c9192df960d16943efa2ba2978aa1e9146fbccf3bc6cbac930e093fa40d84cf407c6c3e557fdb2dc1cb9bc51d77537e120eb00e2b09a4f77

data/Gemfile

@@ -28,10 +28,9 @@ gem "isodoc", github: "metanorma/isodoc", branch: "main"
 # release. Prefer the released gem over a git pin: relaton main has since
 # moved to lutaml-store ~> 0.3, which conflicts with glossarist 2.14's
 # lutaml-store ~> 0.2.0 and makes this bundle unresolvable.
-# parsanol 1.3.120 removed the pre-1.3.113 grammar-header alias (mode), breaking pubid 2.0.1's baked self-description grammar at compile (81 suite failures). Pin below the break until pubid regenerates its artifacts against the current compiler.
-gem "parsanol", "< 1.3.120"
-gem "relaton", "~> 3.0"
-gem "pubid", ">= 2.0.3" # 2.0.3: edition-2 iso artifact
+gem "parsanol", "~> 1.3.123"
+gem "relaton", "~> 3.1.1"
+gem "pubid", "~> 2.0" # 2.0.3+: edition-2 iso artifact
 
 gem "metanorma-plugin-lutaml", github: "metanorma/metanorma-plugin-lutaml", branch: "main"
 

data/lib/metanorma/converter/anchor.rb

@@ -81,9 +81,42 @@ module Metanorma
       def inline_anchor_link(node)
         contents, attributes = inline_anchor_link_attrs(node)
         noko do |xml|
-          xml.link **attr_code(attributes) do |l|
+          link_hardbreak_segments(xml, contents, attr_code(attributes))
+        end
+      end
+
+      # A hard break inside link macro text is a " +" at end of line
+      # (asciidoctor HardLineBreakRx). Inline macros are substituted
+      # before post-replacements, so the break still arrives here in
+      # the raw node text, and the anchor's own markup is already in
+      # the paragraph string when sub_post_replacements expands that
+      # break: the expansion re-emits the whole preceding line through
+      # the break node, and the fragment parse of that line closes the
+      # still-open <link> early, leaking the tail as text with an
+      # orphaned close (metanorma-pdfa#102). Consume the break here
+      # instead: emit one link per break-separated segment, reopening
+      # the same target after each break, so no " +" survives into
+      # post-replacements and the emitted markup is well-formed.
+      HARD_BREAK_RX = / \+\n| \+\z/.freeze
+
+      def link_hardbreak_segments(xml, contents, attributes)
+        segs = contents.split(HARD_BREAK_RX, -1)
+        if segs.size <= 1
+          xml.link **attributes do |l|
             l << contents
           end
+          return
+        end
+        trailing = segs.last.empty?
+        segs.pop if trailing
+        segs.each_with_index do |seg, i|
+          xml.link **attributes do |l|
+            l << seg
+          end
+          last = i == segs.size - 1
+          br = !last || trailing
+          xml.br if br
+          xml << "\n" if br && !last
         end
       end
 

data/lib/metanorma/converter/converter.rb

@@ -23,8 +23,6 @@ module Metanorma
     class Converter
       Asciidoctor::Extensions.register do
         preprocessor Metanorma::Standoc::ResolveIncludePreprocessor
-        treeprocessor Metanorma::Plugin::Asciichem::Extension::ChemTreeprocessor
-        inline_macro Metanorma::Plugin::Asciichem::Extension::ChemInlineMacro, :chem
         preprocessor Metanorma::Plugin::Lutaml::LutamlDataPreprocessor
         preprocessor Metanorma::Plugin::Lutaml::LutamlXsdPreprocessor
         preprocessor Metanorma::Plugin::Lutaml::LutamlPreprocessor

data/lib/metanorma/converter/macros.rb

@@ -9,7 +9,6 @@ require_relative "macros_embed"
 require_relative "macros_link"
 require_relative "macros_nosub"
 require_relative "macros_number"
-require "metanorma-plugin-asciichem"
 require "metanorma-plugin-glossarist"
 require "metanorma-plugin-lutaml"
 require "metanorma-plugin-plantuml"

data/lib/metanorma/converter/macros_nosub.rb

@@ -6,12 +6,60 @@ module Metanorma
     class LinkProtectPreprocessor < Asciidoctor::Extensions::Preprocessor
       def process(document, reader)
         p = Metanorma::Utils::LineStatus.new
-        lines = reader.lines.map do |t|
+        out = []
+        buf = nil
+        reader.lines.each do |t|
           p.process(t)
-          !p.pass && t.include?(":") and t = inlinelinkmacro(inlinelink(t))
-          t
+          if buf
+            buf = "#{buf}\n#{t}"
+            next unless bracket_closed?(buf)
+
+            out << escape_line(buf, p.pass)
+            buf = nil
+          elsif bracket_open?(t)
+            # an inline macro's bracketed text may span lines (a hard
+            # break inside the link text); hold the fragment so the
+            # escape pass sees the whole macro instead of the first
+            # line's unclosed bracket, which it rewrites as a bare
+            # empty-text link
+            buf = t
+          else
+            out << escape_line(t, p.pass)
+          end
         end
-        ::Asciidoctor::PreprocessorReader.new document, lines
+        out << buf if buf
+        ::Asciidoctor::PreprocessorReader.new document, out
+      end
+
+      def escape_line(text, pass)
+        !pass && text.include?(":") ? inlinelinkmacro(inlinelink(text)) : text
+      end
+
+      # Buffer only lines that open a link macro's bracketed text:
+      # buffering any other open-bracket line would defer that line's
+      # own substitution passes (e.g. character expansions), so the
+      # bracket-unclosed test is reserved for the URL/link/mailto
+      # prefixes the escape pass below actually rewrites.
+      #
+      # NOTE: no /x mode or comments in this pattern — TruffleRuby's
+      # TRegex parser rejects /x-commented patterns in this file (see
+      # PASS_INLINE_MACRO_STR).
+      LINK_MACRO_OPEN_RX =
+        /(?:\b(?:https?|file|ftp|irc):\/\/|\blink:(?!\+)|\bmailto:)/.freeze
+
+      # the line opens a bracket it never closes: a multi-line link
+      # macro (or a genuinely unterminated fragment, flushed verbatim
+      # at EOF)
+      def bracket_open?(line)
+        LINK_MACRO_OPEN_RX.match?(line) or return false
+        open = line.index("[") or return false
+        !bracket_closed?(line)
+      end
+
+      def bracket_closed?(text)
+        open = text.index("[") or return false
+        close = text.index("]", open) or return false
+        text[close - 1] != "\\"
       end
 
       PASS_INLINE_MACROS = %w(pass pass-format identifier std-link stem)

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "3.5.9".freeze
+    VERSION = "3.5.11".freeze
   end
 end