asciidoctor-gb 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f95843bd4c0dc4eea97ff106631da38431667b93a7abfb58728fe968c4b5006
-  data.tar.gz: faac2fff0908ebc6e4406ddb1f7cb60a7aef34c800757b8cceeb061e58fbab2a
+  metadata.gz: 3d575dd90564cdf6559599921fab8a71bdb584e441f5cd24484a847a793aad9a
+  data.tar.gz: 260c7cb9bbefbf93619ca52688b77298767fb31fd05f736fe6a467c90a696a56
 SHA512:
-  metadata.gz: bf33482865dd9fb29d0eb62b636126e1b82b336ac277d952dd291a6ef2e4a0da476f797a447d04a587822662c3051832de1006b9b6d2959d6004b2149e142791
-  data.tar.gz: 002b9ee560f3c75feb82975058d40a1bb05a5d7f117c7b4ae49c84f886f40714631e122c22ee66d70e4bcc1f787157cd6194deb38d94d4acd37048a17ae9d749
+  metadata.gz: ceb9ef6b5fd1f879271b60d9dc3bc21a9a55003d19e4f493f436116a9f8124e2ae06b761a1564d834e06684c47216d354fe7727ef7304c9bb7811efd91effd74
+  data.tar.gz: e62aca0454d2fee75bd2922588af111d75fe11dcb989f5658fc407a67810d209006e82b6300e9f4949418bc8ec5e09fe3fd957027380c8f84cca1a52344b44c5

data/.travis.yml

@@ -1,7 +1,14 @@
+dist: trusty
 sudo: false
 language: ruby
 rvm:
-  - 2.4.3
+  - 2.5
+  - 2.4
+  - ruby-head
 before_install:
   - gem install bundler -v 1.16.1
   - unset _JAVA_OPTIONS
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+

data/Gemfile

@@ -1,3 +1,6 @@
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
+
 source "https://rubygems.org"
 
 #git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }

data/README.adoc

@@ -27,6 +27,7 @@ have the same format; the gem formats the title page to have the correct
 metadata displayed.
 
 The following outputs are generated.
+
 * (Optional) An HTML preview generated directly from the Asciidoctor document,
 using native Asciidoc formatting.
 ** http://asciimath.org[AsciiMathML] is to be used for mathematical formatting.

data/asciidoctor-gb.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   DESCRIPTION
 
   spec.homepage      = "https://github.com/riboseinc/asciidoctor-gb"
-  spec.license       = "MIT"
+  spec.license       = "BSD-2-Clause"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -27,9 +27,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "asciidoctor-iso", ">= 0.9.0"
-  spec.add_dependency "gbbib"
+  spec.add_dependency "gbbib", "~> 0.2.2"
   spec.add_dependency "isodoc", ">= 0.8.0"
   spec.add_dependency "twitter_cldr"
+  spec.add_dependency "gb-agencies", "~> 0.0.1"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug", "~> 9.1"

data/lib/asciidoctor/gb/biblio.rng

@@ -514,7 +514,7 @@
     </element>
   </define>
   <define name="bsource">
-    <element name="link">
+    <element name="uri">
       <ref name="TypedUri"/>
     </element>
   </define>
@@ -523,11 +523,6 @@
       <ref name="FormattedString"/>
     </element>
   </define>
-  <define name="link">
-    <element name="link">
-      <ref name="TypedUri"/>
-    </element>
-  </define>
   <define name="validity">
     <element name="validity">
       <optional>
@@ -805,6 +800,8 @@
           <value>nonequivalent</value>
           <value>includedIn</value>
           <value>includes</value>
+          <value>instance</value>
+          <value>partOf</value>
         </choice>
       </attribute>
       <element name="bibitem">

data/lib/asciidoctor/gb/converter.rb

@@ -3,6 +3,7 @@ require "asciidoctor/iso/converter"
 require "asciidoctor/gb/version"
 require "isodoc/gb/gbconvert"
 require "isodoc/gb/gbwordconvert"
+require "gb_agencies"
 require_relative "./section_input.rb"
 require_relative "./front.rb"
 require_relative "./validate.rb"
@@ -50,16 +51,30 @@ module Asciidoctor
         )
       end
 
+      def html_compliant_converter(node)
+        node.nil? ? IsoDoc::Gb::HtmlConvert.new({}) :
+          IsoDoc::Gb::HtmlConvert.new(
+            script: node.attr("script"),
+            bodyfont: node.attr("body-font"),
+            headerfont: node.attr("header-font"),
+            monospacefont: node.attr("monospace-font"),
+            titlefont: node.attr("title-font"),
+            i18nyaml: node.attr("i18nyaml"),
+            scope: node.attr("scope"),
+            compliant: true,
+        )
+      end
+
       def doc_converter(node)
         node.nil? ? IsoDoc::Gb::WordConvert.new({}) :
-        IsoDoc::Gb::WordConvert.new(
-          script: node.attr("script"),
-          bodyfont: node.attr("body-font"),
-          headerfont: node.attr("header-font"),
-          monospacefont: node.attr("monospace-font"),
-          titlefont: node.attr("title-font"),
-          i18nyaml: node.attr("i18nyaml"),
-          scope: node.attr("scope"),
+          IsoDoc::Gb::WordConvert.new(
+            script: node.attr("script"),
+            bodyfont: node.attr("body-font"),
+            headerfont: node.attr("header-font"),
+            monospacefont: node.attr("monospace-font"),
+            titlefont: node.attr("title-font"),
+            i18nyaml: node.attr("i18nyaml"),
+            scope: node.attr("scope"),
         )
       end
 
@@ -85,6 +100,8 @@ module Asciidoctor
         unless node.attr("nodoc") || !node.attr("docfile")
           filename = node.attr("docfile").gsub(/\.adoc$/, "").gsub(%r{^.*/}, "")
           File.open(filename + ".xml", "w") { |f| f.write(ret) }
+          html_compliant_converter(node).convert(filename + ".xml")
+          system "mv #{filename}.html #{filename}_compliant.html"
           html_converter(node).convert(filename + ".xml")
           doc_converter(node).convert(filename + ".xml")
         end
@@ -168,7 +185,7 @@ module Asciidoctor
         "YD|YS|YY|YZ|ZY|GB|GBZ|GJB|GBn|GHZB|GWKB|GWPB|JJF|JJG|Q|T)(/Z|/T)?)"
 
       ISO_REF = %r{^<ref\sid="(?<anchor>[^"]+)">
-      \[(?<code>(ISO|IEC|#{GBCODE})[^0-9]*\s[0-9-]+)(:(?<year>[0-9]+))?\]</ref>,?\s
+      \[(?<code>(ISO|IEC|#{GBCODE})[^0-9]*\s[0-9-]+?)([:-](?<year>(19|20)[0-9][0-9]))?\]</ref>,?\s
       (?<text>.*)$}xm
 
       ISO_REF_NO_YEAR = %r{^<ref\sid="(?<anchor>[^"]+)">
@@ -186,9 +203,19 @@ module Asciidoctor
         [matched, matched2, matched3]
       end
 
+      def fetch_ref(xml, code, year, **opts)
+        code = "GB Standard " + code if /^#{GBCODE}[^A-Za-z]/.match? code
+        hit = @bibdb&.fetch(code, year, opts)
+        return nil if hit.nil?
+        xml.parent.add_child(hit.to_xml)
+        xml
+      rescue Algolia::AlgoliaProtocolError
+        nil # Render reference without an Internet connection.
+      end
+
       def cleanup(xmldoc)
         lang = xmldoc.at("//language")&.text
-        @agencyclass = IsoDoc::Gb::Agencies.new(lang, {}, "")
+        @agencyclass = GbAgencies::Agencies.new(lang, {}, "")
         super
         contributor_cleanup(xmldoc)
         xmldoc

data/lib/asciidoctor/gb/isodoc.rng

@@ -888,12 +888,18 @@
       </attribute>
       <optional>
         <attribute name="width">
-          <data type="int"/>
+          <choice>
+            <data type="int"/>
+            <value>auto</value>
+          </choice>
         </attribute>
       </optional>
       <optional>
         <attribute name="height">
-          <data type="int"/>
+          <choice>
+            <data type="int"/>
+            <value>auto</value>
+          </choice>
         </attribute>
       </optional>
     </element>

data/lib/asciidoctor/gb/isostandard.rng

@@ -804,7 +804,7 @@
           <data type="int"/>
         </attribute>
       </optional>
-      <data type="int"/>
+      <text/>
     </element>
   </define>
   <define name="tc-documentnumber">

data/lib/asciidoctor/gb/section_input.rb

@@ -70,17 +70,6 @@ module Asciidoctor
         #end
       #end
 
-      #def fetch_ref1(code, year, opts)
-        #id = iso_id(code, year, opts[:all_parts])
-        #return nil if @bibdb.nil? # signals we will not be using isobib
-        #@bibdb[id] = Isobib::IsoBibliography.get(code, year, opts) unless @bibdb[id]
-        #@local_bibdb[id] = @bibdb[id] if !@local_bibdb.nil? &&
-          #!@local_bibdb[id]
-        #return @local_bibdb[id] unless @local_bibdb.nil?
-        #@bibdb[id]
-      #end
-
-
 =begin
       # spec of permissible section sequence
       SEQ = [

data/lib/asciidoctor/gb/validate.rb

@@ -13,7 +13,7 @@ module Asciidoctor
         bilingual_terms_validate(doc.root)
         issuer_validate(doc.root)
         prefix_validate(doc.root)
-        @agencyclass.gbtype_validate(doc.root)
+        @agencyclass.gbtype_validate(doc.root.at("//gbscope")&.text, doc.root.at("//gbprefix")&.text)
       end
 
       def prefix_validate(root)

data/lib/asciidoctor/gb/version.rb

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

data/lib/isodoc/gb/gbconvert.rb

@@ -45,7 +45,7 @@ module IsoDoc
 
       def local_logo_suffix(scope)
         return "" if scope != "local"
-        local = @meta.get[:docidentifier][2,2]
+        local = @meta.get[:gblocalcode]
         "<span style='font-weight:bold'>#{local}</span>"
       end
 

data/lib/isodoc/gb/gbhtmlconvert.rb

@@ -1,5 +1,5 @@
 require_relative "gbconvert"
-require_relative "agencies"
+require "gb_agencies"
 require_relative "gbcleanup"
 require_relative "metadata"
 require_relative "gbhtmlrender"
@@ -28,14 +28,25 @@ module IsoDoc
       def initialize(options)
         @common = IsoDoc::Gb::Common.new(options)
         super
-        @htmlstylesheet = generate_css(html_doc_path("htmlstyle.scss"), true, default_fonts(options))
-        @standardstylesheet = generate_css(html_doc_path("gb.scss"), true, default_fonts(options))
-        @htmlcoverpage = html_doc_path("html_gb_titlepage.html")
+        if options[:compliant]
+          @htmlstylesheet = generate_css(html_doc_path("htmlcompliantstyle.scss"), true, default_fonts(options))
+          @htmlcoverpage = html_doc_path("html_compliant_gb_titlepage.html")
+        else
+          @htmlstylesheet = generate_css(html_doc_path("htmlstyle.scss"), true, default_fonts(options))
+          #@htmlcoverpage = html_doc_path("html_gb_titlepage.html")
+          @htmlcoverpage = html_doc_path("html_compliant_gb_titlepage.html")
+        end
         @htmlintropage = html_doc_path("html_gb_intro.html")
         @scripts = html_doc_path("scripts.html")
+        @lang = "zh"
+        @script = "Hans"
       end
 
       def metadata_init(lang, script, labels)
+        unless ["en", "zh"].include? lang
+          lang = "zh"
+          script = "Hans"
+        end
         @meta = Metadata.new(lang, script, labels)
         @common = IsoDoc::Gb::Common.new(meta: @meta)
       end

data/lib/isodoc/gb/gbhtmlrender.rb

@@ -188,9 +188,11 @@ module IsoDoc
       end
 
       def term_defs_boilerplate(div, source, term, preface)
-        (source.empty? && term.nil?) and div << @no_terms_boilerplate or
-          div << term_defs_boilerplate_cont(source, term)
-        div << @term_def_boilerplate unless preface
+        unless preface
+          (source.empty? && term.nil?) and div << @no_terms_boilerplate or
+            div << term_defs_boilerplate_cont(source, term)
+        end
+        #div << @term_def_boilerplate unless preface
       end
 
       def reference_names(ref)

data/lib/isodoc/gb/gbwordconvert.rb

@@ -1,7 +1,7 @@
 require "isodoc"
 require_relative "gbconvert"
 require_relative "gbcleanup"
-require_relative "agencies"
+require "gb_agencies"
 require_relative "metadata"
 require_relative "gbwordrender"
 
@@ -29,7 +29,7 @@ module IsoDoc
 
       def metadata_init(lang, script, labels)
         @meta = Metadata.new(lang, script, labels)
-                @common = IsoDoc::Gb::Common.new(meta: @meta)
+        @common = IsoDoc::Gb::Common.new(meta: @meta)
       end
 
       def html_doc_path(file)
@@ -46,14 +46,20 @@ module IsoDoc
         @wordintropage = html_doc_path("word_gb_intro.html")
         @ulstyle = "l7"
         @olstyle = "l10"
+        @lang = "zh"
+        @script = "Hans"
       end
 
-            def metadata_init(lang, script, labels)
+      def metadata_init(lang, script, labels)
+        unless ["en", "zh"].include? lang
+          lang = "zh"
+          script = "Hans"
+        end
         @meta = Metadata.new(lang, script, labels)
         @common = IsoDoc::Gb::Common.new(meta: @meta)
       end
 
-            def cleanup(docxml)
+      def cleanup(docxml)
         @cleanup = Cleanup.new(@script, @deprecated_lbl)
         super
         @cleanup.cleanup(docxml)
@@ -128,23 +134,6 @@ module IsoDoc
         docxml
       end
 
-      #def word_intro(docxml)
-      #super
-      #title_cleanup(docxml.at('//div[@class="WordSection2"]'))
-      #end
-
-=begin
-      def toWord(result, filename, dir)
-        result = populate_template(result, :word)
-        result = from_xhtml(word_cleanup(to_xhtml(result)))
-        Html2Doc.process(result, filename: filename,
-                         stylesheet: @wordstylesheet,
-                         header_file: "header.html", dir: dir,
-                         asciimathdelims: [@openmathdelim, @closemathdelim],
-                         liststyles: {ul: "l7", ol: "l10"})
-      end
-=end
-
       def html_doc_path(file)
         File.join(File.dirname(__FILE__), File.join("html", file))
       end

data/lib/isodoc/gb/gbwordrender.rb

@@ -190,7 +190,7 @@ module IsoDoc
       def term_defs_boilerplate(div, source, term, preface)
         (source.empty? && term.nil?) and div << @no_terms_boilerplate or
           div << term_defs_boilerplate_cont(source, term)
-        div << @term_def_boilerplate unless preface
+        #div << @term_def_boilerplate unless preface
       end
 
       def reference_names(ref)

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

@@ -15,7 +15,7 @@ p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode
 	mso-fareast-font-family:Calibri;
 	mso-bidi-font-family:"Courier New";
 	mso-ansi-language:EN-GB;}
-p.Biblio, li.Biblio, div.Biblio
+p.Biblio, li.Biblio, div.Biblio, p.NormRef, li.NormRef, p.NormRef
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
 	mso-style-parent:"";
@@ -553,4 +553,4 @@ span.zh {
 }
 span.en {
     font-family: Cambria,serif;
-}
+}

data/lib/isodoc/gb/html/html_compliant_gb_titlepage.html

@@ -0,0 +1,116 @@
+<div class="document-stage-band" id="{{ status | downcase }}-band">
+<p class="document-stage">{{ status }}</p> 
+    </div>
+
+    <div class="document-type-band" id="{{ doctype | downcase}}-band">
+      <p class="document-type">{{ doctype }}</p>
+    </div>
+
+<div id='toggle'> <span>•</span> </div>
+
+<header>
+<div class="coverpage">
+                  <div class="coverpage-header">
+
+
+  <div class="coverpage-category">
+    <span class="category-1">{{ libraryid_ccs }}</span>
+    <span class="category-2">ICS {{ libraryid_ics }} </span>
+  </div>
+
+  <div class="coverpage-logo">
+    <div class="coverpage-logo-gb-img">{{ standard_logo }}</div>
+  </div>
+
+  <div class="coverpage-logo-header">
+                                        <div>
+                                        <span class="coverpage-logo-text">
+
+    <span class="coverpage-logo-text">{{ standard_class }}</span>
+
+  </div>
+
+  <div class="coverpage-doc-identity-first">
+    <div class="coverpage_docnumber">
+      <span class="docnumber">{{ docidentifier }}</span>
+      {{ draftinfo }}
+    {%- if isostandard and gbequivalence == "IDT" -%}
+       /<span class="docnumber">{{ isostandard }}</span>
+    {%- endif -%}
+    </div>
+
+    <div class="coverpage-doc-relations">
+    {% if obsoletes %}
+    {% if obsoletes_part %}
+    <span class="partially-supercedes">{{ partly_supercedes_lbl }}</span>
+    {% else %}
+    <span class="supercedes">{{ supercedes_lbl }}</span>
+    {% endif %}
+    {{ obsoletes }}
+    {% endif %}
+    </div>
+  </div>
+  </div>
+                  </div>
+</div>
+
+                <div class="coverpage-banner">
+
+
+  <div class="coverpage-doc-identity-second">
+    <div class="coverpage-title-zh">
+      <span class="title-first">{{ docmaintitlezh }}</span>
+      <span class="title-second">{{ docsubtitlezh }}</span>
+      <span class="title-third"> {{ docparttitlezh }}</span>
+    </div>
+
+    <!-- for local standards (DB, DB/T), no en title -->
+    <div class="coverpage-title-en">
+      <span class="title-first">{{ docmaintitleen }}</span>
+      <span class="title-second">{{ docsubtitleen }}</span>
+      <span class="title-third">{{ docparttitleen }}</span>
+    </div>
+  </div>
+
+
+  <div class="coverpage-footer">
+    <!-- for local standards (DB, DB/T), no relation to ISO standards -->
+    <!-- if related to ISO standards -->
+    {% if isostandard %}
+    <div class="coverpage-iso-relation">
+      <span class="openparen">（</span>
+      <span class="iso-document-code">{{ isostandard }}</span>
+      {% if isostandardtitle != "[not supplied]" %}
+      <span class="iso-title-first">{{ isostandardtitle }}</span>
+      {% endif %}
+      <span class="join">，</span>
+      <span class="iso-equivalence-code">{{ gbequivalence }}</span>
+      <span class="closeparen">）</span>
+    </div>
+    {% endif %}
+
+  <div class="coverpage-stage-block" lang="{{ language }}">
+    {% if stage and stage < 60 %}
+    <span class="stage-if-draft">（{{ stageabbr }}）</span> <br/>
+    {% if stage == 30 %}
+    <div class="coverpage_warning">
+    {{ patent_request }}
+    </div>
+    {% endif %}
+    {% if revdate %}
+    <span class="revision-if-draft">（{{completion_date}} {{ revdate }}）</span>
+    {% endif %}
+    {% endif %}
+  </div>
+  </div>
+                </div>
+                    <div class="coverpage-dates">
+                          <span class="date-publish">{{ labelled_publisheddate }}</span>
+                          <span class="date-active">{{ labelled_implementeddate }}</span>
+                        </div>
+
+
+  <div class="coverpage_footer">
+    {{ standard_agency_formatted }}
+  </div>
+</header>

data/lib/isodoc/gb/html/html_gb_intro.html

@@ -1,9 +1,6 @@
-<div class="rule"></div>
+<nav>
 
-<div class="toc">
-  <h1 class="toc-contents">{{ table_of_contents }}</h1>
-    <div id="toc"></div>
-</div>
-
-<div class="rule"></div>
+  <h1 id="content">Contents</h1>
+  <div id="toc"></div>
 
+</nav>

data/lib/isodoc/gb/html/html_gb_titlepage.html

@@ -1,4 +1,6 @@
-<div class="coverpage">
+    <div id='toggle'> <span>•</span> </div>
+
+
 
   <div class="coverpage-category">
     <span class="category-1">ICS {{ libraryid_ics }} </span>
@@ -13,10 +15,10 @@
   </div>
 
   <div class="coverpage-doc-identity-first">
-    <div class="doc-number">
+    <div class="coverpage_docnumber">
       <span class="docnumber">{{ docidentifier }}</span>
-      <span class="docnumber-separator">-</span>
-      <span class="docyear">{{ docyear }}</span>
+      <span class="docnumber-separator">
+      {{ draftinfo }}
     {%- if isostandard and gbequivalence == "IDT" -%}
        /<span class="docnumber">{{ isostandard }}</span>
     {%- endif -%}
@@ -25,16 +27,10 @@
     <div class="coverpage-doc-relations">
     {% if obsoletes %}
     {% if obsoletes_part %}
-      <span class="partially-supercedes">部分代替</span>
+    <span class="partially-supercedes">{{ partly_supercedes_lbl }}</span>
     {% else %}
-      <span class="supercedes">代替</span>
+    <span class="supercedes">{{ supercedes_lbl }}</span>
     {% endif %}
-    <!--
-      <ul>
-        <li>GB/T XXXX-XXXX</li>
-        <li>GB/T YYYY-YYYY</li>
-      </ul>
-    -->
     {{ obsoletes }}
     {% endif %}
     </div>
@@ -76,24 +72,23 @@
     {% if stage and stage < 60 %}
     <span class="stage-if-draft">（{{ stageabbr }}）</span>
     {% if revdate %}
-    <span class="revision-if-draft">（本稿完成日期：{{ revdate }}）</span>
+    <span class="revision-if-draft">（{{completion_date}}：{{ revdate }}）</span>
     {% endif %}
     {% if stage == 30 %}
-    <span class="warning-if-draft">
-    在提交反馈意见时，请将您知道的相关专利连同支持文件一并附上
-    </span>
+    <div class="coverpage_warning">
+    {{ patent_request }}
+    </div>
     {% endif %}
     {% endif %}
   </div>
 
   <div class="coverpage-dates">
-    <span class="date-publish">{{ publisheddate }} 发布</span>
-    <span class="date-active">{{ activateddate }} 实施</span>
+    <span class="date-publish">{{ labelled_publisheddate }}</span>
+    <span class="date-active">{{ labelled_implementeddate }}</span>
   </div>
 
   <div class="coverpage_footer">
     {{ standard_agency_formatted }}
   </div>
 
-</div>