asciidoctor-gb 0.3.2 → 0.3.3

data/lib/isodoc/gb/metadata.rb

@@ -76,6 +76,18 @@ module IsoDoc
         "95": "(Withdrawal)",
       }.freeze
 
+      STATUS_CSS = {
+        "00": "working-draft",
+        "10": "working-draft",
+        "20": "working-draft",
+        "30": "committee-draft",
+        "40": "draft-standard",
+        "50": "draft-standard",
+        "60": "standard",
+        "90": "standard",
+        "95": "obsolete",
+      }
+
       def stage_abbrev_cn(stage, iter, draft)
         return stage_abbrev(stage, iter, draft) if @lang != "zh"
         stage = STAGE_ABBRS_CN[stage.to_sym] || "??"
@@ -91,6 +103,7 @@ module IsoDoc
           abbr = stage_abbrev_cn(docstatus.text, isoxml.at(ns("//status/iteration")),
                                  isoxml.at(ns("//version/draft")))
           set(:stageabbr, abbr)
+          set(:status, STATUS_CSS[docstatus.text.to_sym])
         end
       end
 
@@ -135,12 +148,18 @@ module IsoDoc
         docyear = isoxml&.at(ns("//copyright/from"))&.text
         issuer = isoxml&.at(ns("//bibdata/contributor[role/@type = 'issuer']/"\
                                "organization/name"))&.text || "GB"
-        @agencies = Agencies.new(@lang, @labels, issuer)
-        set(:docidentifier, @agencies.docidentifier(scope, prefix, mandate, docyear, get[:docnumber]))
+        @agencies = GbAgencies::Agencies.new(@lang, @labels, issuer)
+        #set(:docidentifier, @agencies.docidentifier(scope, prefix, mandate, docyear, get[:docnumber]))
+        set(:docidentifier, @agencies.docidentifier(nil, nil, nil, docyear, get[:docnumber]))
         set(:issuer, issuer)
         set(:standard_class, @agencies.standard_class(scope, prefix, mandate))
         set(:standard_agency, @agencies.standard_agency(scope, prefix, mandate))
-        set(:gbprefix, scope == "local" ? "DB" : prefix)
+        if scope == "local"
+          set(:gbprefix, "DB")
+          set(:gblocalcode, prefix)
+        else
+          set(:gbprefix, prefix)
+        end 
         set(:gbscope, scope)
       end
 
@@ -179,15 +198,15 @@ module IsoDoc
         m = get
         if @lang == "zh"
           set(:labelled_publisheddate, m[:publisheddate] + " " +
-                       @labels["publicationdate_lbl"])
+              @labels["publicationdate_lbl"])
           set(:labelled_implementeddate, m[:implementeddate] + " " +
-                       @labels["implementationdate_lbl"])
+              @labels["implementationdate_lbl"])
         else
           set(:labelled_publisheddate, @labels["publicationdate_lbl"] +
-                       ": " + m[:publisheddate])
+              ": " + m[:publisheddate])
           set(:labelled_implementeddate,
-                       @labels["implementationdate_lbl"] + ": " +
-                       m[:implementeddate])
+              @labels["implementationdate_lbl"] + ": " +
+              m[:implementeddate])
         end
       end
     end

data/lib/metanorma/gb/processor.rb

@@ -13,6 +13,7 @@ module Metanorma
       def output_formats
         super.merge(
           html: "html",
+          compliant_html: "compliant.html",
           doc: "doc"
         )
       end
@@ -29,6 +30,8 @@ module Metanorma
         case format
         when :html
           IsoDoc::Gb::HtmlConvert.new(options).convert(outname, isodoc_node)
+        when :compliant_html
+          IsoDoc::Gb::HtmlConvert.new(options.merge(compliant: true)).convert(outname, isodoc_node)
         when :doc
           IsoDoc::Gb::WordConvert.new(options).convert(outname, isodoc_node)
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-gb
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-06 00:00:00.000000000 Z
+date: 2018-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor-iso
@@ -28,16 +28,16 @@ dependencies:
   name: gbbib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gb-agencies
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -240,7 +254,6 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.adoc
 - Rakefile
@@ -291,7 +304,6 @@ files:
 - lib/asciidoctor/gb/section_input.rb
 - lib/asciidoctor/gb/validate.rb
 - lib/asciidoctor/gb/version.rb
-- lib/isodoc/gb/agencies.rb
 - lib/isodoc/gb/gbcleanup.rb
 - lib/isodoc/gb/gbconvert.rb
 - lib/isodoc/gb/gbhtmlconvert.rb
@@ -323,8 +335,10 @@ files:
 - lib/isodoc/gb/html/gb-logos/gb-standard-zb.svg
 - lib/isodoc/gb/html/gb.scss
 - lib/isodoc/gb/html/header.html
+- lib/isodoc/gb/html/html_compliant_gb_titlepage.html
 - lib/isodoc/gb/html/html_gb_intro.html
 - lib/isodoc/gb/html/html_gb_titlepage.html
+- lib/isodoc/gb/html/htmlcompliantstyle.scss
 - lib/isodoc/gb/html/htmlstyle.scss
 - lib/isodoc/gb/html/logo.png
 - lib/isodoc/gb/html/scripts.html
@@ -338,7 +352,7 @@ files:
 - lib/metanorma/gb/processor.rb
 homepage: https://github.com/riboseinc/asciidoctor-gb
 licenses:
-- MIT
+- BSD-2-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/Gemfile.lock

@@ -1,244 +0,0 @@
-PATH
-  remote: .
-  specs:
-    asciidoctor-gb (0.3.1)
-      asciidoctor-iso (>= 0.9.0)
-      gbbib
-      isodoc (>= 0.8.0)
-      twitter_cldr
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    algoliasearch (1.23.2)
-      httpclient (~> 2.8, >= 2.8.3)
-      json (>= 1.5.1)
-    asciidoctor (1.5.7.1)
-    asciidoctor-csand (0.3.1)
-      asciidoctor (~> 1.5.7)
-      asciidoctor-iso (>= 0.9.0)
-      asciimath
-      htmlentities (~> 4.3.4)
-      image_size
-      isodoc (>= 0.8.0)
-      mime-types
-      nokogiri
-      ruby-jing
-      ruby-xslt
-      thread_safe
-      uuidtools
-    asciidoctor-csd (0.4.1)
-      asciidoctor-iso (>= 0.9.0)
-      isodoc (>= 0.8.0)
-    asciidoctor-iso (0.9.3)
-      asciidoctor (~> 1.5.7)
-      iso-bib-item (~> 0.1.6)
-      isobib (~> 0.1.8)
-      isodoc (>= 0.8)
-      ruby-jing
-    asciidoctor-m3d (0.3.2)
-      asciidoctor (~> 1.5.7)
-      asciidoctor-iso (>= 0.9.0)
-      asciimath
-      htmlentities (~> 4.3.4)
-      image_size
-      isodoc (>= 0.8.0)
-      mime-types
-      nokogiri
-      ruby-jing
-      ruby-xslt
-      thread_safe
-      uuidtools
-    asciidoctor-rfc (0.9.0)
-      asciidoctor (~> 1.5.7)
-      htmlentities (~> 4.3.4)
-      nokogiri
-      ruby-jing
-      thread_safe
-    asciidoctor-rsd (0.3.1)
-      asciidoctor (~> 1.5.7)
-      asciidoctor-iso (>= 0.8.0)
-      asciimath
-      htmlentities (~> 4.3.4)
-      image_size
-      isodoc (>= 0.7.0)
-      mime-types
-      nokogiri
-      ruby-jing
-      ruby-xslt
-      thread_safe
-      uuidtools
-    asciimath (1.0.4)
-    ast (2.4.0)
-    byebug (9.1.0)
-    camertron-eprun (1.1.1)
-    cldr-plurals-runtime-rb (1.0.1)
-    cnccs (0.1.1)
-    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.25)
-    formatador (0.2.5)
-    gbbib (0.1.2)
-      cnccs
-      iso-bib-item
-    guard (2.14.2)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (>= 1.0.12, < 2.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    html2doc (0.8.0)
-      asciimath
-      htmlentities (~> 4.3.4)
-      image_size
-      mime-types
-      nokogiri
-      ruby-xslt
-      thread_safe
-      uuidtools
-    htmlentities (4.3.4)
-    httpclient (2.8.3)
-    image_size (2.0.0)
-    iso-bib-item (0.1.10)
-      duplicate
-      isoics (~> 0.1.6)
-      nokogiri
-    isobib (0.1.9)
-      algoliasearch
-      iso-bib-item (~> 0.1.10)
-    isodoc (0.8.1)
-      asciimath
-      html2doc (>= 0.7.1)
-      htmlentities (~> 4.3.4)
-      image_size
-      liquid
-      mime-types
-      nokogiri
-      roman-numerals
-      ruby-xslt
-      sass
-      thread_safe
-      uuidtools
-    isoics (0.1.6)
-    jaro_winkler (1.5.1)
-    json (2.1.0)
-    liquid (4.0.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lumberjack (1.0.13)
-    metanorma (0.2.4)
-      asciidoctor-csand (>= 0.3.0)
-      asciidoctor-csd (>= 0.4.0)
-      asciidoctor-gb (>= 0.3.0)
-      asciidoctor-iso (>= 0.9.1)
-      asciidoctor-m3d (>= 0.3.1)
-      asciidoctor-rfc (>= 0.9.0)
-      asciidoctor-rsd (>= 0.3.0)
-      isodoc (>= 0.8.0)
-    method_source (0.9.0)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.3.0)
-    nenv (0.3.0)
-    nokogiri (1.8.3)
-      mini_portile2 (~> 2.3.0)
-    notiffany (0.1.1)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    optout (0.0.2)
-    parallel (1.12.1)
-    parser (2.5.1.0)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rainbow (3.0.0)
-    rake (12.3.1)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    roman-numerals (0.3.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    rubocop (0.57.2)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-jing (0.0.1)
-      optout (>= 0.0.2)
-    ruby-progressbar (1.9.0)
-    ruby-xslt (0.9.10)
-    ruby_dep (1.5.0)
-    sass (3.5.6)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    shellany (0.0.1)
-    simplecov (0.16.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    thor (0.20.0)
-    thread_safe (0.3.6)
-    timecop (0.9.1)
-    twitter_cldr (4.4.3)
-      camertron-eprun
-      cldr-plurals-runtime-rb (~> 1.0)
-      tzinfo
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.4.0)
-    uuidtools (2.1.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  asciidoctor-gb!
-  bundler (~> 1.15)
-  byebug (~> 9.1)
-  equivalent-xml (~> 0.6)
-  guard (~> 2.14)
-  guard-rspec (~> 4.7)
-  metanorma
-  rake (~> 12.0)
-  rspec (~> 3.6)
-  rubocop (~> 0.50)
-  simplecov (~> 0.15)
-  timecop (~> 0.9)
-
-BUNDLED WITH
-   1.16.2