metanorma-mpfd 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3aa5a9f0ef4bfd60f3ed379ab93658d135595d46f683ccf902cf500dc872259d
-  data.tar.gz: acc27115044a5e3f1503e81bf004144538123dde339c35340a19acb1a37c6efb
+  metadata.gz: 8d0c6a177d211cf93a3afb043b49c426aff129e82bb51d103ed573cc897dbae6
+  data.tar.gz: 8b2178b95740ea87c3e86c2a082be995804495d5a55c0f0f1913e5fb5fc459d1
 SHA512:
-  metadata.gz: 5cf869caa9bc42e2ba1369d100bf737316ea04b34994b39ea00d00024b1ad9c340c903e82fdbc1ecb20af1754fc6f0c60de9b043d28bc5ee0a047a322159cb2f
-  data.tar.gz: 47516f68c9b7c8b079af57a1bee5cc161fb21e8563f430679fe7a8cbacd5d463c91b67af075d820f44df54da32df6719eea825cfabd742da777d551ff1fd8b06
+  metadata.gz: 974265d0f9fea53379eab72e57400530d0ee773d29be3552587640c8f11a52238a1b460a89b369fe095a7802b20d02eef29bed29e504fafc099555b823af3090
+  data.tar.gz: d05ad1cf3074248bc06d5588610f41e8fd92cf661db12a666c0d86c4de4b0ef9c6de6b313d55b9f2a255c330c92fc93955400febb93d628bb78bf5a325c9857f

data/lib/asciidoctor/mpfd/converter.rb

@@ -1,6 +1,6 @@
 require "asciidoctor"
 require "asciidoctor/mpfd"
-require "asciidoctor/iso/converter"
+require "asciidoctor/standoc/converter"
 require "isodoc/mpfd/html_convert"
 require "isodoc/mpfd/word_convert"
 require_relative "section"
@@ -11,7 +11,7 @@ module Asciidoctor
     # A {Converter} implementation that generates MPFD output, and a document
     # schema encapsulation of the document for validation
     #
-    class Converter < ISO::Converter
+    class Converter < Standoc::Converter
 
       register_for "mpfd"
 
@@ -153,38 +153,11 @@ module Asciidoctor
       end
 
       def html_converter(node)
-        IsoDoc::Mpfd::HtmlConvert.new(
-          script: node.attr("script"),
-          bodyfont: node.attr("body-font"),
-          headerfont: node.attr("header-font"),
-          monospacefont: node.attr("monospace-font"),
-          titlefont: node.attr("title-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"),
-        )
+        IsoDoc::Mpfd::HtmlConvert.new(html_extract_attributes(node))
       end
 
       def word_converter(node)
-        IsoDoc::Mpfd::WordConvert.new(
-          script: node.attr("script"),
-          bodyfont: node.attr("body-font"),
-          headerfont: node.attr("header-font"),
-          monospacefont: node.attr("monospace-font"),
-          titlefont: node.attr("title-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"),
-        )
+        IsoDoc::Mpfd::WordConvert.new(doc_extract_attributes(node))
       end
 
       def inline_quoted(node)

data/lib/asciidoctor/mpfd/section.rb

@@ -1,6 +1,6 @@
 require "asciidoctor"
 require "asciidoctor/mpfd"
-require "asciidoctor/iso/converter"
+require "asciidoctor/standoc/converter"
 require "isodoc/mpfd/html_convert"
 require "isodoc/mpfd/word_convert"
 
@@ -10,7 +10,7 @@ module Asciidoctor
     # A {Converter} implementation that generates MPFD output, and a document
     # schema encapsulation of the document for validation
     #
-    class Converter < ISO::Converter
+    class Converter < Standoc::Converter
 
       def sections_cleanup(x)
         super
@@ -25,7 +25,7 @@ module Asciidoctor
       end
 
       def section(node)
-        a = { id: Asciidoctor::ISO::Utils::anchor_or_uuid(node) }
+        a = { id: Asciidoctor::Standoc::Utils::anchor_or_uuid(node) }
         noko do |xml|
           case sectiontype(node)
           when "introduction" then

data/lib/asciidoctor/mpfd/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Mpfd
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/metanorma-mpfd.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciidoctor", "~> 1.5.7"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "nokogiri"
-  spec.add_dependency "asciidoctor-iso", "~> 0.10.1"
+  spec.add_dependency "metanorma-standoc", "~> 1.0.0"
   spec.add_dependency "isodoc", "~> 0.8.8"
   spec.add_dependency "twitter_cldr"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-mpfd
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: asciidoctor-iso
+  name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement