metanorma-ogc 1.4.2 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa7220c37ec4c4f57f175cc19ded9faa15b4cef238107d9dbf20fed3350e7964
-  data.tar.gz: 652a56390a308dc6d52c991b6492fbc733275a87b64bdc3b7ebcfd33519e7743
+  metadata.gz: 2cb1583cace9a2d58cc458ee480be7385034abb7666d511bcbe1a228908258fe
+  data.tar.gz: 882469c7bf396171ad9cd81599d0f9f49c9b591a040968da758fb0d2d7fd600e
 SHA512:
-  metadata.gz: a6374615ac10104cb610e08015f44df88f2ba8a2d11f9830dc91cc4055a881d240d50a54f2db3fb253de8ff00a1900cfc4a6e76db5867b939c15b9abf791db35
-  data.tar.gz: e0c934e414bae2c2749033a9b62add64765d0adc44f72711f97c8f48eb1e15ccf311a5c46d7538cdaf5f91acfd39b2e13ab91432a41e593543090b19eb87aa71
+  metadata.gz: 114c8e43be8dfb2c3d4f088645111f93014b258881f1df9de256a3850e6853f2342acc3bfb8784e48f74e9524f2a3d94c33e0d8a1fc7d7939f76d9c32b4ec1e8
+  data.tar.gz: d070f02e1965aeb0c29d61a2010a90af3be5bd7614c31362d01befa59d212b26eb3b65479be5252caf5ab256511a4a66f2d3ed1b1f21b6db19d62aab2e239e87

data/lib/asciidoctor/ogc/basicdoc.rng

@@ -624,6 +624,9 @@
         <choice>
           <ref name="PureTextElement"/>
           <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -634,6 +637,9 @@
         <choice>
           <ref name="PureTextElement"/>
           <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -641,7 +647,12 @@
   <define name="tt">
     <element name="tt">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -822,7 +833,9 @@
       <attribute name="alt"/>
     </optional>
     <ref name="CitationType"/>
-    <text/>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
   </define>
   <define name="hyperlink">
     <element name="link">
@@ -835,7 +848,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="xref">
@@ -849,7 +864,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="fn">

data/lib/asciidoctor/ogc/cleanup.rb

@@ -74,23 +74,28 @@ module Asciidoctor
       end
 
       def requirement_metadata_component_tags
-        %w(test-purpose test-method conditions part description reference
-           requirement permission recommendation)
+        %w(test-purpose test-method test-method-type conditions part description
+           reference step requirement permission recommendation)
       end
 
-      def requirement_metadata1(reqt, dlist)
-        ins = super
+      def requirement_metadata1(reqt, dlist, ins)
+        ins1 = super
         dlist.xpath("./dt").each do |e|
-          next unless requirement_metadata_component_tags.include? e.text
+          tag = e&.text&.gsub(/ /, "-")&.downcase
+          next unless requirement_metadata_component_tags.include? tag
 
-          ins.next = requirement_metadata1_component(e)
-          ins = ins.next
+          ins1.next = requirement_metadata1_component(e, tag)
+          ins1 = ins1.next
         end
       end
 
-      def requirement_metadata1_component(term)
+      def requirement_metadata1_component(term, tag)
         val = term.at("./following::dd")
-        val.name = term.text
+        val.name = tag
+        val.xpath("./dl").each do |d|
+          requirement_metadata1(val, d, d)
+          d.remove
+        end
         if %w(requirement permission
               recommendation).include?(term.text) && !val.text.empty?
           val["label"] = val.text.strip
@@ -109,8 +114,8 @@ module Asciidoctor
       end
 
       def requirement_metadata_to_component(reqt)
-        reqt.xpath("./test-method | ./test-purpose | ./conditions | ./part | "\
-                   "./reference")
+        reqt.xpath(".//test-method | .//test-purpose | .//conditions | "\
+                   ".//part | .//test-method-type | .//step | .//reference")
           .each do |c|
           c["class"] = c.name
           c.name = "component"
@@ -125,8 +130,10 @@ module Asciidoctor
       end
 
       def requirement_subparts_to_blocks(reqt)
-        reqt.xpath("./component | ./description").each do |c|
-          %w(p ol ul dl table).include?(c&.elements&.first&.name) and next
+        reqt.xpath(".//component | .//description").each do |c|
+          next if %w(p ol ul dl table component description)
+            .include?(c&.elements&.first&.name)
+
           c.children = "<p>#{c.children.to_xml}</p>"
         end
       end
@@ -140,6 +147,27 @@ module Asciidoctor
           t.remove
         end
       end
+
+      def requirement_cleanup(xmldoc)
+        requirement_type(xmldoc)
+        super
+      end
+
+      def requirement_type(xmldoc)
+        xmldoc.xpath(REQRECPER).each do |r|
+          next unless r["type"]
+
+          r["type"] = case r["type"]
+                      when "requirement", "recommendation", "permission"
+                        "general"
+                      when "requirements_class" then "class"
+                      when "conformance_test" then "verification"
+                      when "conformance_class" then "conformanceclass"
+                      when "abstract_test" then "abstracttest"
+                      else r["type"]
+                      end
+        end
+      end
     end
   end
 end

data/lib/asciidoctor/ogc/converter.rb

@@ -122,6 +122,16 @@ module Asciidoctor
         xml.hi { |s| s << text }
       end
 
+      def example(node)
+        role = node.role || node.attr("style")
+        if %w(requirements_class conformance_test conformance_class
+              abstract_test).include?(role)
+          node.set_attr("type", role)
+          return requirement(node, "requirement")
+        end
+        super
+      end
+
       def presentation_xml_converter(node)
         IsoDoc::Ogc::PresentationXMLConvert.new(html_extract_attributes(node))
       end