metanorma-gb 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2e72d488a261291e202a179c57113ec315b78fbaf73aa2c842ea711412d219d
-  data.tar.gz: cb675f99f57b66794bc465c6b6950bf9c949b72593d50e91770719b593d36c8e
+  metadata.gz: 5bc1b7d14c6fb7838469307406ad9d9942ca59faedbc998f2a4c49db97f02701
+  data.tar.gz: 79fbf7df72778a85f056b2bdb8dd5f9d96733fb11fb21c243ae9c9d3fa77d330
 SHA512:
-  metadata.gz: 0420f05b150aa97334b747bf99e0ab1db2a8e77915a638307a3f737be9b018ebc1032df787177dece749b1aa8d3a8827375b3b4569bcf3fd431a5f63fbe36993
-  data.tar.gz: c544bdc3ce059ff8b54ff3f1ddee7cbb4978e8841b2d8125095c6d118ff1bb3bb8b55b9fc66ffeeb797e9cab6008949a3e4d2859e0e5bb8103489673afe88645
+  metadata.gz: 70999dfd783e9d8a955a4bdb715c862c4695d8057095f9fada0fead6d6f0b5ae0abca77e702ca1fcdc2ab7f8a0d3b195d6117e66f61f0a73954f4a9f70e8500b
+  data.tar.gz: 38de8f7e1f2326d3b8f96d259e49eb03d17e596f901d91a6ba2a844f0b31e390c75d101109b0e5b5125c946b2cc0cacf2f9c2cadf74b438cbb7b49ff8c9b38c4

data/lib/asciidoctor/gb/converter.rb

@@ -184,12 +184,7 @@ module Asciidoctor
       def fetch_ref(xml, code, year, **opts)
         code = "CN(#{code})" if !/^CN\(/.match(code) &&
           /^#{GBCODE}[^A-Za-z]/.match(code)
-        hit = @bibdb&.fetch(code, year, opts)
-        return nil if hit.nil?
-        xml.parent.add_child(Asciidoctor::Standoc::Utils::smart_render_xml(hit))
-        xml
-      rescue Algolia::AlgoliaProtocolError
-        nil # Render reference without an Internet connection.
+          super
       end
 
       def cleanup(xmldoc)

data/lib/asciidoctor/gb/reqt.rng

@@ -87,7 +87,7 @@
     </element>
   </define>
   <define name="reqinherit">
-    <element name="subject">
+    <element name="inherit">
       <text/>
     </element>
   </define>

data/lib/isodoc/gb/gbbaseconvert.rb

@@ -77,11 +77,11 @@ module IsoDoc
         out.table **{ class: "dl" } do |v|
           node.elements.each_slice(2) do |dt, dd|
             v.tr do |tr|
-              tr.td **{ valign: "top", align: "left" } do |term|
+              tr.td **{ style: "vertical-align:top;text-align:left;" } do |term|
                 dt_parse(dt, term)
               end
-              tr.td(**{ valign: "top" }) { |td| td << "&mdash;" }
-              tr.td **{ valign: "top" } do |listitem|
+              tr.td(**{ style: "vertical-align:top;" }) { |td| td << "&mdash;" }
+              tr.td **{ style: "vertical-align:top;" } do |listitem|
                 dd.children.each { |n| parse(n, listitem) }
               end
             end
@@ -90,8 +90,8 @@ module IsoDoc
       end
 
       EXAMPLE_TBL_ATTR =
-        { valign: "top", class: "example_label",
-          style: "padding:2pt 2pt 2pt 2pt" }.freeze
+        { class: "example_label",
+          style: "padding:2pt 2pt 2pt 2pt;vertical-align:top;" }.freeze
 
       def example_label(node)
         l10n(super + ":")
@@ -105,7 +105,7 @@ module IsoDoc
             tr.td **EXAMPLE_TBL_ATTR do |td|
               td << l10n(note_label(node) + ":")
             end
-            tr.td **{ valign: "top", class: "Note" } do |td|
+            tr.td **{ style: "vertical-align:top;", class: "Note" } do |td|
               node.children.each { |n| parse(n, td) }
             end
           end
@@ -120,7 +120,7 @@ module IsoDoc
             tr.td **EXAMPLE_TBL_ATTR do |td|
               td << l10n("#{anchor(node['id'], :label)}:")
             end
-            tr.td **{ valign: "top", class: "Note" } do |td|
+            tr.td **{ style: "vertical-align:top;", class: "Note" } do |td|
               node.children.each { |n| parse(n, td) }
             end
           end

data/lib/isodoc/gb/metadata.rb

@@ -102,16 +102,16 @@ module IsoDoc
 
       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 += iter if iter
+        stage = "Pre" + stage if draft =~ /^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] || "??"
-        stage = "#{iter.text.to_i.localize(:zh).spellout.force_encoding("UTF-8")}次#{stage}" if iter
-        stage = "Pre" + HTMLEntities.new.encode(stage, :hexadecimal) if draft&.text =~ /^0\./
+        stage = "#{iter.to_i.localize(:zh).spellout.force_encoding("UTF-8")}次#{stage}" if iter
+        stage = "Pre" + HTMLEntities.new.encode(stage, :hexadecimal) if draft =~ /^0\./
         stage
       end
 
@@ -121,8 +121,9 @@ module IsoDoc
         if docstatus
           set(:stage, docstatus.text.to_i)
           set(:unpublished, docstatus.text.to_i < 60)
-          abbr = stage_abbrev_cn(docstatus.text, isoxml.at(ns("//bibdata/status/iteration")),
-                                 isoxml.at(ns("//version/draft")))
+          abbr = stage_abbrev_cn(docstatus.text,
+                                 isoxml&.at(ns("//bibdata/status/iteration"))&.text,
+                                 isoxml&.at(ns("//version/draft"))&.text)
           set(:stageabbr, abbr)
           set(:status, STATUS_CSS[docstatus.text.to_sym])
         end

data/lib/metanorma/gb/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Gb
-    VERSION = "1.2.4"
+    VERSION = "1.3.0"
   end
 end

data/metanorma-gb.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.add_dependency "metanorma-iso", "~> 1.2.0"
-  spec.add_dependency "isodoc", "~> 0.10.0"
+  spec.add_dependency "metanorma-iso", "~> 1.3.0"
+  spec.add_dependency "isodoc", "~> 1.0.0"
   spec.add_dependency "twitter_cldr", "~> 4.4.4"
   spec.add_dependency "gb-agencies", "~> 0.0.4"
   spec.add_dependency "htmlentities", "~> 4.3.4"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-gb
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-04 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement