metanorma-standoc 3.0.10 → 3.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db6d5e84280a719a76127b82021c52b54a140d3238f49ee7a5ac7c972d142e37
-  data.tar.gz: a0b7796f74365c18f35d05b27bffc7fbb369def03e1d29753ddeb7adbc9bef86
+  metadata.gz: 14dd3592a7b0cac4d375b01632ea94aee5912282ef0507d4303de2b864dd34f4
+  data.tar.gz: 74e246856bdc1b864967479d91432f8b4a264a3e85bf887da7233560e9218441
 SHA512:
-  metadata.gz: f6991e701daa845955fc12f72f602eab1947ff397ecad2e8514e3ec9a9b04fdfa68fa0e6d946b3a8d53ae6d1feb8fcb78ff81f5d71e17ffa580157cda891ccde
-  data.tar.gz: d9025688e127d12e7103537af3d8d6f50b8d1c6a67eff352a365a0ebcb67acb7d976bbfb391dd30980df56b193bf3a56c99d98db6f326e4ede057cc29b3bf935
+  metadata.gz: a27bb5c03d733d0506afef9938d718b57dd40759a53ee20b919abb63d088d732981f31f0674c58f4c3cbf573e59896aa3e389554420449794bd4ea9ba99c3381
+  data.tar.gz: e5f67c683462e63239c12e39abdf7a5c7dfd6f33b9ad146535ba57150fc69a50b9a9af6864cb1f8ec8876ff354d77bc6b927418fc2b11dd8cbc3859c48a3dc32

data/lib/metanorma/standoc/cleanup_boilerplate.rb

@@ -159,11 +159,25 @@ module Metanorma
         end
       end
 
+      # Asciidoc macro, e.g. span:publisher[...
+      ADOC_MACRO_START = '\S+:[^\[\] ]*\['.freeze
+
+      # Replace {{ ... }} with {{ pass:[...]}} to preserve any XML markup
+      # use pass:[...\] if {{}} is already inside an Asciidoc macro
       def boilerplate_read(file)
+        in_macro = false
         ret = File.read(file, encoding: "UTF-8")
-        /\.adoc$/.match?(file) and
-          ret.gsub!(/(?<!\{)(\{\{[^{}]+\}\})(?!\})/, "pass:[\\1]")
-        ret
+        /\.adoc$/.match?(file) or return ret
+        ret.split(/(#{ADOC_MACRO_START}|\])/o).map do |r|
+          if /^#{ADOC_MACRO_START}$/o.match?(r)
+            in_macro = true
+            r
+          else
+            delim = in_macro ? '\]' : "]"
+            in_macro = false
+            r.gsub(/(?<!\{)(\{\{[^{}]+\}\})(?!\})/, "pass:[\\1#{delim}")
+          end
+        end.join
       end
 
       # If Asciidoctor, convert top clauses to tags and wrap in <boilerplate>

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "3.0.10".freeze
+    VERSION = "3.0.11".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.0.11
 platform: ruby
 authors:
 - Ribose Inc.