asciidoctor-iso 0.10.1 → 0.10.2

data/lib/asciidoctor/iso/validate_requirements.rb

@@ -1,10 +1,10 @@
-require "asciidoctor/iso/utils"
+require "metanorma-standoc"
 require "nokogiri"
 require "pp"
 
 module Asciidoctor
   module ISO
-    module Validate
+    class Converter < Standoc::Converter
       REQUIREMENT_RE_STR = <<~REGEXP.freeze
         \\b
          ( shall | (is|are)_to |

data/lib/asciidoctor/iso/validate_section.rb

@@ -2,7 +2,7 @@ require "nokogiri"
 
 module Asciidoctor
   module ISO
-    module Validate
+    class Converter < Standoc::Converter
       def section_validate(doc)
         foreword_validate(doc.root)
         normref_validate(doc.root)
@@ -10,8 +10,7 @@ module Asciidoctor
         sections_sequence_validate(doc.root)
         section_style(doc.root)
         subclause_validate(doc.root)
-        sourcecode_style(doc.root)
-        asset_style(doc.root)
+        super
       end
 
       def foreword_validate(root)
@@ -143,6 +142,13 @@ module Asciidoctor
           warn("ISO style: There are sections after the final Bibliography")
       end
 
+      def style_warning(node, msg, text)
+        return if @novalid
+        w = "ISO style: WARNING (#{Standoc::Utils::current_location(node)}): #{msg}"
+        w += ": #{text}" if text
+        warn w
+      end
+
       NORM_ISO_WARN = "non-ISO/IEC reference not expected as normative".freeze
       SCOPE_WARN = "Scope contains subclauses: should be succint".freeze
 
@@ -182,8 +188,8 @@ module Asciidoctor
 
       def norm_bibitem_style(root)
         root.xpath(NORM_BIBITEMS).each do |b|
-          if b.at(Cleanup::ISO_PUBLISHER_XPATH).nil?
-            Utils::warning(b, NORM_ISO_WARN, b.text)
+          if b.at(Standoc::Converter::ISO_PUBLISHER_XPATH).nil?
+            Standoc::Utils::warning(b, NORM_ISO_WARN, b.text)
           end
         end
       end
@@ -194,8 +200,8 @@ module Asciidoctor
         root.xpath("//note").each { |e| note_style(e) }
         root.xpath("//fn").each { |e| footnote_style(e) }
         root.xpath(ASSETS_TO_STYLE).each { |e| style(e, extract_text(e)) }
-        asset_title_style(root)
         norm_bibitem_style(root)
+        super
       end
 
       def subclause_validate(root)

data/lib/asciidoctor/iso/validate_style.rb

@@ -1,10 +1,10 @@
-require "asciidoctor/iso/utils"
+require "metanorma-standoc"
 require "nokogiri"
 require "pp"
 
 module Asciidoctor
   module ISO
-    module Validate
+    class Converter < Standoc::Converter
       def extract_text(node)
         return "" if node.nil?
         node1 = Nokogiri::XML.fragment(node.to_s)
@@ -54,13 +54,6 @@ module Asciidoctor
         style(node, extract_text(node))
       end
 
-      def style_warning(node, msg, text)
-        return if @novalid
-        w = "ISO style: WARNING (#{Utils::current_location(node)}): #{msg}"
-        w += ": #{text}" if text
-        warn w
-      end
-
       def style_regex(re, warning, n, text)
         (m = re.match(text)) && style_warning(n, warning, m[:num])
       end

data/lib/asciidoctor/iso/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module ISO
-    VERSION = "0.10.1".freeze
+    VERSION = "0.10.2".freeze
   end
 end

data/spec/asciidoctor-iso/base_spec.rb

@@ -5,6 +5,7 @@ RSpec.describe Asciidoctor::ISO do
     expect(Asciidoctor::ISO::VERSION).not_to be nil
   end
 
+=begin
   it "generates output for the Rice document" do
     system "cd spec/examples; rm -f rice.xml; rm -f rice.doc; rm -f rice.html; rm -f rice_alt.html; asciidoctor --trace -b iso -r 'asciidoctor-iso' rice.adoc; cd ../.."
     expect(File.exist?("spec/examples/rice.xml")).to be true
@@ -12,6 +13,7 @@ RSpec.describe Asciidoctor::ISO do
     expect(File.exist?("spec/examples/rice.html")).to be true
     expect(File.exist?("spec/examples/rice_alt.html")).to be true
   end
+=end
 
   it "processes a blank document" do
     expect(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)).to be_equivalent_to <<~"OUTPUT"

data/spec/asciidoctor-iso/macros_spec.rb

@@ -104,7 +104,7 @@ Alice <-- Bob: another authentication Response
   private
 
   def mock_plantuml_disabled
-    expect(Asciidoctor::ISO::PlantUMLBlockMacroBackend).to receive(:plantuml_installed?) do
+    expect(Asciidoctor::Standoc::PlantUMLBlockMacroBackend).to receive(:plantuml_installed?) do
       false
     end
   end

data/spec/asciidoctor-iso/refs_spec.rb

@@ -460,7 +460,7 @@ RSpec.describe Asciidoctor::ISO do
             <abbreviation>ISO</abbreviation>
           </organization>
         </contributor>
-
+        <language>en</language>
         <script>Latn</script>
         <status>
           <stage>60</stage>

data/spec/asciidoctor-iso/validate_spec.rb

@@ -1,17 +1,6 @@
 require "spec_helper"
 
 RSpec.describe Asciidoctor::ISO do
-it "warns when missing a title" do
-  expect { Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true) }.to output(/Table should have title/).to_stderr
-  #{VALIDATING_BLANK_HDR}
-  |===
-  |A |B |C
-
-  h|1 |2 |3
-  |===
-  INPUT
-end
-
 
 it "warns that introduction may contain requirement" do
   expect { Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true) }.to output(/Introduction may contain requirement/).to_stderr
@@ -134,7 +123,7 @@ it "warns that term source is not a real reference" do
   INPUT
 end
 
-it "warns that ndated reference has locality" do
+it "warns that undated reference has locality" do
   expect { Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true) }.to output(/undated reference ISO 123 should not contain specific elements/).to_stderr
   #{VALIDATING_BLANK_HDR}
   

data/spec/assets/iso.doc

@@ -1,7 +1,7 @@
 MIME-Version: 1.0
-Content-Type: multipart/related; boundary="----=_NextPart_30405c9c.cfdb.4e46"
+Content-Type: multipart/related; boundary="----=_NextPart_94e7f467.3c17.4d67"
 
-------=_NextPart_30405c9c.cfdb.4e46
+------=_NextPart_94e7f467.3c17.4d67
 Content-Location: file:///C:/Doc/spec/assets/iso.htm
 Content-Type: text/html; charset="utf-8"
 
@@ -2069,11 +2069,11 @@ Switzerland<p class="MsoNormal"></p></span></p>
 <p class="MsoToc1"><span lang="EN-GB" xml:lang="EN-GB"><span style="mso-element:field-begin"></span><span style="mso-spacerun:yes">&#xA0;</span>TOC
   \o "1-2" \h \z \u <span style="mso-element:field-separator"></span></span>
 <span class="MsoHyperlink"><span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
-<a href="#_Toc893822203">Foreword<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+<a href="#_Toc938931447">Foreword<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
 <span style="mso-tab-count:1 dotted">. </span>
 </span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
 <span style="mso-element:field-begin"></span></span>
-<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc893822203 \h </span>
+<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc938931447 \h </span>
   <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-separator"></span></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">1</span>
   <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-end"></span></span></a></span></span></p>
 
@@ -2106,7 +2106,7 @@ Switzerland<p class="MsoNormal"></p></span></p>
 </html>
 
 
-------=_NextPart_30405c9c.cfdb.4e46
+------=_NextPart_94e7f467.3c17.4d67
 Content-Location: file:///C:/Doc/spec/assets/iso_files/filelist.xml
 Content-Transfer-Encoding: base64
 Content-Type: application/xml
@@ -2116,7 +2116,7 @@ ICAgICAgIDxvOk1haW5GaWxlIEhSZWY9Ii4uL3NwZWMvYXNzZXRzL2lzby5odG0iLz4gIDxvOkZp
 bGUgSFJlZj0iZmlsZWxpc3QueG1sIi8+CiAgPG86RmlsZSBIUmVmPSJoZWFkZXIuaHRtbCIvPgo8
 L3htbD4K
 
-------=_NextPart_30405c9c.cfdb.4e46
+------=_NextPart_94e7f467.3c17.4d67
 Content-Location: file:///C:/Doc/spec/assets/iso_files/header.html
 Content-Transfer-Encoding: base64
 Content-Type: text/html charset="utf-8"
@@ -2309,4 +2309,4 @@ cD4NCg0KPHAgY2xhc3M9TXNvRm9vdGVyPjxzcGFuIGxhbmc9RU4tQVUgc3R5bGU9J2ZvbnQtc2l6
 ZToxMC4wcHQ7Jz7CqQ0KJm5ic3A7Jm5ic3A74oCTIEFsbCByaWdodHMgcmVzZXJ2ZWQ8bzpwPjwv
 bzpwPjwvc3Bhbj48L3A+DQoNCjwvZGl2Pg0KDQoNCg0KPC9ib2R5Pg0KDQo8L2h0bWw+DQo=
 
-------=_NextPart_30405c9c.cfdb.4e46--
+------=_NextPart_94e7f467.3c17.4d67--

data/spec/spec_helper.rb

@@ -110,6 +110,7 @@ BLANK_HDR = <<~"HDR"
       <abbreviation>ISO</abbreviation>
     </organization>
   </contributor>
+  <language>en</language>
   <script>Latn</script>
   <status>
     <stage>60</stage>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-iso
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-08 00:00:00.000000000 Z
+date: 2018-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: metanorma-standoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -281,24 +295,13 @@ files:
 - lib/asciidoctor-iso.rb
 - lib/asciidoctor/iso/base.rb
 - lib/asciidoctor/iso/biblio.rng
-- lib/asciidoctor/iso/blocks.rb
 - lib/asciidoctor/iso/cleanup.rb
-- lib/asciidoctor/iso/cleanup_block.rb
-- lib/asciidoctor/iso/cleanup_footnotes.rb
-- lib/asciidoctor/iso/cleanup_ref.rb
 - lib/asciidoctor/iso/converter.rb
 - lib/asciidoctor/iso/front.rb
-- lib/asciidoctor/iso/inline.rb
 - lib/asciidoctor/iso/isodoc.rng
 - lib/asciidoctor/iso/isostandard.rnc
 - lib/asciidoctor/iso/isostandard.rng
-- lib/asciidoctor/iso/isostandard_diff.rnc
-- lib/asciidoctor/iso/lists.rb
-- lib/asciidoctor/iso/macros.rb
-- lib/asciidoctor/iso/ref.rb
 - lib/asciidoctor/iso/section.rb
-- lib/asciidoctor/iso/table.rb
-- lib/asciidoctor/iso/utils.rb
 - lib/asciidoctor/iso/validate.rb
 - lib/asciidoctor/iso/validate_requirements.rb
 - lib/asciidoctor/iso/validate_section.rb

data/lib/asciidoctor/iso/blocks.rb

@@ -1,190 +0,0 @@
-require "htmlentities"
-require "uri"
-
-module Asciidoctor
-  module ISO
-    module Blocks
-      def id_attr(node = nil)
-        { id: Utils::anchor_or_uuid(node) }
-      end
-
-      # open block is a container of multiple blocks,
-      # treated as a single block.
-      # We append each contained block to its parent
-      def open(node)
-        result = []
-        node.blocks.each do |b|
-          result << send(b.context, b)
-        end
-        result
-      end
-
-      def literal(node)
-        paragraph(node)
-      end
-
-      # NOTE: html escaping is performed by Nokogiri
-      def stem(node)
-        stem_content = node.lines.join("\n")
-        noko do |xml|
-          xml.formula **id_attr(node) do |s|
-            stem_parse(stem_content, s)
-          end
-        end
-      end
-
-      def sidebar_attrs(node)
-        date = node.attr("date") || Date.today.iso8601.gsub(/\+.*$/, "")
-        date += "T00:00:00Z" unless /T/.match date
-        {
-          reviewer: node.attr("reviewer") || node.attr("source") || "(Unknown)",
-          id: Utils::anchor_or_uuid(node),
-          date: date,
-          from: node.attr("from"),
-          to: node.attr("to") || node.attr("from"),
-        }
-      end
-
-      def sidebar(node)
-        return unless draft?
-        noko do |xml|
-          xml.review **attr_code(sidebar_attrs(node)) do |r|
-            wrap_in_para(node, r)
-          end
-        end
-      end
-
-      def termnote(n)
-        noko do |xml|
-          xml.termnote **id_attr(n) do |ex|
-            wrap_in_para(n, ex)
-          end
-        end.join("\n")
-      end
-
-      def note(n)
-        noko do |xml|
-          xml.note **id_attr(n) do |c|
-            wrap_in_para(n, c)
-          end
-        end.join("\n")
-      end
-
-      def admonition_attrs(node)
-        name = node.attr("name")
-        if type = node.attr("type")
-          ["danger", "safety precautions"].each do |t|
-            name = t if type.casecmp(t).zero?
-          end
-        end
-        { id: Utils::anchor_or_uuid(node), type: name }
-      end
-
-      def admonition(node)
-        return termnote(node) if in_terms?
-        return note(node) if node.attr("name") == "note"
-        noko do |xml|
-          xml.admonition **admonition_attrs(node) do |a|
-            wrap_in_para(node, a)
-          end
-        end.join("\n")
-      end
-
-      def term_example(node)
-        noko do |xml|
-          xml.termexample **id_attr(node) do |ex|
-            wrap_in_para(node, ex)
-          end
-        end.join("\n")
-      end
-
-      def example(node)
-        return term_example(node) if in_terms?
-        noko do |xml|
-          xml.example **id_attr(node) do |ex|
-            content = node.content
-            ex << content
-          end
-        end.join("\n")
-      end
-
-      def preamble(node)
-        noko do |xml|
-          xml.foreword do |xml_abstract|
-            xml_abstract.title { |t| t << "Foreword" }
-            content = node.content
-            xml_abstract << content
-          end
-        end.join("\n")
-      end
-
-      def image_attributes(node)
-        uri = node.image_uri node.attr("target")
-        types = MIME::Types.type_for(uri)
-        { src: uri,
-          id: Utils::anchor_or_uuid,
-          imagetype: types.first.sub_type.upcase,
-          height: node.attr("height") || "auto",
-          width: node.attr("width") || "auto" }
-      end
-
-      def figure_title(node, f)
-        unless node.title.nil?
-          f.name { |name| name << node.title }
-        end
-      end
-
-      def image(node)
-        noko do |xml|
-          xml.figure **id_attr(node) do |f|
-            figure_title(node, f)
-            f.image **attr_code(image_attributes(node))
-          end
-        end
-      end
-
-      def paragraph(node)
-        return termsource(node) if node.role == "source"
-        attrs = { align: node.attr("align"),
-                  id: Utils::anchor_or_uuid(node) }
-        noko do |xml|
-          xml.p **attr_code(attrs) do |xml_t|
-            xml_t << node.content
-          end
-        end.join("\n")
-      end
-
-      def quote_attrs(node)
-        { id: Utils::anchor_or_uuid(node), align: node.attr("align") }
-      end
-
-      def quote_attribution(node, out)
-        if node.attr("citetitle")
-          m = /^(?<cite>[^,]+)(,(?<text>.*$))?$/m.match node.attr("citetitle")
-          out.source m[:text],
-            **attr_code(target: m[:cite], type: "inline")
-        end
-        if node.attr("attribution")
-          out.author { |a| a << node.attr("attribution") }
-        end
-      end
-
-      def quote(node)
-        noko do |xml|
-          xml.quote **attr_code(quote_attrs(node)) do |q|
-            quote_attribution(node, q)
-            wrap_in_para(node, q)
-          end
-        end
-      end
-
-      def listing(node)
-        # NOTE: html escaping is performed by Nokogiri
-        noko do |xml|
-          xml.sourcecode(**id_attr(node)) { |s| s << node.content }
-          # xml.sourcecode(**id_attr(node)) { |s| s << node.lines.join("\n") }
-        end
-      end
-    end
-  end
-end