metanorma-m3d 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54f988fbd702d2edf27e7fe8cbadf837ab117ceed4c09f2c6cce94078ebcb67f
-  data.tar.gz: f3c5d31cf20bd1a1bcb5331f932abeda17085ee03ca92e3260cbe7dcee9f56b1
+  metadata.gz: 41e24693933de2a6ec176e4c61da0b2a89139544c8f3bb57fc6cf4be911cd812
+  data.tar.gz: 5986a9c10b9b4c9c74d6eae91b6ee380013986a1be0204345b531ac28b3187f9
 SHA512:
-  metadata.gz: be1f1427bcd49a2af4fa817e14a7eced3f28331f50ccd9cbd239c1fb1dd33ea1a3e1b95ec870baa4d768485c1a5b931e89c89a6d51bf3c827c851d1a7b0097f7
-  data.tar.gz: d339b404d41c021c546ce16c8e21b22c30d1a4338c2ccd5c3133fe5eb52440f0493b85e5dbe6af84f04c0885cc6a1d9d4b167e2e799a76b7e293a970d59021ed
+  metadata.gz: db2b4363d8d6310c3c5924b782b69cbbc15ed4995863bb96627e59c5e347a885a9dfaaaff063121ce9e52639c05f5b04bd975517c2209bab36c3a602a03b2756
+  data.tar.gz: c298f1510b6c7f1ad1620f57d5db05539499733572f5fb4cabde37e59a552115a6dde401fda5b944137a950849bf497dba887aa96538d324df202bf9dce1afc5

data/.travis.yml

@@ -1,15 +1,16 @@
-dist: trusty
-sudo: false
 language: ruby
+cache: bundler
+os:
+- linux
+- osx
 rvm:
-  - 2.5
-  - 2.4
-  - 2.3
-  - ruby-head
+- 2.5
+- 2.4
+- 2.3
+- ruby-head
 before_install:
-  - gem install bundler -v 2.0.1
-  - travis_retry sudo apt-get update
-  - sudo bash -c "curl -L https://raw.githubusercontent.com/metanorma/metanorma-linux-setup/master/ubuntu-install-puppeteer.sh | bash"
+- gem install bundler -v 2.0.1
+- bundle update
 matrix:
   allow_failures:
     - rvm: ruby-head

data/appveyor.yml

@@ -1,5 +1,8 @@
 version: '{build}'
 
+cache:
+  - vendor/bundle
+
 environment:
   matrix:
     - RUBY_VERSION: 25
@@ -17,6 +20,7 @@ install:
 
 build_script:
   - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+  - bundle config --local path vendor/bundle
   - bundle update
   - bundle install
 
@@ -26,5 +30,4 @@ before_test:
   - bundle -v
 
 test_script:
-  - bundle exec rake
-
+  - bundle exec rake

data/lib/asciidoctor/m3d/biblio.rng

@@ -636,22 +636,27 @@
       <ref name="ISO8601Date"/>
     </optional>
   </define>
+  <define name="BibliographicDateType">
+    <choice>
+      <value>published</value>
+      <value>accessed</value>
+      <value>created</value>
+      <value>implemented</value>
+      <value>obsoleted</value>
+      <value>confirmed</value>
+      <value>updated</value>
+      <value>issued</value>
+      <value>transmitted</value>
+      <value>copied</value>
+      <value>unchanged</value>
+      <value>circulated</value>
+    </choice>
+  </define>
   <define name="bdate">
     <element name="date">
       <attribute name="type">
         <choice>
-          <value>published</value>
-          <value>accessed</value>
-          <value>created</value>
-          <value>implemented</value>
-          <value>obsoleted</value>
-          <value>confirmed</value>
-          <value>updated</value>
-          <value>issued</value>
-          <value>transmitted</value>
-          <value>copied</value>
-          <value>unchanged</value>
-          <value>circulated</value>
+          <ref name="BibliographicDateType"/>
           <text/>
         </choice>
       </attribute>

data/lib/asciidoctor/m3d/converter.rb

@@ -1,7 +1,8 @@
 require "asciidoctor"
 require "metanorma/m3d/version"
-require "isodoc/m3d/m3dhtmlconvert"
-require "isodoc/m3d/m3dwordconvert"
+require "isodoc/m3d/html_convert"
+require "isodoc/m3d/word_convert"
+require "isodoc/m3d/pdf_convert"
 require "asciidoctor/standoc/converter"
 require "fileutils"
 

data/lib/asciidoctor/m3d/isodoc.rng

@@ -735,6 +735,20 @@
       <ref name="bookmark"/>
     </choice>
   </define>
+  <define name="PureTextElement">
+    <choice>
+      <text/>
+      <ref name="em"/>
+      <ref name="strong"/>
+      <ref name="sub"/>
+      <ref name="sup"/>
+      <ref name="tt"/>
+      <ref name="keyword"/>
+      <ref name="strike"/>
+      <ref name="smallcap"/>
+      <ref name="br"/>
+    </choice>
+  </define>
   <define name="source">
     <element name="source">
       <ref name="TypedUri"/>
@@ -742,42 +756,58 @@
   </define>
   <define name="em">
     <element name="em">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="strong">
     <element name="strong">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="tt">
     <element name="tt">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="keyword">
     <element name="keyword">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="sub">
     <element name="sub">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="sup">
     <element name="sup">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="strike">
     <element name="strike">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="smallcap">
     <element name="smallcap">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="br">

data/lib/asciidoctor/m3d/isostandard.rng

@@ -4,14 +4,6 @@
     <start>
       <ref name="iso-standard"/>
     </start>
-    <define name="language">
-      <element name="language">
-        <choice>
-          <value>en</value>
-          <value>fr</value>
-        </choice>
-      </element>
-    </define>
     <define name="script">
       <element name="script">
         <value>Latn</value>

data/lib/asciidoctor/m3d/m3d.rng

@@ -9,11 +9,6 @@
     <start>
       <ref name="m3d-standard"/>
     </start>
-    <define name="language">
-      <element name="language">
-        <value>en</value>
-      </element>
-    </define>
     <define name="docidentifier">
       <element name="docidentifier">
         <optional>

data/lib/isodoc/m3d/{m3dpdfrender.rb → base_convert.rb}

@@ -1,8 +1,20 @@
+require_relative "metadata"
+require "fileutils"
+
 module IsoDoc
   module M3d
-    # A {Converter} implementation that generates CSAND output, and a document
-    # schema encapsulation of the document for validation
-    class PdfConvert < IsoDoc::PdfConvert
+    module BaseRender
+      def metadata_init(lang, script, labels)
+        @meta = Metadata.new(lang, script, labels)
+      end
+      
+      def add_image(filenames)
+        filenames.each do |filename|
+          FileUtils.cp html_doc_path(filename), File.join(@localdir, filename)
+          @files_to_delete << File.join(@localdir, filename)
+        end
+      end
+
       def annex_name(annex, name, div)
         div.h1 **{ class: "Annex" } do |t|
           t << "#{get_anchors[annex['id']][:label]} "

data/lib/isodoc/m3d/{m3dhtmlconvert.rb → html_convert.rb}

@@ -1,20 +1,11 @@
 require "isodoc"
-require_relative "metadata"
-require_relative "m3dhtmlrender"
-require "fileutils"
+require_relative "base_convert"
 
 module IsoDoc
   module M3d
     # A {Converter} implementation that generates CSAND output, and a document
     # schema encapsulation of the document for validation
     class HtmlConvert < IsoDoc::HtmlConvert
-      def add_image(filenames)
-        filenames.each do |filename|
-          FileUtils.cp html_doc_path(filename), File.join(@localdir, filename)
-          @files_to_delete << File.join(@localdir, filename)
-        end
-      end
-
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
@@ -43,10 +34,6 @@ module IsoDoc
         }
       end
 
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-      end
-
       def colophon(body, docxml)
         body.div **{ class: "colophon" } do |div|
           div << <<~"COLOPHON"
@@ -77,6 +64,8 @@ module IsoDoc
       def html_toc(docxml)
         docxml
       end
+
+      include BaseRender
     end
   end
 end

data/lib/isodoc/m3d/{m3dpdfconvert.rb → pdf_convert.rb}

@@ -1,20 +1,11 @@
 require "isodoc"
-require_relative "metadata"
-require_relative "m3dpdfrender"
-require "fileutils"
+require_relative "base_convert"
 
 module IsoDoc
   module M3d
     # A {Converter} implementation that generates CSAND output, and a document
     # schema encapsulation of the document for validation
     class PdfConvert < IsoDoc::PdfConvert
-      def add_image(filenames)
-        filenames.each do |filename|
-          FileUtils.cp html_doc_path(filename), File.join(@localdir, filename)
-          @files_to_delete << File.join(@localdir, filename)
-        end
-      end
-
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
@@ -43,10 +34,6 @@ module IsoDoc
         }
       end
 
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-      end
-
       def colophon(body, docxml)
         body.div **{ class: "colophon" } do |div|
           div << <<~"COLOPHON"
@@ -77,6 +64,8 @@ module IsoDoc
       def html_toc(docxml)
         docxml
       end
+
+      include BaseRender
     end
   end
 end

data/lib/isodoc/m3d/{m3dwordconvert.rb → word_convert.rb}

@@ -1,6 +1,5 @@
 require "isodoc"
-require_relative "m3wordrender"
-require "fileutils"
+require_relative "base_convert"
 
 module IsoDoc
   module M3d
@@ -41,10 +40,6 @@ module IsoDoc
         }
       end
 
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-      end
-
       def colophon(body, docxml)
         section_break(body)
         body.div **{ class: "colophon" } do |div|
@@ -64,6 +59,8 @@ module IsoDoc
         main = isoxml&.at(ns("//title[@language='en']"))&.text
         set_metadata(:doctitle, main)
       end
+
+      include BaseRender
     end
   end
 end

data/lib/metanorma/m3d/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module M3d
-    VERSION = "1.1.4"
+    VERSION = "1.1.5"
   end
 end

data/lib/metanorma-m3d.rb

@@ -1,8 +1,8 @@
 require "asciidoctor" unless defined? Asciidoctor::Converter
 require_relative "asciidoctor/m3d/converter"
-require_relative "isodoc/m3d/m3dhtmlconvert"
-require_relative "isodoc/m3d/m3dpdfconvert"
-require_relative "isodoc/m3d/m3dwordconvert"
+require_relative "isodoc/m3d/html_convert"
+require_relative "isodoc/m3d/pdf_convert"
+require_relative "isodoc/m3d/word_convert"
 require_relative "metanorma/m3d/version"
 
 if defined? Metanorma

data/metanorma-m3d.gemspec

@@ -34,7 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mime-types"
   spec.add_dependency "nokogiri"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "ruby-xslt"
   spec.add_dependency "thread_safe"
   spec.add_dependency "uuidtools"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-m3d
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2019-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -108,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-xslt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: thread_safe
   requirement: !ruby/object:Gem::Requirement
@@ -354,7 +340,6 @@ files:
 - README.adoc
 - Rakefile
 - appveyor.yml
-- asciidoctor-m3d.gemspec.old
 - bin/console
 - bin/rspec
 - bin/setup
@@ -365,6 +350,7 @@ files:
 - lib/asciidoctor/m3d/isostandard.rng
 - lib/asciidoctor/m3d/m3d.rng
 - lib/asciidoctor/m3d/reqt.rng
+- lib/isodoc/m3d/base_convert.rb
 - lib/isodoc/m3d/html/dots-w@2x.png
 - lib/isodoc/m3d/html/dots@2x.png
 - lib/isodoc/m3d/html/header.html
@@ -379,13 +365,10 @@ files:
 - lib/isodoc/m3d/html/word_m3d_intro.html
 - lib/isodoc/m3d/html/word_m3d_titlepage.html
 - lib/isodoc/m3d/html/wordstyle.scss
-- lib/isodoc/m3d/m3dhtmlconvert.rb
-- lib/isodoc/m3d/m3dhtmlrender.rb
-- lib/isodoc/m3d/m3dpdfconvert.rb
-- lib/isodoc/m3d/m3dpdfrender.rb
-- lib/isodoc/m3d/m3dwordconvert.rb
-- lib/isodoc/m3d/m3wordrender.rb
+- lib/isodoc/m3d/html_convert.rb
 - lib/isodoc/m3d/metadata.rb
+- lib/isodoc/m3d/pdf_convert.rb
+- lib/isodoc/m3d/word_convert.rb
 - lib/metanorma-m3d.rb
 - lib/metanorma/m3d.rb
 - lib/metanorma/m3d/processor.rb

data/asciidoctor-m3d.gemspec.old

@@ -1,54 +0,0 @@
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "asciidoctor/m3d/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "asciidoctor-m3d"
-  spec.version       = Asciidoctor::M3d::VERSION
-  spec.authors       = ["Ribose Inc."]
-  spec.email         = ["open.source@ribose.com"]
-
-  spec.summary       = "asciidoctor-m3d lets you write M3AAWG Documents (M3D) in AsciiDoc."
-  spec.description   = <<~DESCRIPTION
-    asciidoctor-m3d lets you write M3AAWG Documents (M3D) in AsciiDoc syntax.
-
-    This gem is in active development.
-  DESCRIPTION
-
-  spec.homepage      = "https://github.com/riboseinc/asciidoctor-m3d"
-  spec.license       = "BSD-2-Clause"
-  spec.post_install_message = "The asciidoctor-csd gem has been deprecated and has been replaced by metanorma-csd"
-
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "asciidoctor", "~> 1.5.7"
-  spec.add_dependency "asciimath"
-  spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "image_size"
-  spec.add_dependency "mime-types"
-  spec.add_dependency "nokogiri"
-  spec.add_dependency "ruby-jing"
-  spec.add_dependency "ruby-xslt"
-  spec.add_dependency "thread_safe"
-  spec.add_dependency "uuidtools"
-
-  spec.add_dependency "asciidoctor-iso", "~> 0.10.2"
-  spec.add_dependency "isodoc", "~> 0.8.8"
-
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "byebug", "~> 9.1"
-  spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  spec.add_development_dependency "guard", "~> 2.14"
-  spec.add_development_dependency "guard-rspec", "~> 4.7"
-  spec.add_development_dependency "rake", "~> 12.0"
-  spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "~> 0.50"
-  spec.add_development_dependency "simplecov", "~> 0.15"
-  spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "metanorma", "~> 0.2.5"
-end

data/lib/isodoc/m3d/m3dhtmlrender.rb

@@ -1,49 +0,0 @@
-module IsoDoc
-  module M3d
-    # A {Converter} implementation that generates CSAND output, and a document
-    # schema encapsulation of the document for validation
-    class HtmlConvert < IsoDoc::HtmlConvert
-      def annex_name(annex, name, div)
-        div.h1 **{ class: "Annex" } do |t|
-          t << "#{get_anchors[annex['id']][:label]} "
-          t.br
-          t.b do |b|
-            name&.children&.each { |c2| parse(c2, b) }
-          end
-        end
-      end
-
-      def term_defs_boilerplate(div, source, term, preface)
-        if source.empty? && term.nil?
-          div << @no_terms_boilerplate
-        else
-          div << term_defs_boilerplate_cont(source, term)
-        end
-      end
-
-      def i18n_init(lang, script)
-        super
-        @annex_lbl = "Appendix"
-      end
-
-      def fileloc(loc)
-        File.join(File.dirname(__FILE__), loc)
-      end
-
-      def cleanup(docxml)
-        super
-        term_cleanup(docxml)
-      end
-
-      def term_cleanup(docxml)
-        docxml.xpath("//p[@class = 'Terms']").each do |d|
-          h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
-          h2.add_child("&nbsp;")
-          h2.add_child(d.remove)
-        end
-        docxml
-      end
-    end
-  end
-end
-

data/lib/isodoc/m3d/m3wordrender.rb

@@ -1,49 +0,0 @@
-module IsoDoc
-  module M3d
-    # A {Converter} implementation that generates CSAND output, and a document
-    # schema encapsulation of the document for validation
-    class WordConvert < IsoDoc::WordConvert
-      def annex_name(annex, name, div)
-        div.h1 **{ class: "Annex" } do |t|
-          t << "#{get_anchors[annex['id']][:label]} "
-          t.br
-          t.b do |b|
-            name&.children&.each { |c2| parse(c2, b) }
-          end
-        end
-      end
-
-      def term_defs_boilerplate(div, source, term, preface)
-        if source.empty? && term.nil?
-          div << @no_terms_boilerplate
-        else
-          div << term_defs_boilerplate_cont(source, term)
-        end
-      end
-
-      def i18n_init(lang, script)
-        super
-        @annex_lbl = "Appendix"
-      end
-
-      def fileloc(loc)
-        File.join(File.dirname(__FILE__), loc)
-      end
-
-      def cleanup(docxml)
-        super
-        term_cleanup(docxml)
-      end
-
-      def term_cleanup(docxml)
-        docxml.xpath("//p[@class = 'Terms']").each do |d|
-          h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
-          h2.add_child("&nbsp;")
-          h2.add_child(d.remove)
-        end
-        docxml
-      end
-    end
-  end
-end
-