metanorma-csd 1.1.4 → 1.2.0

data/lib/isodoc/csd/html/html_csd_titlepage.html

@@ -1,5 +1,5 @@
-<div class="document-stage-band" id="{{ status | replace: ' ', '-' | downcase }}-band">
-  <p class="document-stage">{{ status }}</p>
+<div class="document-stage-band" id="{{ stage | replace: ' ', '-' | downcase }}-band">
+  <p class="document-stage">{{ stage }}</p>
 </div>
 
 <div class="document-type-band" id="{{ doctype | replace: ' ', '-' | downcase }}-band">
@@ -64,7 +64,7 @@
       </div>
 
       <div class="coverpage-stage-block" >
-        <span class="coverpage-maturity" id="{{ status | replace: ' ', '-' | downcase }}">{% if unpublished %}{{ status }}{% endif %}</span>
+        <span class="coverpage-maturity" id="{{ stage | replace: ' ', '-' | downcase }}">{% if unpublished %}{{ stage }}{% endif %}</span>
       </div>
 
       {% if unpublished %}

data/lib/isodoc/csd/html/word_csd_titlepage.html

@@ -34,7 +34,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'>{% if unpublished %}{{ status }} {% endif %}{{ doctype }}</span></p>
+                     lang="EN-GB" style='font-size:16.0pt'>{% if unpublished %}{{ stage }} {% endif %}{{ doctype }}</span></p>
 
 {% if doctype == "Policy And Procedures" or doctype == "Proposal" %}
 <p class="MsoNormal" align="center" style='text-align:center;border:none;

data/lib/isodoc/csd/html_convert.rb

@@ -1,5 +1,5 @@
+require_relative "base_convert"
 require "isodoc"
-require_relative "metadata"
 
 module IsoDoc
   module Csd
@@ -28,33 +28,6 @@ module IsoDoc
         }
       end
 
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-      end
-
-      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 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">
@@ -75,19 +48,7 @@ module IsoDoc
         docxml
       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
+      include BaseConvert
     end
   end
 end

data/lib/isodoc/csd/metadata.rb

@@ -9,7 +9,6 @@ module IsoDoc
 
       def initialize(lang, script, labels)
         super
-        set(:status, "XXX")
         set(:tc, "XXXX")
       end
 
@@ -23,7 +22,7 @@ module IsoDoc
       end
 
       def author(isoxml, _out)
-        tc = isoxml.at(ns("//bibdata/editorialgroup/technical-committee"))
+        tc = isoxml.at(ns("//bibdata/ext/editorialgroup/technical-committee"))
         set(:tc, tc.text) if tc
         personal_authors(isoxml)
       end
@@ -51,10 +50,6 @@ module IsoDoc
         end
       end
 
-      def status_print(status)
-        status.split(/-/).map{ |w| w.capitalize }.join(" ")
-      end
-
       def status_abbr(status)
         ::Metanorma::Csd::DOCSTATUS[status] || ""
       end

data/lib/isodoc/csd/pdf_convert.rb

@@ -1,5 +1,5 @@
+require_relative "base_convert"
 require "isodoc"
-require_relative "metadata"
 
 module IsoDoc
   module Csd
@@ -28,33 +28,6 @@ module IsoDoc
         }
       end
 
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-      end
-
-      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 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">
@@ -75,19 +48,7 @@ module IsoDoc
         docxml
       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
+      include BaseConvert
     end
   end
 end

data/lib/isodoc/csd/word_convert.rb

@@ -1,5 +1,5 @@
+require_relative "base_convert"
 require "isodoc"
-require_relative "metadata"
 
 module IsoDoc
   module Csd
@@ -31,46 +31,7 @@ module IsoDoc
         }
       end
 
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-      end
-
-      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 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
+      include BaseConvert
     end
   end
 end

data/lib/metanorma/csd/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Csd
-    VERSION = "1.1.4"
+    VERSION = "1.2.0"
   end
 end

data/metanorma-csd.gemspec

@@ -26,9 +26,10 @@ 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 "metanorma-standoc", "~> 1.1.0"
-  spec.add_dependency "isodoc", "~> 0.9.6"
+  spec.add_dependency "metanorma-standoc", "~> 1.2.0"
+  spec.add_dependency "isodoc", "~> 0.10.0"
 
   spec.add_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "byebug", "~> 9.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-csd
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2019-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -226,9 +226,10 @@ files:
 - lib/asciidoctor/csd/front.rb
 - lib/asciidoctor/csd/isodoc.rng
 - lib/asciidoctor/csd/isostandard.rng
-- lib/asciidoctor/csd/pdf.js
 - lib/asciidoctor/csd/reqt.rng
+- lib/asciidoctor/csd/validate.rb
 - lib/asciidoctor/csd/validate_section.rb
+- lib/isodoc/csd/base_convert.rb
 - lib/isodoc/csd/html/csd.scss
 - lib/isodoc/csd/html/dots-w@2x.png
 - lib/isodoc/csd/html/dots@2x.png
@@ -262,7 +263,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:
   - - ">="
@@ -270,7 +271,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: metanorma-csd lets you write CSD in AsciiDoc.

data/lib/asciidoctor/csd/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();