metanorma-gb 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdf2ed427e67746d3a8ad50fb1604080f019ca3947d60730ad1c4c3cc6984b46
-  data.tar.gz: c7f36372bb587490c34d476f7395231373b91756a46cf1e73259ade1574b2c0f
+  metadata.gz: 110b6ef6b6a174d04c98ba1a7275a6c0bb3e9f5c5b97e2690b5b4f718c2fec0a
+  data.tar.gz: f063c6f9f38981719d774166a816d3a507126a05ad083be5021cf68984aee149
 SHA512:
-  metadata.gz: '0082cc59718a8bd8f3dbb2f41e75793c86cfb64fb1bb56b754160a73ed5938d0445fd4a872fe845270eebd21c5fcb451af1d3184a3e48c6ec907630f699a7b39'
-  data.tar.gz: 752d9bf92f918b18699b818f64838ebf9a462a4cd3a625a7913dc987c8a14470426ef8a1173cb4fee6320994be26d982c469a46d176654819b2d745497e870ed
+  metadata.gz: 0adbf79cf6b413d962d5aa9bde4101b81f8ed89797a7a00bda80e448b14a0c4d3029e9a3e23f0e28da7bc2655a9b25347ff1161ffb2f5c26eb8b6b80452df141
+  data.tar.gz: fce8f2ff2f7de990f91210065eaada65cfe789661a0845b3714ea406810977a5a53d67c269ba0a6a76b42e4c8f2e2ede2d7cf74047ab16288372ace3cd07c925

data/README.adoc

@@ -211,6 +211,15 @@ If absent (default), any paragraphs supplied at the start of the Terms and Defin
 section are deleted, and replaced with standard boilerplate. If present, any such
 paragraphs in the text are retained.
 
+`:standard-logo-img:`::
+User-supplied graphic to overwrite the logo for the standard on the title page.
+
+`:standard-class-img:`::
+User-supplied graphic to overwrite the name of the standard class on the title page.
+
+`:standard-issuer-img:`::
+User-supplied graphic to overwrite the name of the standard issuer on the title page.
+
 === Language macros
 
 In Terms and Definitions, preferred terms, alternate terms and deprecated terms

data/lib/asciidoctor/gb/biblio.rng

@@ -384,7 +384,7 @@
   </define>
   <define name="LocalityType">
     <data type="string">
-      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|example|volume|issue|locality:[a-zA-Z0-9_]+</param>
+      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|locality:[a-zA-Z0-9_]+</param>
     </data>
   </define>
   <define name="referenceFrom">
@@ -700,8 +700,12 @@
         <ref name="btitle"/>
         <ref name="formattedref"/>
       </choice>
-      <ref name="bplace"/>
-      <ref name="seriesorganization"/>
+      <optional>
+        <ref name="bplace"/>
+      </optional>
+      <optional>
+        <ref name="seriesorganization"/>
+      </optional>
       <optional>
         <ref name="abbreviation"/>
       </optional>

data/lib/asciidoctor/gb/converter.rb

@@ -32,24 +32,37 @@ module Asciidoctor
         ret1
       end
 
+      def gb_attributes(node)
+        {
+          standardlogoimg: node.attr("standard-logo-img"),
+          standardclassimg: node.attr("standard-class-img"),
+          standardissuerimg: node.attr("standard-issuer-img"),
+          titlefont: node.attr("title-font"),
+        }
+      end
+
+      def html_extract_attributes(node)
+        super.merge(gb_attributes(node))
+      end
+
+      def doc_extract_attributes(node)
+        super.merge(gb_attributes(node))
+      end
+
       def html_converter(node)
         node.nil? ? IsoDoc::Gb::HtmlConvert.new({}) :
-          IsoDoc::Gb::HtmlConvert.new(
-            html_extract_attributes(node).merge(titlefont:
-                                                node.attr("title-font")))
+          IsoDoc::Gb::HtmlConvert.new(html_extract_attributes(node))
       end
 
       def html_compliant_converter(node)
         node.nil? ? IsoDoc::Gb::HtmlConvert.new({}) :
           IsoDoc::Gb::HtmlConvert.new(html_extract_attributes(node).
-                                      merge(compliant: true,
-                                            titlefont: node.attr("title-font")))
+                                      merge(compliant: true))
       end
 
       def doc_converter(node)
         node.nil? ? IsoDoc::Gb::WordConvert.new({}) :
-          IsoDoc::Gb::WordConvert.new(doc_extract_attributes(node).
-                                      merge(titlefont: node.attr("title-font")))
+          IsoDoc::Gb::WordConvert.new(doc_extract_attributes(node))
       end
 
       def document(node)

data/lib/asciidoctor/gb/isodoc.rng

@@ -956,6 +956,11 @@
   </define>
   <define name="li">
     <element name="li">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
       <oneOrMore>
         <ref name="paragraph-with-footnote"/>
       </oneOrMore>
@@ -999,7 +1004,9 @@
   </define>
   <define name="dt">
     <element name="dt">
-      <ref name="TextElement"/>
+      <zeroOrMore>
+        <ref name="TextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="dd">

data/lib/asciidoctor/gb/isostandard.rng

@@ -20,6 +20,9 @@
     <!-- add type to docidentifier in isodoc? -->
     <define name="docidentifier">
       <element name="docidentifier">
+        <optional>
+          <attribute name="type"/>
+        </optional>
         <choice>
           <text/>
           <group>
@@ -108,6 +111,27 @@
       <zeroOrMore>
         <ref name="docrelation"/>
       </zeroOrMore>
+      <zeroOrMore>
+        <ref name="series"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="medium"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="bplace"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="extent"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="accesslocation"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="bclassification"/>
+      </optional>
+      <optional>
+        <ref name="validity"/>
+      </optional>
       <optional>
         <ref name="editorialgroup"/>
       </optional>
@@ -164,6 +188,27 @@
       <zeroOrMore>
         <ref name="docrelation"/>
       </zeroOrMore>
+      <zeroOrMore>
+        <ref name="series"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="medium"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="bplace"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="extent"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="accesslocation"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="bclassification"/>
+      </optional>
+      <optional>
+        <ref name="validity"/>
+      </optional>
       <ref name="editorialgroup"/>
       <zeroOrMore>
         <ref name="ics"/>
@@ -548,10 +593,17 @@
     </define>
     <define name="li">
       <element name="li">
-        <oneOrMore>
-          <!-- ( paragraph-with-footnote | table | note | formula | admonition | ol | ul | dl | quote | sourcecode | review | example )+ -->
-          <ref name="BasicBlock"/>
-        </oneOrMore>
+        <group>
+          <optional>
+            <!-- ( paragraph-with-footnote | table | note | formula | admonition | ol | ul | dl | quote | sourcecode | review | example )+ -->
+            <attribute name="id">
+              <data type="ID"/>
+            </attribute>
+          </optional>
+          <oneOrMore>
+            <ref name="BasicBlock"/>
+          </oneOrMore>
+        </group>
         <!-- exclude figures? -->
       </element>
     </define>
@@ -859,7 +911,7 @@
     </element>
   </define>
   <define name="allParts">
-    <element name="allParts">
+    <element name="allparts">
       <data type="boolean"/>
     </element>
   </define>
@@ -947,17 +999,13 @@
       <optional>
         <ref name="section-title"/>
       </optional>
-      <choice>
-        <oneOrMore>
+      <zeroOrMore>
+        <choice>
           <ref name="term-clause"/>
-        </oneOrMore>
-        <zeroOrMore>
-          <choice>
-            <ref name="terms"/>
-            <ref name="definitions"/>
-          </choice>
-        </zeroOrMore>
-      </choice>
+          <ref name="terms"/>
+          <ref name="definitions"/>
+        </choice>
+      </zeroOrMore>
     </element>
   </define>
   <define name="reference-clause">

data/lib/asciidoctor/gb/section_input.rb

@@ -7,8 +7,9 @@ module Asciidoctor
     # schema encapsulation of the document for validation
     class Converter < ISO::Converter
 
+      # subclause contains subclauses
       def term_def_subclause_parse(attrs, xml, node)
-        # subclause contains subclauses
+        return clause_parse(attrs, xml, node) if node.role == "nonterm"
         sub = node.find_by(context: :section) {|s| s.level == node.level + 1 }
         sub.empty? || (return term_def_parse(attrs, xml, node, false))
         (node.title.downcase == "symbols and abbreviated terms" ||
@@ -24,29 +25,30 @@ module Asciidoctor
         a = { id: Asciidoctor::Standoc::Utils::anchor_or_uuid(node) }
         noko do |xml|
           case sectiontype(node)
-          when "引言", "introduction" then
-            if node.level == 1 then introduction_parse(a, xml, node)
-            else
-              clause_parse(a, xml, node)
-            end
+          when "引言", "introduction" then introduction_parse(a, xml, node)
           when "patent notice" then patent_notice_parse(xml, node)
           when "范围", "scope" then scope_parse(a, xml, node)
           when "规范性引用文件", "normative references"
             norm_ref_parse(a, xml, node)
           when "术语和定义", "terms and definitions",
             "术语、定义、符号、代号和缩略语",
-            "terms, definitions, symbols and abbreviated terms"
+            "terms, definitions, symbols and abbreviated terms",
+            "terms, definitions, symbols and abbreviations",
+            "terms, definitions and symbols",
+            "terms, definitions and abbreviations",
+            "terms, definitions and abbreviated terms"
             @term_def = true
             term_def_parse(a, xml, node, true)
             @term_def = false
-          when "符号、代号和缩略语", "symbols and abbreviated terms"
+          when "符号、代号和缩略语", "symbols and abbreviated terms",
+            "abbreviated terms", "abbreviations", "symbols"
             symbols_parse(a, xml, node)
           when "参考文献", "bibliography"
             bibliography_parse(a, xml, node)
           else
             if @term_def then term_def_subclause_parse(a, xml, node)
             elsif @biblio then bibliography_parse(a, xml, node)
-                          elsif node.attr("style") == "bibliography" && node.level == 1
+            elsif node.attr("style") == "bibliography" && node.level == 1
               bibliography_parse(a, xml, node)
             elsif node.attr("style") == "appendix" && node.level == 1
               annex_parse(a, xml, node)
@@ -57,19 +59,6 @@ module Asciidoctor
         end.join("\n")
       end
 
-      # @param xml [Nokogiri::XML::Builder]
-      # @param code [String]
-      #def fetch_ref(xml, code, _year, **opts)
-        #warn "fetching #{code}..."
-        #result = Gbbib::GbBibliography.search code
-        #hit = result.first
-        #if hit&.title&.match(%r{^[^\s]+\s[\d-]+}).to_s == code
-          ## hit.fetch.to_xml xml, opts
-          #xml.parent.add_child hit.fetch.to_xml(xml, opts)
-          #xml
-        #end
-      #end
-
 =begin
       # spec of permissible section sequence
       SEQ = [

data/lib/asciidoctor/gb/version.rb

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

data/lib/isodoc/gb/gbconvert.rb

@@ -8,8 +8,13 @@ module IsoDoc
     # A {Converter} implementation that generates GB output, and a document
     # schema encapsulation of the document for validation
     class Common < IsoDoc::Common
+      attr_accessor :meta
+
       def initialize(options)
         @meta = options[:meta]
+        @standardlogoimg = options[:standardlogoimg]
+        @standardclassimg = options[:standardclassimg]
+        @standardissuerimg = options[:standardissuerimg]
       end
 
       def fileloc(loc)
@@ -17,6 +22,7 @@ module IsoDoc
       end
 
       def format_agency(agency, format)
+        return "<img src='#{@standardissuerimg}' alt='#{agency.join(",")}'></img>" if @standardissuerimg
         return agency unless agency.is_a?(Array)
         if agency == ["中华人民共和国国家质量监督检验检疫总局", "中国国家标准化管理委员会"]
           logo = "gb-issuer-default.gif"
@@ -36,8 +42,9 @@ module IsoDoc
       end
 
       def format_logo(prefix, scope, _format)
-        return "" if %w(enterprise social-group).include? scope
         logo = @meta.standard_logo(prefix)
+        return format_logo1(logo, prefix, scope) if @standardlogoimg
+        return "" if %w(enterprise social-group).include? scope
         if logo.nil?
           "<span style='font-size:36pt;font-weight:bold'>#{prefix}</span>"
         else
@@ -53,10 +60,11 @@ module IsoDoc
 
 
       def format_logo1(logo, prefix, scope)
+        local = local_logo_suffix(scope)
+        return "<img width='113' height='56' src='#{@standardlogoimg}' alt='#{prefix}'></img>"\
+          "#{local}" if  @standardlogoimg
         logo += ".gif"
-        #system "cp #{fileloc(File.join('html/gb-logos', logo))}  #{logo}"
         FileUtils.cp fileloc(File.join('html/gb-logos', logo)), logo
-        local = local_logo_suffix(scope)
         #@files_to_delete << logo
         "<img width='113' height='56' src='#{logo}' alt='#{prefix}'></img>"\
           "#{local}"

data/lib/isodoc/gb/gbhtmlconvert.rb

@@ -11,6 +11,7 @@ module IsoDoc
     class HtmlConvert < IsoDoc::HtmlConvert
       def initialize(options)
         @common = IsoDoc::Gb::Common.new(options)
+        @standardclassimg = options[:standardclassimg]
         @libdir = File.dirname(__FILE__)
         super
         @lang = "zh"
@@ -52,7 +53,8 @@ module IsoDoc
           script = "Hans"
         end
         @meta = Metadata.new(lang, script, labels)
-        @common = IsoDoc::Gb::Common.new(meta: @meta)
+        @meta.set(:standardclassimg, @standardclassimg)
+        @common.meta = @meta
       end
 
       def cleanup(docxml)

data/lib/isodoc/gb/gbhtmlrender.rb

@@ -199,7 +199,8 @@ module IsoDoc
         isopub = ref.at(ns(ISO_PUBLISHER_XPATH))
         docid = ref.at(ns("./docidentifier"))
         date = ref.at(ns("./date[@type = 'published']"))
-        reference = format_ref(docid.text, isopub, date)
+        allparts = ref.at(ns("./allparts"))
+        reference = format_ref(docid.text, isopub, date, allparts)
         @anchors[ref["id"]] = { xref: reference }
       end
     end

data/lib/isodoc/gb/gbwordconvert.rb

@@ -13,12 +13,13 @@ module IsoDoc
     class WordConvert < IsoDoc::WordConvert
       def initialize(options)
         @common = IsoDoc::Gb::Common.new(options)
+        @standardclassimg = options[:standardclassimg]
         @libdir = File.dirname(__FILE__)
         super
         @lang = "zh"
         @script = "Hans"
       end
-        
+
       def default_fonts(options)
         script = options[:script] || "Hans"
         scope = options[:scope] || "national"
@@ -27,10 +28,10 @@ module IsoDoc
           headerfont: (script == "Hans" ? '"SimHei",sans-serif' : '"Calibri",sans-serif'),
           monospacefont: '"Courier New",monospace',
           titlefont: (scope == "national" ? (script != "Hans" ? '"Cambria",serif' : '"SimSun",serif' ) :
-           (script == "Hans" ? '"SimHei",sans-serif' : '"Calibri",sans-serif' ))
+                      (script == "Hans" ? '"SimHei",sans-serif' : '"Calibri",sans-serif' ))
         }     
       end     
-                
+
       def default_file_locations(options)
         {   
           wordstylesheet: html_doc_path("wordstyle.scss"),
@@ -42,7 +43,7 @@ module IsoDoc
           olstyle: "l10",
         }
       end 
-          
+
       def extract_fonts(options)
         b = options[:bodyfont] || "Arial"
         h = options[:headerfont] || "Arial"
@@ -57,7 +58,8 @@ module IsoDoc
           script = "Hans"
         end
         @meta = Metadata.new(lang, script, labels)
-        @common = IsoDoc::Gb::Common.new(meta: @meta)
+        @meta.set(:standardclassimg, @standardclassimg)
+        @common.meta = @meta
       end
 
       def cleanup(docxml)

data/lib/isodoc/gb/metadata.rb

@@ -159,6 +159,13 @@ module IsoDoc
         end
       end
 
+      def standard_class(scope, prefix, mandate)
+        standardclassimg = get[:standardclassimg]
+        ret = @agencies.standard_class(scope, prefix, mandate)
+        return "<img src='#{standardclassimg}' alt='#{ret}'></img>" if standardclassimg
+        ret
+      end
+
       def gb_identifier(isoxml)
         scope = isoxml.at(ns("//gbscope"))&.text || "national"
         mandate = isoxml.at(ns("//gbmandate"))&.text || "mandatory"
@@ -167,10 +174,9 @@ module IsoDoc
         issuer = isoxml&.at(ns("//bibdata/contributor[role/@type = 'issuer']/"\
                                "organization/name"))&.text || "GB"
         @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_class, standard_class(scope, prefix, mandate))
         set(:standard_agency, @agencies.standard_agency(scope, prefix, mandate))
         if scope == "local"
           set(:gbprefix, "DB")

data/lib/metanorma/gb/processor.rb

@@ -26,6 +26,21 @@ module Metanorma
         Metanorma::Input::Asciidoc.new.process(file, @asciidoctor_backend)
       end
 
+      def extract_options(file)
+        head = file.sub(/\n\n.*$/m, "\n")
+        /\n:standard-logo-img: (?<standardlogoimg>[^\n]+)\n/ =~ head
+        /\n:standard-class-img: (?<standardclassimg>[^\n]+)\n/ =~ head
+        /\n:standard-issuer-img: (?<standardissuerimg>[^\n]+)\n/ =~ head
+        /\n:title-font: (?<titlefont>[^\n]+)\n/ =~ head
+        new_options = {
+          standardlogoimg: defined(standardlogoimg) ? standardlogoimg : nil,
+          standardclassimg: defined(standardclassimg) ? standardclassimg : nil,
+          standardissuerimg: defined(standardissuerimg) ? standardissuerimg : nil,
+          titlefont: defined(titlefont) ? titlefont : nil,
+        }.reject { |_, val| val.nil? }
+        super.merge(new_options)
+      end
+
       def output(isodoc_node, outname, format, options={})
         case format
         when :html

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-gb
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2018-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso