metanorma-unece 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6871322b366b2ef44c6b2466eda47f244bde463d49a73932bab6a30dcefbc7a
-  data.tar.gz: 6b022cad4b1f019ca11d043282f797de91ee00badb2f6909669dd3915500d46a
+  metadata.gz: 310b51a54be216010c47f06e0c602d8a3fca3ea59c10ebc5308fa134252ebbea
+  data.tar.gz: 93a9deb63d422937ba7050b9cb1dca1b1ff698c8ab09c82ff20500b2074a58b8
 SHA512:
-  metadata.gz: c7fa7fbc4bd216ba99801c6f5fadb24910cbed2d1b514e562321c90326e008a8ad7b5ad4374b8950c50858e6351c3025b4739335887da0736ade42a81fe654cc
-  data.tar.gz: 9dd1376f632679ef180c30ead155cfaaa4830b6e8819fcf9f385e3c1b8fcd59a8e615693388a458afa8ddc70002b71007d9f04cd7ecb1eb663b3eddc53f6eae4
+  metadata.gz: 7c79df69d9bd44c93b46a600069eb6de08f9aec061277cbfc889071c85cb5645d679dda5ec786dc157f6f3d21c6f7252531a40fa255b73afafe04214077ed930
+  data.tar.gz: 57476c0fa779c278c75b1abc050d86afe71f999f56a53ca68b673739cba5e42edf387f3fe82acfee3dc5c4c4c02dd557a0156f836d323d0008d990ba09a48e41

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
   - unset _JAVA_OPTIONS
   - wget "http://downloads.sourceforge.net/project/plantuml/plantuml.jar?r=&ts=1424308684&use_mirror=jaist" -O plantuml.jar
   - sudo mkdir -p /opt/plantuml

data/README.adoc

@@ -224,7 +224,7 @@ ISO-639-1 codes are used for languages, and they are comma-delimited.
 `:item-footnote:`:: Footnoted reference to item, if item is on the preliminary list or the provisional agenda.
 
 [[model_additions]]
-== Asciidoctor features specific to CSAND
+== Asciidoctor features specific to UNECE
 
 The https://github.com/riboseinc/metanorma-standoc[metanorma-standoc]
 gem documents the customisations of Asciidoctor markup common to all metanorma gems.

data/lib/asciidoctor/unece/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/unece/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/unece/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/unece/unece.rng

@@ -193,6 +193,9 @@
       <optional>
         <ref name="edition"/>
       </optional>
+      <optional>
+        <ref name="version"/>
+      </optional>
       <zeroOrMore>
         <ref name="biblionote"/>
       </zeroOrMore>
@@ -335,9 +338,6 @@
   <define name="unece-standard">
     <element name="unece-standard">
       <ref name="bibdata"/>
-      <optional>
-        <ref name="version"/>
-      </optional>
       <ref name="preface"/>
       <oneOrMore>
         <ref name="sections"/>

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

@@ -241,7 +241,7 @@ main {
 }
 
 @media screen {
-  img {
+  div.figure > img {
       width: 100%;
       height: auto;
   }
@@ -593,11 +593,11 @@ ul, ol {
   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;
 }
 
@@ -614,7 +614,7 @@ ul li:first-child {
   display: none;
 }
 
-main ul li {
+main ul > li {
   list-style-type: disc;
   list-style-position: outside;
   margin-bottom: 0.5em;
@@ -683,6 +683,18 @@ div.Admonition {
     }
 }
 
+.Admonition {
+    background-color: #ffcccc;
+    color: #47430c;
+    padding: 1.2em;
+    margin: 1em 0 1em 0;
+
+    p {
+        margin: 0;
+    }
+}
+
+
 /*
     3.8 Examples
 */
@@ -1120,6 +1132,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/unece/html/unece.scss

@@ -557,8 +557,6 @@ table.MsoISOTable
 	mso-border-insideh:.75pt solid windowtext;
 	mso-border-insidev:.75pt solid windowtext;
         margin-bottom:12pt;
-        mso-table-anchor-vertical:paragraph;
-        mso-table-bspace:12.0pt;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
 table.MsoISOTable tr
@@ -586,8 +584,6 @@ table.MsoTableGrid
 	mso-para-margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
         margin-bottom:12pt;
-        mso-table-anchor-vertical:paragraph;
-        mso-table-bspace:12.0pt;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
 td { page-break-inside:avoid; }
@@ -645,10 +641,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/unece/html/wordstyle.scss

@@ -1069,8 +1069,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/isodoc/unece/metadata.rb

@@ -83,7 +83,7 @@ module IsoDoc
       end
 
       def unpublished(status)
-        %w(published withdrawn).include? status.downcase
+        !%w(published withdrawn).include? status.downcase
       end
 
       def version(isoxml, _out)

data/lib/isodoc/unece/word_convert.rb

@@ -150,7 +150,7 @@ module IsoDoc
       foreword.parent = preface_container if foreword && preface_container
       intro.parent = preface_container if intro && preface_container
       if preface_container && (foreword || intro)
-        preface_container.at("./div/br").remove # remove initial page break
+        preface_container.at("./div/p[br]").remove # remove initial page break
       end
       if abstractbox && !intro && !foreword && !@toc
         sect2 = docxml.at("//div[@class='WordSection2']")

data/lib/metanorma/unece/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Unece
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/metanorma-unece.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "metanorma-standoc", "~> 1.0.0"
   spec.add_dependency "isodoc", "~> 0.9.0"
 
-  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-unece
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 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
@@ -128,14 +128,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