metanorma-csd 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f636a1b9e0dd059719304718108e989bc5b2674bf424489ab1d8c708c5a42fab
-  data.tar.gz: 144e027a106e43e82aaccbb32b6823dff56ed9b1d3cb309044c60bc9113f87b3
+  metadata.gz: d5e2ae80d5f1cd65a6c560f4013a58d9e1c9ed313bee90959f5e21f2ff50cc77
+  data.tar.gz: a6f3c25db46069cdbd4a7c6cb40cbe360342b4fc7a6874bcb64a7dfd2ebb71c5
 SHA512:
-  metadata.gz: 282fa313ca0659704839dcd19ea60e7f376e5d5094816e320db9c7f85b5778de7c08256cabf1c4645a4a1f959d9f3eaa59d1e543707791b8966ec573b9bc9dfa
-  data.tar.gz: 05f8626d4f0c79caad7fa6de6dc122226c8b9f26c08aad38f0edd711b87b9602a2e1da215aedbfd829183f7ec5cfa094bc4f0da52dec66ef3352dc90c8c9d7cf
+  metadata.gz: 651d59900bb63911dfdcf102bb216550d2245cc045c89cbe2a3a02a74c32ffa176b6325d7e40744be6ecb67ca8140528f72618bea4efda5133edff4dd9bd487f
+  data.tar.gz: 291473b15acc2c6aab1b9146f0f8dfeababf7ec4310c64cc5cc6d8026637f1adc8e9724e68b206a5a15d00fe6b9560e1240ffd428ec1ceeeaf64e0d2fca52c99

data/lib/asciidoctor/csd/converter.rb

@@ -69,23 +69,24 @@ module Asciidoctor
 
       def metadata_id(node, xml)
         id = node.attr("docnumber") || "???"
-        # prefix = "CC"
-        doctype(node)
-        # unless typesuffix.empty?
-        #   prefix += "/#{typesuffix}"
-        # end
-        #
-        # status = DOCSTATUS[node.attr("status")] || ""
-        # unless status.empty?
-        #   prefix += "/#{status}"
-        # end
-        #
-        # id = "#{prefix} #{id}"
-        #
-        # year = node.attr("copyright-year")
-        # if year
-        #   id += ":#{year}"
-        # end
+        prefix = "CC"
+        type = doctype(node)
+        typesuffix = ::Metanorma::Csd::DOCSUFFIX[node.attr("doctype")] || ""
+        unless typesuffix.empty?
+           prefix += "/#{typesuffix}"
+        end
+        
+        status = ::Metanorma::Csd::DOCSTATUS[node.attr("status")] || ""
+        unless status.empty?
+          prefix += "/#{status}"
+        end
+        
+        id = "#{prefix} #{id}"
+       
+        year = node.attr("copyright-year")
+        if year
+          id += ":#{year}"
+        end
 
         xml.docidentifier { |i| i << id }
       end

data/lib/isodoc/csd/html/word_csd_titlepage.html

@@ -1,5 +1,5 @@
 <p class="MsoNormal" align="right" style='text-align:right'><b style='mso-bidi-font-weight:
-normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>{{ docnumber }}:{{ docyear }} {{ draftinfo }}</span></b><b
+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"

data/lib/isodoc/csd/metadata.rb

@@ -34,8 +34,10 @@ module IsoDoc
 
         if docnumber.nil?
           set(:docnumber, prefix)
+        else
+          set(:docnumber, docnumber.text)
         end
-
+=begin
         dn = docnumber&.text
 
         doctype = isoxml&.at(ns("//bibdata"))&.attr("type")
@@ -60,8 +62,8 @@ module IsoDoc
         if year
           docid += ":#{year}"
         end
-
         set(:docnumber, docid)
+=end
       end
 
       def status_print(status)

data/lib/metanorma/csd/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-csd
 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-10-29 00:00:00.000000000 Z
+date: 2018-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc