metanorma-m3d 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e547037e67b0e0e801e60628c592161fbb2f8f3475e9430dc4b804ceaed0bea
-  data.tar.gz: 7a821dff76506187b273df899d7fe4e84a4b7299d67f13591bf8ce00cbc763ba
+  metadata.gz: e56ff0f758437606bfe1cd38596fa6d53e827e00b1c1c74d9b394a897a0709da
+  data.tar.gz: 75b1c8474c4031c75ee5c85539c285e5cb291bd7122f55b45aa3cb8eb272087c
 SHA512:
-  metadata.gz: 87c1537944eb92c2d3d3599ecb63e635150357ce07a900ac25661b750054f192a7efd07d12dd3437d557bc43654952e87fef319c9e50a08e57a2a20cd0f7145c
-  data.tar.gz: 759fe729cd05b687c2bd2b3c700ed8a080e756a244827e1cec25bc093c5ce5e94ff376f80f8170ba7b1dd6e58154e94bbe43b105ad8eaf62b4cf65975c96a3fd
+  metadata.gz: 7d9d0fb6708b39019c1688f1db57607b15e26eb30ddc61c3721983cb4c2b48f5e034b56447d123ce48bbec4c4320baa7820c8dd018dec81faa6350c62c08b14a
+  data.tar.gz: 758cd891a9273629b2b681791ab6a41e0bd54bf35b1784ee2b31395c297ff0150cbe97e7b74f2ff64316c9e501b6462413b9b67c7e16ea5a15a1e47786479460

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

@@ -19,6 +19,7 @@ module Asciidoctor
         title node, xml
         metadata_source(node, xml)
         metadata_id(node, xml)
+        metadata_date(node, xml)
         metadata_author(node, xml)
         metadata_publisher(node, xml)
         xml.language node.attr("language")
@@ -60,20 +61,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::M3d::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: "m3d"}
+        xml.docnumber { |i| i << node.attr("docnumber") }
       end
 
       def metadata_copyright(node, xml)

data/lib/asciidoctor/m3d/isodoc.rng

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

data/lib/asciidoctor/m3d/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/m3d/html/html_m3d_titlepage.html

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

data/lib/isodoc/m3d/html/word_m3d_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'>{{ agency }}&nbsp;{{ docnumber }}:{{ docyear }}(E) {{ 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/m3d/m3dwordconvert.rb

@@ -56,45 +56,11 @@ module IsoDoc
         end
       end
 
-      def make_body2(body, docxml)
-        body.div **{ class: "WordSection2" } do |div2|
-          info docxml, div2
-          div2.p { |p| p << "&nbsp;" } # placeholder
-        end
-        # body.br **{ clear: "all", style: "page-break-before:auto;mso-break-type:section-break;" }
-        # apparently that was not intended: enforce page break between ToC and body
-        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.url isoxml, out
         super

data/lib/isodoc/m3d/metadata.rb

@@ -27,18 +27,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/metanorma/m3d/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-m3d
 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-27 00:00:00.000000000 Z
+date: 2018-11-19 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