metanorma-generic 1.10.2 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15f20c2ff6ac5b4bd0c8225e2c2e90eccc45535e37ed0aa1a2d5d644aa66edab
-  data.tar.gz: b8334113bb3b81424dded4d127fdabf2767441201c5a4509d9282b280304d004
+  metadata.gz: 68780e456b59524a58f5943a2f611eb77eb8609d71d67d0fd03493845bd77a26
+  data.tar.gz: d80def3233b10b107eae9159b981755486555782962d5ab48ef8dfbd5f476e53
 SHA512:
-  metadata.gz: 45cb75656b843384c91ce95588e490515cb8aeec3c3288359cd755c89a988d6d4821a0990a83c9c94776822a3d9df09ccc518934d8a8180364e9a3c0465e8435
-  data.tar.gz: c539dee549b527bb65f52272caaed23924139b06cc822272589a49a14dff01c826f4d2cb33a931e8d571b9b7466395935eff8d4893b4fd2b47a047b78d85acc7
+  metadata.gz: 2e583a0c09780c638708932e53c6d625f291650ad66cbc0c15aad3eb8fce7f1bc728e6503b7b2c7c531558da48fd305c4575541255f501cfd68a391ab775fd17
+  data.tar.gz: 0c937c51fc767624d6c05d2d74e409a8128b4c45d57da929bed48cf301be47b5897ecff6632219bb1532b785cce3cf707686568f42e9b6c2651ea65db27cd6a5

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