asciidoctor-gb 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d575dd90564cdf6559599921fab8a71bdb584e441f5cd24484a847a793aad9a
-  data.tar.gz: 260c7cb9bbefbf93619ca52688b77298767fb31fd05f736fe6a467c90a696a56
+  metadata.gz: a27bbb1d084ffa183532aa1bca44b2e8b0e749821f0b10af1805820cb3704d0a
+  data.tar.gz: 2bd6177218a0ba3968d6ef53d55d0caca3bf114f33cc782f0208586d37f30e99
 SHA512:
-  metadata.gz: ceb9ef6b5fd1f879271b60d9dc3bc21a9a55003d19e4f493f436116a9f8124e2ae06b761a1564d834e06684c47216d354fe7727ef7304c9bb7811efd91effd74
-  data.tar.gz: e62aca0454d2fee75bd2922588af111d75fe11dcb989f5658fc407a67810d209006e82b6300e9f4949418bc8ec5e09fe3fd957027380c8f84cca1a52344b44c5
+  metadata.gz: 1a30114bd166879703086331bfc2e255e783cef6298a70dec943f8b796694e319a53c0dacfabbeb5c1f2b2dd4cd1eb3aa373d748acd5e34acaa58f702677fe30
+  data.tar.gz: bc416feab8820719d17216872cd9152b6cf80bc748532e6a14369149ceb39e21a791884b8f1bd95e3a676966b45cf5be075a2383cc97882c8e20bffa2214a491

data/.travis.yml

@@ -4,6 +4,7 @@ language: ruby
 rvm:
   - 2.5
   - 2.4
+  - 2.3
   - ruby-head
 before_install:
   - gem install bundler -v 1.16.1

data/asciidoctor-gb.gemspec

@@ -26,9 +26,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "asciidoctor-iso", ">= 0.9.0"
+  spec.add_dependency "asciidoctor-iso", "~> 0.10.0"
   spec.add_dependency "gbbib", "~> 0.2.2"
-  spec.add_dependency "isodoc", ">= 0.8.0"
+  spec.add_dependency "isodoc", "~> 0.8.7"
   spec.add_dependency "twitter_cldr"
   spec.add_dependency "gb-agencies", "~> 0.0.1"
 

data/lib/asciidoctor/gb/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Gb
-    VERSION = "0.3.3"
+    VERSION = "0.3.4"
   end
 end

data/lib/isodoc/gb/gbhtmlrender.rb

@@ -161,7 +161,7 @@ module IsoDoc
         header_class = {} if header_class.nil?
         div.h1 **attr_code(header_class) do |h1|
           if num
-            h1 << num
+            h1 << "#{num}."
             h1 << "&#x3000;"
           end
           h1 << title

data/lib/isodoc/gb/gbwordrender.rb

@@ -161,7 +161,7 @@ module IsoDoc
         header_class = {} if header_class.nil?
         div.h1 **attr_code(header_class) do |h1|
           if num
-            h1 << num
+            h1 << "#{num}."
             h1 << "&#x3000;"
           end
           h1 << title

data/lib/isodoc/gb/metadata.rb

@@ -37,12 +37,10 @@ module IsoDoc
       def set_doctitle
         if @lang == "zh"
           set(:doctitle, get[:docmaintitlezh] + 
-                       get[:docsubtitlezh] +
-                       get[:docparttitlezh])
+                       get[:docsubtitlezh] + get[:docparttitlezh])
         else
           set(:doctitle, get[:docmaintitleen] + 
-                       get[:docsubtitleen] +
-                       get[:docparttitleen])
+                       get[:docsubtitleen] + get[:docparttitleen])
         end
       end
 
@@ -64,6 +62,19 @@ module IsoDoc
         set(:committee, gbcommittee&.text)
       end
 
+      # from ISO
+      STAGE_ABBRS = {
+        "00": "PWI",
+        "10": "NWIP",
+        "20": "WD",
+        "30": "CD",
+        "40": "DIS",
+        "50": "FDIS",
+        "60": "IS",
+        "90": "(Review)",
+        "95": "(Withdrawal)",
+      }.freeze
+
       STAGE_ABBRS_CN = {
         "00": "新工作项目建议",
         "10": "新工作项目",
@@ -88,6 +99,13 @@ module IsoDoc
         "95": "obsolete",
       }
 
+      def stage_abbrev(stage, iter, draft)
+        stage = STAGE_ABBRS[stage.to_sym] || "??"
+        stage += iter.text if iter
+        stage = "Pre" + stage if draft&.text =~ /^0\./
+        stage
+      end
+
       def stage_abbrev_cn(stage, iter, draft)
         return stage_abbrev(stage, iter, draft) if @lang != "zh"
         stage = STAGE_ABBRS_CN[stage.to_sym] || "??"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-gb
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-03 00:00:00.000000000 Z
+date: 2018-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: gbbib
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement
@@ -370,7 +370,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-gb lets you write GB standards in AsciiDoc.