metanorma-rsd 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98b99e88b32c3e2d17a6afc7b45fd10faaac409883603438a8a31cde40eb5054
-  data.tar.gz: 2186f48f7fcc6108ba1bb0fc0c7f259e254b43c3e41eb90605a9c54fdddcf97e
+  metadata.gz: 00b3faf336bcf41627e1d1ef606370b69f61ee557d57f62b48fa8725d186a3c3
+  data.tar.gz: 93a068bf291392e7726b26dc9d7e47d670fd96d3ea33282f4373ce7b28400ae7
 SHA512:
-  metadata.gz: d096176eea24e61432d283604596f3dc4d38d7dc761d7041c9af23605a8588c1ef2cb4618e0c66e46eb9aff160e3848144bf3e84fc23d241d43aa65fb14438ff
-  data.tar.gz: 9033dcc1afc7be2924018b9a23013d331ebecc2730d6fd4adece1a1425982885f693d846641b40a01ab4e11f46a817b15a145b3ccd51a159a57c4d8c8b07310f
+  metadata.gz: 3be851a5cae952ce487faa7fddc11badc94a0e4ab4db38b9b676d7dbedaf600767d5ae18c30ad78e69e13a355bebff2ab91c245a59171f0930d0d5a018d2df27
+  data.tar.gz: cfc15d586a6323688fcb2cadd645cbafc0f82f81c82e603ab9c773521fd888451a0cd460db7a03b4f9faa52a45effaa1a138283e99b9f3eb5062c9a1852af1a6

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/rsd/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/rsd/converter.rb

@@ -51,20 +51,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::Rsd::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: "rsd"}
+        xml.docnumber { |i| i << node.attr("docnumber") }
       end
 
       def metadata_copyright(node, xml)

data/lib/asciidoctor/rsd/isodoc.rng

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

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

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

data/lib/isodoc/rsd/html/html_rsd_titlepage.html

@@ -19,8 +19,7 @@
   <div class="coverpage-doc-identity">
     <div class="doc-number">
       <span class="docnumber">{{ docnumber }}</span>
-      <span class="docnumber-separator">:</span>
-      <span class="docyear">{{ docyear }} {{ draftinfo }}</span>
+      <span class="docyear">{{ draftinfo }}</span>
     </div>
 
     <div class="coverpage-title">

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

@@ -518,7 +518,7 @@ p.document-stage {
    }
 
    ul li:before {
-    content: "—";
+    content: "\2014";
     display: inline-block; width: 1em;
     margin-left: -1.2em;
   }

data/lib/isodoc/rsd/html/word_rsd_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/rsd/metadata.rb

@@ -25,18 +25,7 @@ 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(" ")
+        set(:docnumber, docnumber&.text)
       end
 
       def status_abbr(status)

data/lib/isodoc/rsd/word_convert.rb

@@ -57,35 +57,6 @@ module IsoDoc
         section_break(body)
       end
 
-      def title(isoxml, _out)
-        main = isoxml&.at(ns("//title[@language='en']"))&.text
-        set_metadata(:doctitle, main)
-      end
-
-      def generate_header(filename, dir)
-        return unless @header
-        template = Liquid::Template.parse(File.read(@header, encoding: "UTF-8"))
-        meta = @meta.get
-        meta[:filename] = filename
-        params = meta.map { |k, v| [k.to_s, v] }.to_h
-        File.open("header.html", "w") { |f| f.write(template.render(params)) }
-        @files_to_delete << "header.html"
-        "header.html"
-      end
-
-      def header_strip(h)
-        h = h.to_s.gsub(%r{<br/>}, " ").sub(/<\/?h[12][^>]*>/, "")
-        h1 = to_xhtml_fragment(h.dup)
-        h1.traverse do |x|
-          x.replace(" ") if x.name == "span" &&
-            /mso-tab-count/.match(x["style"])
-          x.remove if x.name == "span" && x["class"] == "MsoCommentReference"
-          x.remove if x.name == "a" && x["epub:type"] == "footnote"
-          x.replace(x.children) if x.name == "a"
-        end
-        from_xhtml(h1)
-      end
-
       def info(isoxml, out)
         @meta.security isoxml, out
         super

data/lib/metanorma/rsd/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-rsd
 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-27 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -247,6 +247,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hound.yml"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile