metanorma-acme 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7695563b6b961ffc6416b530556337a18e7d98b956dcf47524644bb23382ee3c
-  data.tar.gz: 14b88af6836dc8fd32c4a4ba898427b4e8fbfe6d73fcb501a58d0963811237e7
+  metadata.gz: 0f92eecb2ec9350efda09ba06a211745a52dd8e77e7423d6cb0ffda156724fe2
+  data.tar.gz: 7189c366347aaac3299a3aac7cd7f78ec36d8bbec2c866057b18d333adee1d30
 SHA512:
-  metadata.gz: 6359389bdd65c0acd49acfc86ae2a1e530c4e1f845e3748286c8c28c320cf05aad428d64417c2a637778a8133e4f2b8c42b929ce5278296f5159cadd8d97c25f
-  data.tar.gz: d790765a41ecf4bf1c4eaafc272a86802d13e2058dab90df895dbd179e82954d36bf0ef94202a9e5c37d8c9a715a91e401164558bc8f455320345f4c686e187d
+  metadata.gz: 1882f351732a105c1e0903b48b1af9a5a3ed083242069d65e7eedb173762149f0d2ae966e8dd244417ed615e74b8ac0a949092c19547d9a42d0d35481dbff96b
+  data.tar.gz: 36721f08dd92909451538fd47b4abbc200b33ad8f9092f3175dea769fbdc8625457794b07705d24cfa5c82aa234683a94244ff1493bb0e578cc9613eb4699c4a

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

@@ -1,15 +1,15 @@
-= metanorma-ogc: Asciidoctor processor for Open Geospatial Consortium  documents
+= metanorma-acme: Asciidoctor processor for a (fictitious) Acme Corporation
 
-image:https://img.shields.io/gem/v/metanorma-ogc.svg["Gem Version", link="https://rubygems.org/gems/metanorma-ogc"]
-image:https://img.shields.io/travis/riboseinc/metanorma-ogc/master.svg["Build Status", link="https://travis-ci.org/riboseinc/metanorma-ogc"]
-image:https://codeclimate.com/github/riboseinc/metanorma-ogc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/riboseinc/metanorma-ogc"]
+image:https://img.shields.io/gem/v/metanorma-acme.svg["Gem Version", link="https://rubygems.org/gems/metanorma-acme"]
+image:https://img.shields.io/travis/riboseinc/metanorma-acme/master.svg["Build Status", link="https://travis-ci.org/riboseinc/metanorma-acme"]
+image:https://codeclimate.com/github/riboseinc/metanorma-acme/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/riboseinc/metanorma-acme"]
 
 WARNING: This gem is still under development.
 
 == Functionality
 
 This gem processes http://asciidoctor.org/[Asciidoctor] documents following
-a template for generating OGC documents.
+a template for generating Acme documents.
 
 The gem currently inherits from the https://github.com/riboseinc/metanorma-standoc
 gem, and aligns closely to it. Refer to the ISO gem documentation
@@ -17,9 +17,9 @@ for guidance, including https://github.com/riboseinc/metanorma-iso/wiki/Guidance
 
 The following outputs are generated.
 
-* an XML representation of the document, intended as a document model for OGC documents.
+* an XML representation of the document, intended as a document model for Acme documents.
 * The XML representation is processed in turn to generate the following outputs
-as end deliverable OGC documents.
+as end deliverable Acme documents.
 ** HTML
 ** http://asciimath.org[AsciiMathML] is to be used for mathematical formatting.
 The gem uses the https://github.com/asciidoctor/asciimath[Ruby AsciiMath parser],
@@ -33,9 +33,9 @@ The preferred way to invoke this gem is via the `metanorma` script:
 
 [source,console]
 ----
-$ metanorma --type ogc a.adoc                   # output HTML 
-$ metanorma --type ogc --extensions html a.adoc # output just HTML
-$ metanorma --type ogc --extensions xml a.adoc  # output RSD XML
+$ metanorma --type acme a.adoc                   # output HTML 
+$ metanorma --type acme --extensions html a.adoc # output just HTML
+$ metanorma --type acme --extensions xml a.adoc  # output RSD XML
 ----
 
 The gem translates the document into Metanorma XML format, and then
@@ -50,7 +50,7 @@ The gem can also be invoked directly within asciidoctor, though this is deprecat
 
 [source,console]
 ----
-$ asciidoctor -b ogc -r 'metanorma-ogc' a.adoc  
+$ asciidoctor -b acme -r 'metanorma-acme' a.adoc  
 ----
 
 === Installation
@@ -62,7 +62,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 metanorma-ogc
+$ gem install metanorma-acme
 $ gem install metanorma-cli
 ----
 
@@ -70,16 +70,16 @@ $ gem install metanorma-cli
 
 === Document model
 
-The OGC Document model used by this gem is an instance of the
+The Acme Document model used by this gem is an instance of the
 https://github.com/riboseinc/isodoc-models[StandardDocument model].
 
-The Metanorma XML format intends to introduce rigor into the OGC
+The Metanorma XML format intends to introduce rigor into the Acme
 standards authoring process, and is prescribed in a separate document.
 
 === Asciidoctor
 
 Asciidoctor has been selected as the authoring tool to generate the document
-model representation of OGC standards. It is a document formatting tool like
+model representation of Acme standards. It is a document formatting tool like
 Markdown and DocBook, which combines the relative ease of use of the former
 (using relatively lightweight markup), and the rigor and expressively of the
 latter (it has a well-defined syntax, and was in fact initially developed as a
@@ -133,7 +133,7 @@ report:: report
 The attribute `:draft:`, if present, includes review notes in the XML output;
 these are otherwise suppressed.
 
-== Asciidoctor features specific to OGC
+== Asciidoctor features specific to Acme
 
 The https://github.com/riboseinc/metanorma-standoc[metanorma-standoc]
 gem documents the customisations of Asciidoctor markup common to all metanorma gems.

data/lib/asciidoctor/acme/acme.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="acme-standard">
     <element name="acme-standard">
       <ref name="bibdata"/>
-      <optional>
-        <ref name="version"/>
-      </optional>
       <zeroOrMore>
         <ref name="termdocsource"/>
       </zeroOrMore>

data/lib/asciidoctor/acme/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/acme/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/acme/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/isodoc/acme/html/acme.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-bspace:12.0pt;
-        mso-table-anchor-vertical:paragraph;
 	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-bspace:12.0pt;
-        mso-table-anchor-vertical:paragraph;
 	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/acme/html/htmlstyle.scss

@@ -215,7 +215,7 @@ table {
 }
 
 @media screen {
-  img { 
+  div.figure > img { 
       width: 100%; 
       height: auto;
   }
@@ -522,17 +522,17 @@ p.document-stage {
   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;
 }
 
@@ -602,6 +602,18 @@ p.Biblio, p.NormRef {
     }
 }
 
+.Admonition {
+    background-color: #ffcccc;
+    color: #47430c;
+    padding: 1.2em;
+    margin: 1em 0 1em 0;
+
+    p {
+        margin: 0;
+    }
+}
+
+
 /*
     3.8 Examples
 */
@@ -1034,6 +1046,18 @@ To top button
       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/acme/html/wordstyle.scss

@@ -1085,8 +1085,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/acme/metadata.rb

@@ -50,7 +50,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/metanorma/acme/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Acme
-    VERSION = "1.0.8"
+    VERSION = "1.0.9"
   end
 end

data/metanorma-acme.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "metanorma-standoc", "~> 1.0.8"
   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-acme
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 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
@@ -86,14 +86,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