asciidoctor-m3d 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f796b6eb0ec3b88d6cc2932585c61db7b591fb7ddd352e66e955b8bf25468d2
-  data.tar.gz: a953610472abcf575045b14b3f8054d30b35697791bdf6d4e2cb05357edf3b52
+  metadata.gz: 738054d455f2b744a3e9cb70de431503d92d72f5f6235c37ea741d5c5e7d5134
+  data.tar.gz: 19375c04a588bbdd3cfdcb92c686c3017651853006b08c17e00581e4f168ce14
 SHA512:
-  metadata.gz: bf31275e3c03d11b5c967563dbed2ecd68296276a88654a2fe3a8a1c4ad136d6d3754c6b17ec01a6ca2dcede0f6baacee6a8005c6a36cca3e7b41adf57f3d898
-  data.tar.gz: 1d6e010ac13c03ebd7fe0ba7a37ee432370e8f303167d61cc1bf409a33dde726004427d10945ad29e5c48af75f7d07d34fb75787d094f8edf4b6d4f5a68ebf77
+  metadata.gz: 3bdc29f96385ebd252c614d9e8b784420657175906c00f3dd8ed00a5db5c86206aceb97b0f0bba9688748e23c91e4edcf9bb8f21892a92f7926756029075c31a
+  data.tar.gz: 06c9837fa58facb91add98b3b4e85d8492f2199949a73f2c5de71c83c3099c92159deb3c033c19767f50c3edcf84550d72eccbd54cb95922863d43ea5575ff59

data/Gemfile.lock

@@ -1,11 +1,12 @@
 GIT
   remote: https://github.com/riboseinc/asciidoctor-iso
-  revision: 8e9f119ed5c38e7d75d975b1a945ebb069f94a27
+  revision: 1fca67f1a4e7a67461ea3999918abc10bca3ca2c
   specs:
-    asciidoctor-iso (0.8.1)
+    asciidoctor-iso (0.9.0)
       asciidoctor (~> 1.5.7)
-      isobib (~> 0.1.4)
-      isodoc (>= 0.7.0)
+      iso-bib-item (~> 0.1.6)
+      isobib (~> 0.1.6)
+      isodoc (>= 0.8)
       ruby-jing
 
 GIT
@@ -24,9 +25,9 @@ GIT
 
 GIT
   remote: https://github.com/riboseinc/isodoc
-  revision: cd4f1ecfcf31b0462f783159c8978007c929ceb8
+  revision: 601c1870fea386cb54fd8b2f112f680f71bd58a3
   specs:
-    isodoc (0.7.0)
+    isodoc (0.8)
       asciimath
       html2doc (>= 0.7.1)
       htmlentities (~> 4.3.4)
@@ -43,13 +44,13 @@ GIT
 PATH
   remote: .
   specs:
-    asciidoctor-m3d (0.2.6)
+    asciidoctor-m3d (0.2.7)
       asciidoctor (~> 1.5.7)
-      asciidoctor-iso (>= 0.8.0)
+      asciidoctor-iso (>= 0.9.0)
       asciimath
       htmlentities (~> 4.3.4)
       image_size
-      isodoc (>= 0.7.0)
+      isodoc (>= 0.8.0)
       mime-types
       nokogiri
       ruby-jing
@@ -60,7 +61,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    algoliasearch (1.22.0)
+    algoliasearch (1.23.2)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     asciidoctor (1.5.7.1)
@@ -70,6 +71,7 @@ GEM
     coderay (1.1.2)
     diff-lcs (1.3)
     docile (1.3.1)
+    duplicate (1.1.1)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
     ffi (1.9.25)
@@ -91,10 +93,11 @@ GEM
     htmlentities (4.3.4)
     httpclient (2.8.3)
     image_size (2.0.0)
-    iso-bib-item (0.1.5)
+    iso-bib-item (0.1.6)
+      duplicate
       isoics (~> 0.1.6)
       nokogiri
-    isobib (0.1.5)
+    isobib (0.1.6)
       algoliasearch
       iso-bib-item (~> 0.1.2)
     isoics (0.1.6)
@@ -112,7 +115,7 @@ GEM
     mime-types-data (3.2016.0521)
     mini_portile2 (2.3.0)
     nenv (0.3.0)
-    nokogiri (1.8.2)
+    nokogiri (1.8.3)
       mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)

data/asciidoctor-m3d.gemspec

@@ -36,8 +36,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thread_safe"
   spec.add_dependency "uuidtools"
 
-  spec.add_dependency "asciidoctor-iso", ">= 0.8.0"
-  spec.add_dependency "isodoc", ">= 0.7.0"
+  spec.add_dependency "asciidoctor-iso", ">= 0.9.0"
+  spec.add_dependency "isodoc", ">= 0.8.0"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug", "~> 9.1"

data/lib/asciidoctor-m3d.rb

@@ -3,3 +3,8 @@ require_relative "asciidoctor/m3d/converter"
 require_relative "isodoc/m3d/m3dhtmlconvert"
 require_relative "isodoc/m3d/m3dwordconvert"
 require_relative "asciidoctor/m3d/version"
+
+if defined? Metanorma
+  require_relative "metanorma/m3d"
+  Metanorma::Registry.instance.register(Metanorma::M3d::Processor)
+end

data/lib/asciidoctor/m3d/converter.rb

@@ -139,7 +139,7 @@ module Asciidoctor
       end
 
       def html_converter(node)
-        IsoDoc::M3d::Convert.new(
+        IsoDoc::M3d::HtmlConvert.new(
           script: node.attr("script"),
           bodyfont: node.attr("body-font"),
           headerfont: node.attr("header-font"),

data/lib/asciidoctor/m3d/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module M3d
-    VERSION = "0.2.7"
+    VERSION = "0.3.0"
   end
 end

data/lib/isodoc/m3d/html/header.html

@@ -138,7 +138,7 @@ background:#E0E0E0'><o:p>&nbsp;</o:p></span></p>
 
 <div style='mso-element:header' id=fh1>
 
-<p class=MsoHeader><img width="323" height="39" src="logo.jpg"></img>
+<p class=MsoHeader><img width="323" height="39" src="logo.png"></img>
 <!--[if gte vml 1]><v:line id="_x0000_s2049" alt=""
  style='position:absolute;flip:y;z-index:251659264;mso-wrap-style:none;
  mso-wrap-edited:f;mso-width-percent:0;mso-height-percent:0;

data/lib/isodoc/m3d/m3dhtmlconvert.rb

@@ -6,7 +6,7 @@ module IsoDoc
   module M3d
     # A {Converter} implementation that generates CSAND output, and a document
     # schema encapsulation of the document for validation
-    class Convert < IsoDoc::Convert
+    class HtmlConvert < IsoDoc::HtmlConvert
       def html_doc_path(file)
         File.join(File.dirname(__FILE__), File.join("html", file))
       end
@@ -110,7 +110,7 @@ module IsoDoc
       def error_parse(node, out)
         # catch elements not defined in ISO
         case node.name
-        when "pre" 
+        when "pre"
           pre_parse(node, out)
         when "keyword"
           out.span node.text, **{ class: "keyword" }

data/lib/isodoc/m3d/m3dhtmlrender.rb

@@ -2,7 +2,7 @@ module IsoDoc
   module M3d
     # A {Converter} implementation that generates CSAND output, and a document
     # schema encapsulation of the document for validation
-    class Convert < IsoDoc::Convert
+    class HtmlConvert < IsoDoc::HtmlConvert
             def annex_name(annex, name, div)
         div.h1 **{ class: "Annex" } do |t|
           t << "#{get_anchors[annex['id']][:label]} "

data/lib/isodoc/m3d/m3dwordconvert.rb

@@ -69,6 +69,7 @@ module IsoDoc
         params = meta.map { |k, v| [k.to_s, v] }.to_h
         File.open("header.html", "w") { |f| f.write(template.render(params)) }
         @files_to_delete << "header.html"
+        "header.html"
       end
 
       def header_strip(h)

data/lib/metanorma/m3d.rb

@@ -0,0 +1,7 @@
+require_relative "./m3d/processor"
+
+module Metanorma
+  module M3d
+
+  end
+end

data/lib/metanorma/m3d/processor.rb

@@ -0,0 +1,35 @@
+require "metanorma/processor"
+
+module Metanorma
+  module M3d
+    class Processor < Metanorma::Processor
+
+      def initialize
+        @short = :m3d
+        @input_format = :asciidoc
+        @asciidoctor_backend = :m3d
+      end
+
+      def output_formats
+        {
+          html: "html",
+          doc: "doc"
+        }
+      end
+
+      def input_to_isodoc(file)
+        Metanorma::Input::Asciidoc.new.process(file, @asciidoctor_backend)
+      end
+
+      def output(isodoc_node, outname, format, options={})
+        case format
+        when :html
+          IsoDoc::M3d::HtmlConvert.new(options).convert(outname, isodoc_node)
+        when :doc
+          IsoDoc::M3d::WordConvert.new(options).convert(outname, isodoc_node)
+        end
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-m3d
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2018-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -156,28 +156,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -362,6 +362,7 @@ files:
 - lib/isodoc/m3d/html/html_m3d_intro.html
 - lib/isodoc/m3d/html/html_m3d_titlepage.html
 - lib/isodoc/m3d/html/htmlstyle.scss
+- lib/isodoc/m3d/html/logo.jpg
 - lib/isodoc/m3d/html/m3d.scss
 - lib/isodoc/m3d/html/scripts.html
 - lib/isodoc/m3d/html/word_m3d_intro.html
@@ -372,6 +373,8 @@ files:
 - lib/isodoc/m3d/m3dwordconvert.rb
 - lib/isodoc/m3d/m3wordrender.rb
 - lib/isodoc/m3d/metadata.rb
+- lib/metanorma/m3d.rb
+- lib/metanorma/m3d/processor.rb
 homepage: https://github.com/riboseinc/asciidoctor-m3d
 licenses:
 - MIT
@@ -392,7 +395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: asciidoctor-m3d lets you write M3AAWG Documents (M3D) in AsciiDoc.