metanorma-cc 1.7.11 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a6ac48185b38e14f7918b96cd5a3e2380c791e5550a9fe15c742603226e95bd
-  data.tar.gz: '07259b1161b45eb3597833e8af35528f96fb7cef886ac6f44f5ed9f795165743'
+  metadata.gz: e6773b2389fcbb144d384002256bd7ba303aab7baa25f20ac37b0d40af9ae451
+  data.tar.gz: ad6d676e3086792134308b0e0abeb32f4a21b65141a923ddb8fe4303d8d822b8
 SHA512:
-  metadata.gz: 5be76dd1739b18c9e7b08d1a47a9ef73b5fe94c6f42228bb64db24abe9faa96f8e324217fbbb5a67fb0c04930e9d0026ef4c667e29c20d516f0535ed2c20e30f
-  data.tar.gz: 9f7775c02f07d64d9a51f7425210ce947e795341a15c2ee8975532640ca92a9e421da63969f9dfd3f7441260f6b24b0dfd4cd01d5817c443cb5556c61f1b96d5
+  metadata.gz: 3f0bc68cc852e0ed53dc3a97009a8d4ebd73d0deadc1950bb34c77e2587d11c4840e1f56308c597ed821d2cae87c8b8a681c94902fc811c6dd62662c7f69e58b
+  data.tar.gz: 8fc55cd529d92cdaf66d93f37979b618df59d3a1e2883480661660795d4f1676756dfee017efc2977c39693cfdd6ff7d44bf0a48748b038bcce7b0a7bf8a9606

data/docs/quickstart.adoc

@@ -19,7 +19,7 @@ Assuming you have Docker installed, it’s as easy as:
 
 [source,console]
 --
-docker pull ribose/metanorma
+docker pull metanorma/metanorma
 --
 
 
@@ -38,7 +38,7 @@ To compile the document, run the Docker container as follows:
 
 [source,console]
 --
-docker run -v "$(pwd)":/metanorma/ -w /metanorma ribose/metanorma metanorma -t csd -x xml,html,pdf,doc rfc6350.adoc
+docker run -v "$(pwd)":/metanorma/ -w /metanorma metanorma/metanorma metanorma -t csd -x xml,html,pdf,doc rfc6350.adoc
 --
 
 NOTE: If you use Metanorma-CLI instead of Docker,

data/lib/asciidoctor/cc/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/cc/converter.rb

@@ -4,7 +4,7 @@ require "isodoc/cc/word_convert"
 require "isodoc/cc/presentation_xml_convert"
 require "metanorma/cc"
 require "asciidoctor/standoc/converter"
-require 'asciidoctor/generic/converter'
+require "asciidoctor/generic/converter"
 require_relative "validate_section"
 
 module Asciidoctor
@@ -21,27 +21,28 @@ module Asciidoctor
 
       def metadata_committee(node, xml)
         return unless node.attr("technical-committee")
+
         xml.editorialgroup do |a|
           a.committee node.attr("technical-committee"),
-            **attr_code(type: node.attr("technical-committee-type"))
+                      **attr_code(type: node.attr("technical-committee-type"))
           i = 2
-          while node.attr("technical-committee_#{i}") do
+          while node.attr("technical-committee_#{i}")
             a.committee node.attr("technical-committee_#{i}"),
-              **attr_code(type: node.attr("technical-committee-type_#{i}"))
+                        **attr_code(type: node.attr("technical-committee-type_#{i}"))
             i += 1
           end
         end
       end
 
       def outputs(node, ret)
-         File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
-          presentation_xml_converter(node).convert(@filename + ".xml")
-          html_converter(node).convert(@filename + ".presentation.xml", 
-                                       nil, false, "#{@filename}.html")
-          doc_converter(node).convert(@filename + ".presentation.xml", 
-                                      nil, false, "#{@filename}.doc")
-          pdf_converter(node)&.convert(@filename + ".presentation.xml", 
-                                       nil, false, "#{@filename}.pdf")
+        File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
+        presentation_xml_converter(node).convert(@filename + ".xml")
+        html_converter(node).convert(@filename + ".presentation.xml",
+                                     nil, false, "#{@filename}.html")
+        doc_converter(node).convert(@filename + ".presentation.xml",
+                                    nil, false, "#{@filename}.doc")
+        pdf_converter(node)&.convert(@filename + ".presentation.xml",
+                                     nil, false, "#{@filename}.pdf")
       end
 
       def html_converter(node)
@@ -50,6 +51,7 @@ module Asciidoctor
 
       def pdf_converter(node)
         return if node.attr("no-pdf")
+
         IsoDoc::CC::PdfConvert.new(html_extract_attributes(node))
       end