asciidoctor-gb 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 168141bfa68f1d5e4677cb56d404d9d21c419a70
-  data.tar.gz: 20d5990c8c9bbfe1ec981039ef27187f9af42737
+  metadata.gz: 7e4e1c31f5269c58542a2c1d056a1ab82511bb5a
+  data.tar.gz: 4ac75f3fb309e8fcab15a18044f124d541b0defd
 SHA512:
-  metadata.gz: 1a1c076aa1d9ce1131dd756f3425645f54d05e5956df00e1534de05894ca040e7adb6ddab55b1bf8aee501c2a9fbc073ba6286c27305ebcd645e664ea9e89ac2
-  data.tar.gz: 97cb050b7b61c903fddb11c8f1f6ce37056b3ced64b6ca24501ad672f0160c2438128658e82bdc6ec84b701bbdae4195f7f79becfe02f6baa264c4ae6c7d8275
+  metadata.gz: c5a7b32e894db4ab6b2d57e6482b6692f19e399a20f2a3ba957d42dbd821fca194da991d96a43057312d64ad01553c0d66974a80cefffa4f86930907deb85ee7
+  data.tar.gz: 3e0d8fd448fbbe7d5501f48f4bdb5f422aa783b5eaf569f052717bd2793c792f394a66104bcc6cd4f9b62dde5b041baade2a5d2acd514796494a35a79872a0b4

data/Gemfile

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

data/Gemfile.lock

@@ -0,0 +1,176 @@
+PATH
+  remote: .
+  specs:
+    asciidoctor-gb (0.2.3)
+      asciidoctor-iso (>= 0.7.9)
+      twitter_cldr
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    algoliasearch (1.22.0)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    asciidoctor (1.5.7.1)
+    asciidoctor-iso (0.7.9)
+      asciidoctor (~> 1.5.7)
+      html2doc
+      isobib (~> 0.1.4)
+      isodoc (~> 0.6.2)
+      ruby-jing
+    asciimath (1.0.4)
+    ast (2.4.0)
+    byebug (9.1.0)
+    camertron-eprun (1.1.1)
+    cldr-plurals-runtime-rb (1.0.1)
+    coderay (1.1.2)
+    diff-lcs (1.3)
+    docile (1.3.1)
+    equivalent-xml (0.6.0)
+      nokogiri (>= 1.4.3)
+    ffi (1.9.23)
+    formatador (0.2.5)
+    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.7.1)
+      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.3)
+      isoics (~> 0.1.6)
+      nokogiri
+    isobib (0.1.4)
+      algoliasearch
+      iso-bib-item (~> 0.1.2)
+    isodoc (0.6.2)
+      asciimath
+      html2doc
+      htmlentities (~> 4.3.4)
+      image_size
+      liquid
+      mime-types
+      nokogiri
+      roman-numerals
+      ruby-xslt
+      sass
+      thread_safe
+      uuidtools
+    isoics (0.1.6)
+    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)
+    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.2)
+      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.1)
+    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.56.0)
+      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.3.3)
+    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)
+  rake (~> 12.0)
+  rspec (~> 3.6)
+  rubocop (~> 0.50)
+  simplecov (~> 0.15)
+  timecop (~> 0.9)
+
+BUNDLED WITH
+   1.16.2

data/README.adoc

@@ -74,7 +74,7 @@ citations; e.g. `clause 7-9, clause 11`
 
 `:scope:`::
 The scope of the GB standard (`national`, `sector`, `professional`, `local`,
-`enterprise`). Defaults to `national`.
+`enterprise`, `social-group`). Defaults to `national`.
 
 `:mandate:`::
 The mandate of the GB standard (`mandatory`, `recommended`, `guidelines`).
@@ -147,6 +147,12 @@ The font to use for the standard class and issuer on the (Word) cover page; desc
 "custom font". If not provided, the font is inferred from the scope of the standard, aligning
 with existing practice: SimSun for national scope, SimHei for all other scopes.
 
+`:keep-boilerplate:`::
+
+If absent (default), any paragraphs supplied at the start of the Terms and Definitions
+section are deleted, and replaced with standard boilerplate. If present, any such
+paragraphs in the text are retained.
+
 === Language macros
 
 In Terms and Definitions, preferred terms, alternate terms and deprecated terms

data/asciidoctor-gb.gemspec

@@ -26,19 +26,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "asciidoctor", "~> 1.5.6"
-  spec.add_dependency "asciimath"
-  spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "image_size"
-  spec.add_dependency "mime-types"
-  spec.add_dependency "nokogiri"
-  spec.add_dependency "ruby-jing"
-  spec.add_dependency "ruby-xslt"
-  spec.add_dependency "thread_safe"
-  spec.add_dependency "uuidtools"
+  spec.add_dependency "asciidoctor-iso", ">= 0.7.9"
   spec.add_dependency "twitter_cldr"
-  spec.add_dependency "asciidoctor-iso"
-  spec.add_dependency "isodoc"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug", "~> 9.1"

data/lib/asciidoctor/gb/biblio.rng

@@ -442,9 +442,9 @@
     <optional>
       <ref name="status"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="copyright"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="docrelation"/>
     </zeroOrMore>
@@ -489,10 +489,15 @@
           <value>issued</value>
         </choice>
       </attribute>
-      <ref name="bfrom"/>
-      <optional>
-        <ref name="bto"/>
-      </optional>
+      <choice>
+        <group>
+          <ref name="bfrom"/>
+          <optional>
+            <ref name="bto"/>
+          </optional>
+        </group>
+        <ref name="date_on"/>
+      </choice>
     </element>
   </define>
   <define name="bfrom">
@@ -511,6 +516,14 @@
       </choice>
     </element>
   </define>
+  <define name="date_on">
+    <element name="on">
+      <choice>
+        <data type="gYear"/>
+        <data type="date"/>
+      </choice>
+    </element>
+  </define>
   <define name="docidentifier">
     <element name="docidentifier">
       <optional>

data/lib/asciidoctor/gb/converter.rb

@@ -21,6 +21,7 @@ module Asciidoctor
       def makexml(node)
         result = ["<?xml version='1.0' encoding='UTF-8'?>\n<gb-standard>"]
         @draft = node.attributes.has_key?("draft")
+        @keepboilerplate = node.attributes.has_key?("keep-boilerplate")
         result << noko { |ixml| front node, ixml }
         result << noko { |ixml| middle node, ixml }
         result << "</gb-standard>"
@@ -80,9 +81,9 @@ module Asciidoctor
       def document(node)
         init(node)
         ret = makexml(node).to_xml(indent: 2)
-        unless node.attr("nodoc")
+        unless node.attr("nodoc") || !node.attr("docfile")
           filename = node.attr("docfile").gsub(/\.adoc$/, "").gsub(%r{^.*/}, "")
-          File.open(filename, "w") { |f| f.write(ret) }
+          File.open(filename + ".xml", "w") { |f| f.write(ret) }
           html_converter(node).convert(filename + ".xml")
           doc_converter(node).convert(filename + ".xml")
         end
@@ -156,7 +157,8 @@ module Asciidoctor
       end
 
       def termdef_boilerplate_cleanup(xmldoc)
-        nil
+        return if @keepboilerplate
+        super
       end
 
       GBCODE = "((AQ|BB|CB|CH|CJ|CY|DA|DB|DL|DZ|EJ|FZ|GA|GH|GM|GY|HB|HG|"\

data/lib/asciidoctor/gb/front.rb

@@ -90,7 +90,7 @@ module Asciidoctor
         node.attr("scope") and return node.attr("scope")
         scope = if %r{^[TQ]/}.match? node.attr("prefix")
                   m = node.attr("prefix").split(%{/})
-                  mandate = m[0] == "T" ? "social" :
+                  mandate = m[0] == "T" ? "social-group" :
                     m[0] == "Q" ? "enterprise" : nil
                 end
         return scope unless scope.nil?
@@ -143,7 +143,7 @@ module Asciidoctor
       def metadata_date1(node, xml, type)
         date = node.attr("#{type}-date")
         date and xml.date **{ type: type } do |d|
-          d.from date
+          d.on date
         end
       end
 

data/lib/asciidoctor/gb/gbstandard.rng

@@ -347,6 +347,7 @@
         <value>professional</value>
         <value>local</value>
         <value>enterprise</value>
+        <value>social-group</value>
       </choice>
     </element>
   </define>

data/lib/asciidoctor/gb/isostandard.rng

@@ -166,7 +166,7 @@
         <ref name="ics"/>
       </zeroOrMore>
     </define>
-    <define name="bfrom">
+    <define name="date_on">
       <element name="from">
         <choice>
           <data type="gYear"/>

data/lib/asciidoctor/gb/validate.rb

@@ -20,7 +20,7 @@ module Asciidoctor
         prefix = root&.at("//gbprefix")&.text
         scope = root&.at("//gbscope")&.text
         case scope
-        when "social"
+        when "social-group"
           /^[A-Za-z]{3,6}$/.match? prefix or
             warn("#{prefix} is improperly formatted for social standards")
         when "enterprise"

data/lib/asciidoctor/gb/version.rb

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

data/lib/isodoc/gb/agencies.rb

@@ -272,7 +272,7 @@ module IsoDoc
           when "enterprise" 
             issuer = get_metadata[:issuer]
             "#{issuer}#{@labels["enterprise_standard"]}"
-          when "social" then @labels["social_standard"]
+          when "social-group" then @labels["social_standard"]
           when "professional" then "PROFESSIONAL STANDARD" # TODO
           end
       end
@@ -286,7 +286,7 @@ module IsoDoc
           SECTOR&.dig(@lang, prefix.to_sym, :admin) || nil
         when "local"
           LOCAL&.dig(@lang, prefix.to_sym) || nil 
-        when "enterprise", "social"
+        when "enterprise", "social-group"
           get_metadata[:issuer] || nil
         when "professional" then "PROFESSIONAL STANDARD" # TODO
         end
@@ -301,7 +301,7 @@ module IsoDoc
           SECTOR&.dig(@lang, prefix.to_sym, :admin) || nil
         when "local"
           "#{LOCAL&.dig(@lang, prefix.to_sym) || 'XXXX'}#{@labels["local_issuer"]}" 
-        when "enterprise", "social"
+        when "enterprise", "social-group"
           get_metadata[:issuer]
         when "professional" then "PROFESSIONAL STANDARD" # TODO
         end

data/lib/isodoc/gb/gbconvert.rb

@@ -87,7 +87,7 @@ module IsoDoc
       end
 
       def format_logo(prefix, scope, _format)
-        return "" if %w(enterprise social).include? scope
+        return "" if %w(enterprise social-group).include? scope
         logo = standard_logo(prefix)
         if logo.nil?
           "<span style='font-size:36pt;font-weight:bold'>#{prefix}</span>"

data/lib/isodoc/gb/metadata.rb

@@ -129,9 +129,9 @@ module IsoDoc
       end
 
       SCOPEPFX = {
-        local: "DB",
-        social: "T",
-        enterprise: "Q",
+        :local => "DB",
+        "social-group".to_sym => "T",
+        :enterprise => "Q",
       }.freeze
 
       def docidentifier(scope, prefix, mandate, docyear)
@@ -140,7 +140,7 @@ module IsoDoc
              when "local"
                "#{SCOPEPFX[scope.to_sym]}#{mandate_suffix(prefix, mandate)}/"\
                  "#{docnum}".gsub(%r{/([TZ])/}, "/\\1 ")
-             when "social", "enterprise"
+             when "social-group", "enterprise"
                "#{mandate_suffix(SCOPEPFX[scope.to_sym], mandate)}/"\
                  "#{prefix} #{docnum}"
              else

data/lib/isodoc/gb/section_output.rb

@@ -44,12 +44,13 @@ module IsoDoc
         end
       end
 
-      def term_defs_boilerplate(div, source, term)
+      def term_defs_boilerplate(div, source, term, preface)
         if source.empty? && term.nil?
           div << @no_terms_boilerplate
         else
           div << term_defs_boilerplate_cont(source, term)
         end
+        div << @term_def_boilerplate unless preface
       end
     end
   end

metadata

@@ -1,185 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-gb
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2018-06-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: asciidoctor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.6
-- !ruby/object:Gem::Dependency
-  name: asciimath
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: htmlentities
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.4
-- !ruby/object:Gem::Dependency
-  name: image_size
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-jing
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-xslt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: thread_safe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: uuidtools
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: twitter_cldr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: asciidoctor-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.9
 - !ruby/object:Gem::Dependency
-  name: isodoc
+  name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -350,6 +196,7 @@ files:
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.adoc
 - Rakefile
@@ -464,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: asciidoctor-gb lets you write GB standards in AsciiDoc.