metanorma-standoc 3.0.10 → 3.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db6d5e84280a719a76127b82021c52b54a140d3238f49ee7a5ac7c972d142e37
-  data.tar.gz: a0b7796f74365c18f35d05b27bffc7fbb369def03e1d29753ddeb7adbc9bef86
+  metadata.gz: 4cc58286193e50f5ca184b5d5439465515299913c90f81ee497260d75603a2a8
+  data.tar.gz: ec80b7fb69439a96da2b7ece19695cc613545e118686bb2e915e66484091b020
 SHA512:
-  metadata.gz: f6991e701daa845955fc12f72f602eab1947ff397ecad2e8514e3ec9a9b04fdfa68fa0e6d946b3a8d53ae6d1feb8fcb78ff81f5d71e17ffa580157cda891ccde
-  data.tar.gz: d9025688e127d12e7103537af3d8d6f50b8d1c6a67eff352a365a0ebcb67acb7d976bbfb391dd30980df56b193bf3a56c99d98db6f326e4ede057cc29b3bf935
+  metadata.gz: d28d1413c425808f0fc2f5e41f7ece023b573c6ca3b776a6199f5b04e1fbe31ad3d07d84560c1d00a8ba599f2b95a585f535f51a696828b22d0204bcc87473ff
+  data.tar.gz: 790a9adb18645e2c52206235753cdd029fb473b28ede08b9deb39cd64f1c31d710744b3508d50bbaf1b24c63679a58af0217f6e9168e94426660043a56d9c94c

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/cleanup_text.rb

@@ -4,6 +4,7 @@ module Metanorma
       def textcleanup(result)
         text = result.flatten.map(&:rstrip) * "\n"
         text = text.gsub(/(?<!\s)\s+<fn /, "<fn ")
+        #@semantic_headless and return text
         %w(passthrough passthrough-inline).each do |v|
           text.gsub!(%r{<#{v}\s+formats="metanorma">([^<]*)
                     </#{v}>}mx) { @c.decode($1) }
@@ -34,7 +35,8 @@ module Metanorma
           out = Metanorma::Utils.line_sanitise(lines)
           e[:last] or out.pop
           /\s$/.match?(e[:text][-1]) or out[-1].rstrip!
-          e[:elem].replace(out.join)
+          # do not accidentally XML tags when inserting text with &lt; back in to doc
+          e[:elem].replace(@c.encode(out.join, :hexadecimal, :basic))
         end
       end
 
@@ -73,6 +75,7 @@ module Metanorma
       end
 
       def smartquotes_cleanup1(xmldoc)
+        # prevent normalising boilerplate text twice
         uninterrupt_quotes_around_xml(xmldoc)
         dumb2smart_quotes(xmldoc)
       end
@@ -98,7 +101,7 @@ module Metanorma
 
       IGNORE_QUOTES_ELEMENTS =
         %w(pre tt sourcecode stem asciimath figure bibdata passthrough
-           identifier metanorma-extension).freeze
+           identifier metanorma-extension boilerplate).freeze
 
       PRESERVE_LINEBREAK_ELEMENTS =
         %w(pre sourcecode passthrough metanorma-extension stem).freeze

data/lib/metanorma/standoc/init.rb

@@ -41,6 +41,7 @@ module Metanorma
         @embed_id = node.attr("embed_id")
         @document_scheme = document_scheme(node)
         @source_linenums = node.attr("source-linenums-option") == "true"
+        @semantic_headless = node.attr("semantic-metadata-headless") == "true"
         @default_doctype = "standard"
       end
 

data/lib/metanorma/standoc/macros_inline.rb

@@ -143,7 +143,7 @@ module Metanorma
       def process(parent, target, attrs)
         format = target || "metanorma"
         out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
-        <<~XML
+        <<~XML.strip
           <passthrough-inline formats="#{format}">#{xml_process(out)}</passthrough-inline>
         XML
       end

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "3.0.10".freeze
+    VERSION = "3.0.12".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.12
 platform: ruby
 authors:
 - Ribose Inc.