metanorma-standoc 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e7285f74dd3b2b9ab155b8bf7e334aeb45f453a20f1d4eaf94f39f42b9251d3
-  data.tar.gz: fdbad7c4cd96de56faacf360fdedaa0a0a5d24313c34b68ec2ab8e152db6a7c2
+  metadata.gz: d2c3089664934dc34b5f41b7e03a7bc2d2b1060e17decafb29dfc1f36fb7bed0
+  data.tar.gz: 7ecc333b2847252e7965be128c701f4cb2241d148179cd43b66a9f5cd2a2e108
 SHA512:
-  metadata.gz: ce9033847b44804a9ba150db5e4840e1d3dafef077a9c5af52defd74321333c66a3053abc589ae02ee3c28d6fe42afbd568cdef8b1a529e5b2a97ea46ec95ae0
-  data.tar.gz: 6f498786e8222646f72fe88193797b0b0a23c30d1478cf78fad27862f19ece9c054ebe72c891ad671f5c03b4c8f06a659195cc77f359f517b1ffea02203ad22b
+  metadata.gz: 5308c4354dc5fd14e1d5d18dc32e7b52d81ba492e53381771e7dfecea4c83af0bd73387af2bfb6c913687352eaad85c44ded592e1c95179d5d41b3974bc923ff
+  data.tar.gz: ba8122c376d231eb6f1f4f4ea235b608b4dd1769394a899fe9fcd6f5bee011f2384cf1455fae0d86d32648e37aee080c0db18755d4a761e793ad5164b500ce61

data/lib/metanorma/standoc/cleanup_reqt.rb

@@ -53,7 +53,7 @@ module Metanorma
                    permission).include?(text.name))) ||
           (text.text.strip.empty? && !text.at(".//xref | .//eref | .//link"))
 
-        t = Nokogiri::XML::Element.new("description", reqt)
+        t = Nokogiri::XML::Element.new("description", reqt.document)
         text.before(t)
         t.children = text.remove
       end

data/lib/metanorma/standoc/inline.rb

@@ -79,7 +79,8 @@ module Metanorma
       end
 
       def inline_anchor_bibref(node)
-        eref_contents = (node.text || node.target || node.id)
+        eref_contents = HTMLEntities.new
+          .decode(node.text || node.target || node.id)
           &.sub(/^\[?([^\[\]]+?)\]?$/, "[\\1]")
         @refids << (node.target || node.id)
         noko do |xml|

data/lib/metanorma/standoc/macros.rb

@@ -130,7 +130,7 @@ module Metanorma
 
       def process(parent, target, attrs)
         out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
-        %{<autonumber type=#{target}>#{out}</autonumber>}
+        %{<autonumber type='#{target}'>#{out}</autonumber>}
       end
     end
 
@@ -143,9 +143,9 @@ module Metanorma
         /^(?<lang>[^-]*)(?:-(?<script>.*))?$/ =~ target
         out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
         if script
-          %{<variant lang=#{lang} script=#{script}>#{out}</variant>}
+          %{<variant lang='#{lang}' script='#{script}'>#{out}</variant>}
         else
-          %{<variant lang=#{lang}>#{out}</variant>}
+          %{<variant lang='#{lang}'>#{out}</variant>}
         end
       end
     end

data/lib/metanorma/standoc/macros_form.rb

@@ -56,7 +56,7 @@ module Metanorma
         m = %w(disabled value)
           .map { |a| attr[a] ? " #{a}='#{attr[a]}'" : nil }.compact
         out = Asciidoctor::Inline.new(parent, :quoted, attr["text"]).convert
-        %{<option #{m.join}">#{out}</option>}
+        %{<option #{m.join}>#{out}</option>}
       end
     end
   end

data/lib/metanorma/standoc/reqt.rb

@@ -64,14 +64,16 @@ module Metanorma
       def requirement_elems(node, out)
         node.title and out.title { |t| t << node.title }
         a = node.attr("label") and out.label do |l|
-          l << a
+          l << out.text(a)
         end
         a = node.attr("subject") and csv_split(a)&.each do |subj|
-          out.subject { |s| s << subj }
+          out.subject { |s| s << out.text(subj) }
         end
         a = HTMLEntities.new.decode(node.attr("inherit")) and
           csv_split(a)&.each do |i|
-            out.inherit { |inh| inh << i }
+            out.inherit do |inh|
+              inh << HTMLEntities.new.encode(i, :hexadecimal)
+            end
           end
         classif = node.attr("classification") and
           requirement_classification(classif, out)

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.1.0".freeze
+    VERSION = "2.1.1".freeze
   end
 end