metanorma-csd 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07a1c4c2346d23b888d601689d2bf5dbb4d5e9360f7244f04f3a0acc54dfe2ba
-  data.tar.gz: 810674351bc67f23e2634fa7b292967d30494dcad39d460429d6e9647bea2a7e
+  metadata.gz: b883ec7d0c6e32c1c969d25ea2d87fb40d2d0a93975bdefc96cb544429b1da31
+  data.tar.gz: 55a9eda449de34ad2d9c3d80da4bac8209aa1fc61bc68b1224bec9d084d0ba25
 SHA512:
-  metadata.gz: fd36d9482a4b31b8ef69d2649c1587b3d557d4f937462229bb33760f677f6dbbc1a72d3bcc41417a6b7121f00f6e2547cf1ddea5f2d2fdab674972d308105e41
-  data.tar.gz: dbf8ec8f9fceacbb37d6034d582810815fc76f8545d71c9174e4f4bb5b9a0c2b7d9d4b0d5c6ac9edc4f99dde654616414b8a77bd5c637ec177a87db0f8202ccd
+  metadata.gz: 645a63ce30ba0fc053b8588e2a9413bdcdaff8cf6b5d76b93830475040216dce13feceb70aca79b6b5255a67ac39de574b3cc9650aa7f379c02f7ec6986f9196
+  data.tar.gz: 9abf53c1a1efdaa285a0ef8f2b01d32e96e0dd370ae826292b13f042c5b27b598abcce15874732a50baae03e62bf4ab87b9f2aaf085f2dc544f03a45ce01f253

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/docs/navigation.adoc

@@ -1,8 +1,8 @@
 ---
-sections:
-- name: Introduction
+items:
+- title: Introduction
   items:
-    - quickstart
+    - { title: Quickstart, path: quickstart/ }
 ---
 
 = Navigation

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

@@ -120,6 +120,9 @@
       <optional>
         <ref name="edition"/>
       </optional>
+      <optional>
+        <ref name="version"/>
+      </optional>
       <zeroOrMore>
         <ref name="biblionote"/>
       </zeroOrMore>
@@ -202,6 +205,9 @@
       <optional>
         <ref name="edition"/>
       </optional>
+      <optional>
+        <ref name="version"/>
+      </optional>
       <zeroOrMore>
         <ref name="biblionote"/>
       </zeroOrMore>
@@ -269,9 +275,6 @@
   <define name="csd-standard">
     <element name="csd-standard">
       <ref name="bibdata"/>
-      <optional>
-        <ref name="version"/>
-      </optional>
       <zeroOrMore>
         <ref name="termdocsource"/>
       </zeroOrMore>

data/lib/asciidoctor/csd/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/csd/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/csd/html/csd.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; }
@@ -625,10 +621,6 @@ p.example, li.example, div.example, td.example
 td.example p.MsoListParagraph {
   font-size: 10.0pt;
 }
-table.example {
-        margin-bottom:12pt;
-}
-
 
 span.note_label, span.example_label, td.example_label, td.note_label
 {

data/lib/isodoc/csd/html/html_csd_titlepage.html

@@ -1,16 +1,14 @@
 <div class="document-stage-band" id="{{ status | replace: ' ', '-' | downcase }}-band">
-    <p class="document-stage">{{ status }}</p>
+  <p class="document-stage">{{ status }}</p>
 </div>
 
 <div class="document-type-band" id="{{ doctype | replace: ' ', '-' | downcase }}-band">
-    <p class="document-type">CalConnect {{ doctype }}</p>
+  <p class="document-type">CalConnect {{ doctype }}</p>
 </div>
 
+<div id='toggle'> <span>•</span> </div>
 
-
-  <div id='toggle'> <span>•</span> </div>
-
-  <header>
+<header>
 
 <!--<div class="WordSection1">-->
   <div class="coverpage">
@@ -37,22 +35,22 @@
     <span>TC {{ tc }}</span>
   </div>
 
-  {% capture tags %}
-  {% for tag in contributors %}
-    {{ tag[0] }}
-  {% endfor %}
+{% capture tags %}
+{% for tag in contributors %}
+  {{ tag[0] }}
+{% endfor %}
 {% endcapture %}
+
 {% assign sortedtags = tags | split:' ' | sort %}
 
   {% for tag in sortedtags %}
-  <div class="coverpage-tc-name"><span>
-    {% if contributors[tag].size > 1 %}
-    {{ tag | capitalize }}s: 
-    {% else %}
-    {{ tag | capitalize }}:
-    {% endif %}
-    {{ contributors[tag] | join: ", " }}
-    </span></div>
+  <div class="coverpage-contributors">
+    <div class="group {{ tag }}">
+    {% for person in contributors[tag] %}
+    <span class="person {{ tag }}">{{ person }}<span class="role">{{ tag | capitalize }}</span></span>
+    {% endfor %}
+    </div>
+  </div>
   {% endfor %}
 
   </div>

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

@@ -216,7 +216,7 @@ table {
 }
 
 @media screen {
-  img {
+  div.figure > img {
       width: 100%;
       height: auto;
   }
@@ -498,36 +498,36 @@ span.obligation {
     3.3 Lists
 */
 
-    ul {
-    margin-left: 1.2em;
-  }
 
 ol {
-  margin-left: 1.2em; }
+  margin-left: 1.2em;
+}
 
-ul > li {
+ul {
+  position: relative;
+  margin-left: 0;
   list-style: none;
+  padding-left: 1.2em;
 }
 
-  ul > li:before {
-    content: "\2014";
-    display: inline-block; width: 1em;
-    margin-left: -1.2em;
-  }
-
-li p:first-child {
-  display: inline;
+ul > li:before {
+  content: "\2014";
+  position: absolute;
+  left: 0;
 }
 
-li:first-child {
+main li {
   margin-top: 1em;
+  padding-left: 0.5em;
 }
 
 #toc ul {
-  margin-bottom: 0.25em; }
+  margin-bottom: 0.25em;
+}
 
 #toc li {
-  list-style-type: none; }
+  list-style-type: none;
+}
 
 #toc li:before {
   content: " ";
@@ -556,9 +556,12 @@ h2 p {
 */
 
 p.Biblio, p.NormRef {
-    margin-top: 1em;
-    margin-left: 2em;
-    text-indent:-2em;
+  margin-top: 1em;
+}
+
+p.Biblio:before, p.NormRef:before {
+  content: "\2014";
+  padding-right: 1em;
 }
 
 /*
@@ -586,11 +589,22 @@ p.Biblio, p.NormRef {
     3.7 Notes
 */
 
-.Note {
-    background-color: #fff495;
+.Note, .Admonition {
     color: #47430c;
-    padding: 1.2em;
-    margin: 2em 0 1em 0;
+    padding: 0.25em;
+    margin: 0;
+}
+
+.Note p, .Admonition p {
+  margin: 1em;
+}
+
+.Note {
+  background-color: #fff495;
+}
+
+.Admonition {
+  background-color: #ffcccc;
 }
 
 /*
@@ -694,31 +708,26 @@ a.footnote-number {
 */
 
 .contact-info {
-    background-color: #f7f7f7;
-    padding: 2em;
-    margin-top: 5em;
-    width: auto;
-    margin-left: auto;
-    margin-right: auto;
-    text-align: left;
+  background-color: #f7f7f7;
+  padding: 1em;
+  margin-top: 2em;
+  width: auto;
+  margin-left: auto;
+  margin-right: auto;
+  text-align: left;
 }
 
 .contact-info p, .contact-info a {
-    font-family: $monospacefont;
-    font-variant-ligatures: none;
-    font-weight: 400;
+  font-family: $monospacefont;
+  font-variant-ligatures: none;
+  font-weight: 400;
+  line-height: 1.3em;
+  font-size: 1em;
+  margin: 0;
 }
 
 .contact-info .name {
-    font-weight: 700;
-    font-size: 1.2em;
-    margin-bottom:0;
-}
-
-.contact-info .address {
-    font-size: 1em;
-    line-height: 1.3em;
-    margin-top:0;
+  font-weight: 700;
 }
 
 /*
@@ -726,7 +735,7 @@ a.footnote-number {
 */
 
 span.keyword {
-    font-weight: 600;
+  font-weight: 600;
 }
 
 /*
@@ -769,51 +778,73 @@ p {
     padding: 2em 0;
 }
 
-  .doc-number {
-      font-size: 0.5em;
-      font-family: $bodyfont;
-  }
+.doc-number {
+  font-size: 0.5em;
+  font-family: $bodyfont;
+}
 
-  .coverpage-title {
-      padding-bottom: 0.5em;
-      font-family: $headerfont;
-      font-size: 1.2em;
+.coverpage-title {
+  padding-bottom: 0.5em;
+  font-family: $headerfont;
+  font-size: 1.2em;
 	line-height: 1.2em;
-	font-weight: 900;
+	font-weight: 600;
 	padding-left: 1em;
 	padding-right: 1em;
-  }
+}
 
-  .title-section1 {
-    padding: 0 2em 0 3em;
-  }
+.title-section1 {
+  padding: 0 2em 0 3em;
+}
 
-  .prefatory-section {
-    padding: 0 3em 0 6em;
-  }
+.prefatory-section {
+  padding: 0 3em 0 6em;
+}
 
 
-  .zzSTDTitle1, .MsoCommentText {
-    display: none;
-  }
+.zzSTDTitle1, .MsoCommentText {
+  display: none;
+}
 
 
-  .coverpage {
-    text-align: center;
-    padding-left: 1.5em;
-  }
+.coverpage {
+  text-align: center;
+  padding-left: 1.5em;
+}
 
-  .coverpage-logo span, .coverpage-tc-name span {
-    font-family: $bodyfont;
-      text-transform: uppercase;
-      font-weight: 600;
-  }
+.coverpage-logo span, .coverpage-tc-name span {
+  font-family: $bodyfont;
+  text-transform: uppercase;
+  font-weight: 600;
+}
 
-  .coverpage-tc-name {
-    font-size: 1.2em;
-    line-height: 1.2em;
-    margin: 0.25em 0;
-  }
+.coverpage-tc-name {
+  font-size: 1.2em;
+  line-height: 1.2em;
+  margin: 0.25em 0;
+}
+
+.coverpage-contributors {
+  margin-top: 1em;
+  line-height: 1.5em;
+  font-weight: 300;
+}
+
+.coverpage-contributors .role {
+  font-variant-caps: all-small-caps;
+  background: #f7f7f7;
+  border-radius: 5px;
+  padding: 0.1em 0.5em;
+  margin-left: 1em;
+  color: #485094;
+  font-size: 0.9em;
+  font-weight: 900;
+}
+
+.coverpage-contributors .person {
+  display: block;
+  font-weight: 300;
+}
 
 /*
     4.2 Document Identity
@@ -869,7 +900,7 @@ p {
 
   .copyright {
     padding: 1em;
-    font-size: 0.8em;
+    font-size: 0.9em;
     text-align: left;
   }
 

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

@@ -1087,8 +1087,6 @@ table.MsoNormalTable
 	mso-para-margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
 	font-size:10.0pt;
-        mso-table-anchor-vertical:paragraph;
-        mso-table-bspace:12.0pt;
 	font-family:$bodyfont;}
 br.section
     {page-break-before:always;

data/lib/isodoc/csd/metadata.rb

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

data/lib/metanorma/csd/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Csd
-    VERSION = "1.0.13"
+    VERSION = "1.0.14"
   end
 end

data/metanorma-csd.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "metanorma-standoc", "~> 1.0.0"
   spec.add_dependency "isodoc", "~> 0.9.6"
 
-  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-csd
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 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: metanorma-standoc
@@ -44,14 +44,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
@@ -213,7 +213,6 @@ files:
 - LICENSE
 - README.adoc
 - Rakefile
-- asciidoctor-csd.gemspec.old
 - bin/console
 - bin/rspec
 - bin/setup

data/asciidoctor-csd.gemspec.old

@@ -1,43 +0,0 @@
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "asciidoctor/csd/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "asciidoctor-csd"
-  spec.version       = Asciidoctor::Csd::VERSION
-  spec.authors       = ["Ribose Inc."]
-  spec.email         = ["open.source@ribose.com"]
-
-  spec.summary       = "asciidoctor-csd lets you write CSD in AsciiDoc."
-  spec.description   = <<~DESCRIPTION
-    asciidoctor-csd lets you write CSD in AsciiDoc syntax.
-
-    This gem is in active development.
-  DESCRIPTION
-
-  spec.homepage      = "https://github.com/riboseinc/metanorma-csd"
-  spec.license       = "BSD-2-Clause"
-  spec.post_install_message = "The asciidoctor-csd gem has been deprecated and has been replaced by metanorma-csd"
-
-  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-iso", "~> 0.10.2"
-  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.5"
-end