metanorma-csd 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f90cd60a9e021755b1e8aad94de86f1b8a3a6a3e67900f2d1ef91abe472e56b2
-  data.tar.gz: efb26635649632f5835221b5ad41a10ef39bdd5ad22afafd03ed0e1c93d2524b
+  metadata.gz: 3babdd82a2ba14b27acef8c2fae81aa8cfa1e13e3593c110d6ae729aab3cffc9
+  data.tar.gz: 1359410d9a5ebb955608519cdae0a3c076ae5f61a08bb198dddcdad8d793860e
 SHA512:
-  metadata.gz: bbc4a4f774038675aadef92328cfd3c06dcee3dc3edde6e8e2dba49b6402bb733b1661b1f5fdcb22da0eac059530045e66d6b8f7d4538b5460a1b7c47d5755f3
-  data.tar.gz: 5a94af0b3c1a505531fa68cc801117a95771f47836c4330803c12bf9b4ee6312bd0c9579833aa58a7d7bda4df4aaf328ef85d0cbd55e340b13d5660d73cb12d6
+  metadata.gz: ea0e3a111a5b78b1252c31ad4add9396a4fdd962da14f1c7e00f80e17197dbc7ffe76930b0805238caf04d8165f727de7655179d1819fca9eae0bc3eb6792fd1
+  data.tar.gz: 2fd1b20fbc3a79aa2ef042a8748a1df3ddfdc879c1115be9ca92a8daaf5568f15dd6c3aca02e868be2b25eada2cf68c87dbb913eb86a982cc27f5ff101383bdf

data/lib/asciidoctor/csd/converter.rb

@@ -1,5 +1,4 @@
 require "asciidoctor"
-require "asciidoctor/csd/version"
 require "isodoc/csd/html_convert"
 require "isodoc/csd/word_convert"
 require "asciidoctor/standoc/converter"

data/lib/asciidoctor/csd.rb

@@ -1,5 +1,3 @@
-require "asciidoctor/csd/version"
-
 module Asciidoctor
   module Csd
     # Your code goes here...

data/lib/isodoc/csd/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>CC&nbsp;{{ docnumber }}:{{ docyear }}</span></p>
 
 </div>
 

data/lib/isodoc/csd/html/word_csd_intro.html

@@ -1,14 +1,30 @@
-<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'>
+<div class="copyright">
+  <p class="year">
+    &copy; {{ docyear }} The Calendaring and Scheduling Consortium, Inc.
+  </p>
+
+  <p class="message">
+    All rights reserved. Unless otherwise specified, no part of this
+    publication may be reproduced or utilized otherwise in any form or by any
+    means, electronic or mechanical, including photocopying, or posting on the
+    internet or an intranet, without prior written permission. Permission can
+    be requested from the address below.
+  </p>
+
+<div class="contact-info">
+  <p class="name">The Calendaring and Scheduling Consortium, Inc.</p>
+  <p class="address">
+    4390 Chaffin Lane<br />
+    McKinleyville<br />
+    California 95519<br />
+    United States of America<br />
+    <br />
+    <a href="mailto:copyright@calconnect.org">copyright@calconnect.org</a><br />
+    <a href="www.calconnect.org">www.calconnect.org</a>
+  </p>
+</div>
+</div>
 
-<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 }}.<o:p></o:p></span></p>
 
 </div>
 

data/lib/isodoc/csd/metadata.rb

@@ -28,11 +28,11 @@ module IsoDoc
       def docid(isoxml, _out)
         docnumber = isoxml.at(ns("//bibdata/docidentifier"))
         docstatus = isoxml.at(ns("//bibdata/status"))
-        dn = docnumber&.text
+        dn = docnumber&.text || "???"
         if docstatus
           set(:status, status_print(docstatus.text))
           abbr = status_abbr(docstatus.text)
-          dn = "#{dn}(#{abbr})" unless abbr.empty?
+          dn += "/#{abbr}" unless abbr.empty?
         end
         set(:docnumber, dn)
       end
@@ -43,9 +43,11 @@ module IsoDoc
 
       def status_abbr(status)
         case status
-        when "working-draft" then "wd"
-        when "committee-draft" then "cd"
-        when "draft-standard" then "d"
+        when "working-draft" then "WD"
+        when "committee-draft" then "CD"
+        when "draft-standard" then "DS"
+        when "final-draft" then "FDS"
+        # when "published" then ""
         else
           ""
         end

data/lib/metanorma/csd/processor.rb

@@ -19,7 +19,7 @@ module Metanorma
       end
 
       def version
-        "Asciidoctor::Csd #{Asciidoctor::Csd::VERSION}"
+        "Metanorma::Csd #{Metanorma::Csd::VERSION}"
       end
 
       def input_to_isodoc(file)

data/lib/metanorma/csd/version.rb

@@ -0,0 +1,5 @@
+module Metanorma
+  module Csd
+    VERSION = "1.0.5"
+  end
+end

data/lib/metanorma-csd.rb

@@ -3,7 +3,7 @@ require_relative "asciidoctor/csd/converter"
 require_relative "isodoc/csd/html_convert"
 require_relative "isodoc/csd/word_convert"
 require_relative "isodoc/csd/pdf_convert"
-require_relative "asciidoctor/csd/version"
+require_relative "metanorma/csd/version"
 
 if defined? Metanorma
   require_relative "metanorma/csd"

data/metanorma-csd.gemspec

@@ -1,10 +1,10 @@
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "asciidoctor/csd/version"
+require "metanorma/csd/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "metanorma-csd"
-  spec.version       = Asciidoctor::Csd::VERSION
+  spec.version       = Metanorma::Csd::VERSION
   spec.authors       = ["Ribose Inc."]
   spec.email         = ["open.source@ribose.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-csd
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2018-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -223,7 +223,6 @@ files:
 - lib/asciidoctor/csd/isodoc.rng
 - lib/asciidoctor/csd/isostandard.rng
 - lib/asciidoctor/csd/pdf.js
-- lib/asciidoctor/csd/version.rb
 - lib/isodoc/csd/html/csd.scss
 - lib/isodoc/csd/html/dots-w@2x.png
 - lib/isodoc/csd/html/dots@2x.png
@@ -243,6 +242,7 @@ files:
 - lib/metanorma-csd.rb
 - lib/metanorma/csd.rb
 - lib/metanorma/csd/processor.rb
+- lib/metanorma/csd/version.rb
 - metanorma-csd.gemspec
 homepage: https://github.com/riboseinc/metanorma-csd
 licenses:

data/lib/asciidoctor/csd/version.rb

@@ -1,5 +0,0 @@
-module Asciidoctor
-  module Csd
-    VERSION = "1.0.4"
-  end
-end