metanorma-acme 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '055496ecad0c9599c3343121300fd15c360c4955655d0433cd24228eeae85eb4'
-  data.tar.gz: 54842f7c59725cba1fc60758cf1658c31f5af4f9dd28fb9a54eb161e00b43c76
+  metadata.gz: b4803bf90b5668d13750c9b0522e3cf1c348948eeccfaf8c6ae8ca39ea3c91eb
+  data.tar.gz: 9eee46a6c47da7db9630b7e0106cf707299c8720bcb87b98b56a5568d2bf24d7
 SHA512:
-  metadata.gz: 16a9d7556f6b9bfcdb63b768a22f917a0e4202ac3357b4dab1aefac89ca9b12fe46e0f6c34782d9621fc914dfd9d155da748db605a9f5a24a40ee0dc74c5d526
-  data.tar.gz: ef45ef75d0367b300a05c1db933febadb042a3f6cdcfaf74c305c9313fac2ccbc2e330a22f6da9526e8adffe824a2e11953fbf72f4e48f6d06a86fc2595f5a1d
+  metadata.gz: 106b17c80727c2a68d20d0680b87bc62a39385e267d3d34593a95d777fc4ec430e21516b4f2d3ece034e97fcf58c4c0e1fe02d8bf3c8c9496decd37bf0a206d1
+  data.tar.gz: af67308f96a1ebd456b52b2ee3a355a05adb83337d69a5e8f37392b7e2c94dc2d8cd6659a5955ca88ca9d2ba41e02f9173dba397c8345dda125432de3160f99c

data/.rubocop.yml

@@ -3,13 +3,8 @@
 # All project-specific additions and overrides should be specified in this file.
 
 inherit_from:
-  # Thoughtbot's style guide from: https://github.com/thoughtbot/guides
-  - ".rubocop.tb.yml"
-  # Overrides from Ribose
-  - ".rubocop.ribose.yml"
+  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  DisplayCopNames: false
-  StyleGuideCopsOnly: false
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.3
 Rails:
   Enabled: true

data/.travis.yml

@@ -8,6 +8,8 @@ rvm:
   - ruby-head
 before_install:
   - gem install bundler -v 1.16.1
+  - npm install -g puppeteer
+  - npm install
   - unset _JAVA_OPTIONS
 matrix:
   allow_failures:

data/lib/asciidoctor/acme/acme.rng

@@ -7,7 +7,7 @@
   -->
   <include href="isostandard.rng">
     <start>
-      <ref name="rsd-standard"/>
+      <ref name="acme-standard"/>
     </start>
     <define name="language">
       <element name="language">
@@ -140,6 +140,9 @@
       <zeroOrMore>
         <ref name="docidentifier"/>
       </zeroOrMore>
+      <optional>
+        <ref name="docnumber"/>
+      </optional>
       <zeroOrMore>
         <ref name="bdate"/>
       </zeroOrMore>
@@ -203,8 +206,8 @@
       <text/>
     </element>
   </define>
-  <define name="rsd-standard">
-    <element name="rsd-standard">
+  <define name="acme-standard">
+    <element name="acme-standard">
       <ref name="bibdata"/>
       <optional>
         <ref name="version"/>

data/lib/asciidoctor/acme/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/acme/converter.rb

@@ -43,20 +43,17 @@ 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") }
+        return unless node.attr("docnumber")
+        xml.docidentifier do |i|
+          i << "#{Metanorma::Acme::ORGANIZATION_NAME_SHORT} "\
+            "#{node.attr("docnumber")}"
+        end
+        xml.docnumber { |i| i << node.attr("docnumber") }
       end
 
       def metadata_copyright(node, xml)

data/lib/asciidoctor/acme/isodoc.rng

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

data/lib/asciidoctor/acme/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/acme/html/htmlstyle.scss

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

data/lib/isodoc/acme/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/acme/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Acme
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-acme
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 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