metanorma-standoc 3.0.12 → 3.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cc58286193e50f5ca184b5d5439465515299913c90f81ee497260d75603a2a8
-  data.tar.gz: ec80b7fb69439a96da2b7ece19695cc613545e118686bb2e915e66484091b020
+  metadata.gz: fc20406485170bc7733b681fff936b12da4ef7c535f64501a83eda49d577f606
+  data.tar.gz: 0b598e8a7dc1e238419bc5c08764041b96678a457850e68e387bf5b6757e6974
 SHA512:
-  metadata.gz: d28d1413c425808f0fc2f5e41f7ece023b573c6ca3b776a6199f5b04e1fbe31ad3d07d84560c1d00a8ba599f2b95a585f535f51a696828b22d0204bcc87473ff
-  data.tar.gz: 790a9adb18645e2c52206235753cdd029fb473b28ede08b9deb39cd64f1c31d710744b3508d50bbaf1b24c63679a58af0217f6e9168e94426660043a56d9c94c
+  metadata.gz: 758c16f43d1bb63d6643366ebae9869c22ded47e63bb43071bd0a3f3310a8906e178b2529d92ac40a193fdcf6d5895d67452bff818ce8454400858db15ea1c48
+  data.tar.gz: e3966e963e6a9e0b1d112fca22db3155d73ee3edfe56a2af7274e4be134200b091679b2847d90cb6955c9a453d08d80478c58b2fb8272c088aa7f36607ecc1cd

data/lib/metanorma/standoc/cleanup_boilerplate.rb

@@ -65,6 +65,7 @@ module Metanorma
 
       def boilerplate_cleanup(xmldoc)
         isodoc = boilerplate_isodoc(xmldoc) or return
+        # boilerplate_isodoc_values(isodoc)
         termdef_boilerplate_cleanup(xmldoc)
         termdef_boilerplate_insert(xmldoc, isodoc)
         unwrap_boilerplate_clauses(xmldoc, self.class::TERM_CLAUSE)
@@ -75,6 +76,19 @@ module Metanorma
         initial_boilerplate(xmldoc, isodoc)
       end
 
+      # KILL
+      # escape < > & to > etc,
+      # for passthrough insertion into boilerplate
+      def boilerplate_isodoc_values(isodoc)
+        isodoc.meta.get.each do |k, v|
+          if v.is_a?(String)
+            isodoc.meta.set(k, v.gsub("&", "&&&&&&&")
+              .gsub("<", "<").gsub(">", ">")
+              .gsub("&&&&&&&", "&"))
+          end
+        end
+      end
+
       def initial_boilerplate(xml, isodoc)
         xml.at("//boilerplate") and return
         preface = xml.at("//preface | //sections | //annex | //references") or
@@ -111,6 +125,7 @@ module Metanorma
         end
 
         b = conv.populate_template(boilerplate_read(filename), nil)
+          .gsub(/pass-format:metanorma\[\+\+\+\+\]\s*/, "")
         boilerplate_file_convert(b)
       end
 
@@ -159,23 +174,24 @@ module Metanorma
         end
       end
 
-      # Asciidoc macro, e.g. span:publisher[...
-      ADOC_MACRO_START = '\S+:[^\[\] ]*\['.freeze
+      # Asciidoc macro, e.g. span:publisher[...]
+      # May contain one or more {{ }} in target, with spaces in them
+      # Does not end in \]
+      ADOC_MACRO_START = '\S+:(?:[^\[\] ]+|\{\{[^{}]+\}\})*\[.*?(?<!\\\\)\]'.freeze
 
       # Replace {{ ... }} with {{ pass:[...]}} to preserve any XML markup
       # use pass:[...\] if {{}} is already inside an Asciidoc macro
+      # Do not use pass: if this is a macro target: mailto:{{x}}[] 
+      # or body: mailto:[{{x}}]
       def boilerplate_read(file)
-        in_macro = false
         ret = File.read(file, encoding: "UTF-8")
         /\.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}")
+            r.gsub(/(?<!\{)(\{\{[^{}]+\}\})(?!\})/,
+                   "pass-format:metanorma[++\\1++]")
           end
         end.join
       end

data/lib/metanorma/standoc/cleanup_inline.rb

@@ -164,10 +164,11 @@ module Metanorma
         end
       end
 
+      # overwrite xmldoc, so must assign result to xmldoc
       def passthrough_metanorma_cleanup(doc)
-        doc.xpath("//passthrough[@formats = 'metanorma']").each do |p|
-          p.replace(p.children)
-        end
+        ret = to_xml(doc)
+          .gsub(%r{<passthrough formats="metanorma">([^<]*)</passthrough>}) { @c.decode($1) }
+        doc.root = Nokogiri::XML(ret, &:huge).root
       end
 
       def link_cleanup(xmldoc)

data/lib/metanorma/standoc/cleanup_text.rb

@@ -5,10 +5,10 @@ module Metanorma
         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) }
-        end
+        #%w(passthrough passthrough-inline).each do |v|
+          #text.gsub!(%r{<#{v}\s+formats="metanorma">([^<]*)
+                    #</#{v}>}mx) { @c.decode($1) }
+        #end
         text
       end
 

data/lib/metanorma/standoc/inline.rb

@@ -14,7 +14,6 @@ module Metanorma
       end
 
       def pass(node)
-        require "debug"; binding.b
         "<passthrough-inline formats='metanorma'>#{node.content}</passthrough-inline>"
       end
 

data/lib/metanorma/standoc/macros.rb

@@ -120,10 +120,11 @@ module Metanorma
 
       def pass_inline_split(text)
         text.split(PASS_INLINE_MACRO_RX).each.map do |x|
-          PASS_INLINE_MACRO_RX.match?(x) ? pass_convert(x) : yield(x)
+          PASS_INLINE_MACRO_RX.match?(x) ? x : yield(x)
         end
       end
 
+      # KILL
       def pass_convert(text)
         text.sub(/^pass:\[(.+)$/, "pass-format:metanorma[\\1")
       end
@@ -209,7 +210,8 @@ module Metanorma
         p = Metanorma::Utils::LineStatus.new
         lines = reader.lines.map do |t|
           p.process(t)
-          !p.pass && t.include?("pass:") and t = inlinelink(t)
+          !p.pass && (t.include?("pass:") || t.include?("pass-format:")) and
+            t = inlinelink(t)
           t
         end
         ::Asciidoctor::PreprocessorReader.new document, lines
@@ -221,8 +223,17 @@ module Metanorma
         end
       end
 
+      # pass:[A] => pass-format:metanorma[++A++],
+      # so long as A doesn't already start with ++
+      # ditto pass-format:[A] => pass-format:[++A++]
       def pass_convert(text)
-        text.sub(/^pass:\[(.+)$/, "pass-format:metanorma[\\1")
+        text
+          .gsub(/pass-format:([^\[ ]*)\[(?!\+\+)(.+?)(?<!\\)\]/,
+                "pass-format:\\1[++\\2++]")
+          .gsub(/pass:\[(?=\+\+)(.+?)(?<!\\)\]/,
+                "pass-format:metanorma[\\1]")
+          .gsub(/pass:\[(?!\+\+)(.+?)(?<!\\)\]/,
+                "pass-format:metanorma[++\\1++]")
       end
 
       def inlinelink(text)

data/lib/metanorma/standoc/macros_inline.rb

@@ -138,16 +138,18 @@ module Metanorma
     class PassFormatInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
       use_dsl
       named :"pass-format"
-      parse_content_as :text
+      parse_content_as :raw
 
       def process(parent, target, attrs)
         format = target || "metanorma"
-        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
+        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"],
+                                      type: :pass, attributes: { 'subs' => [] }).convert
         <<~XML.strip
           <passthrough-inline formats="#{format}">#{xml_process(out)}</passthrough-inline>
         XML
       end
 
+      # KILL
       # Split content into XML tags (including XML-escaped instances),
       # XML escapes, and text segments
       # Then only apply ZWNJ to punctuation in text segments
@@ -156,7 +158,8 @@ module Metanorma
         segments = out.split(/(<[^>]*>|&lt;[^&]*&gt;|&[^;]*;)/)
         segments.each_with_index do |segment, index|
           processed_out += if index.even? # Text segment (not a tag or escape)
-                             segment.gsub(/([[:punct:]])/, "\\1&#x200c;")
+                             #segment.gsub(/([[:punct:]])/, "\\1&#x200c;")
+                             segment
                            else # XML tag or escape
                              segment
                            end

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "3.0.12".freeze
+    VERSION = "3.0.14".freeze
   end
 end

metadata

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