metanorma-csand 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f72fb053ef6f5498b07128eab4938b772ae6f978dc405fe7410dd1ce536d25c
-  data.tar.gz: 94cfb906070e72023908f51d3dd0719a564adc365fa8a7931534f5a1f2ac39af
+  metadata.gz: aaa18ba2049c946b9db17988b63c4137cf3db235aedaad050dad6dad2f31e47e
+  data.tar.gz: f2af1a2be2115d40f09a959e6a2822ce7f2ba2c3c68a447971e5577dfeec65a5
 SHA512:
-  metadata.gz: 5742c99c1d46d8d6c7eef7edd12e63e7b6e97a7cd99c27039a94b3bc6ec4eb51280f6f6bb9c2089f66ab535c9e775b3f79b4436cc9997e2fac97f3b9e519da58
-  data.tar.gz: bdd4cfc7feb8223270814bcef373258b2a1c3ba2334e6a4466d71af39de1b0b5d213b8cf6b2391bd54a6ad42a0ef8e3ea9bfed5a29611ad6acc57fecc042875c
+  metadata.gz: 52f3835f9c4adaff9a3490c79b00b74493191fde0445df02e22ea2dc1ce40e072486a49b9d617b26cd707bf23fff1d500cd3c5fc1cadea7d24a6b52475178181
+  data.tar.gz: 7ee7a3824c0ead9b0cde7e7337d3623ed6759a37de33f3721fb804988f37bded40fe7661b7e5c2f21dbc5dd790e1ba4a514bef7ac6910a7fcd8a1c050dc38547

data/.hound.yml

@@ -0,0 +1,3 @@
+ruby:
+  Enabled: true
+  config_file: .rubocop.yml

data/.rubocop.yml

@@ -0,0 +1,10 @@
+# This project follows the Ribose OSS style guide.
+# https://github.com/riboseinc/oss-guides
+# All project-specific additions and overrides should be specified in this file.
+
+inherit_from:
+  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
+AllCops:
+  TargetRubyVersion: 2.3
+Rails:
+  Enabled: true

data/lib/asciidoctor/csand/biblio.rng

@@ -476,6 +476,9 @@
     <zeroOrMore>
       <ref name="docidentifier"/>
     </zeroOrMore>
+    <optional>
+      <ref name="docnumber"/>
+    </optional>
     <zeroOrMore>
       <ref name="bdate"/>
     </zeroOrMore>
@@ -637,6 +640,8 @@
           <value>transmitted</value>
           <value>copied</value>
           <value>unchanged</value>
+          <value>circulated</value>
+          <text/>
         </choice>
       </attribute>
       <choice>
@@ -673,6 +678,11 @@
       <text/>
     </element>
   </define>
+  <define name="docnumber">
+    <element name="docnumber">
+      <text/>
+    </element>
+  </define>
   <define name="bclassification">
     <element name="classification">
       <optional>

data/lib/asciidoctor/csand/converter.rb

@@ -45,20 +45,21 @@ module Asciidoctor
         end
       end
 
-      def title(node, xml)
-        ["en"].each do |lang|
-          xml.title **{ language: lang, format: "plain" } do |t|
-            t << asciidoc_sub(node.attr("title"))
-          end
-        end
-      end
-
       def metadata_status(node, xml)
         xml.status(**{ format: "plain" }) { |s| s << node.attr("status") }
       end
 
       def metadata_id(node, xml)
-        xml.docidentifier { |i| i << node.attr("docnumber") }
+        docstatus = node.attr("status")
+        dn = node.attr("docnumber")
+        if docstatus
+          abbr = IsoDoc::Csand::Metadata.new("en", "Latn", {}).
+            status_abbr(docstatus)
+          dn = "#{dn}(#{abbr})" unless abbr.empty?
+        end
+        node.attr("copyright-year") and dn += ":#{node.attr("copyright-year")}"
+        xml.docidentifier dn, **{type: "csand"}
+        xml.docnumber { |i| i << node.attr("docnumber") }
       end
 
       def metadata_copyright(node, xml)

data/lib/asciidoctor/csand/isodoc.rng

@@ -1034,6 +1034,9 @@
     <zeroOrMore>
       <ref name="docidentifier"/>
     </zeroOrMore>
+    <optional>
+      <ref name="docnumber"/>
+    </optional>
     <zeroOrMore>
       <ref name="bdate"/>
     </zeroOrMore>

data/lib/asciidoctor/csand/isostandard.rng

@@ -84,6 +84,9 @@
       <zeroOrMore>
         <ref name="docidentifier"/>
       </zeroOrMore>
+      <optional>
+        <ref name="docnumber"/>
+      </optional>
       <zeroOrMore>
         <ref name="bdate"/>
       </zeroOrMore>
@@ -163,6 +166,9 @@
       <zeroOrMore>
         <ref name="docidentifier"/>
       </zeroOrMore>
+      <optional>
+        <ref name="docnumber"/>
+      </optional>
       <zeroOrMore>
         <ref name="bdate"/>
       </zeroOrMore>

data/lib/isodoc/csand/html/html_csand_titlepage.html

@@ -19,8 +19,6 @@
 
   <div class="doc-number">
     <span class="docnumber">{{ docnumber }}</span>
-    <span class="docnumber-separator">:</span>
-    <span class="docyear">{{ docyear }}</span>
   </div>
 
   <div class="title-first">{{ doctitle }}</div>

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

@@ -82,6 +82,11 @@ h1, h2, h3, h4, h5, h6, .h2Annex {
   font-family: $headerfont;
 }
 
+li {
+  margin-left: 1em;
+  list-style-position: outside;
+}
+
 dl {
   display: grid;
   grid-template-columns: max-content auto;

data/lib/isodoc/csand/metadata.rb

@@ -27,19 +27,8 @@ module IsoDoc
 
 
       def docid(isoxml, _out)
-        docnumber = isoxml.at(ns("//bibdata/docidentifier"))
-        docstatus = isoxml.at(ns("//bibdata/status"))
-        dn = docnumber&.text
-        if docstatus
-          set(:status, status_print(docstatus.text))
-          abbr = status_abbr(docstatus.text)
-          dn = "#{dn}(#{abbr})" unless abbr.empty?
-        end
-        set(:docnumber, dn)
-      end
-
-      def status_print(status)
-        status.split(/-/).map{ |w| w.capitalize }.join(" ")
+        docnumber = isoxml.at(ns("//bibdata/docidentifier[@type = 'csand']"))
+        set(:docnumber, docnumber&.text)
       end
 
       def status_abbr(status)

data/lib/metanorma/csand/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Csand
-    VERSION = "1.0.7"
+    VERSION = "1.0.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-csand
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-26 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -345,6 +345,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hound.yml"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile