metanorma-generic 1.10.1 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2abd9ea291615c858aa8c77067cebedee925fa9c4644c4a30bfba0f7734e8098
-  data.tar.gz: 1125772c1f2479ae3d67786ff3bc20e64fde743f57322eae5c338d6631d0d144
+  metadata.gz: e0f723b5f6592e4b954120f9dfbd3da6853cdf357a9361bb4e3514fc2a76a0e7
+  data.tar.gz: f4fa24394f18ed2826e038a83b90d9c67684c005e7be75eb9a35cd0b49a349bb
 SHA512:
-  metadata.gz: 82dec664f4a88d80f262810a945718ed15844270df5747a1fe7c31d6e26ce04a6c3963db1047ed1efb665175e820a0b1fb48dab3ee713d135eeec8ad2a969c56
-  data.tar.gz: e502ff1bcf7f2550395f8dc6bee4aa3a1d8ce9136a04228121e8b88fdff484ccdff28c87c3e7fb4bf525587c473301a0a5a7ed005f8b7508a33aa4b34a0b7f4a
+  metadata.gz: 1f3a5df30ebbd0bc6de1a4099d8fe4cc2c90c8ddfed32d171ce2ad2de2ce8e0f37d23bc1d689519a6d791914e281d0c6de81b7d48c43e2870a68a49f0aaccf37
+  data.tar.gz: 7e4cb9673702cb3a1da9cbb4bd6f7acf6827cac3889f0a0fc2477ed6c35cd78ed4a4bfcd4aebf1d2138781898eba3b7a6d4b80affc1639ccb1b46699f214e9ba

data/.github/workflows/rake.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.0', '2.7', '2.6', '2.5', '2.4' ]
+        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
     steps:

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