asciidoctor-iso 0.10.1 → 0.10.2

data/lib/asciidoctor/iso/converter.rb

@@ -1,55 +1,19 @@
 require "asciidoctor"
+require "metanorma-standoc"
 require "asciidoctor/iso/version"
 require "asciidoctor/iso/base"
 require "asciidoctor/iso/front"
-require "asciidoctor/iso/lists"
-require "asciidoctor/iso/ref"
-require "asciidoctor/iso/inline"
-require "asciidoctor/iso/blocks"
 require "asciidoctor/iso/section"
-require "asciidoctor/iso/table"
 require "asciidoctor/iso/validate"
-require "asciidoctor/iso/utils"
 require "asciidoctor/iso/cleanup"
-require_relative "./macros.rb"
 
 module Asciidoctor
   module ISO
     # A {Converter} implementation that generates ISO output, and a document
     # schema encapsulation of the document for validation
-    class Converter
-      include ::Asciidoctor::Converter
-      include ::Asciidoctor::Writer
-
-      include ::Asciidoctor::ISO::Base
-      include ::Asciidoctor::ISO::Front
-      include ::Asciidoctor::ISO::Lists
-      include ::Asciidoctor::ISO::Inline
-      include ::Asciidoctor::ISO::Blocks
-      include ::Asciidoctor::ISO::Section
-      include ::Asciidoctor::ISO::Table
-      include ::Asciidoctor::ISO::Utils
-      include ::Asciidoctor::ISO::Cleanup
-      include ::Asciidoctor::ISO::Validate
-
+    class Converter < ::Asciidoctor::Standoc::Converter
       register_for "iso"
 
-      $xreftext = {}
-
-      def initialize(backend, opts)
-        super
-        basebackend "html"
-        outfilesuffix ".xml"
-      end
-
-      alias_method :embedded, :content
-      alias_method :verse, :quote
-      alias_method :audio, :skip
-      alias_method :video, :skip
-      alias_method :inline_button, :skip
-      alias_method :inline_kbd, :skip
-      alias_method :inline_menu, :skip
-      alias_method :inline_image, :skip
     end
   end
 end

data/lib/asciidoctor/iso/front.rb

@@ -8,7 +8,7 @@ require "pp"
 
 module Asciidoctor
   module ISO
-    module Front
+    class Converter < Standoc::Converter
       def metadata_id(node, xml)
         part, subpart = node&.attr("partnumber")&.split(/-/)
         xml.docidentifier do |i|
@@ -20,20 +20,6 @@ module Asciidoctor
         end
       end
 
-      def metadata_version(node, xml)
-        xml.version do |v|
-          v.edition node.attr("edition") if node.attr("edition")
-          v.revision_date node.attr("revdate") if node.attr("revdate")
-          v.draft node.attr("draft") if node.attr("draft")
-        end
-      end
-
-      def committee_component(compname, node, out)
-        out.send compname.gsub(/-/, "_"), node.attr(compname),
-          **attr_code(number: node.attr("#{compname}-number"),
-                      type: node.attr("#{compname}-type"))
-      end
-
       def organization(org, orgname)
         if ["ISO",
             "International Organization for Standardization"].include? orgname
@@ -97,21 +83,12 @@ module Asciidoctor
         end
       end
 
-      def metadata_ics(node, xml)
-        ics = node.attr("library-ics")
-        ics && ics.split(/,\s*/).each do |i|
-          xml.ics do |ics|
-            ics.code i
-          end
-        end
-      end
-
       def metadata(node, xml)
         title node, xml
         metadata_id(node, xml)
         metadata_author(node, xml)
         metadata_publisher(node, xml)
-        xml.language node.attr("language")
+        xml.language (node.attr("language") || "en")
         xml.script (node.attr("script") || "Latn")
         metadata_status(node, xml)
         metadata_copyright(node, xml)
@@ -119,13 +96,6 @@ module Asciidoctor
         metadata_ics(node, xml)
       end
 
-      def asciidoc_sub(x)
-        return nil if x.nil?
-        d = Asciidoctor::Document.new(x.lines.entries, {header_footer: false})
-        b = d.parse.blocks.first
-        b.apply_subs(b.source)
-      end
-
       def title_intro(node, t, lang, at)
         return unless node.attr("title-intro-#{lang}")
         t.title_intro(**attr_code(at)) do |t1|

data/lib/asciidoctor/iso/isodoc.rng

@@ -18,7 +18,21 @@
   of this.
 -->
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <include href="biblio.rng"/>
+  <include href="biblio.rng">
+    <define name="status">
+      <element name="status">
+        <choice>
+          <value>proposal</value>
+          <value>working_draft</value>
+          <value>committee_draft</value>
+          <value>draft_standard</value>
+          <value>final_draft</value>
+          <value>published</value>
+          <value>withdrawn</value>
+        </choice>
+      </element>
+    </define>
+  </include>
   <start>
     <ref name="standard-document"/>
   </start>
@@ -28,9 +42,10 @@
       <optional>
         <ref name="version"/>
       </optional>
-      <oneOrMore>
-        <ref name="sections"/>
-      </oneOrMore>
+      <optional>
+        <ref name="preface"/>
+      </optional>
+      <ref name="sections"/>
       <zeroOrMore>
         <ref name="annex"/>
       </zeroOrMore>
@@ -44,11 +59,6 @@
       <ref name="BibData"/>
     </element>
   </define>
-  <define name="status">
-    <element name="status">
-      <ref name="FormattedString"/>
-    </element>
-  </define>
   <define name="version">
     <element name="version">
       <optional>
@@ -77,6 +87,13 @@
       <text/>
     </element>
   </define>
+  <define name="preface">
+    <element name="preface">
+      <oneOrMore>
+        <ref name="content"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="sections">
     <element name="sections">
       <oneOrMore>
@@ -104,7 +121,9 @@
   </define>
   <define name="section-title">
     <element name="title">
-      <text/>
+      <zeroOrMore>
+        <ref name="TextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="content">
@@ -324,7 +343,7 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
-      <ref name="BasicBlock"/>
+      <ref name="paragraph"/>
     </element>
   </define>
   <define name="termsource">
@@ -423,7 +442,7 @@
         <data type="ID"/>
       </attribute>
       <oneOrMore>
-        <ref name="paragraph-with-footnote"/>
+        <ref name="paragraph"/>
       </oneOrMore>
     </element>
   </define>
@@ -690,21 +709,20 @@
         <ref name="tname"/>
       </optional>
       <choice>
-        <oneOrMore>
+        <ref name="image"/>
+        <zeroOrMore>
           <ref name="figure"/>
-        </oneOrMore>
-        <group>
-          <zeroOrMore>
-            <ref name="TextElement"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-          <optional>
-            <ref name="dl"/>
-          </optional>
-        </group>
+        </zeroOrMore>
       </choice>
+      <zeroOrMore>
+        <ref name="fn"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="dl"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="note"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="TextElement">

data/lib/asciidoctor/iso/isostandard.rng

@@ -681,6 +681,14 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="preface">
+      <element name="preface">
+        <ref name="foreword"/>
+        <optional>
+          <ref name="introduction"/>
+        </optional>
+      </element>
+    </define>
   </include>
   <!-- end overrides -->
   <!--
@@ -706,14 +714,6 @@
       <ref name="bibliography"/>
     </element>
   </define>
-  <define name="preface">
-    <element name="preface">
-      <ref name="foreword"/>
-      <optional>
-        <ref name="introduction"/>
-      </optional>
-    </element>
-  </define>
   <define name="bibliography">
     <element name="bibliography">
       <oneOrMore>

data/lib/asciidoctor/iso/section.rb

@@ -3,29 +3,9 @@ require "uri"
 
 module Asciidoctor
   module ISO
-    module Section
-      @biblio = false
-      @term_def = false
-      @norm_ref = false
-
-      def in_biblio?
-        @biblio
-      end
-
-      def in_terms?
-        @term_def
-      end
-
-      def in_norm_ref?
-        @norm_ref
-      end
-
-      def sectiontype(node)
-        node&.attr("heading")&.downcase || node.title.downcase
-      end
-
+    class Converter < Standoc::Converter
       def section(node)
-        a = { id: Utils::anchor_or_uuid(node) }
+        a = { id: Standoc::Utils::anchor_or_uuid(node) }
         noko do |xml|
           case sectiontype(node)
           when "introduction" then
@@ -64,35 +44,6 @@ module Asciidoctor
         end.join("\n")
       end
 
-      def set_obligation(attrs, node)
-        attrs[:obligation] = if node.attributes.has_key?("obligation")
-                               node.attr("obligation")
-                             elsif node.parent.attributes.has_key?("obligation")
-                               node.parent.attr("obligation")
-                             else
-                               "normative"
-                             end
-      end
-
-      def clause_parse(attrs, xml, node)
-        attrs["inline-header".to_sym] = node.option? "inline-header"
-        attrs[:level] = node.attr("level")
-        set_obligation(attrs, node)
-        xml.send "clause", **attr_code(attrs) do |xml_section|
-          xml_section.title { |n| n << node.title } unless node.title.nil?
-          xml_section << node.content
-        end
-      end
-
-      def annex_parse(attrs, xml, node)
-        attrs["inline-header".to_sym] = node.option? "inline-header"
-        set_obligation(attrs, node)
-        xml.annex **attr_code(attrs) do |xml_section|
-          xml_section.title { |name| name << node.title }
-          xml_section << node.content
-        end
-      end
-
       def appendix_parse(attrs, xml, node)
         attrs["inline-header".to_sym] = node.option? "inline-header"
         set_obligation(attrs, node)
@@ -102,72 +53,6 @@ module Asciidoctor
         end
       end
 
-      def bibliography_parse(attrs, xml, node)
-        node.attr("style") == "bibliography" or
-          warn "Section not marked up as [bibliography]!"
-        @biblio = true
-        xml.references **attr_code(attrs) do |xml_section|
-          title = node.level == 1 ? "Bibliography" : node.title
-          xml_section.title { |t| t << title }
-          xml_section << node.content
-        end
-        @biblio = false
-      end
-
-      def symbols_parse(attrs, xml, node)
-        xml.definitions **attr_code(attrs) do |xml_section|
-          xml_section << node.content
-        end
-      end
-
-      # subclause contains subclauses
-      def term_def_subclause_parse(attrs, xml, node)
-        sub = node.find_by(context: :section) { |s| s.level == node.level + 1 }
-        sub.empty? || (return term_def_parse(attrs, xml, node, false))
-        node.title.casecmp("symbols and abbreviated terms").zero? &&
-          (return symbols_parse(attrs, xml, node))
-        xml.term **attr_code(attrs) do |xml_section|
-          xml_section.preferred { |name| name << node.title }
-          xml_section << node.content
-        end
-      end
-
-      def term_def_title(toplevel, node)
-        return node.title unless toplevel
-        sub = node.find_by(context: :section) do |s|
-          s.title.casecmp("symbols and abbreviated terms").zero?
-        end
-        return "Terms and definitions" if sub.empty?
-        "Terms, definitions, symbols and abbreviated terms"
-      end
-
-      def term_def_parse(attrs, xml, node, toplevel)
-        xml.terms **attr_code(attrs) do |section|
-          section.title { |t| t << term_def_title(toplevel, node) }
-          (s = node.attr("source")) && s.split(/,/).each do |s1|
-            section.termdocsource(nil, **attr_code(bibitemid: s1, type: "inline"))
-          end
-          section << node.content
-        end
-      end
-
-      def norm_ref_parse(attrs, xml, node)
-        @norm_ref = true
-        xml.references **attr_code(attrs) do |xml_section|
-          xml_section.title { |t| t << "Normative References" }
-          xml_section << node.content
-        end
-        @norm_ref = false
-      end
-
-      def introduction_parse(attrs, xml, node)
-        xml.introduction **attr_code(attrs) do |xml_section|
-          xml_section.title = "Introduction"
-          content = node.content
-          xml_section << content
-        end
-      end
-
       def patent_notice_parse(xml, node)
         # xml.patent_notice do |xml_section|
         #  xml_section << node.content

data/lib/asciidoctor/iso/validate.rb

@@ -1,4 +1,4 @@
-require "asciidoctor/iso/utils"
+require "metanorma-standoc"
 require_relative "./validate_style.rb"
 require_relative "./validate_requirements.rb"
 require_relative "./validate_section.rb"
@@ -9,7 +9,7 @@ require "iev"
 
 module Asciidoctor
   module ISO
-    module Validate
+    class Converter < Standoc::Converter
       def title_intro_validate(root)
         title_intro_en = root.at("//title-intro[@language='en']")
         title_intro_fr = root.at("//title-intro[@language='fr']")
@@ -98,7 +98,7 @@ module Asciidoctor
   end
 
   def onlychild_clause_validate(root)
-    root.xpath(Utils::SUBCLAUSE_XPATH).each do |c|
+    root.xpath(Standoc::Utils::SUBCLAUSE_XPATH).each do |c|
       next unless c.xpath("../clause").size == 1
       title = c.at("./title")
       location = c["id"] || c.text[0..60] + "..."
@@ -168,23 +168,10 @@ module Asciidoctor
     end
   end
 
-  SOURCELOCALITY = ".//locality[@type = 'clause']/referenceFrom".freeze
-
-  def iev_validate(xmldoc)
-    xmldoc.xpath("//term").each do |t|
-      /^IEV($|\s|:)/.match(t&.at(".//origin/@citeas")&.text) or next
-      pref = t.xpath("./preferred").inject([]) { |m, x| m << x&.text&.downcase }
-      locality = t.xpath(SOURCELOCALITY)&.text or next
-      iev = @iev.fetch(locality, xmldoc&.at("//language")&.text || "en") or next
-      pref.include?(iev.downcase) or
-        warn %(Term "#{pref[0]}" does not match IEV #{locality} "#{iev}")
-    end
-  end
-
   def content_validate(doc)
+    super
     title_validate(doc.root)
     isosubgroup_validate(doc.root)
-    section_validate(doc)
     onlychild_clause_validate(doc.root)
     termdef_style(doc.root)
     iev_validate(doc.root)
@@ -193,34 +180,6 @@ module Asciidoctor
     locality_erefs_validate(doc.root)
   end
 
-  def schema_validate(doc, filename)
-    File.open(".tmp.xml", "w:UTF-8") { |f| f.write(doc.to_xml) }
-    begin
-      errors = Jing.new(filename).validate(".tmp.xml")
-    rescue Jing::Error => e
-      abort "what what what #{e}"
-    end
-    warn "Valid!" if errors.none?
-    errors.each do |error|
-      warn "#{error[:message]} @ #{error[:line]}:#{error[:column]}"
-    end
-  end
-
-  # RelaxNG cannot cope well with wildcard attributes. So we strip
-  # any attributes from FormattedString instances (which can contain
-  # xs:any markup, and are signalled with @format) before validation.
-  def formattedstr_strip(doc)
-    doc.xpath("//*[@format]").each do |n|
-      n.elements.each do |e|
-        e.traverse do |e1|
-          next unless e1.element?
-          e1.each { |k, _v| e.delete(k) }
-        end
-      end
-    end
-    doc
-  end
-
   def validate(doc)
     content_validate(doc)
     schema_validate(formattedstr_strip(doc.dup),