metanorma-mpfd 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa175636c95c1056cc6acebc3e3176f73d91a63248664f3495eb21736ffb0b02
-  data.tar.gz: 242826c616cd5d60b3b97a12cc31386cfc484da5a84065345e64f5434da5f0e6
+  metadata.gz: 87602011623efb1127c8dd1a19a6812c491aed3148d8d561232ce494e45ccfe3
+  data.tar.gz: cf0f26d14b14814641f32bc3f8cd4bf886691317f6714fd07a557278e4f70df1
 SHA512:
-  metadata.gz: 37004493a370155537a3230acb8a9f4b1855a145d27f1241a75656df08bc4204f3b9c2e4cd31efdacba2bd64ecac815d266b535c96d8935cef73e579c08dd7b5
-  data.tar.gz: e376b9a3b076ccc7b03fa51ac642489857aa598027fb550f11b374b8ac63e44fde3ae2012e8aec9c95d25d82fd7c0eaa4b59b52279211905811cab40f259e5d6
+  metadata.gz: e54bf36db25e2533a9009ee95e189bdeb387192b95192e588a04163e708d1415a7b0a1f16b5bcd0cec8330b1826c19ea2f89d5560e36e447bbfc0acd93e606d4
+  data.tar.gz: e5441f308639b8def4cbd504747bb4faa1cb63529852b70ca88930b8a5ebc2cdcfbdd0cf5d51ba2e3be6d922a82a382f7eecfd6ccebf2adf434472c46fcd3f4e

data/.travis.yml

@@ -7,7 +7,7 @@ rvm:
   - 2.3
   - ruby-head
 before_install:
-  - gem install bundler -v 1.16.1
+  - gem install bundler -v 2.0.1
   - npm install -g puppeteer
   - npm install
   - unset _JAVA_OPTIONS

data/README.adoc

@@ -98,7 +98,7 @@ tables etc, and automatically generating references and citations.
 
 
 [[model_additions]]
-== Asciidoctor features specific to CSAND
+== Asciidoctor features specific to MPFD
 
 The https://github.com/riboseinc/metanorma-standoc[metanorma-standoc]
 gem documents the customisations of Asciidoctor markup common to all metanorma gems.

data/lib/asciidoctor/mpfd/biblio.rng

@@ -488,6 +488,9 @@
     <optional>
       <ref name="edition"/>
     </optional>
+    <optional>
+      <ref name="version"/>
+    </optional>
     <zeroOrMore>
       <ref name="biblionote"/>
     </zeroOrMore>
@@ -866,6 +869,34 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="version">
+    <element name="version">
+      <optional>
+        <ref name="vedition"/>
+      </optional>
+      <optional>
+        <ref name="revision-date"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="draft"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="vedition">
+    <element name="edition">
+      <data type="int"/>
+    </element>
+  </define>
+  <define name="revision-date">
+    <element name="revision-date">
+      <data type="date"/>
+    </element>
+  </define>
+  <define name="draft">
+    <element name="draft">
+      <text/>
+    </element>
+  </define>
   <!--
     Anycontents = mixed {
     https://github.com/relaxng/jing-trang/issues/211

data/lib/asciidoctor/mpfd/isodoc.rng

@@ -39,9 +39,6 @@
   <define name="standard-document">
     <element name="standard-document">
       <ref name="bibdata"/>
-      <optional>
-        <ref name="version"/>
-      </optional>
       <optional>
         <ref name="preface"/>
       </optional>
@@ -59,34 +56,6 @@
       <ref name="BibData"/>
     </element>
   </define>
-  <define name="version">
-    <element name="version">
-      <optional>
-        <ref name="vedition"/>
-      </optional>
-      <optional>
-        <ref name="revision-date"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="draft"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="vedition">
-    <element name="edition">
-      <data type="int"/>
-    </element>
-  </define>
-  <define name="revision-date">
-    <element name="revision-date">
-      <data type="date"/>
-    </element>
-  </define>
-  <define name="draft">
-    <element name="draft">
-      <text/>
-    </element>
-  </define>
   <define name="preface">
     <element name="preface">
       <oneOrMore>
@@ -1068,6 +1037,9 @@
     <optional>
       <ref name="edition"/>
     </optional>
+    <optional>
+      <ref name="version"/>
+    </optional>
     <zeroOrMore>
       <ref name="biblionote"/>
     </zeroOrMore>

data/lib/asciidoctor/mpfd/isostandard.rng

@@ -96,6 +96,9 @@
       <optional>
         <ref name="edition"/>
       </optional>
+      <optional>
+        <ref name="version"/>
+      </optional>
       <zeroOrMore>
         <ref name="biblionote"/>
       </zeroOrMore>
@@ -178,6 +181,9 @@
       <optional>
         <ref name="edition"/>
       </optional>
+      <optional>
+        <ref name="version"/>
+      </optional>
       <zeroOrMore>
         <ref name="biblionote"/>
       </zeroOrMore>
@@ -762,9 +768,6 @@
   <define name="iso-standard">
     <element name="iso-standard">
       <ref name="bibdata"/>
-      <optional>
-        <ref name="version"/>
-      </optional>
       <zeroOrMore>
         <ref name="termdocsource"/>
       </zeroOrMore>

data/lib/asciidoctor/mpfd/mpfd.rng

@@ -130,6 +130,9 @@
       <optional>
         <ref name="edition"/>
       </optional>
+      <optional>
+        <ref name="version"/>
+      </optional>
       <zeroOrMore>
         <ref name="biblionote"/>
       </zeroOrMore>
@@ -177,9 +180,6 @@
   <define name="mpfd-standard">
     <element name="mpfd-standard">
       <ref name="bibdata"/>
-      <optional>
-        <ref name="version"/>
-      </optional>
       <zeroOrMore>
         <ref name="termdocsource"/>
       </zeroOrMore>

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

@@ -211,7 +211,7 @@ strong {
 }
 
 @media screen {
-  img { 
+  div.figure > img { 
       width: 100%;   
       height: auto;
   }
@@ -528,21 +528,21 @@ a:hover {
 
 ul, ol {margin-left: 1.2em;}
 
-ul  li {
+ul > li {
   list-style: none;
 }
 
-ul li:before {
+ul > li:before {
   content: "\2014";
   display: inline-block; width: 1em;
   margin-left: -1.2em;
 }
 
-ul li p:first-child {
+ul > li p:first-child {
   display: inline;
 }
 
-ul li:first-child {
+ul > li:first-child {
   margin-top: 1em;
 }
 
@@ -609,6 +609,15 @@ p.Biblio, p.NormRef {
 
 }
 
+.Admonition {
+  background-color: #ffcccc;
+  color: #47430c;
+  padding: 1.2em;
+  margin: 2em 0 1em 0;
+
+}
+
+
 /*
 3.8 Examples
  */
@@ -1132,6 +1141,17 @@ a.anchorjs-link:hover {
     padding: 0 5px 0 5px;
   }
 
+  .Admonition {
+    background-color: #ffcccc;
+    color: #47430c;
+    padding: 5px;
+    margin: 2em 0 1em 0;
+  }
+
+  .Admonition p {
+    padding: 0 5px 0 5px;
+  }
+
   nav {
     line-height: 1;
   }

data/lib/isodoc/mpfd/html/rsd.scss

@@ -535,8 +535,6 @@ table.MsoISOTable
 	mso-yfti-tbllook:480;
 	mso-border-insideh:.75pt solid windowtext;
 	mso-border-insidev:.75pt solid windowtext;
-        mso-table-anchor-vertical:paragraph;
-        mso-table-bspace:12.0pt;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
 table.MsoISOTable tr
@@ -563,8 +561,6 @@ table.MsoTableGrid
 	mso-para-margin:0cm;
 	mso-para-margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
-        mso-table-anchor-vertical:paragraph;
-        mso-table-bspace:12.0pt;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
 td { page-break-inside:avoid; }
@@ -622,10 +618,6 @@ p.example, li.example, div.example, td.example
         font-size:10.0pt;
         font-family:$bodyfont;}
 
-table.example {
-        margin-bottom:12pt;
-}
-
 td.example p.MsoListParagraph {
   font-size: 10.0pt;
 }

data/lib/isodoc/mpfd/html/wordstyle.scss

@@ -1086,8 +1086,6 @@ table.MsoNormalTable
 	mso-para-margin:0cm;
 	mso-para-margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
-        mso-table-anchor-vertical:paragraph;
-        mso-table-bspace:12.0pt;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
 br.section

data/lib/metanorma/mpfd/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Mpfd
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/metanorma-mpfd.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "isodoc", "~> 0.9.0"
   spec.add_dependency "twitter_cldr"
 
-  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "bundler", "~> 2.0.1"
   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-mpfd
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2019-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -277,7 +277,6 @@ files:
 - lib/asciidoctor/mpfd/isodoc.rng
 - lib/asciidoctor/mpfd/isostandard.rng
 - lib/asciidoctor/mpfd/mpfd.rng
-- lib/asciidoctor/mpfd/pdf.js
 - lib/asciidoctor/mpfd/section.rb
 - lib/isodoc/mpfd/html/header.html
 - lib/isodoc/mpfd/html/html_rsd_intro.html

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