metanorma-rsd 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17ba99fe26d10086b67c51a7bf7faf38306fdc9bac155769de589e2e73786f01
-  data.tar.gz: 48ea14db4faa42a5eadd58e194d0700b80a345ab7e99d58e6b66d7e3713d5fe4
+  metadata.gz: 87b62054297007670e86fe29e7ba5a32777109209b7c77d8e77d61abcb5048e6
+  data.tar.gz: 3ee3e1f5935484da11163966236735b68f968640782f7e4aaf070a6db47974f0
 SHA512:
-  metadata.gz: 0044e7343d26dd42403bd86aa4187b6760b7215fa7fdee07dbe3d03f4b7598695f3f11879fe04abeaf8cc9ffc6b21df2444de348e152ae36e8115f7fcac27307
-  data.tar.gz: 630ca871edef588bd03c656abe35d537b37f20f737f64ff76138b4ff5df371e96c0fdad4b5da77d49caad69ce2a098e250d808e14000e87c7378803ad46afde4
+  metadata.gz: 63828a56e9583202a3cf574bb1424197facdf6203cfc6524652ae8050b5b3ed4065bdf68d4578ae1ae34fbb9684028f79cd69114e7ce0a223b8e62334b93b637
+  data.tar.gz: fcfdb68f9ec28eb1ffae772483a493d3852cb74b3b0cdbd83ca520e29109e63d9491afc7d5ae66da9222abec598bb024b799e3dba114145d3a22e96627ddcebc

data/.travis.yml

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

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

data/lib/isodoc/rsd/html/header.html

@@ -66,7 +66,7 @@ normal'><span lang=EN-GB><span style='mso-special-character:footnote-continuatio
 <div style='mso-element:header' id=eh1>
 
 <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB>CS&nbsp;{{ docnumber }}:{{ docyear }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>RS&nbsp;{{ docnumber }}:{{ docyear }}</span></p>
 
 </div>
 
@@ -100,14 +100,14 @@ Ribose Group Inc.&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></sp
 <div style='mso-element:header' id=eh2>
 
 <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB>Ribose Group Inc.&nbsp;{{ docnumber }}:{{ docyear }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>Ribose {{ doctype }}&nbsp;{{ docnumber }}:{{ docyear }}</span></p>
 
 </div>
 
 <div style='mso-element:header' id=h2>
 
 <p class=MsoHeader align=right style='text-align:right;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB>Ribose Group Inc.&nbsp;{{ docnumber }}:{{ docyear }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>Ribose {{ doctype }}&nbsp;{{ docnumber }}:{{ docyear }}</span></p>
 
 </div>
 

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

@@ -214,7 +214,7 @@ table {
 }
 
 @media screen {
-  img { 
+  div.figure > img { 
       width: 100%;   
       height: auto;
   }
@@ -519,21 +519,21 @@ p.document-stage {
 
     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;
 }
 
@@ -603,6 +603,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
 */
@@ -1035,6 +1047,16 @@ 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/rsd/html/rsd.scss

@@ -479,8 +479,8 @@ p.Formula, li.Formula, div.Formula
 @page WordSection1
 	{size:595.3pt 841.9pt;
 	margin:39.7pt 53.85pt 1.0cm 53.85pt;
-	mso-header-margin:35.45pt;
-	mso-footer-margin:14.2pt;
+	mso-header-margin:50pt;
+	mso-footer-margin:50pt;
 	mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh1;
 	mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1;
 	mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;
@@ -490,8 +490,8 @@ div.WordSection1
 @page WordSection2
 	{size:595.3pt 841.9pt;
 	margin:39.7pt 53.85pt 1.0cm 53.85pt;
-	mso-header-margin:35.45pt;
-	mso-footer-margin:14.2pt;
+	mso-header-margin:50pt;
+	mso-footer-margin:50pt;
 	mso-page-numbers:roman-lower;
 	mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
 	mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
@@ -503,8 +503,8 @@ div.WordSection2
 @page WordSection3
 	{size:595.3pt 841.9pt;
 	margin:39.7pt 53.85pt 1.0cm 53.85pt;
-	mso-header-margin:35.45pt;
-	mso-footer-margin:14.2pt;
+	mso-header-margin:50pt;
+	mso-footer-margin:50pt;
 	mso-page-numbers:1;
 	mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
 	mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
@@ -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; }
@@ -576,7 +572,7 @@ span.stem
     italic;}
 div.formula
     {tab-stops:right 487.45pt;}
-body 
+body
     {tab-interval:36.0pt;}
 dt
     {page-break-inside:avoid;
@@ -594,7 +590,7 @@ dt
     color:#485094;}
 div.coverpage_warning
     {mso-element:para-border-div;
-    border:solid windowtext 1.0pt #485094; 
+    border:solid windowtext 1.0pt #485094;
     mso-border-alt:solid windowtext .5pt;
     padding:1.0pt 4.0pt 1.0pt 4.0pt #485094;
     font-size:10.0pt;
@@ -622,10 +618,6 @@ p.example, li.example, div.example, td.example, td.example p
         font-size:10.0pt;
         font-family:$bodyfont;}
 
-table.example {
-        margin-bottom:12pt;
-}
-
 td.example p.MsoListParagraph {
   font-size: 10.0pt;
 }

data/lib/isodoc/rsd/html/word_rsd_intro.html

@@ -1,14 +1,14 @@
-<div style='mso-element:para-border-div;border:solid windowtext 1.0pt;
-border-bottom:none;mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:
-solid windowtext .5pt;mso-border-right-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 0cm 4.0pt;
-margin-left:5.1pt;margin-right:5.1pt'>
-
-<p class="zzCopyright" align="left" style='margin-top:2.0pt;margin-right:0cm;
-margin-bottom:12.0pt;margin-left:0cm;text-align:left;page-break-before:always;
-mso-layout-grid-align:none;text-autospace:none;border:none;mso-border-top-alt:
-solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;mso-border-right-alt:
-solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 0cm 4.0pt'><span
-lang="EN-GB" style='color:windowtext'>© {{ agency }} {{ docyear }}, Published in Hong Kong.<o:p></o:p></span></p>
+<div class="zzCopyright">
+  <p class="zzCopyright" align="left">
+    <span lang="EN-GB" style='color:windowtext'>© {{ agency }} {{ docyear }} Ribose Group Inc.<o:p></o:p></span>
+    <span lang="EN-GB" style='color:windowtext'>Suite 1, 8/F, New Henry House<o:p></o:p></span>
+    <span lang="EN-GB" style='color:windowtext'>10 Ice House Street<o:p></o:p></span>
+    <span lang="EN-GB" style='color:windowtext'>Central<o:p></o:p></span>
+    <span lang="EN-GB" style='color:windowtext'>Hong Kong<o:p></o:p></span>
+    <br />
+    <span lang="EN-GB" style='color:windowtext'><a href="mailto:copyright@ribose.com">copyright@ribose.com</a><o:p></o:p></span><br />
+    <span lang="EN-GB" style='color:windowtext'><a href="https://www.ribose.com">www.ribose.com</a><o:p></o:p></span>
+  </p>
 
 </div>
 

data/lib/isodoc/rsd/html/word_rsd_titlepage.html

@@ -2,9 +2,8 @@
 normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>{{ docnumber }} {{ draftinfo }}</span></b><b
 style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt'><o:p></o:p></span></b></p>
 
-<p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"
-style='mso-no-proof:yes'>Ribose&nbsp;</span><span lang="EN-GB"><span
-style='mso-no-proof:yes'>{{ tc | join: "/" }}</span></p>
+<p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"><span
+style='mso-no-proof:yes'>Ribose&nbsp;{{ tc | join: "/" }}</span></p>
 
 <p class="MsoNormal" align="center" style='text-align:center;line-height:18.0pt;margin-bottom:0.0pt'><b
 style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:24.0pt'>{{ doctitle }}</span>
@@ -25,7 +24,7 @@ mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0
 <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'> Classification: {{ security }}</span></p>
-{% endif %}                     
+{% endif %}
 
 {% if doctype == "Policy And Procedures" or doctype == "Proposal" %}
 <p class="MsoNormal" align="center" style='text-align:center;border:none;
@@ -48,7 +47,7 @@ lang="EN-GB" style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>Warning for draf
 
 <p class="MsoNormal" style='margin-bottom:6.0pt;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:10.0pt;mso-bidi-font-size:11.0pt;mso-bidi-font-weight:bold'>This document 
+style='font-size:10.0pt;mso-bidi-font-size:11.0pt;mso-bidi-font-weight:bold'>This document
 is not a Ribose Standard. It is distributed for review and
     comment, and is subject to change without notice and may not be referred to as
     a Standard. Recipients of this draft are invited to submit, with their

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

@@ -312,11 +312,11 @@ span.blackgraphtx
 .MsoChpDefault
 	{mso-style-type:export-only;
 	mso-default-props:yes;}
-div.figure 
+div.figure
         {text-align: center;}
-	
-	
-	
+
+
+
 h1
 	{mso-style-priority:1;
 	mso-style-unhide:no;
@@ -753,10 +753,10 @@ p.Tablebody, li.Tablebody, div.Tablebody
  /* Page Definitions */
 @page
 	{
-          size:612.0pt 792.0pt;
+  size:612.0pt 792.0pt;
 	margin:36.0pt 53.85pt 21.55pt 53.85pt;
-	mso-header-margin:42.55pt;
-	mso-footer-margin:43.1pt;
+	mso-header-margin:50pt;
+	mso-footer-margin:50pt;
 	mso-footnote-separator:url("file:///C:/Doc/FILENAME_files/header.html") fs;
 	mso-footnote-continuation-separator:url("file:///C:/Doc/FILENAME_files/header.html") fcs;
 	mso-endnote-separator:url("file:///C:/Doc/FILENAME_files/header.html") es;
@@ -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/isodoc/rsd/metadata.rb

@@ -39,7 +39,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/rsd/version.rb

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

data/metanorma-rsd.gemspec

@@ -33,7 +33,6 @@ 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 "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-rsd
 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-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -255,7 +241,6 @@ files:
 - LICENSE
 - README.adoc
 - Rakefile
-- asciidoctor-rsd.gemspec.old
 - bin/console
 - bin/rspec
 - bin/setup

data/asciidoctor-rsd.gemspec.old

@@ -1,46 +0,0 @@
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "asciidoctor/rsd/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "asciidoctor-rsd"
-  spec.version       = Asciidoctor::Rsd::VERSION
-  spec.authors       = ["Ribose Inc."]
-  spec.email         = ["open.source@ribose.com"]
-
-  spec.summary       = "asciidoctor-rsd lets you write RSD in AsciiDoc."
-  spec.description   = <<~DESCRIPTION
-    asciidoctor-rsd lets you write RSD in AsciiDoc syntax.
-
-    This gem is in active development.
-  DESCRIPTION
-
-  spec.homepage      = "https://github.com/riboseinc/asciidoctor-rsd"
-  spec.license       = "BSD-2-Clause"
-  spec.post_install_message = "The asciidoctor-rsd gem has been deprecated and has been replaced by metanorma-rsd"
-
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "asciidoctor", "~> 1.5.7"
-  spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "nokogiri"
-  spec.add_dependency "asciidoctor-iso", "~> 0.10.1"
-  spec.add_dependency "isodoc", "~> 0.8.8"
-
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "byebug", "~> 9.1"
-  spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  spec.add_development_dependency "guard", "~> 2.14"
-  spec.add_development_dependency "guard-rspec", "~> 4.7"
-  spec.add_development_dependency "rake", "~> 12.0"
-  spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "~> 0.50"
-  spec.add_development_dependency "simplecov", "~> 0.15"
-  spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "metanorma", "~> 0.2.6"
-end