metanorma-vsd 0.3.3 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5a0aeeb23fa51dc9534b03fe5fca846ee06f797fb0454876d20cbfee351d6dc
-  data.tar.gz: dc14705b436e4a7354e97c3cd43ebc528610e12db3637ab279552dcb57b731c0
+  metadata.gz: 1dcd7b0097099695ea64dc393d368259a9cb9018761fe2d7bef3122a464cc9e8
+  data.tar.gz: 3068a1e2a43d4aa125cb0473d95b7aa0f453f079049a95bbee0fe870bfab56ec
 SHA512:
-  metadata.gz: a91fd5b6002864774d01176930c1c9f5de8c43430fe44f4619a433e608552032674d8c3e6596addc3f6cfe6f683efdbbef940191060b6364c4b822345cfb5d49
-  data.tar.gz: b6b4aa601022d8810d4ec42747e965c19f045c49470a44d616b23158ad7e4bf9508bc288937d98d0ce705a9904d3bb992e60a2ec76b17978998940fe18a5cd64
+  metadata.gz: cde8ea03566fe1d5c45323a172b426f22231d10b729a3ef0cd4e248014d3c4701f60178b70dd91dca4835b7330fb86596f8055ed77eee8d543f7ad41a3b0d00d
+  data.tar.gz: 219c2b23836081d0aef8f9d527909bf98160c3c6dc825a2102f1f3ab535e90c60589ebcef0f724e4e0bf3adc1cee5e28c85886b361fc1d55427509007ddb2069

data/.travis.yml

@@ -1,15 +1,20 @@
-dist: trusty
-sudo: false
+# Auto-generated !!! Do not edit it manually
+# use ci-master https://github.com/metanorma/metanorma-build-scripts
 language: ruby
+cache: bundler
+os:
+- linux
+- osx
 rvm:
-  - 2.5
-  - 2.4
-  - ruby-head
-before_install:
-  - gem install bundler -v 1.16.1
-  - npm install -g puppeteer
-  - npm install
-  - unset _JAVA_OPTIONS
+- 2.5
+- 2.4
+- ruby-head
+before_install: 
+- nvm install 8
+- npm install -g puppeteer
+- npm install
+- gem install bundler -v "~> 2"
+- bundle update
 matrix:
   allow_failures:
     - rvm: ruby-head

data/Gemfile

@@ -1,3 +1,6 @@
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
+
 source "https://rubygems.org"
 git_source(:github) {|repo| "https://github.com/#{repo}" }
 

data/README.adoc

@@ -1,8 +1,10 @@
 = Metanorma for VSD: Metanorma processor for Vitagreen Standard Documents (VSD)
 
-image:https://img.shields.io/gem/v/metanorma-rsd.svg["Gem Version", link="https://rubygems.org/gems/metanorma-rsd"]
-image:https://img.shields.io/travis/riboseinc/metanorma-rsd/master.svg["Build Status", link="https://travis-ci.org/riboseinc/metanorma-rsd"]
-image:https://codeclimate.com/github/riboseinc/metanorma-rsd/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/riboseinc/metanorma-rsd"]
+image:https://img.shields.io/gem/v/metanorma-vsd.svg["Gem Version", link="https://rubygems.org/gems/metanorma-vsd"]
+image:https://img.shields.io/travis/riboseinc/metanorma-vsd/master.svg["Build Status", link="https://travis-ci.org/riboseinc/metanorma-vsd"]
+image:https://codeclimate.com/github/riboseinc/metanorma-vsd/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/riboseinc/metanorma-vsd"]
+image:https://ci.appveyor.com/api/projects/status/525uihjhrm2e9s4f?svg=true["Appveyor Build Status", link="https://ci.appveyor.com/project/ribose/metanorma-vsd"]
+
 
 WARNING: This gem is still under development.
 
@@ -39,10 +41,10 @@ The preferred way to invoke this gem is via the `metanorma` script:
 
 [source,console]
 ----
-$ metanorma --type rsd a.adoc                   # output HTML and DOC
-$ metanorma --type rsd --extensions html a.adoc # output just HTML
-$ metanorma --type rsd --extensions doc a.adoc  # output just DOC
-$ metanorma --type rsd --extensions xml a.adoc  # output VSD XML
+$ metanorma --type vsd a.adoc                   # output HTML and DOC
+$ metanorma --type vsd --extensions html a.adoc # output just HTML
+$ metanorma --type vsd --extensions doc a.adoc  # output just DOC
+$ metanorma --type vsd --extensions xml a.adoc  # output VSD XML
 ----
 
 The gem translates the document into VSD XML format, and then
@@ -53,12 +55,6 @@ document.
 
 The gem then converts the XML into HTML and PDF.
 
-The gem can also be invoked directly within asciidoctor, though this is deprecated:
-
-[source,console]
-----
-$ asciidoctor -b rsd -r 'asciidoctor-rsd' a.adoc  
-----
 
 === Installation
 
@@ -69,7 +65,7 @@ scripts such as this one. You need only run the following in a Terminal console:
 [source,console]
 ----
 $ bash <(curl -s https://raw.githubusercontent.com/riboseinc/metanorma-macos-setup/master/metanorma-setup)
-$ gem install asciidoctor-rsd
+$ gem install metanorma-vsd
 ----
 
 
@@ -163,7 +159,7 @@ these are otherwise suppressed.
 The VSD Standard Document format is an instance of the
 https://github.com/riboseinc/isodoc-models[StandardDocument model]. Details of
 this general model can be found on its page. Details of the VSD modifications
-to this general model can be found on the https://github.com/riboseinc/rsd[VSD model]
+to this general model can be found on the https://github.com/riboseinc/metanorma-model-vsd[VSD model]
 repository.
 
 == Examples

data/appveyor.yml

@@ -0,0 +1,36 @@
+# Auto-generated !!! Do not edit it manually
+# use ci-master https://github.com/metanorma/metanorma-build-scripts
+version: '{build}'
+
+cache:
+  - vendor/bundle
+
+environment:
+  matrix:
+    - RUBY_VERSION: 25
+    - RUBY_VERSION: 24
+    - RUBY_VERSION: _trunk
+
+matrix:
+  allow_failures:
+    - RUBY_VERSION: _trunk
+
+install:
+  - ps: . { iwr -useb https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/appveyor.ps1 } | iex
+  - refreshenv
+
+build_script:
+  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+  - set GIT_TERMINAL_PROMPT=0
+  - gem install bundler -v "~> 2"
+  - bundle config --local path vendor/bundle
+  - bundle update
+  - bundle install
+
+before_test:
+  - ruby -v
+  - gem -v
+  - bundle -v
+
+test_script:
+  - bundle exec rake

data/lib/asciidoctor/vsd/converter.rb

@@ -1,4 +1,4 @@
-require "asciidoctor/rsd/converter"
+require "asciidoctor/standoc/converter"
 require "isodoc/vsd"
 
 module Asciidoctor
@@ -7,7 +7,7 @@ module Asciidoctor
     # A {Converter} implementation that generates RSD output, and a document
     # schema encapsulation of the document for validation
     #
-    class Converter < Asciidoctor::Rsd::Converter
+    class Converter < Standoc::Converter
 
       register_for "vsd"
 
@@ -47,7 +47,7 @@ module Asciidoctor
         result << noko { |ixml| front node, ixml }
         result << noko { |ixml| middle node, ixml }
         result << "</vsd-standard>"
-        result = textcleanup(result.flatten * "\n")
+        result = textcleanup(result)
         ret1 = cleanup(Nokogiri::XML(result))
         validate(ret1)
         ret1.root.add_namespace(nil, IsoDoc::Vsd::DOCUMENT_NAMESPACE)

data/lib/isodoc/vsd/html/html_vsd_titlepage.html

@@ -1,5 +1,5 @@
-<div class="document-stage-band" id='{{ status | downcase | replace: " ", "-" }}-band'>
-    <p class="document-stage">{{ status }}</p>
+<div class="document-stage-band" id='{{ stage | downcase | replace: " ", "-" }}-band'>
+    <p class="document-stage">{{ stage }}</p>
 </div>
 
 <div class="document-type-band" id='{{ doctype | downcase | replace: " ", "-" }}-band'>
@@ -46,7 +46,7 @@
   </div>
 
   <div class="coverpage-stage-block" >
-    <p><span class="coverpage-maturity" id="{{ status | replace: ' ', '-' | downcase }}">{{ status }}</span></p>
+    <p><span class="coverpage-maturity" id="{{ stage | replace: ' ', '-' | downcase }}">{{ stage }}</span></p>
 {% if security %}
 <p><span class="coverpage-maturity">Classification: {{ security }}</span></p>
 {% endif %}
@@ -56,7 +56,7 @@
 <div  class="coverpage-stage-block" >{{ revdate }}</div>
 {% endif %}
 
-{% if status != "Published" and status != "Withdrawn" %}
+{% if stage != "Published" and stage != "Withdrawn" %}
   <div class="coverpage-warning">
     <span class="title">Warning for Drafts</span>
 

data/lib/isodoc/vsd/html/htmlstyle.scss

@@ -212,7 +212,7 @@ table {
     list-style: none;
 }
 
-#toc li {
+#toc li a {
     padding: 5px 10px;
 }
 
@@ -223,6 +223,7 @@ table {
 }
 
 #toc a:hover {
+    box-shadow: none;
     color: white;
 }
 
@@ -521,6 +522,14 @@ ul li:first-child {
   margin-top: 1em;
 }
 
+div.figure > img {
+margin-left: auto;
+margin-right: auto;
+display: block;
+max-width: 100%;
+height: auto;
+}
+
     #toc-list ul {margin-bottom: 0.25em;}
 
     #toc-list li {list-style-type: none;}

data/lib/isodoc/vsd/html/scripts.html

@@ -1,7 +1,7 @@
   <script>
     //TOC generation
       $('#toc').toc({
-          'selectors': 'h1,h2:not(.TermNum)', //elements to use as headings
+          'selectors': toclevel(), //elements to use as headings
           'container': 'main', //element to find all selectors in
           'smoothScrolling': true, //enable or disable smooth scrolling on click
           'prefix': 'toc', //prefix for anchor tags and class names
@@ -66,6 +66,7 @@ $('#toggle').on('click', function(){
 !function(A,e){"use strict";"function"==typeof define&&define.amd?define([],e):"object"==typeof module&&module.exports?module.exports=e():(A.AnchorJS=e(),A.anchors=new A.AnchorJS)}(this,function(){"use strict";return function(A){function e(A){A.icon=A.hasOwnProperty("icon")?A.icon:"",A.visible=A.hasOwnProperty("visible")?A.visible:"hover",A.placement=A.hasOwnProperty("placement")?A.placement:"right",A.ariaLabel=A.hasOwnProperty("ariaLabel")?A.ariaLabel:"Anchor",A.class=A.hasOwnProperty("class")?A.class:"",A.truncate=A.hasOwnProperty("truncate")?Math.floor(A.truncate):64}function t(A){var e;if("string"==typeof A||A instanceof String)e=[].slice.call(document.querySelectorAll(A));else{if(!(Array.isArray(A)||A instanceof NodeList))throw new Error("The selector provided to AnchorJS was invalid.");e=[].slice.call(A)}return e}function i(){if(null===document.head.querySelector("style.anchorjs")){var A,e=document.createElement("style");e.className="anchorjs",e.appendChild(document.createTextNode("")),void 0===(A=document.head.querySelector('[rel="stylesheet"], style'))?document.head.appendChild(e):document.head.insertBefore(e,A),e.sheet.insertRule(" .anchorjs-link {   opacity: 0;   text-decoration: none;   -webkit-font-smoothing: antialiased;   -moz-osx-font-smoothing: grayscale; }",e.sheet.cssRules.length),e.sheet.insertRule(" *:hover > .anchorjs-link, .anchorjs-link:focus  {   opacity: 1; }",e.sheet.cssRules.length),e.sheet.insertRule(" [data-anchorjs-icon]::after {   content: attr(data-anchorjs-icon); }",e.sheet.cssRules.length),e.sheet.insertRule(' @font-face {   font-family: "anchorjs-icons";   src: url(data:n/a;base64,AAEAAAALAIAAAwAwT1MvMg8yG2cAAAE4AAAAYGNtYXDp3gC3AAABpAAAAExnYXNwAAAAEAAAA9wAAAAIZ2x5ZlQCcfwAAAH4AAABCGhlYWQHFvHyAAAAvAAAADZoaGVhBnACFwAAAPQAAAAkaG10eASAADEAAAGYAAAADGxvY2EACACEAAAB8AAAAAhtYXhwAAYAVwAAARgAAAAgbmFtZQGOH9cAAAMAAAAAunBvc3QAAwAAAAADvAAAACAAAQAAAAEAAHzE2p9fDzz1AAkEAAAAAADRecUWAAAAANQA6R8AAAAAAoACwAAAAAgAAgAAAAAAAAABAAADwP/AAAACgAAA/9MCrQABAAAAAAAAAAAAAAAAAAAAAwABAAAAAwBVAAIAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAMCQAGQAAUAAAKZAswAAACPApkCzAAAAesAMwEJAAAAAAAAAAAAAAAAAAAAARAAAAAAAAAAAAAAAAAAAAAAQAAg//0DwP/AAEADwABAAAAAAQAAAAAAAAAAAAAAIAAAAAAAAAIAAAACgAAxAAAAAwAAAAMAAAAcAAEAAwAAABwAAwABAAAAHAAEADAAAAAIAAgAAgAAACDpy//9//8AAAAg6cv//f///+EWNwADAAEAAAAAAAAAAAAAAAAACACEAAEAAAAAAAAAAAAAAAAxAAACAAQARAKAAsAAKwBUAAABIiYnJjQ3NzY2MzIWFxYUBwcGIicmNDc3NjQnJiYjIgYHBwYUFxYUBwYGIwciJicmNDc3NjIXFhQHBwYUFxYWMzI2Nzc2NCcmNDc2MhcWFAcHBgYjARQGDAUtLXoWOR8fORYtLTgKGwoKCjgaGg0gEhIgDXoaGgkJBQwHdR85Fi0tOAobCgoKOBoaDSASEiANehoaCQkKGwotLXoWOR8BMwUFLYEuehYXFxYugC44CQkKGwo4GkoaDQ0NDXoaShoKGwoFBe8XFi6ALjgJCQobCjgaShoNDQ0NehpKGgobCgoKLYEuehYXAAAADACWAAEAAAAAAAEACAAAAAEAAAAAAAIAAwAIAAEAAAAAAAMACAAAAAEAAAAAAAQACAAAAAEAAAAAAAUAAQALAAEAAAAAAAYACAAAAAMAAQQJAAEAEAAMAAMAAQQJAAIABgAcAAMAAQQJAAMAEAAMAAMAAQQJAAQAEAAMAAMAAQQJAAUAAgAiAAMAAQQJAAYAEAAMYW5jaG9yanM0MDBAAGEAbgBjAGgAbwByAGoAcwA0ADAAMABAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAH//wAP) format("truetype"); }',e.sheet.cssRules.length)}}this.options=A||{},this.elements=[],e(this.options),this.isTouchDevice=function(){return!!("ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch)},this.add=function(A){var n,o,s,a,r,c,h,l,u,d,f,p=[];if(e(this.options),"touch"===(f=this.options.visible)&&(f=this.isTouchDevice()?"always":"hover"),A||(A="h2, h3, h4, h5, h6"),0===(n=t(A)).length)return this;for(i(),o=document.querySelectorAll("[id]"),s=[].map.call(o,function(A){return A.id}),r=0;r<n.length;r++)if(this.hasAnchorJSLink(n[r]))p.push(r);else{if(n[r].hasAttribute("id"))a=n[r].getAttribute("id");else if(n[r].hasAttribute("data-anchor-id"))a=n[r].getAttribute("data-anchor-id");else{u=l=this.urlify(n[r].textContent),h=0;do{void 0!==c&&(u=l+"-"+h),c=s.indexOf(u),h+=1}while(-1!==c);c=void 0,s.push(u),n[r].setAttribute("id",u),a=u}a.replace(/-/g," "),(d=document.createElement("a")).className="anchorjs-link "+this.options.class,d.href="#"+a,d.setAttribute("aria-label",this.options.ariaLabel),d.setAttribute("data-anchorjs-icon",this.options.icon),"always"===f&&(d.style.opacity="1"),""===this.options.icon&&(d.style.font="1em/1 anchorjs-icons","left"===this.options.placement&&(d.style.lineHeight="inherit")),"left"===this.options.placement?(d.style.position="absolute",d.style.marginLeft="-1em",d.style.paddingRight="0.5em",n[r].insertBefore(d,n[r].firstChild)):(d.style.paddingLeft="0.375em",n[r].appendChild(d))}for(r=0;r<p.length;r++)n.splice(p[r]-r,1);return this.elements=this.elements.concat(n),this},this.remove=function(A){for(var e,i,n=t(A),o=0;o<n.length;o++)(i=n[o].querySelector(".anchorjs-link"))&&(-1!==(e=this.elements.indexOf(n[o]))&&this.elements.splice(e,1),n[o].removeChild(i));return this},this.removeAll=function(){this.remove(this.elements)},this.urlify=function(A){var t=/[& +$,:;=?@"#{}|^~[`%!'<>\]\.\/\(\)\*\\]/g;return this.options.truncate||e(this.options),A.trim().replace(/\'/gi,"").replace(t,"-").replace(/-{2,}/g,"-").substring(0,this.options.truncate).replace(/^-+|-+$/gm,"").toLowerCase()},this.hasAnchorJSLink=function(A){var e=A.firstChild&&(" "+A.firstChild.className+" ").indexOf(" anchorjs-link ")>-1,t=A.lastChild&&(" "+A.lastChild.className+" ").indexOf(" anchorjs-link ")>-1;return e||t||!1}}});  </script>
 
   <script>
+/*
   $(document).ready(function() {
           $('[id^=toc]').each(function ()
           {
@@ -74,6 +75,7 @@ $('#toggle').on('click', function(){
              currentToc.wrap("<a href='" + url + "#" + currentToc.attr("id") + "' </a>");
           });
 });
+*/
   anchors.options = {
   placement: 'left'
 };

data/lib/isodoc/vsd/html/word_vsd_titlepage.html

@@ -18,7 +18,7 @@ margin-left:4.25pt;margin-right:4.25pt'>
 
 <p class="MsoNormal" align="center" style='text-align:center;border:none;
 mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-                     lang="EN-GB" style='font-size:16.0pt'>{{ status }} {{ doctype }}</span></p>
+                     lang="EN-GB" style='font-size:16.0pt'>{{ stage }} {{ doctype }}</span></p>
 
 {% if security %}
 <p class="MsoNormal" align="center" style='text-align:center;border:none;
@@ -39,7 +39,7 @@ mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0
 mso-border-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 1.0pt 4.0pt;
 margin-left:4.25pt;margin-right:4.25pt'>
 
-{% if status != "Published" and status != "Withdrawn" %}
+{% if stage != "Published" and stage != "Withdrawn" %}
 <p class="MsoNormal" align="center" style='margin-bottom:6.0pt;text-align:center;
 border:none;mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:
 1.0pt 4.0pt 1.0pt 4.0pt'><b style='mso-bidi-font-weight:normal'><span

data/lib/isodoc/vsd/html_convert.rb

@@ -1,4 +1,4 @@
-require "isodoc/rsd/html_convert"
+require "isodoc/html_convert"
 require_relative "metadata"
 
 module IsoDoc
@@ -7,46 +7,43 @@ module IsoDoc
     # A {Converter} implementation that generates HTML output, and a document
     # schema encapsulation of the document for validation
     #
-    class HtmlConvert < IsoDoc::Rsd::HtmlConvert
-      def vsd_html_path(file)
-        File.join(File.dirname(__FILE__), File.join("html", file))
+    class HtmlConvert < IsoDoc::HtmlConvert
+      def initialize(options)
+        @libdir ||= File.dirname(__FILE__)
+        super
       end
 
-      def initialize(options)
+      def convert1(docxml, filename, dir)
+        FileUtils.cp html_doc_path('logo.png'), File.join(@localdir, "logo.png")
+        @files_to_delete << File.join(@localdir, "logo.png")
         super
-        @htmlstylesheet = generate_css(vsd_html_path("htmlstyle.scss"), true, default_fonts(options))
-        @htmlcoverpage = vsd_html_path("html_vsd_titlepage.html")
-        @htmlintropage = vsd_html_path("html_vsd_intro.html")
-        @scripts = vsd_html_path("scripts.html")
-        system "cp #{vsd_html_path('logo.png')} logo.png"
-        @files_to_delete << "logo.png"
       end
 
       def default_fonts(options)
-        b = options[:bodyfont] ||
-          (options[:script] == "Hans" ? '"SimSun",serif' :
-           '"Overpass",sans-serif')
-        h = options[:headerfont] ||
-          (options[:script] == "Hans" ? '"SimHei",sans-serif' :
-           '"Overpass",sans-serif')
-        m = options[:monospacefont] || '"Space Mono",monospace'
-        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
+        {
+            bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Overpass",sans-serif'),
+            headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Overpass",sans-serif'),
+            monospacefont: '"Space Mono",monospace'
+        }
       end
 
-      def html_head
-        <<~HEAD.freeze
-    <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+      def default_file_locations(_options)
+        {
+          htmlstylesheet: html_doc_path("htmlstyle.scss"),
+          htmlcoverpage: html_doc_path("html_vsd_titlepage.html"),
+          htmlintropage: html_doc_path("html_vsd_intro.html"),
+          scripts: html_doc_path("scripts.html"),
+        }
+      end
 
-    <!--TOC script import-->
-    <script type="text/javascript" src="https://cdn.rawgit.com/jgallen23/toc/0.3.2/dist/toc.min.js"></script>
+      def metadata_init(lang, script, labels)
+        @meta = Metadata.new(lang, script, labels)
+      end
 
-    <!--Google fonts-->
+      def googlefonts
+        <<~HEAD.freeze
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet">
-    <!--Font awesome import for the link icon-->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous">
-    <style class="anchorjs"></style>
         HEAD
       end
 
@@ -58,7 +55,6 @@ module IsoDoc
           make_body3(body, docxml)
         end
       end
-
     end
   end
 end

data/lib/isodoc/vsd/metadata.rb

@@ -1,10 +1,16 @@
 require "isodoc"
-require "isodoc/rsd/metadata"
 
 module IsoDoc
   module Vsd
+    class Metadata < IsoDoc::Metadata
 
-    class Metadata < IsoDoc::Rsd::Metadata
+      def security(isoxml, _out)
+        keywords = []
+        isoxml.xpath(ns("//bibdata/keyword")).each do |kw|
+          keywords << kw.text
+        end
+        set(:keywords, keywords)
+      end
 
     end
   end

data/lib/isodoc/vsd/pdf_convert.rb

@@ -1,51 +1,41 @@
-require "isodoc"
-require "isodoc/rsd/pdf_convert"
+require "isodoc/pdf_convert"
 require_relative "metadata"
 
 module IsoDoc
   module Vsd
     # A {Converter} implementation that generates PDF HTML output, and a
     # document schema encapsulation of the document for validation
-    class PdfConvert < IsoDoc::Rsd::PdfConvert
-      def vsd_html_path(file)
-        File.join(File.dirname(__FILE__), File.join("html", file))
-      end
-
+    class PdfConvert < IsoDoc::PdfConvert
       def initialize(options)
+        @libdir ||= File.dirname(__FILE__)
         super
-        @htmlstylesheet = generate_css(vsd_html_path("htmlstyle.scss"), true, default_fonts(options))
-        @htmlcoverpage = vsd_html_path("html_vsd_titlepage.html")
-        @htmlintropage = vsd_html_path("html_vsd_intro.html")
-        @scripts = vsd_html_path("scripts.html")
-        system "cp #{vsd_html_path('logo.png')} logo.png"
-        @files_to_delete << "logo.png"
       end
 
       def default_fonts(options)
-        b = options[:bodyfont] ||
-          (options[:script] == "Hans" ? '"SimSun",serif' :
-           '"Overpass",sans-serif')
-        h = options[:headerfont] ||
-          (options[:script] == "Hans" ? '"SimHei",sans-serif' :
-           '"Overpass",sans-serif')
-        m = options[:monospacefont] || '"Space Mono",monospace'
-        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
+        {
+            bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Overpass",sans-serif'),
+            headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Overpass",sans-serif'),
+            monospacefont: '"Space Mono",monospace'
+        }
       end
 
-      def html_head()
-        <<~HEAD.freeze
-    <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+      def default_file_locations(_options)
+        {
+            htmlstylesheet: html_doc_path("htmlstyle.scss"),
+            htmlcoverpage: html_doc_path("html_vsd_titlepage.html"),
+            htmlintropage: html_doc_path("html_vsd_intro.html"),
+            scripts: html_doc_path("scripts.html"),
+        }
+      end
 
-    <!--TOC script import-->
-    <script type="text/javascript"  src="https://cdn.rawgit.com/jgallen23/toc/0.3.2/dist/toc.min.js"></script>
+      def metadata_init(lang, script, labels)
+        @meta = Metadata.new(lang, script, labels)
+      end
 
-    <!--Google fonts-->
+      def googlefonts
+        <<~HEAD.freeze
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet">
-    <!--Font awesome import for the link icon-->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous">
-<style class="anchorjs"></style>
         HEAD
       end
 

data/lib/isodoc/vsd/word_convert.rb

@@ -1,5 +1,4 @@
-require "isodoc"
-require "isodoc/rsd/word_convert"
+require "isodoc/word_convert"
 require_relative "metadata"
 
 module IsoDoc
@@ -7,33 +6,34 @@ module IsoDoc
     # A {Converter} implementation that generates Word output, and a document
     # schema encapsulation of the document for validation
 
-    class WordConvert < IsoDoc::Rsd::WordConvert
-      def vsd_html_path(file)
-        File.join(File.dirname(__FILE__), File.join("html", file))
-      end
-
+    class WordConvert < IsoDoc::WordConvert
       def initialize(options)
+        @libdir ||= File.dirname(__FILE__)
         super
-        @wordstylesheet = generate_css(vsd_html_path("wordstyle.scss"), false, default_fonts(options))
-        @standardstylesheet = generate_css(vsd_html_path("vsd.scss"), false, default_fonts(options))
-        @header = vsd_html_path("header.html")
-        @wordcoverpage = vsd_html_path("word_vsd_titlepage.html")
-        @wordintropage = vsd_html_path("word_vsd_intro.html")
-        @ulstyle = "l3"
-        @olstyle = "l2"
-        system "cp #{vsd_html_path('logo.png')} logo.png"
-        @files_to_delete << "logo.png"
       end
 
       def default_fonts(options)
-        b = options[:bodyfont] ||
-          (options[:script] == "Hans" ? '"SimSun",serif' :
-           '"Arial",sans-serif')
-        h = options[:headerfont] ||
-          (options[:script] == "Hans" ? '"SimHei",sans-serif' :
-           '"Arial",sans-serif')
-        m = options[:monospacefont] || '"Courier New",monospace'
-        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
+        {
+            bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Arial",sans-serif'),
+            headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Arial",sans-serif'),
+            monospacefont: '"Courier New",monospace'
+        }
+      end
+
+      def default_file_locations(options)
+        {
+            wordstylesheet: html_doc_path("wordstyle.scss"),
+            standardstylesheet: html_doc_path("vsd.scss"),
+            header: html_doc_path("header.html"),
+            wordcoverpage: html_doc_path("word_vsd_titlepage.html"),
+            wordintropage: html_doc_path("word_vsd_intro.html"),
+            ulstyle: "l3",
+            olstyle: "l2",
+        }
+      end
+
+      def metadata_init(lang, script, labels)
+        @meta = Metadata.new(lang, script, labels)
       end
 
       def make_body(xml, docxml)

data/lib/metanorma/vsd/processor.rb

@@ -1,8 +1,8 @@
-require "metanorma/rsd/processor"
+require "metanorma/processor"
 
 module Metanorma
   module Vsd
-    class Processor < Metanorma::Rsd::Processor
+    class Processor < Metanorma::Processor
 
       def initialize
         @short = :vsd
@@ -22,8 +22,8 @@ module Metanorma
         "Metanorma::Vsd #{Metanorma::Vsd::VERSION}"
       end
 
-      def input_to_isodoc(file)
-        Metanorma::Input::Asciidoc.new.process(file, @asciidoctor_backend)
+      def input_to_isodoc(file, filename)
+        Metanorma::Input::Asciidoc.new.process(file, filename, @asciidoctor_backend)
       end
 
       def output(isodoc_node, outname, format, options={})

data/lib/metanorma/vsd/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Vsd
-    VERSION = "0.3.3"
+    VERSION = "0.4.1"
   end
 end

data/metanorma-vsd.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
     This gem is in active development.
   DESCRIPTION
 
-  spec.homepage      = "https://github.com/riboseinc/metanorma-vsd"
+  spec.homepage      = "https://github.com/metanorma/metanorma-vsd"
   spec.license       = "BSD-2-Clause"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -24,16 +24,16 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+ spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "asciidoctor", "~> 1.5.7"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "nokogiri"
-  spec.add_dependency "asciidoctor-iso", "~> 0.9.6"
-  spec.add_dependency "asciidoctor-rsd", "~> 0.3.3"
+  spec.add_dependency "metanorma-iso", "~> 1.2.0"
   spec.add_dependency "metanorma"
-  spec.add_dependency "isodoc", ">= 0.8.4"
+  spec.add_dependency "isodoc", "~> 0.10.0"
 
-  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "bundler", "~> 2"
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-vsd
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2019-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -53,33 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: asciidoctor-iso
+  name: metanorma-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.6
-- !ruby/object:Gem::Dependency
-  name: asciidoctor-rsd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: metanorma
   requirement: !ruby/object:Gem::Requirement
@@ -98,30 +84,30 @@ dependencies:
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -265,6 +251,7 @@ files:
 - LICENSE
 - README.adoc
 - Rakefile
+- appveyor.yml
 - bin/console
 - bin/rspec
 - bin/setup
@@ -273,7 +260,6 @@ files:
 - lib/asciidoctor/vsd/converter.rb
 - lib/asciidoctor/vsd/isodoc.rng
 - lib/asciidoctor/vsd/isostandard.rng
-- lib/asciidoctor/vsd/pdf.js
 - lib/asciidoctor/vsd/vsd.rng
 - lib/isodoc/vsd.rb
 - lib/isodoc/vsd/html/header.html
@@ -295,7 +281,7 @@ files:
 - lib/metanorma/vsd/processor.rb
 - lib/metanorma/vsd/version.rb
 - metanorma-vsd.gemspec
-homepage: https://github.com/riboseinc/metanorma-vsd
+homepage: https://github.com/metanorma/metanorma-vsd
 licenses:
 - BSD-2-Clause
 metadata: {}
@@ -307,7 +293,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -315,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: metanorma-vsd lets you write RSD in Metanorma.

data/lib/asciidoctor/vsd/pdf.js

@@ -1,31 +0,0 @@
-'use strict';
-
-try {
-    require.resolve("puppeteer");
-} catch(e) {
-    console.error("puppeteer Node library is not installed; will not generate PDF");
-    process.exit(e.code);
-}
-
-const puppeteer = require('puppeteer');
-
-const createPdf = async() => {
-  let browser;
-  try {
-    browser = await puppeteer.launch({args: ['--no-sandbox', '--disable-setuid-sandbox']});
-    const page = await browser.newPage();
-    await page.goto(process.argv[2], {waitUntil: 'networkidle2'});
-    await page.pdf({
-      path: process.argv[3],
-      format: 'A4'
-    });
-  } catch (err) {
-      console.log(err.message);
-  } finally {
-    if (browser) {
-      browser.close();
-    }
-    process.exit();
-  }
-};
-createPdf();