metanorma-gb 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 110b6ef6b6a174d04c98ba1a7275a6c0bb3e9f5c5b97e2690b5b4f718c2fec0a
-  data.tar.gz: f063c6f9f38981719d774166a816d3a507126a05ad083be5021cf68984aee149
+  metadata.gz: d78f12193ca3356fc2302192db0411d79cf7087b08385bc2908fec1d0e118993
+  data.tar.gz: '078575b73a66f01e6650b8fd8a0d23ebc7dd89135e7f3dee2d88d0a0c0b146e8'
 SHA512:
-  metadata.gz: 0adbf79cf6b413d962d5aa9bde4101b81f8ed89797a7a00bda80e448b14a0c4d3029e9a3e23f0e28da7bc2655a9b25347ff1161ffb2f5c26eb8b6b80452df141
-  data.tar.gz: fce8f2ff2f7de990f91210065eaada65cfe789661a0845b3714ea406810977a5a53d67c269ba0a6a76b42e4c8f2e2ede2d7cf74047ab16288372ace3cd07c925
+  metadata.gz: 1c703597011e7a5425b1cd2ef3265e3350b91b906dc134b4a95e5adab43e519060897f4e6353fb2a7d67cf5e3ce7dbb0175f87dfacb02e0be4692b95e51f7121
+  data.tar.gz: 35e2141810194056040a4ce56599968718b0dbaf38823f845e85f4c0afa192f0749dd0723384bb47ab0e3132a84716d355fb286e0ac8db829fd32240f7623f39

data/lib/asciidoctor/gb/converter.rb

@@ -177,7 +177,7 @@ module Asciidoctor
       end
 
       def fetch_ref(xml, code, year, **opts)
-        code = "GB Standard " + code if /^#{GBCODE}[^A-Za-z]/.match? code
+        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(hit.to_xml)

data/lib/asciidoctor/gb/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Gb
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

data/lib/isodoc/gb/gbhtmlconvert.rb

@@ -81,6 +81,10 @@ module IsoDoc
             end
         @labels = @labels.merge(y)
       end
+
+      def omit_docid_prefix(prefix)
+        super || prefix == "Chinese Standard"
+      end
     end
   end
 end

data/lib/isodoc/gb/gbhtmlrender.rb

@@ -195,6 +195,7 @@ module IsoDoc
         #div << @term_def_boilerplate unless preface
       end
 
+=begin
       def reference_names(ref)
         isopub = ref.at(ns(ISO_PUBLISHER_XPATH))
         docid = ref.at(ns("./docidentifier"))
@@ -203,6 +204,7 @@ module IsoDoc
         reference = format_ref(docid.text, isopub, date, allparts)
         @anchors[ref["id"]] = { xref: reference }
       end
+=end
     end
   end
 end

data/lib/isodoc/gb/gbwordconvert.rb

@@ -133,6 +133,10 @@ module IsoDoc
         @cleanup.title_cleanup(docxml.at('//div[@class="WordSection2"]'))
         docxml
       end
+
+      def omit_docid_prefix(prefix)
+        super || prefix == "Chinese Standard"
+      end
     end
   end
 end

data/lib/isodoc/gb/gbwordrender.rb

@@ -193,6 +193,7 @@ module IsoDoc
         #div << @term_def_boilerplate unless preface
       end
 
+=begin
       def reference_names(ref)
         isopub = ref.at(ns(ISO_PUBLISHER_XPATH))
         docid = ref.at(ns("./docidentifier"))
@@ -200,6 +201,7 @@ module IsoDoc
         reference = format_ref(docid.text, isopub, date)
         @anchors[ref["id"]] = { xref: reference }
       end
+=end
     end
   end
 end

data/lib/isodoc/gb/html/htmlcompliantstyle.scss

@@ -59,10 +59,10 @@ time, mark, audio, video {
         
         
 html, body, div, span, applet, object, iframe,
-p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
+p, blockquote, 
+a, abbr, acronym, address, big, cite, 
+del, dfn, em, img, ins, q, s, 
+small, strike, strong, sub, sup, var,
 b, u, i, center,
 dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
@@ -73,7 +73,11 @@ menu, nav, output, ruby, section, summary,
 time, mark, audio, video {
   font-family: $bodyfont;
 }       
-        
+
+code, pre, tt, kbd, samp {
+  font-family: $monospacefont;
+}
+
 h1, h2, h3, h4, h5, h6, .h2Annex {
   margin-top: 1.5em;
   margin-bottom: 0.3em;
@@ -641,7 +645,7 @@ p.DeprecatedTerms {
 
 /* Navigation*/
 
-@media (min-width: 768px) {
+@media screen and (min-width: 768px) {
     nav {
         position: fixed;
         top: 0;
@@ -695,7 +699,7 @@ p.DeprecatedTerms {
     }
 }
 
-@media (max-width: 768px) {
+@media screen and (max-width: 768px) {
     #toc {
         padding: 0 1.5em 0 1.5em;
         overflow: visible;

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

@@ -59,10 +59,10 @@ time, mark, audio, video {
         
         
 html, body, div, span, applet, object, iframe,
-p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
+p, blockquote, 
+a, abbr, acronym, address, big, cite, 
+del, dfn, em, img, ins, q, s, 
+small, strike, strong, sub, sup, var,
 b, u, i, center,
 dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
@@ -73,6 +73,10 @@ menu, nav, output, ruby, section, summary,
 time, mark, audio, video {
   font-family: $bodyfont;
 }       
+
+code, pre, tt, kbd, samp {
+  font-family: $monospacefont;
+}
         
 h1, h2, h3, h4, h5, h6, .h2Annex {
   font-family: $headerfont;
@@ -481,7 +485,7 @@ p.DeprecatedTerms {
 
 /* Navigation*/
 
-@media (min-width: 768px) {
+@media screen and (min-width: 768px) {
     nav {
         position: fixed;
         top: 0;
@@ -533,7 +537,7 @@ p.DeprecatedTerms {
     }
 }
 
-@media (max-width: 768px) {
+@media screen and (max-width: 768px) {
     #toc {
         padding: 0 1.5em 0 1.5em;
         overflow: visible;

data/lib/isodoc/gb/metadata.rb

@@ -23,10 +23,10 @@ module IsoDoc
       end
 
       def title(isoxml, _out)
-        intro = isoxml.at(ns("//title-intro[@language='zh']"))
-        main = isoxml.at(ns("//title-main[@language='zh']"))
-        part = isoxml.at(ns("//title-part[@language='zh']"))
-        partnumber = isoxml.at(ns("//project-number/@part"))
+        intro = isoxml.at(ns("//bibdata//title-intro[@language='zh']"))
+        main = isoxml.at(ns("//bibdata//title-main[@language='zh']"))
+        part = isoxml.at(ns("//bibdata//title-part[@language='zh']"))
+        partnumber = isoxml.at(ns("//bibdata/docidentifier/project-number/@part"))
         intro.nil? || set(:docmaintitlezh, intro.text + " ")
         main.nil? || set(:docsubtitlezh, main.text)
         partnum = partnumber ? "#{part_label(partnumber, 'zh')}:" : ""
@@ -45,10 +45,10 @@ module IsoDoc
       end
 
       def subtitle(isoxml, _out)
-        intro = isoxml.at(ns("//title-intro[@language='en']"))
-        main = isoxml.at(ns("//title-main[@language='en']"))
-        part = isoxml.at(ns("//title-part[@language='en']"))
-        partnumber = isoxml.at(ns("//project-number/@part"))
+        intro = isoxml.at(ns("//bibdata//title-intro[@language='en']"))
+        main = isoxml.at(ns("//bibdata//title-main[@language='en']"))
+        part = isoxml.at(ns("//bibdata//title-part[@language='en']"))
+        partnumber = isoxml.at(ns("//bibdata/docidentifier/project-number/@part"))
         intro.nil? || set(:docmaintitleen, intro.text + "—")
         main.nil? || set(:docsubtitleen, main.text)
         partnum = partnumber ? "#{part_label(partnumber, 'en')}: " : ""
@@ -115,10 +115,10 @@ module IsoDoc
       end
 
       def docstatus(isoxml, _out)
-        docstatus = isoxml.at(ns("//status/stage"))
+        docstatus = isoxml.at(ns("//bibdata/status/stage"))
         if docstatus
           set(:stage, docstatus.text.to_i)
-          abbr = stage_abbrev_cn(docstatus.text, isoxml.at(ns("//status/iteration")),
+          abbr = stage_abbrev_cn(docstatus.text, isoxml.at(ns("//bibdata/status/iteration")),
                                  isoxml.at(ns("//version/draft")))
           set(:stageabbr, abbr)
           set(:status, STATUS_CSS[docstatus.text.to_sym])
@@ -129,7 +129,7 @@ module IsoDoc
         dn = docnumber(isoxml)
         docstatus = get[:stage]
         if docstatus
-          abbr = stage_abbrev(docstatus.to_s, isoxml.at(ns("//status/iteration")),
+          abbr = stage_abbrev(docstatus.to_s, isoxml.at(ns("//bibdata/status/iteration")),
                               isoxml.at(ns("//version/draft")))
           (docstatus.to_i < 60) && dn = abbr + " " + dn
         end
@@ -167,10 +167,10 @@ module IsoDoc
       end
 
       def gb_identifier(isoxml)
-        scope = isoxml.at(ns("//gbscope"))&.text || "national"
-        mandate = isoxml.at(ns("//gbmandate"))&.text || "mandatory"
-        prefix = isoxml.at(ns("//gbprefix"))&.text || "XXX"
-        docyear = isoxml&.at(ns("//copyright/from"))&.text
+        scope = isoxml.at(ns("//bibdata/gbtype/gbscope"))&.text || "national"
+        mandate = isoxml.at(ns("//bibdata/gbtype/gbmandate"))&.text || "mandatory"
+        prefix = isoxml.at(ns("//bibdata/gbtype/gbprefix"))&.text || "XXX"
+        docyear = isoxml&.at(ns("//bibdata/copyright/from"))&.text
         issuer = isoxml&.at(ns("//bibdata/contributor[role/@type = 'issuer']/"\
                                "organization/name"))&.text || "GB"
         @agencies = GbAgencies::Agencies.new(@lang, @labels, issuer)

data/metanorma-gb.gemspec

@@ -29,8 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "metanorma-iso", "~> 1.0.1"
-  spec.add_dependency "gbbib", "~> 0.2.2"
-  spec.add_dependency "isodoc", "~> 0.8.8"
+  spec.add_dependency "isodoc", "~> 0.9.0"
   spec.add_dependency "twitter_cldr"
   spec.add_dependency "gb-agencies", "~> 0.0.1"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-gb
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-01 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -24,34 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
-- !ruby/object:Gem::Dependency
-  name: gbbib
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.8
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.8
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement