metanorma-standoc 2.4.6 → 2.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93ecb6aeaf9ddd1f6d695e84bdc1e0fc3a916da96ec174dd2a39045c58ac3b8d
-  data.tar.gz: ef76e529c8d445e62e7d0d9a1ad847c91607c050d84ba3f270709968acc90116
+  metadata.gz: ce54912310b9af4d98ddc7626191a27b3dd982afbcbba47af1f2b1503d1eaac1
+  data.tar.gz: db2b1f1bafa6875952c611db4bc4f31568d63102545fb15b9236afd69e77f84b
 SHA512:
-  metadata.gz: 62a612cbc8ae3a06c659def78b581ce31f47846aae73417475b7aae1b9648f2ff56db79f0b34f5099db5a09d0b79d7e96dfd2e2c767c465654941b4e6e249b72
-  data.tar.gz: '08959b3bebcc9a764d8191c68228b7ab77355fec635165b21e1baf84c9908914677845a25b6a0d05d2237ec1135e95e3c222e1194dcd4cf159ddbe938026c48e'
+  metadata.gz: 43d771eebc8879517b65e977a74add3008cc6bfc636f8408a48c0761352a31e113cb2a5720406ce0748faccdbad4e6ff1f290b2a4c446fd576f2a0f91c6bb054
+  data.tar.gz: 73da28422191e64bd324959c1fa63fc29b82074284fc1dc9a25ea70a5982bdb471d1961a3259d26455c9ea470b9f77ee3cc7c64a03f6e645acd9e8e69aa93787

data/lib/metanorma/standoc/cleanup_boilerplate.rb

@@ -145,15 +145,26 @@ module Metanorma
       # If Asciidoctor, convert top clauses to tags and wrap in <boilerplate>
       def boilerplate_file_restructure(file)
         ret = adoc2xml(file, backend.to_sym)
-        ns = ret.namespace.href
-        ret.traverse do |n|
-          n.element? and n.namespace.href == ns and n.namespace = nil
-        end
+        boilerplate_xml_cleanup(ret)
         ret.name = "boilerplate"
         boilerplate_top_elements(ret)
         ret
       end
 
+      # remove Metanorma namespace, so generated doc containing boilerplate 
+      # can be queried consistently
+      # _\d+ anchor is assigned to titleless clauses, will clash with main doc
+      # instances of same
+      def boilerplate_xml_cleanup(xml)
+        ns = xml.namespace.href
+        xml.traverse do |n|
+          n.element? or next
+          n.namespace.href == ns and n.namespace = nil
+          /^_\d+$/.match?(n["id"]) and
+            n["id"] = "_#{UUIDTools::UUID.random_create}"
+        end
+      end
+
       def boilerplate_top_elements(xml)
         xml.elements.each do |e|
           (t = e.at("./title") and /-statement$/.match?(t.text)) or next

data/lib/metanorma/standoc/converter.rb

@@ -22,9 +22,9 @@ module Metanorma
       Asciidoctor::Extensions.register do
         preprocessor Metanorma::Standoc::Datamodel::AttributesTablePreprocessor
         preprocessor Metanorma::Standoc::Datamodel::DiagramPreprocessor
-        preprocessor Metanorma::Plugin::Glossarist::DatasetPreprocessor
         preprocessor Metanorma::Plugin::Datastruct::Json2TextPreprocessor
         preprocessor Metanorma::Plugin::Datastruct::Yaml2TextPreprocessor
+        preprocessor Metanorma::Plugin::Glossarist::DatasetPreprocessor
         inline_macro Metanorma::Standoc::PreferredTermInlineMacro
         inline_macro Metanorma::Standoc::DateInlineMacro
         inline_macro Metanorma::Standoc::SpanInlineMacro

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.4.6".freeze
+    VERSION = "2.4.8".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.4.6
+  version: 2.4.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-19 00:00:00.000000000 Z
+date: 2023-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor