metanorma-generic 1.10.3 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25641110b45e76829391dc1a8d7558ed8a57b1c205ed3edd68b7691e13efffa4
-  data.tar.gz: 7370721bedccaca54ee3277d9d03a96af28582c3a787b75900971e812992b4f0
+  metadata.gz: 97de85e9d88318cf3718865280ca5e855bce23377442c9316d0dc9923227e63e
+  data.tar.gz: a46b6d97a7be1e38c57092d8789451d5a7851f2f0e617ab88dfe3ec16e6615ac
 SHA512:
-  metadata.gz: 783da8466b07f8e9afc0bb8553e1363b8587a4b5883371b0db5611f53fce39a2ae2dd990c556e65424511bf4241f451d9efc3cddbf75644f9d93760416477aad
-  data.tar.gz: 4dac2a50657d08b05e23e4c3e2ad59c200d9a3413e1ec37077b233a4a6c4b9e3ec31deb25d40f278dfe2e77460fbc21237b1461995da82fed95eae7aa4f02521
+  metadata.gz: 5e80f83a0195978fe797dede990db71f346540d7e11b5ee4b5f54bda2d2790127aaa7e665b77d906048334d9195bd4cb7b698259c64b331c0af0d0f55f5c7f74
+  data.tar.gz: 4cd866cb0d250759e77d89ef7b91a3ceb380e79f6e04e9ef74d0d0b76c94cfb15f09ad206b2a184540ade1fee7cc10163898389eb17caddc5f120321329f4316

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

@@ -19,11 +19,13 @@ module Asciidoctor
         configuration.document_namespace || XML_NAMESPACE
       end
 
-       def baselocation(loc)
+      def baselocation(loc)
         return nil if loc.nil?
+
         return loc
         File.expand_path(File.join(File.dirname(
-          self.class::_file || __FILE__), "..", "..", "..", loc))
+                                     self.class::_file || __FILE__,
+                                   ), "..", "..", "..", loc))
       end
 
       def docidentifier_cleanup(xmldoc)
@@ -36,7 +38,7 @@ module Asciidoctor
 
       def doctype(node)
         d = super
-        configuration.doctypes or return d == "article" ? 
+        configuration.doctypes or return d == "article" ?
           (configuration.default_doctype || "standard") : d
         type = configuration.default_doctype ||
           configuration.doctypes.keys.dig(0) || "standard"
@@ -49,18 +51,18 @@ module Asciidoctor
       end
 
       def read_config_file(path_to_config_file)
-        Metanorma::Generic.configuration.
-          set_default_values_from_yaml_file(path_to_config_file)
+        Metanorma::Generic.configuration
+          .set_default_values_from_yaml_file(path_to_config_file)
       end
 
       def sectiontype_streamline(ret)
-        if configuration&.termsdefs_titles&.map(&:downcase)&.include? (ret)
+        if configuration&.termsdefs_titles&.map(&:downcase)&.include? ret
           "terms and definitions"
-        elsif configuration&.symbols_titles&.map(&:downcase)&.include? (ret)
+        elsif configuration&.symbols_titles&.map(&:downcase)&.include? ret
           "symbols and abbreviated terms"
-        elsif configuration&.normref_titles&.map(&:downcase)&.include? (ret)
+        elsif configuration&.normref_titles&.map(&:downcase)&.include? ret
           "normative references"
-        elsif configuration&.bibliography_titles&.map(&:downcase)&.include? (ret)
+        elsif configuration&.bibliography_titles&.map(&:downcase)&.include? ret
           "bibliography"
         else
           ret
@@ -73,15 +75,14 @@ module Asciidoctor
       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", 
+        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", 
+        doc_converter(node)&.convert("#{@filename}.presentation.xml",
                                      nil, false, "#{@filename}.doc")
-        pdf_converter(node)&.convert(@filename + ".presentation.xml", 
+        pdf_converter(node)&.convert("#{@filename}.presentation.xml",
                                      nil, false, "#{@filename}.pdf")
-
       end
 
       def validate(doc)
@@ -106,7 +107,8 @@ module Asciidoctor
         stages.empty? and return
         stage = xmldoc&.at("//bibdata/status/stage")&.text
         stages.include? stage or
-          @log.add("Document Attributes", nil, "#{stage} is not a recognised status")
+          @log.add("Document Attributes", nil,
+                   "#{stage} is not a recognised status")
       end
 
       def committee_validate(xmldoc)
@@ -114,13 +116,14 @@ module Asciidoctor
         committees.empty? and return
         xmldoc.xpath("//bibdata/ext/editorialgroup/committee").each do |c|
           committees.include? c.text or
-            @log.add("Document Attributes", nil, "#{c.text} is not a recognised committee")
+            @log.add("Document Attributes", nil,
+                     "#{c.text} is not a recognised committee")
         end
       end
 
-      def sections_cleanup(x)
+      def sections_cleanup(xml)
         super
-        x.xpath("//*[@inline-header]").each do |h|
+        xml.xpath("//*[@inline-header]").each do |h|
           h.delete("inline-header")
         end
       end
@@ -132,7 +135,8 @@ module Asciidoctor
       end
 
       def presentation_xml_converter(node)
-        IsoDoc::Generic::PresentationXMLConvert.new(html_extract_attributes(node))
+        IsoDoc::Generic::PresentationXMLConvert
+          .new(html_extract_attributes(node))
       end
 
       alias_method :pdf_converter, :html_converter