asciidoctor-csd 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b06c2d35d54cc92d44d34fa6296309026c2c2382cd06da0a0a873ada81b990ca
-  data.tar.gz: a65cfd2752777e4ae4fd017ff4133cb8448372f3450132a9d37241ec0373fd67
+  metadata.gz: 4f757bd08755b310566b64e9cc50010499b1941864540e50e12fa6dea344144f
+  data.tar.gz: 4eb350a9af73db640aed094df5e4960de0f83ef3cba1ee0f803141385932afa5
 SHA512:
-  metadata.gz: 13a7a0feb7ea66a63482da6b3a9535425a87289060a9abc0b7d9ba6f9267892490164fd4aa7ababc7b50567293d5ddfb9fd90ae2b5259265618e6e88d52af331
-  data.tar.gz: 6b87c74a7a50fd2e932cf4090493ac79c1436b505b1bb6526f7768039899e84ba41e3d4bfcc9f3c1f43703dbdce3f5959fda269b64a1c9c25a9ea48cd05979c5
+  metadata.gz: 23813c54c0cb4bd2c0035e75cb7d2481a02084ad814eb68977d6cb58f5032c984b44c1f8a393747b5632ef2b0d200f9fa17b816c874dcb0133ff79a0ae19e7d3
+  data.tar.gz: 325a8920f50768a6fc7eac4b265884791497d249dc9a952d1365b4ebace438299b4e88b10affc6babafe0571d5ee2509b1ab051f97ec2a86cbc768e781ea69ae

data/Gemfile.lock

@@ -25,7 +25,7 @@ GEM
     docile (1.3.1)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    ffi (1.9.24)
+    ffi (1.9.25)
     formatador (0.2.5)
     guard (2.14.2)
       formatador (>= 0.2.4)
@@ -53,15 +53,15 @@ GEM
     htmlentities (4.3.4)
     httpclient (2.8.3)
     image_size (2.0.0)
-    iso-bib-item (0.1.3)
+    iso-bib-item (0.1.5)
       isoics (~> 0.1.6)
       nokogiri
-    isobib (0.1.4)
+    isobib (0.1.5)
       algoliasearch
       iso-bib-item (~> 0.1.2)
     isodoc (0.7.0)
       asciimath
-      html2doc
+      html2doc (>= 0.7.1)
       htmlentities (~> 4.3.4)
       image_size
       liquid
@@ -73,6 +73,7 @@ GEM
       thread_safe
       uuidtools
     isoics (0.1.6)
+    jaro_winkler (1.5.1)
     json (2.1.0)
     liquid (4.0.0)
     listen (3.1.5)
@@ -95,7 +96,7 @@ GEM
     parallel (1.12.1)
     parser (2.5.1.0)
       ast (~> 2.4.0)
-    powerpack (0.1.1)
+    powerpack (0.1.2)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -118,7 +119,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    rubocop (0.56.0)
+    rubocop (0.57.2)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5)
       powerpack (~> 0.1)
@@ -144,7 +146,7 @@ GEM
     thor (0.20.0)
     thread_safe (0.3.6)
     timecop (0.9.1)
-    unicode-display_width (1.3.3)
+    unicode-display_width (1.4.0)
     uuidtools (2.1.5)
 
 PLATFORMS

data/lib/asciidoctor/csd/converter.rb

@@ -47,7 +47,7 @@ module Asciidoctor
       end
 
       def metadata_status(node, xml)
-        xml.status **{ format: "plain" } { |s| s << node.attr("status") }
+        xml.status(**{ format: "plain" }) { |s| s << node.attr("status") }
       end
 
       def metadata_id(node, xml)
@@ -95,9 +95,9 @@ module Asciidoctor
       end
 
       # deactivating biblio caching for now
-      def open_cache_biblio(node, global)
-        nil
-      end
+      #def open_cache_biblio(node, global)
+        #nil
+      #end
 
       def pdf_convert(filename)
         url = "#{Dir.pwd}/#{filename}.html"
@@ -127,10 +127,6 @@ module Asciidoctor
                         File.join(File.dirname(__FILE__), "csd.rng"))
       end
 
-      def html_doc_path(file)
-        File.join(File.dirname(__FILE__), File.join("html", file))
-      end
-
       def literal(node)
         noko do |xml|
           xml.figure **id_attr(node) do |f|

data/lib/asciidoctor/csd/isostandard.rng

@@ -114,6 +114,9 @@
       <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>
+      <optional>
+        <ref name="allParts"/>
+      </optional>
     </define>
     <define name="BibData">
       <optional>
@@ -165,6 +168,9 @@
       <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>
+      <optional>
+        <ref name="allParts"/>
+      </optional>
     </define>
     <define name="bdate">
       <element name="date">
@@ -852,6 +858,11 @@
       <ref name="FormattedString"/>
     </element>
   </define>
+  <define name="allParts">
+    <element name="allParts">
+      <data type="boolean"/>
+    </element>
+  </define>
   <define name="clause-hanging-paragraph-with-footnote">
     <element name="clause">
       <optional>
@@ -905,7 +916,12 @@
   </define>
   <define name="ics">
     <element name="ics">
-      <text/>
+      <element name="code">
+        <text/>
+      </element>
+      <element name="text">
+        <text/>
+      </element>
     </element>
   </define>
   <define name="term-clause">

data/lib/asciidoctor/csd/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Csd
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

data/lib/isodoc/csd/csdconvert.rb

@@ -1,4 +1,5 @@
 require "isodoc"
+require_relative "metadata"
 
 module IsoDoc
   module Csd
@@ -16,7 +17,6 @@ module IsoDoc
         @htmlcoverpage = html_doc_path("html_csd_titlepage.html")
         @htmlintropage = html_doc_path("html_csd_intro.html")
         @scripts = html_doc_path("scripts.html")
-        set_metadata(:status, "XXX")
       end
 
       def default_fonts(options)
@@ -30,49 +30,8 @@ module IsoDoc
         "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
       end
 
-      def init_metadata
-        super
-      end
-
-      def title(isoxml, _out)
-        main = isoxml&.at(ns("//title[@language='en']"))&.text
-        set_metadata(:doctitle, main)
-      end
-
-      def subtitle(_isoxml, _out)
-        nil
-      end
-
-      def author(isoxml, _out)
-        set_metadata(:tc, "XXXX")
-        tc = isoxml.at(ns("//editorialgroup/technical-committee"))
-        set_metadata(:tc, tc.text) if tc
-      end
-
-      def docid(isoxml, _out)
-        docnumber = isoxml.at(ns("//bibdata/docidentifier"))
-        docstatus = isoxml.at(ns("//bibdata/status"))
-        dn = docnumber&.text
-        if docstatus
-          set_metadata(:status, status_print(docstatus.text))
-          abbr = status_abbr(docstatus.text)
-          dn = "#{dn}(#{abbr})" unless abbr.empty?
-        end
-        set_metadata(:docnumber, dn)
-      end
-
-      def status_print(status)
-        status.split(/-/).map{ |w| w.capitalize }.join(" ")
-      end
-
-      def status_abbr(status)
-        case status
-        when "working-draft" then "wd"
-        when "committee-draft" then "cd"
-        when "draft-standard" then "d"
-        else
-          ""
-        end
+      def metadata_init(lang, script, labels)
+        @meta = Metadata.new(lang, script, labels)
       end
 
       def annex_name(annex, name, div)

data/lib/isodoc/csd/html/html_csd_titlepage.html

@@ -38,7 +38,7 @@
   </div>
   </div>
 
-  <div class="WordSection11">
+  <div class="title-section1">
   <div class="coverpage-stage-block" >
     <span class="coverpage-stage" id="{{ doctype | replace: ' ', '-' | downcase }}">Calconnect {{ doctype }}</span>
   </div>

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

@@ -91,7 +91,7 @@ dd {
   grid-column-start: 2;
 }
 
-dd p {
+dd p, dt p {
   margin-top: 0px;
 }
 
@@ -802,11 +802,11 @@ p {
 	padding-right: 1em;
   }
   
-  .WordSection11 {
+  .title-section1 {
     padding: 0 2em 0 3em;
   }
 
-  .WordSection2 {
+  .prefatory-section {
     padding: 0 3em 0 6em;
   }
   
@@ -939,7 +939,7 @@ a.anchorjs-link:hover {
 }
 
 @media print {
-    h1, .WordSection11 {page-break-before: always;}
+    h1, .title-section1 {page-break-before: always;}
     #toggle, .document-stage-band,
     .document-type-band,#myBtn {display: none;}
     .container {padding-left: 0;}

data/lib/isodoc/csd/metadata.rb

@@ -0,0 +1,56 @@
+require "isodoc"
+
+module IsoDoc
+  module Csd
+    # A {Converter} implementation that generates CSD output, and a document
+    # schema encapsulation of the document for validation
+    class Metadata < IsoDoc::Metadata
+      def initialize(lang, script, labels)
+        super
+        set(:status, "XXX")
+      end
+
+      def title(isoxml, _out)
+        main = isoxml&.at(ns("//title[@language='en']"))&.text
+        set(:doctitle, main)
+      end
+
+      def subtitle(_isoxml, _out)
+        nil
+      end
+
+      def author(isoxml, _out)
+        set(:tc, "XXXX")
+        tc = isoxml.at(ns("//editorialgroup/technical-committee"))
+        set(:tc, tc.text) if tc
+      end
+
+      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(" ")
+      end
+
+      def status_abbr(status)
+        case status
+        when "working-draft" then "wd"
+        when "committee-draft" then "cd"
+        when "draft-standard" then "d"
+        else
+          ""
+        end
+      end
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-csd
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-03 00:00:00.000000000 Z
+date: 2018-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor-iso
@@ -217,6 +217,7 @@ files:
 - lib/isodoc/csd/html/html_csd_titlepage.html
 - lib/isodoc/csd/html/htmlstyle.scss
 - lib/isodoc/csd/html/scripts.html
+- lib/isodoc/csd/metadata.rb
 homepage: https://github.com/riboseinc/asciidoctor-csd
 licenses:
 - MIT
@@ -237,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: asciidoctor-csd lets you write CSD in AsciiDoc.