asciidoctor-csand 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: add2d55ce4506ebcc6e138a367a369f3430925dd
-  data.tar.gz: 0df3d1b2775de15f59a7ab0cfa6dd0594622cfd7
+SHA256:
+  metadata.gz: 5452725006b85a3c51448bb2a31d778c3070727712d9fcfa5d768742744c8c73
+  data.tar.gz: ffec7ab9cc922a2c7b7a50c6ff5049b008ebff77bc11e75f9916e44451c57640
 SHA512:
-  metadata.gz: b40076638a012802e1dcbe8d51e5c81c249437250afddcbe01530787047e47a662d3fa199d277756b294100654c9c9495ceac58d906d40c4d0d1cbf1281c6eb8
-  data.tar.gz: ff9715259ab444d452a50eaaadcdeef8a2bc289b63a943b0466953fc6437adc0b9245222f7468dcf92093b232fbba3af3362e64819a94960fb6037c36ff03c0b
+  metadata.gz: 5e984fd1a66073d97657a8bd37687904cbb837afdf3a5087634424f04f8a66df867dafecdf46b29a2c4c790aa71879897e752dc044dd094f55fec7599d00bab0
+  data.tar.gz: e1a8d13cd3a525634e382ad94af3b131243989571418f116056c300aba88ddc8932729d7f206adaea1f3f8c5141edbb83c66a4686ae83b526a58ec6aaa429990

data/.travis.yml

@@ -0,0 +1,7 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.4.3
+before_install:
+  - gem install bundler -v 1.16.1
+  - unset _JAVA_OPTIONS

data/Gemfile.lock

@@ -1,25 +1,20 @@
 GIT
   remote: https://github.com/riboseinc/asciidoctor-iso
-  revision: acb439aa79a102bff01f876b6f19bdf468a47861
+  revision: 8cc05dd17f42f68102e39f84f122775a801f403f
   specs:
-    asciidoctor-iso (0.7.5)
-      asciidoctor (~> 1.5.6)
-      html2doc
-      htmlentities (~> 4.3.4)
-      isodoc
-      nokogiri
+    asciidoctor-iso (0.8.2)
+      asciidoctor (~> 1.5.7)
+      isobib (~> 0.1.4)
+      isodoc (>= 0.7.0)
       ruby-jing
-      sass
-      thread_safe
-      uuidtools
 
 GIT
   remote: https://github.com/riboseinc/isodoc
-  revision: 71a0d3a0f6ed4c001968949187103247de97a879
+  revision: d2e9d051f6c517b9ddec814a259b0f44c7e5c971
   specs:
-    isodoc (0.5.9)
+    isodoc (0.7.1)
       asciimath
-      html2doc
+      html2doc (>= 0.7.1)
       htmlentities (~> 4.3.4)
       image_size
       liquid
@@ -27,19 +22,20 @@ GIT
       nokogiri
       roman-numerals
       ruby-xslt
+      sass
       thread_safe
       uuidtools
 
 PATH
   remote: .
   specs:
-    asciidoctor-csand (0.2.5)
+    asciidoctor-csand (0.2.7)
       asciidoctor (~> 1.5.7)
-      asciidoctor-iso (>= 0.7.5)
+      asciidoctor-iso (>= 0.8.0)
       asciimath
       htmlentities (~> 4.3.4)
       image_size
-      isodoc
+      isodoc (>= 0.7.0)
       mime-types
       nokogiri
       ruby-jing
@@ -50,16 +46,20 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    algoliasearch (1.22.0)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
     asciidoctor (1.5.7.1)
     asciimath (1.0.4)
     ast (2.4.0)
     byebug (9.1.0)
     coderay (1.1.2)
     diff-lcs (1.3)
-    docile (1.3.0)
+    docile (1.3.1)
+    duplicate (1.1.1)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    ffi (1.9.23)
+    ffi (1.9.25)
     formatador (0.2.5)
     guard (2.14.2)
       formatador (>= 0.2.4)
@@ -75,7 +75,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    html2doc (0.7.0)
+    html2doc (0.8.0)
       asciimath
       htmlentities (~> 4.3.4)
       image_size
@@ -85,7 +85,17 @@ GEM
       thread_safe
       uuidtools
     htmlentities (4.3.4)
+    httpclient (2.8.3)
     image_size (2.0.0)
+    iso-bib-item (0.1.5)
+      duplicate
+      isoics (~> 0.1.6)
+      nokogiri
+    isobib (0.1.6)
+      algoliasearch
+      iso-bib-item (~> 0.1.2)
+    isoics (0.1.6)
+    jaro_winkler (1.5.1)
     json (2.1.0)
     liquid (4.0.0)
     listen (3.1.5)
@@ -99,7 +109,7 @@ GEM
     mime-types-data (3.2016.0521)
     mini_portile2 (2.3.0)
     nenv (0.3.0)
-    nokogiri (1.8.2)
+    nokogiri (1.8.3)
       mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -108,7 +118,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)
@@ -131,7 +141,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)
@@ -157,7 +168,7 @@ GEM
     thor (0.20.0)
     thread_safe (0.3.6)
     timecop (0.9.1)
-    unicode-display_width (1.3.2)
+    unicode-display_width (1.4.0)
     uuidtools (2.1.5)
 
 PLATFORMS
@@ -179,4 +190,4 @@ DEPENDENCIES
   timecop (~> 0.9)
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

data/asciidoctor-csand.gemspec

@@ -35,8 +35,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ruby-xslt"
   spec.add_dependency "thread_safe"
   spec.add_dependency "uuidtools"
-  spec.add_dependency "asciidoctor-iso", ">= 0.7.5"
-  spec.add_dependency "isodoc"
+
+  spec.add_dependency "asciidoctor-iso", ">= 0.8.0"
+  spec.add_dependency "isodoc", ">= 0.7.0"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug", "~> 9.1"

data/lib/asciidoctor/csand/biblio.rng

@@ -442,9 +442,9 @@
     <optional>
       <ref name="status"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="copyright"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="docrelation"/>
     </zeroOrMore>
@@ -489,10 +489,31 @@
           <value>issued</value>
         </choice>
       </attribute>
-      <ref name="bfrom"/>
-      <optional>
-        <ref name="bto"/>
-      </optional>
+      <!-- ( ( bfrom, bto? ) | date_on ) -->
+      <choice>
+        <group>
+          <element name="from">
+            <choice>
+              <data type="gYear"/>
+              <data type="date"/>
+            </choice>
+          </element>
+          <optional>
+            <element name="to">
+              <choice>
+                <data type="gYear"/>
+                <data type="date"/>
+              </choice>
+            </element>
+          </optional>
+        </group>
+        <element name="on">
+          <choice>
+            <data type="gYear"/>
+            <data type="date"/>
+          </choice>
+        </element>
+      </choice>
     </element>
   </define>
   <define name="bfrom">
@@ -511,6 +532,14 @@
       </choice>
     </element>
   </define>
+  <define name="date_on">
+    <element name="on">
+      <choice>
+        <data type="gYear"/>
+        <data type="date"/>
+      </choice>
+    </element>
+  </define>
   <define name="docidentifier">
     <element name="docidentifier">
       <optional>

data/lib/asciidoctor/csand/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)

data/lib/asciidoctor/csand/csand.rng

@@ -56,6 +56,20 @@
         </choice>
       </element>
     </define>
+    <define name="status">
+      <element name="status">
+        <choice>
+          <value>proposal</value>
+          <value>working-draft</value>
+          <value>committee-draft</value>
+          <value>draft-standard</value>
+          <value>final-draft</value>
+          <value>published</value>
+          <value>withdrawn</value>
+          <ref name="LocalizedString"/>
+        </choice>
+      </element>
+    </define>
     <!-- TextElement |= keyword -->
     <define name="TextElement">
       <choice>

data/lib/asciidoctor/csand/isodoc.rng

@@ -729,7 +729,7 @@
   </define>
   <define name="source">
     <element name="source">
-      <data type="anyURI"/>
+      <ref name="TypedUri"/>
     </element>
   </define>
   <define name="em">

data/lib/asciidoctor/csand/isostandard.rng

@@ -72,9 +72,9 @@
         </oneOrMore>
         <ref name="formattedref"/>
       </choice>
-      <optional>
+      <zeroOrMore>
         <ref name="bsource"/>
-      </optional>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="docidentifier"/>
       </zeroOrMore>
@@ -96,9 +96,9 @@
       <zeroOrMore>
         <ref name="script"/>
       </zeroOrMore>
-      <optional>
+      <zeroOrMore>
         <ref name="abstract"/>
-      </optional>
+      </zeroOrMore>
       <optional>
         <ref name="status"/>
       </optional>
@@ -114,6 +114,9 @@
       <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>
+      <optional>
+        <ref name="allParts"/>
+      </optional>
     </define>
     <define name="BibData">
       <optional>
@@ -127,9 +130,9 @@
       <optional>
         <ref name="formattedref"/>
       </optional>
-      <optional>
+      <zeroOrMore>
         <ref name="bsource"/>
-      </optional>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="docidentifier"/>
       </zeroOrMore>
@@ -151,9 +154,9 @@
       <zeroOrMore>
         <ref name="script"/>
       </zeroOrMore>
-      <optional>
+      <zeroOrMore>
         <ref name="abstract"/>
-      </optional>
+      </zeroOrMore>
       <optional>
         <ref name="status"/>
       </optional>
@@ -165,13 +168,49 @@
       <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>
+      <optional>
+        <ref name="allParts"/>
+      </optional>
     </define>
-    <define name="bfrom">
-      <element name="from">
+    <define name="bdate">
+      <element name="date">
+        <attribute name="type">
+          <choice>
+            <value>published</value>
+            <value>accessed</value>
+            <value>created</value>
+            <value>implemented</value>
+            <value>obsoleted</value>
+            <value>confirmed</value>
+            <value>updated</value>
+            <value>issued</value>
+          </choice>
+        </attribute>
+        <!-- ( ( bfrom, bto? ) | date_on ) -->
         <choice>
-          <data type="gYear"/>
-          <data type="date"/>
-          <value>--</value>
+          <group>
+            <element name="from">
+              <choice>
+                <data type="gYear"/>
+                <data type="date"/>
+              </choice>
+            </element>
+            <optional>
+              <element name="to">
+                <choice>
+                  <data type="gYear"/>
+                  <data type="date"/>
+                </choice>
+              </element>
+            </optional>
+          </group>
+          <element name="on">
+            <choice>
+              <data type="gYear"/>
+              <data type="date"/>
+              <value>--</value>
+            </choice>
+          </element>
         </choice>
       </element>
     </define>
@@ -819,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>
@@ -872,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/csand/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Csand
-    VERSION = "0.2.7"
+    VERSION = "0.2.8"
   end
 end

data/lib/isodoc/csand/csandconvert.rb

@@ -1,4 +1,5 @@
 require "isodoc"
+require_relative "metadata"
 
 module IsoDoc
   module Csand
@@ -16,64 +17,21 @@ module IsoDoc
         @htmlcoverpage = html_doc_path("html_csand_titlepage.html")
         @htmlintropage = html_doc_path("html_csand_intro.html")
         @scripts = html_doc_path("scripts.html")
-        set_metadata(:status, "XXX")
       end
 
       def default_fonts(options)
         b = options[:bodyfont] ||
           (options[:script] == "Hans" ? '"SimSun",serif' :
-           '"Overpass",sans-serif')
+           '"Source Sans Pro",sans-serif')
         h = options[:headerfont] ||
           (options[:script] == "Hans" ? '"SimHei",sans-serif' :
-           '"Overpass",sans-serif')
+           '"Source Sans Pro",sans-serif')
         m = options[:monospacefont] || '"Space Mono",monospace'
         "$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)
@@ -93,7 +51,7 @@ module IsoDoc
         out.pre node.text # content.gsub(/</, "&lt;").gsub(/>/, "&gt;")
       end
 
-      def term_defs_boilerplate(div, source, term)
+      def term_defs_boilerplate(div, source, term, preface)
         if source.empty? && term.nil?
           div << @no_terms_boilerplate
         else
@@ -127,7 +85,10 @@ module IsoDoc
 
     <!--Google fonts-->
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Rubik:300,300i,500" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Overpass:100,300,300i,600,900" rel="stylesheet">
+
+    <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,700,900" rel="stylesheet">
     <!--Font awesome import for the link icon-->
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous">
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous">