metanorma-standoc 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95bc05ab73fa06e975a949474abebaf5959e75c1e84b8b8c246cf08dd7263dfc
-  data.tar.gz: b2e6975dff646384cc1a902aa8d58b2f85d818fb12d001de484b12180ad340f0
+  metadata.gz: db3428a1564b7f52dd275be33d22191aacec1c9de572bd355b2889e1da0f7acd
+  data.tar.gz: dadf1c955de197d23c37440b5d028793e9dff69e0e5dea566e214458ba3ff065
 SHA512:
-  metadata.gz: c199576acff27f9dddd1f1458f1fe1889667ad0b353a40a845989190cf225f911a2edc612099a8290aac01492536af73aec5ef6a3d9325c7518c9694bea1321b
-  data.tar.gz: 48f9fd5f5cc59495ddcbf1eec93851fce1a08148116f09037fafa260b6a8a0abb1f10c4e6398e6b4e95027ab5eafd574956979db4ee49efe38efa291b89e5732
+  metadata.gz: 5b79bf52f01df9f3c02eb128d867cadaef60829b5c58adc64aad116a2a2654c0ea1b0a85580c370eeba1c87434fb5ff21dfb81e4fc827cec9f668adc18c21a5c
+  data.tar.gz: 0542ccaa5125ab49f192edbd29c21e33db9c560eb3eb1f327ec22d196de6acb22eff9be43d893f7e85e44a856c8000a564f88cbc10f09e8f2a6ca991551c43a3

data/lib/asciidoctor/standoc/base.rb

@@ -37,6 +37,11 @@ module Asciidoctor
           headerfont: node.attr("header-font"),
           monospacefont: node.attr("monospace-font"),
           i18nyaml: node.attr("i18nyaml"),
+          scope: node.attr("scope"),
+          htmlstylesheet: node.attr("htmlstylesheet"),
+          htmlcoverpage: node.attr("htmlcoverpage"),
+          htmlintropage: node.attr("htmlintropage"),
+          scripts: node.attr("scripts"),
         )
       end
 
@@ -47,6 +52,14 @@ module Asciidoctor
           headerfont: node.attr("header-font"),
           monospacefont: node.attr("monospace-font"),
           i18nyaml: node.attr("i18nyaml"),
+          scope: node.attr("scope"),
+          wordstylesheet: node.attr("wordstylesheet"),
+          standardstylesheet: node.attr("standardstylesheet"),
+          header: node.attr("header"),
+          wordcoverpage: node.attr("wordcoverpage"),
+          wordintropage: node.attr("wordintropage"),
+          ulstyle: node.attr("ulstyle"),
+          olstyle: node.attr("olstyle"),
         )
       end
 

data/lib/asciidoctor/standoc/cleanup.rb

@@ -184,23 +184,6 @@ module Asciidoctor
         end
       end
 
-      ELEMS_ALLOW_NOTES =
-        # %w[p formula quote sourcecode example admonition ul ol dl figure]
-        %w[p formula ul ol dl figure].freeze
-
-      # if a note is at the end of a section, it is left alone
-      # if a note is followed by a non-note block,
-      # it is moved inside its preceding block if it is not delimited
-      # (so there was no way of making that block include the note)
-      def note_cleanup(xmldoc)
-        q = "//note[following-sibling::*[not(local-name() = 'note')]]"
-        xmldoc.xpath(q).each do |n|
-          next unless n.ancestors("table").empty?
-          prev = n.previous_element || next
-          n.parent = prev if ELEMS_ALLOW_NOTES.include? prev.name
-        end
-      end
-
       def empty_text_before_first_element(x)
         x.children.each do |c|
           if c.text?

data/lib/asciidoctor/standoc/cleanup_block.rb

@@ -129,6 +129,23 @@ module Asciidoctor
         end
       end
 
+      ELEMS_ALLOW_NOTES =
+        # %w[p formula quote sourcecode example admonition ul ol dl figure]
+        %w[p formula ul ol dl figure].freeze
+
+      # if a note is at the end of a section, it is left alone
+      # if a note is followed by a non-note block,
+      # it is moved inside its preceding block if it is not delimited
+      # (so there was no way of making that block include the note)
+      def note_cleanup(xmldoc)
+        q = "//note[following-sibling::*[not(local-name() = 'note')]]"
+        xmldoc.xpath(q).each do |n|
+          next unless n.ancestors("table").empty?
+          prev = n.previous_element || next
+          n.parent = prev if ELEMS_ALLOW_NOTES.include? prev.name
+        end
+      end
+
       def sections_order_cleanup(x)
         s = x.at("//sections")
         make_preface(x, s)

data/lib/asciidoctor/standoc/converter.rb

@@ -40,6 +40,12 @@ module Asciidoctor
         super
         basebackend "html"
         outfilesuffix ".xml"
+        @libdir = File.dirname(__FILE__)
+      end
+
+      # path to isodoc assets in child gems
+      def html_doc_path(file)
+        File.join(@libdir, File.join("../../isodoc/html", file))
       end
 
       alias_method :embedded, :content

data/lib/asciidoctor/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "0.0.1".freeze
+    VERSION = "0.0.2".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "asciidoctor", "~> 1.5.7"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "isodoc", ">= 0.8"
+  spec.add_dependency "isodoc", "~> 0.8.8"
   spec.add_dependency "iev", "~> 0.2.0"
   spec.add_dependency "relaton", "~> 0.1.3"
 

data/spec/asciidoctor-standoc/base_spec.rb

@@ -58,18 +58,13 @@ RSpec.describe Asciidoctor::Standoc do
       :docsubstage: 20
       :iteration: 3
       :language: en
-      :title-intro-en: Introduction
-      :title-main-en: Main Title -- Title
-      :title-part-en: Title Part
-      :title-intro-fr: Introduction Française
-      :title-main-fr: Titre Principal
-      :title-part-fr: Part du Titre
+      :title: Main Title -- Title
       :library-ics: 1,2,3
     INPUT
     <?xml version="1.0" encoding="UTF-8"?>
 <standard-document xmlns="http://riboseinc.com/isoxml">
 <bibdata type="article">
-
+<title language="en" format="text/plain">Main Title — Title</title>
   <docidentifier>
     <project-number part="1"> 1000</project-number>
   </docidentifier>
@@ -101,7 +96,6 @@ RSpec.describe Asciidoctor::Standoc do
     OUTPUT
   end
 
-
   it "processes complex metadata" do
     expect(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)).to be_equivalent_to <<~'OUTPUT'
       = Document title
@@ -202,40 +196,13 @@ RSpec.describe Asciidoctor::Standoc do
       Author
       :docfile: test.adoc
       :novalid:
+      :scripts: spec/assets/scripts.html
     INPUT
     html = File.read("test.html", encoding: "utf-8")
     expect(html).to match(%r{<script>})
   end
 
-  it "uses default fonts" do
-    system "rm -f test.html"
-    Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
-      = Document title
-      Author
-      :docfile: test.adoc
-      :novalid:
-    INPUT
-    html = File.read("test.html", encoding: "utf-8")
-    expect(html).to match(%r[\.Sourcecode[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Cambria", serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Cambria", serif;]m)
-  end
-
-  it "uses default fonts for alt doc" do
-    system "rm -f test_alt.html"
-    Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
-      = Document title
-      Author
-      :docfile: test.adoc
-      :novalid:
-    INPUT
-    html = File.read("test_alt.html", encoding: "utf-8")
-    expect(html).to match(%r[\.Sourcecode[^{]+\{[^{]+font-family: "Space Mono", monospace;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Lato", sans-serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Lato", sans-serif;]m)
-  end
-
-  it "uses Chinese fonts" do
+  it "uses specified fonts and assets in HTML" do
     system "rm -f test.html"
     Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
       = Document title
@@ -243,15 +210,25 @@ RSpec.describe Asciidoctor::Standoc do
       :docfile: test.adoc
       :novalid:
       :script: Hans
+      :body-font: Zapf Chancery
+      :header-font: Comic Sans
+      :monospace-font: Andale Mono
+      :htmlstylesheet: spec/assets/html.css
+      :htmlcoverpage: spec/assets/htmlcover.html
+      :htmlintropage: spec/assets/htmlintro.html
+      :scripts: spec/assets/scripts.html
     INPUT
     html = File.read("test.html", encoding: "utf-8")
-    expect(html).to match(%r[\.Sourcecode[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "SimSun", serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "SimHei", sans-serif;]m)
+    expect(html).to match(%r[pre[^{]+\{[^{]+font-family: Andale Mono;]m)
+    expect(html).to match(%r[p[^{]+\{[^{]+font-family: Zapf Chancery;]m)
+    expect(html).to match(%r[h1[^{]+\{[^{]+font-family: Comic Sans;]m)
+    expect(html).to match(%r[an empty html cover page])
+    expect(html).to match(%r[an empty html intro page])
+    expect(html).to match(%r[This is > a script])
   end
 
-  it "uses specified fonts" do
-    system "rm -f test.html"
+  it "uses specified fonts and assets in Word" do
+    system "rm -f test.doc"
     Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
       = Document title
       Author
@@ -261,11 +238,28 @@ RSpec.describe Asciidoctor::Standoc do
       :body-font: Zapf Chancery
       :header-font: Comic Sans
       :monospace-font: Andale Mono
+      :wordstylesheet: spec/assets/word.css
+      :wordcoverpage: spec/assets/wordcover.html
+      :wordintropage: spec/assets/wordintro.html
+      :header: spec/assets/header.html
     INPUT
-    html = File.read("test.html", encoding: "utf-8")
-    expect(html).to match(%r[\.Sourcecode[^{]+\{[^{]+font-family: Andale Mono;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: Zapf Chancery;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: Comic Sans;]m)
+    html = File.read("test.doc", encoding: "utf-8")
+    expect(html).to match(%r[pre[^{]+\{[^{]+font-family: Andale Mono;]m)
+    expect(html).to match(%r[p[^{]+\{[^{]+font-family: Zapf Chancery;]m)
+    expect(html).to match(%r[h1[^{]+\{[^{]+font-family: Comic Sans;]m)
+    expect(html).to match(%r[an empty word cover page])
+    expect(html).to match(%r[an empty word intro page])
+    expect(html).to match(%r[Content-Location: file:///C:/Doc/test_files/header.html
+Content-Transfer-Encoding: base64
+Content-Type: text/html charset="utf-8"
+
+Ci8qIGFuIGVtcHR5IGhlYWRlciAqLwoKU1RBUlQgRE9DIElEOiAgOiBFTkQgRE9DIElECgpGSUxF
+TkFNRTogdGVzdAoK
+])
   end
 
+
 end
+
+
+

data/spec/asciidoctor-standoc/blocks_spec.rb

@@ -131,14 +131,27 @@ RSpec.describe Asciidoctor::Standoc do
     it "processes notes" do
       expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
       #{ASCIIDOC_BLANK_HDR}
+      NOTE: This is a note
+
+      == Clause 1
+
+
       NOTE: This is a note
       INPUT
               #{BLANK_HDR}
-       <sections>
+              <preface><foreword obligation="informative">
+         <title>Foreword</title>
          <note id="_">
          <p id="_">This is a note</p>
        </note>
-       </sections>
+       </foreword></preface><sections>
+       <clause id="_" inline-header="false" obligation="normative">
+         <title>Clause 1</title>
+         <note id="_">
+         <p id="_">This is a note</p>
+       </note>
+       </clause></sections>
+
        </standard-document>
 
       OUTPUT

data/spec/asciidoctor-standoc/validate_spec.rb

@@ -2,6 +2,14 @@ require "spec_helper"
 
 RSpec.describe Asciidoctor::Standoc do
 
+  it "warns that video is a skipped node" do
+  expect { Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) }.to output(/converter missing for video node/).to_stderr
+  #{VALIDATING_BLANK_HDR}
+
+  video::video_file.mp4[]
+  INPUT
+  end
+
 it "warns that figure does not have title" do
   expect { Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) }.to output(/Figure should have title/).to_stderr
   #{VALIDATING_BLANK_HDR}

data/spec/assets/html.css

@@ -1,2 +1,13 @@
 
-/* another empty stylesheet */
+p {
+  font-family: $bodyfont;
+}
+
+h1 {
+  font-family: $headerfont;
+}
+
+pre {
+  font-family: $monospacefont;
+}
+

data/spec/assets/word.css

@@ -1,2 +1,13 @@
 
-/* one empty stylesheet */
+p {
+  font-family: $bodyfont;
+}
+
+h1 {
+  font-family: $headerfont;
+}
+
+pre {
+  font-family: $monospacefont;
+}
+

data/spec/metanorma/processor_spec.rb

@@ -67,4 +67,37 @@ RSpec.describe Metanorma::Standoc::Processor do
     OUTPUT
   end
 
+    it "generates HTML from IsoDoc XML" do
+    system "rm -f test.doc"
+    processor.output(<<~"INPUT", "test.doc", :doc)
+               <iso-standard xmlns="http://riboseinc.com/isoxml">
+       <sections>
+       <terms id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title>
+         <term id="J">
+         <preferred>Term2</preferred>
+       </term>
+        </terms>
+        </sections>
+        </iso-standard>
+    INPUT
+    expect(File.read("test.doc", encoding: "utf-8")).to match(/Electropedia/)
+    end
+
+    it "generates XML from IsoDoc XML" do
+      system "rm -f test.xml"
+      processor.output(<<~"INPUT", "test.xml", :xml)
+               <iso-standard xmlns="http://riboseinc.com/isoxml">
+       <sections>
+       <terms id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title>
+         <term id="J">
+         <preferred>Term2</preferred>
+       </term>
+        </terms>
+        </sections>
+        </iso-standard>
+      INPUT
+        expect(File.exist?("test.xml")).to be true
+
+    end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-12 00:00:00.000000000 Z
+date: 2018-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -42,16 +42,16 @@ dependencies:
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.8
 - !ruby/object:Gem::Dependency
   name: iev
   requirement: !ruby/object:Gem::Requirement