asciidoctor-gb 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7e4e1c31f5269c58542a2c1d056a1ab82511bb5a
-  data.tar.gz: 4ac75f3fb309e8fcab15a18044f124d541b0defd
+SHA256:
+  metadata.gz: b75cd19574a490445f390f3e9d69d5bbeeca40695948561b7d9acf97f2037d8e
+  data.tar.gz: d1752a876bc91b6e41259ec7654871f09b6f05a10175524ffadc68f6d48703ed
 SHA512:
-  metadata.gz: c5a7b32e894db4ab6b2d57e6482b6692f19e399a20f2a3ba957d42dbd821fca194da991d96a43057312d64ad01553c0d66974a80cefffa4f86930907deb85ee7
-  data.tar.gz: 3e0d8fd448fbbe7d5501f48f4bdb5f422aa783b5eaf569f052717bd2793c792f394a66104bcc6cd4f9b62dde5b041baade2a5d2acd514796494a35a79872a0b4
+  metadata.gz: 6ab057c83e120e8b6a81159b72b093841e255597fe458b906397200c7f9a471de7947506c0292ae4a40bdfeb03914a15662c9da69289ebac7ba4cfda4c31761f
+  data.tar.gz: 39c61307b05a2ded3e0b34072caeb1c1294796537a3f1866f764c64e4b24a585ee9e52863bb53969efcc3bee9cdb90876867d2172a1ba8303eeb190c82cf8828

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

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+#git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in asciidoctor-csd.gemspec
 gemspec

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    asciidoctor-gb (0.2.3)
+    asciidoctor-gb (0.2.4)
       asciidoctor-iso (>= 0.7.9)
+      isodoc (>= 0.7.0)
       twitter_cldr
 
 GEM
@@ -12,11 +13,10 @@ GEM
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     asciidoctor (1.5.7.1)
-    asciidoctor-iso (0.7.9)
+    asciidoctor-iso (0.8.1)
       asciidoctor (~> 1.5.7)
-      html2doc
       isobib (~> 0.1.4)
-      isodoc (~> 0.6.2)
+      isodoc (>= 0.7.0)
       ruby-jing
     asciimath (1.0.4)
     ast (2.4.0)
@@ -26,9 +26,10 @@ GEM
     coderay (1.1.2)
     diff-lcs (1.3)
     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)
@@ -44,7 +45,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    html2doc (0.7.1)
+    html2doc (0.8.0)
       asciimath
       htmlentities (~> 4.3.4)
       image_size
@@ -56,15 +57,16 @@ 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)
+      duplicate
       isoics (~> 0.1.6)
       nokogiri
-    isobib (0.1.4)
+    isobib (0.1.6)
       algoliasearch
       iso-bib-item (~> 0.1.2)
-    isodoc (0.6.2)
+    isodoc (0.7.1)
       asciimath
-      html2doc
+      html2doc (>= 0.7.1)
       htmlentities (~> 4.3.4)
       image_size
       liquid
@@ -76,6 +78,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)
@@ -89,7 +92,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)
@@ -98,7 +101,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)
@@ -121,7 +124,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)
@@ -153,7 +157,7 @@ GEM
       tzinfo
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.3.3)
+    unicode-display_width (1.4.0)
     uuidtools (2.1.5)
 
 PLATFORMS

data/asciidoctor-gb.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "asciidoctor-iso", ">= 0.7.9"
+  spec.add_dependency "isodoc", ">= 0.7.0"
   spec.add_dependency "twitter_cldr"
 
   spec.add_development_dependency "bundler", "~> 1.15"

data/lib/asciidoctor-gb.rb

@@ -2,4 +2,5 @@ require "asciidoctor" unless defined? Asciidoctor::Converter
 require_relative "asciidoctor/gb/converter"
 require_relative "asciidoctor/gb/version"
 require "isodoc/gb/gbconvert"
+require "isodoc/gb/gbhtmlconvert"
 require "isodoc/gb/gbwordconvert"

data/lib/asciidoctor/gb/biblio.rng

@@ -489,14 +489,30 @@
           <value>issued</value>
         </choice>
       </attribute>
+      <!-- ( ( bfrom, bto? ) | date_on ) -->
       <choice>
         <group>
-          <ref name="bfrom"/>
+          <element name="from">
+            <choice>
+              <data type="gYear"/>
+              <data type="date"/>
+            </choice>
+          </element>
           <optional>
-            <ref name="bto"/>
+            <element name="to">
+              <choice>
+                <data type="gYear"/>
+                <data type="date"/>
+              </choice>
+            </element>
           </optional>
         </group>
-        <ref name="date_on"/>
+        <element name="on">
+          <choice>
+            <data type="gYear"/>
+            <data type="date"/>
+          </choice>
+        </element>
       </choice>
     </element>
   </define>

data/lib/asciidoctor/gb/converter.rb

@@ -198,8 +198,9 @@ module Asciidoctor
         mandate = xmldoc.at("//gbmandate")&.text || "mandatory"
         lang = xmldoc.at("//language")&.text
         agency = issuer.content
-        agency = IsoDoc::Gb::Convert.new({}).standard_agency1(scope, prefix, mandate) if agency == "GB"
-        agency = "GB" unless agency
+        @agencyclass = IsoDoc::Gb::Agencies.new(lang, {}, "")
+        agency = @agencyclass.standard_agency1(scope, prefix, mandate) if agency == "GB"
+        agency = "GB" if agency.nil? || agency.empty?
         owner = xmldoc.at("//copyright/owner/organization/name")
         owner.content = agency
         owner = xmldoc.at("//contributor[role/@type = 'issuer']/organization/name")

data/lib/asciidoctor/gb/gbstandard.rng

@@ -191,9 +191,9 @@
       <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>
-      <oneOrMore>
+      <zeroOrMore>
         <ref name="gbcommittee"/>
-      </oneOrMore>
+      </zeroOrMore>
       <ref name="gbtype"/>
       <oneOrMore>
         <ref name="gbccs"/>
@@ -308,7 +308,14 @@
   </define>
   <define name="gbccs">
     <element name="ccs">
-      <text/>
+      <element name="code">
+        <text/>
+      </element>
+      <optional>
+        <element name="text">
+          <text/>
+        </element>
+      </optional>
     </element>
   </define>
   <define name="gbplannumber">

data/lib/asciidoctor/gb/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/gb/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="date_on">
-      <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/gb/section_input.rb

@@ -44,6 +44,8 @@ module Asciidoctor
           else
             if @term_def then term_def_subclause_parse(a, xml, node)
             elsif @biblio then bibliography_parse(a, xml, node)
+                          elsif node.attr("style") == "bibliography" && node.level == 1
+              bibliography_parse(a, xml, node)
             elsif node.attr("style") == "appendix" && node.level == 1
               annex_parse(a, xml, node)
             else

data/lib/asciidoctor/gb/validate.rb

@@ -13,7 +13,7 @@ module Asciidoctor
         bilingual_terms_validate(doc.root)
         issuer_validate(doc.root)
         prefix_validate(doc.root)
-        doc_converter(nil).gbtype_validate(doc.root)
+        @agencyclass.gbtype_validate(doc.root)
       end
 
       def prefix_validate(root)

data/lib/asciidoctor/gb/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Gb
-    VERSION = "0.2.4"
+    VERSION = "0.2.5"
   end
 end

data/lib/isodoc/gb/agencies.rb

@@ -1,8 +1,12 @@
-require "isodoc"
-
 module IsoDoc
   module Gb
-    class Convert < IsoDoc::Convert
+    class Agencies
+      def initialize(lang, labels, issuer)
+        @lang = lang
+        @labels = labels
+        @issuer = issuer
+      end
+
       SECTOR = { "zh" => {
         AQ: { industry: "安全生产", admin: "国家安全生产管理局" },
         BB: { industry: "包装", admin: "国家发改委" },
@@ -270,8 +274,8 @@ module IsoDoc
         when "local"
           "#{LOCAL&.dig(@lang, prefix.to_sym) || 'XXXX'}#{@labels["local_standard"]}"
           when "enterprise" 
-            issuer = get_metadata[:issuer]
-            "#{issuer}#{@labels["enterprise_standard"]}"
+            #issuer = get_metadata[:issuer]
+            "#{@issuer}#{@labels["enterprise_standard"]}"
           when "social-group" then @labels["social_standard"]
           when "professional" then "PROFESSIONAL STANDARD" # TODO
           end
@@ -280,14 +284,17 @@ module IsoDoc
       def standard_agency1(scope, prefix, mandate)
         case scope
         when "national"
-          NATIONAL&.dig(@lang, gb_mandate_suffix(prefix, mandate).to_sym,
+          ret = NATIONAL&.dig(@lang, gb_mandate_suffix(prefix, mandate).to_sym,
                         :admin) || nil
+          ret = ret.join(" ") if ret && ret.is_a?(Array)
+          ret
         when "sector"
           SECTOR&.dig(@lang, prefix.to_sym, :admin) || nil
         when "local"
           LOCAL&.dig(@lang, prefix.to_sym) || nil 
         when "enterprise", "social-group"
-          get_metadata[:issuer] || nil
+          #get_metadata[:issuer] || nil
+          @issuer || nil
         when "professional" then "PROFESSIONAL STANDARD" # TODO
         end
       end
@@ -302,7 +309,8 @@ module IsoDoc
         when "local"
           "#{LOCAL&.dig(@lang, prefix.to_sym) || 'XXXX'}#{@labels["local_issuer"]}" 
         when "enterprise", "social-group"
-          get_metadata[:issuer]
+          #get_metadata[:issuer]
+          @issuer
         when "professional" then "PROFESSIONAL STANDARD" # TODO
         end
       end