metanorma-csa 1.8.9 → 1.8.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7aefe79c1f9cb7bfad232959f298be205d970ac1502093b58af0aaf9436478d
-  data.tar.gz: 8c4e27f9ca23412d6add815c971b0051ab280bd93d1f1418ae1743d7c3ef65af
+  metadata.gz: '0278402202df1d54400e2484353f2b72e6cc1cb1460b667d612e33ed59866bd8'
+  data.tar.gz: 5b0dc26b3f6ca9a6ebcefae0aab24c489d2cd44375b460fa7de256f49df33241
 SHA512:
-  metadata.gz: 321c6a9aca508161b1aba80939fd09a63bc81b4073eacd597b2ed3ad3edb7381d4848778c114224fe81efd2bb7051cfc52791658ab5fa386797f3a8ce833d3a5
-  data.tar.gz: 48bdcfb288a3697149f7031e38c26c2f80d5353927b6e3f2c2a9c8deedcbfceedafac68db4f0b281dac26294e99fdf7b3bf4ff05eaa23e74d469f0bd1f86c6de
+  metadata.gz: 1777e7470a39065734ebdba76f5b393516e368af17d023028caa91e91f968bff5228fb895ae9838b6eaeb9c27457fadd25a396331074d70043efd58959913051
+  data.tar.gz: f5d341dc22ac44eb35c04ffa55f7bdab25963543eb1f1851e3602563296f573e7793268b10e7a5bc9d70be5ad6e4b61f272e894a78b625a0e1a43324c2a39d87

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

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
-require 'asciidoctor'
-require 'metanorma-generic'
-require 'isodoc/csa/html_convert'
-require 'isodoc/csa/pdf_convert'
-require 'isodoc/csa/word_convert'
-require 'isodoc/csa/presentation_xml_convert'
-require 'metanorma/csa'
-require 'fileutils'
+require "asciidoctor"
+require "metanorma-generic"
+require "isodoc/csa/html_convert"
+require "isodoc/csa/pdf_convert"
+require "isodoc/csa/word_convert"
+require "isodoc/csa/presentation_xml_convert"
+require "metanorma/csa"
+require "fileutils"
 
 module Asciidoctor
   module Csa
     class Converter < ::Asciidoctor::Generic::Converter
-      XML_ROOT_TAG = "csa-standard".freeze
-      XML_NAMESPACE = "https://www.metanorma.org/ns/csa".freeze
+      XML_ROOT_TAG = "csa-standard"
+      XML_NAMESPACE = "https://www.metanorma.org/ns/csa"
 
       register_for "csa"
 
@@ -21,46 +21,47 @@ module Asciidoctor
         Metanorma::Csa.configuration
       end
 
-      def personal_role(node, c, suffix)
+      def personal_role(node, contrib, suffix)
         role = node.attr("role#{suffix}")&.downcase || "full author"
-        c.role **{ type: role == "editor" ? "editor" : "author" } do |r|
+        contrib.role **{ type: role == "editor" ? "editor" : "author" } do |r|
           r.description role.strip.gsub(/\s/, "-")
         end
       end
 
       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 title_validate(root)
+      def title_validate(_root)
         nil
       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 sections_cleanup(x)
+      def sections_cleanup(xml)
         super
-        x.xpath("//*[@inline-header]").each do |h|
-          h.delete('inline-header')
+        xml.xpath("//*[@inline-header]").each do |h|
+          h.delete("inline-header")
         end
       end
 
@@ -74,13 +75,13 @@ module Asciidoctor
           r["type"] == "author" or next
           role = r.at("./description").text
           %w{full-author contributor staff reviewer}.include?(role) or
-        @log.add("Document Attributes", nil,
-                 "#{role} is not a recognised role")
+            @log.add("Document Attributes", nil,
+                     "#{role} is not a recognised role")
         end
       end
 
-      def style(n, t)
-        return
+      def style(_node, _text)
+        nil
       end
 
       def html_converter(node)
@@ -89,6 +90,7 @@ module Asciidoctor
 
       def pdf_converter(node)
         return if node.attr("no-pdf")
+
         IsoDoc::Csa::PdfConvert.new(html_extract_attributes(node))
       end