metanorma-m3d 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 796a15febdb1bdc732fe791cee368cba8b7660e0e23924b871c09beb61f13f85
-  data.tar.gz: 15ecfe1691a78b9b81ae353e2ed9580ff3f429fe046aa48728d9e6fabbd90696
+  metadata.gz: c7ee7b8bd216cc4c6f77728f19a511c95dc3468f311a501bb42ebb0efc5767bd
+  data.tar.gz: c7d5198cf8b51f8a84b8db1b9490278842a2863057b11a0526712c6b045c2097
 SHA512:
-  metadata.gz: 78b14116bd7fa82fd31b9c42d4c51f44900e699f70f3875bf6299a13068883cc3ac3eff045fb5f4bb0ce9029e719300f06c5f9c1bfb1e12daf599b3d2550c357
-  data.tar.gz: 6b2f5226d9c462d1cceff426b8b8235768e1441974d89519f494cf939b7a1865f5e7511980840830736db7a31d89623502101ebe18f78df68d5999082e5e2134
+  metadata.gz: '01893848b7cf6a612d0161b51b843aaa0631af27a41edfbb5f3a3a0b858ea91a100b646ef27d038c826476410a4e53f8fb5772b8c5bd5d2610de716b4b82b284'
+  data.tar.gz: 9ec043bad9a26f7b8d2d2af8eb0ed26442ab10f5f999775c3ed4c17f38d87e28ccd6eb6cdbed8066340f0167293cf8a1626795c77e719b4bc93b01e4000470e5

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

@@ -108,9 +108,6 @@
   <define name="m3d-standard">
     <element name="m3d-standard">
       <ref name="bibdata"/>
-      <optional>
-        <ref name="version"/>
-      </optional>
       <zeroOrMore>
         <ref name="termdocsource"/>
       </zeroOrMore>

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

@@ -227,7 +227,7 @@ table {
 }
   
 @media screen {
-  img {
+  div.figure > img {
       width: 100%;
       height: auto;
   }
@@ -612,6 +612,15 @@ p.Biblio, p.NormRef {
     margin: 2em 0 2em -1em;
 }
 
+.Admonition {
+    background-color: #ffcccc;
+    border-left: solid 5px #69C5DC;
+    color: rgb(91, 94, 95);
+    padding: 1.2em 1.2em 1.2em 2.2em;
+    margin: 2em 0 2em -1em;
+}
+
+
 /*
     3.8 Examples
 */

data/lib/isodoc/m3d/html/m3d.scss

@@ -478,8 +478,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
@@ -506,8 +504,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; }
@@ -650,10 +646,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/m3d/html/wordstyle.scss

@@ -1061,8 +1061,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/m3d/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module M3d
-    VERSION = "1.0.12"
+    VERSION = "1.0.13"
   end
 end

data/metanorma-m3d.gemspec

@@ -41,7 +41,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-m3d
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -184,14 +184,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