metanorma-gb 1.3.20 → 1.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d38df0aea67cff245bf6cf1b6dbd5975eafd219f91cddf3b43440bf6955eba2
-  data.tar.gz: 3dde182c4cc8a403eb09abea786c8ea2875a3176b220c7098aad95e93d895e29
+  metadata.gz: 9572e4b6c6d084df727b40bfc2827cdba1e9238f2905213753166091ce6d7fb6
+  data.tar.gz: 0cc451ec6098c3fcaeb4d7f246cec4b623f2a2ce7a2ae9b9600f453163814767
 SHA512:
-  metadata.gz: eabebfbb64e5f20f27549340754c8f6ad6d24a3b61d4b9e299e35a35057ac7a88ac848785f3d3e3eb6589ff08005a36bfebc4fb28f31e0bdf0a8eb21087e1645
-  data.tar.gz: 13e00179ec95b0cdc6bd4bbbcb2d19e8c0a9eacc8c7617a9d87fa74fcefeaac4fa69079ced0013dcc1c044ff79185e8b7043effbe9b2cb8e0bee6ae1d217f1c8
+  metadata.gz: f62662c60f2f0bea290ae7bcc81cb17af9e7738f31305a90cdc9ce7259e8f2d6a31fb2596cc7e735e21cf62d3c20f240fced43f552ec04a8b359ae778b742e80
+  data.tar.gz: 15727819f77f7d1b9456377f5c6aa22b4fbe4e900a9fd6de656dcd0015ea0125ecad379f3079adeefa3092d0d93fbe9c5ed6b3ab5113a0f089403f04aa678f84

data/lib/asciidoctor/gb/biblio.rng

@@ -49,11 +49,17 @@
   </define>
   <define name="stage">
     <element name="stage">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
       <text/>
     </element>
   </define>
   <define name="substage">
     <element name="substage">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -452,9 +458,14 @@
     <attribute name="bibitemid">
       <data type="IDREF"/>
     </attribute>
-    <zeroOrMore>
-      <ref name="locality"/>
-    </zeroOrMore>
+    <choice>
+      <zeroOrMore>
+        <ref name="locality"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="localityStack"/>
+      </zeroOrMore>
+    </choice>
     <optional>
       <ref name="date"/>
     </optional>
@@ -469,6 +480,25 @@
       <ref name="BibItemLocality"/>
     </element>
   </define>
+  <define name="localityStack">
+    <element name="localityStack">
+      <zeroOrMore>
+        <ref name="locality"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="sourceLocality">
+    <element name="sourceLocality">
+      <ref name="BibItemLocality"/>
+    </element>
+  </define>
+  <define name="sourceLocalityStack">
+    <element name="sourceLocalityStack">
+      <zeroOrMore>
+        <ref name="sourceLocality"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="BibItemLocality">
     <attribute name="type">
       <ref name="LocalityType"/>
@@ -1028,12 +1058,30 @@
       <attribute name="type">
         <ref name="DocRelationType"/>
       </attribute>
+      <optional>
+        <element name="description">
+          <ref name="FormattedString"/>
+        </element>
+      </optional>
       <element name="bibitem">
         <ref name="BibliographicItem"/>
       </element>
-      <zeroOrMore>
-        <ref name="locality"/>
-      </zeroOrMore>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
+      <choice>
+        <zeroOrMore>
+          <ref name="sourceLocality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="sourceLocalityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="version">

data/lib/asciidoctor/gb/front.rb

@@ -1,6 +1,24 @@
 module Asciidoctor
   module Gb
     class Converter < ISO::Converter
+      STAGE_ABBRS_CN = {
+        "00": "新工作项目建议",
+        "10": "新工作项目",
+        "20": "标准草案工作组讨论稿",
+        "30": "标准草案征求意见稿",
+        "40": "标准草案送审稿",
+        "50": "标准草案报批稿",
+        "60": "国家标准",
+        "90": "(Review)",
+        "95": "(Withdrawal)",
+      }.freeze
+
+      def stage_name(stage, substage)
+        return "Proof" if stage == "60" && substage == "00"
+        @language == "en" ?
+          STAGE_NAMES[stage.to_sym] : STAGE_ABBRS_CN[stage.to_sym]
+      end
+
       def doctype(node)
         type = node.attr("mandate") || "mandatory"
         type = "standard" if type == "mandatory"
@@ -67,7 +85,8 @@ module Asciidoctor
         type = node.attr("equivalence") || "equivalent"
         m = /^(?<code>[^,]+),?(?<title>.*)$/.match isostd
         title = m[:title].empty? ? "[not supplied]" : m[:title]
-        xml.relation **{ type: type } do |r|
+        xml.relation **{ type: "adoptedFrom" } do |r|
+          r.description type
           r.bibitem do |b|
             b.title { |t| t << title }
             b.docidentifier m[:code]
@@ -220,6 +239,7 @@ module Asciidoctor
         metadata_committee(node, xml)
         metadata_ics(node, xml)
         structured_id(node, xml)
+        xml.stagename stage_name(get_stage(node), get_substage(node))
         metadata_gbtype(node, xml)
         metadata_gblibraryids(node, xml)
       end

data/lib/asciidoctor/gb/gbstandard.rng

@@ -67,6 +67,9 @@
         <ref name="ics"/>
       </zeroOrMore>
       <ref name="structuredidentifier"/>
+      <optional>
+        <ref name="stagename"/>
+      </optional>
       <ref name="gbtype"/>
       <oneOrMore>
         <ref name="gbccs"/>

data/lib/asciidoctor/gb/isostandard.rng

@@ -43,6 +43,9 @@
         <ref name="ics"/>
       </zeroOrMore>
       <ref name="structuredidentifier"/>
+      <optional>
+        <ref name="stagename"/>
+      </optional>
     </define>
     <define name="bdate">
       <element name="date">
@@ -511,4 +514,9 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="stagename">
+    <element name="stagename">
+      <text/>
+    </element>
+  </define>
 </grammar>

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

@@ -44,8 +44,8 @@ body {
 
 
 h1 {
-  font-size: 1.5em; 
-  line-height: 2em; 
+  font-size: 1.5em;
+  line-height: 2em;
   color: #485094;
   font-weight: 400;
 
@@ -54,8 +54,8 @@ h1 {
 }
 
 h2 {
-  font-size: 1.3em; 
-  line-height: 1.5em; 
+  font-size: 1.3em;
+  line-height: 1.5em;
   color: #485094;
   font-weight: 300;
 
@@ -75,8 +75,8 @@ h2 {
 }
 
 h3 {
-  font-size: 1.1em; 
-  line-height: 1.3em; 
+  font-size: 1.1em;
+  line-height: 1.3em;
   color: #485094;
   font-weight: 300;
 }
@@ -225,7 +225,11 @@ nav {
 }
 
 .document-type-band {
-  @include docBand($order: 2, $textLength: 210px, $offset: 180px);
+  @include docBand($order: 2, $offset: 180px);
+
+  .document-type {
+    top: 20px;
+  }
 }
 
 #governance-band p.document-type {
@@ -233,7 +237,6 @@ nav {
   height: 230px !important;
 }
 
-
 // Bibliograhy
 
 p.Biblio, p.NormRef {
@@ -249,7 +252,7 @@ p.Biblio, p.NormRef {
   background-color: #f7f7f7;
 
   /*
-    div.figure > img:not(.logo) { 
+    div.figure > img:not(.logo) {
       TODO:         ^^^ Relevant selector?
       margin-left: auto;
       margin-right: auto;

data/lib/isodoc/gb/metadata.rb

@@ -1,12 +1,13 @@
 require "isodoc"
 require "twitter_cldr"
 require "htmlentities"
+require "metanorma-iso"
 
 module IsoDoc
   module Gb
     # A {Converter} implementation that generates GB output, and a document
     # schema encapsulation of the document for validation
-    class Metadata < IsoDoc::Metadata
+    class Metadata < IsoDoc::Iso::Metadata
       def initialize(lang, script, labels)
         super
         set(:docmaintitlezh, "")
@@ -21,6 +22,8 @@ module IsoDoc
         set(:doctitle, "XXXX")
         set(:obsoletes, nil)
         set(:obsoletes_part, nil)
+        set(:publisheddate, "XXX")
+        set(:implementeddate, "XXX")
       end
 
       def title(isoxml, _out)
@@ -63,19 +66,6 @@ module IsoDoc
         set(:committee, gbcommittee&.text)
       end
 
-      # from ISO
-      STAGE_ABBRS = {
-        "00": "PWI",
-        "10": "NWIP",
-        "20": "WD",
-        "30": "CD",
-        "40": "DIS",
-        "50": "FDIS",
-        "60": "IS",
-        "90": "(Review)",
-        "95": "(Withdrawal)",
-      }.freeze
-
       STAGE_ABBRS_CN = {
         "00": "新工作项目建议",
         "10": "新工作项目",
@@ -100,20 +90,11 @@ module IsoDoc
         "95": "obsolete",
       }
 
-      def stage_abbr(stage)
-        STAGE_ABBRS[stage.to_sym] || "??"
-      end
-
-      def status_abbrev(stage, iter, draft)
-        stage = STAGE_ABBRS[stage.to_sym] || "??"
-        stage += iter if iter
-        stage = "Pre" + stage if draft =~ /^0\./
-        stage
-      end
-
-      def status_abbrev_cn(stage, iter, draft)
-        return status_abbrev(stage, iter, draft) if @lang != "zh"
-        stage = STAGE_ABBRS_CN[stage.to_sym] || "??"
+      def status_abbrev_cn(stage, _substage, iter, draft)
+        return status_abbrev(stage, _substage, iter, draft) if @lang != "zh"
+        stage_num = stage == "PRF" ? "60" : 
+          (Asciidoctor::Gb::Converter::STAGE_ABBRS&.invert[stage]&.to_s || "??")
+        stage = STAGE_ABBRS_CN[stage_num.to_sym] || "??"
         stage = "#{iter.to_i.localize(:zh).spellout.force_encoding("UTF-8")}次#{stage}" if iter
         stage = "Pre" + HTMLEntities.new.encode(stage, :hexadecimal) if draft =~ /^0\./
         stage
@@ -125,12 +106,13 @@ module IsoDoc
         if docstatus
           set(:stage, docstatus.text.to_i)
           set(:unpublished, unpublished(docstatus.text))
-          set(:statusabbr, status_abbrev_cn(docstatus.text,
+          set(:statusabbr, status_abbrev_cn(docstatus["abbreviation"],
+                                            isoxml&.at(ns("//bibdata/status/substage"))&.text,
                                             isoxml&.at(ns("//bibdata/status/iteration"))&.text,
                                             isoxml&.at(ns("//version/draft"))&.text))
           set(:status, STATUS_CSS[docstatus.text.to_sym])
           unpublished(docstatus.text) and
-            set(:stageabbr, stage_abbr(docstatus.text))
+            set(:stageabbr, docstatus["abbreviation"])
         end
       end
 
@@ -150,15 +132,15 @@ module IsoDoc
         gb_equivalence(isoxml)
       end
 
-      ISO_STD_XPATH = "//bibdata/relation[@type = 'equivalent' or "\
-        "@type = 'identical' or @type = 'nonequivalent']/bibitem".freeze
+      ISO_STD_XPATH = "//bibdata/relation[xmlns:description[text() = 'equivalent' or "\
+        "text() = 'identical' or text() = 'nonequivalent']]/bibitem".freeze
 
       def gb_equivalence(isoxml)
         isostdid = isoxml.at(ns("#{ISO_STD_XPATH}/docidentifier")) || return
         set(:isostandard, isostdid.text)
         isostdtitle = isoxml.at(ns("#{ISO_STD_XPATH}/title"))
         set(:isostandardtitle, isostdtitle.text) if isostdtitle
-        eq = isoxml.at(ns("//bibdata/relation/@type"))
+        eq = isoxml.at(ns("//bibdata/relation/description"))
         case eq.text
         when "equivalent" then set(:gbequivalence, "MOD")
         when "nonequivalent" then set(:gbequivalence, "NEQ")
@@ -207,12 +189,9 @@ module IsoDoc
       end
 
       def gb_library_identifier(isoxml)
-        ics = []
         ccs = []
-        isoxml.xpath(ns("//bibdata/ext/ics/code")).each { |i| ics << i.text }
         isoxml.xpath(ns("//bibdata/ext/ccs")).each { |i| ccs << i.text }
         p = isoxml.at(ns("//bibdata/ext/plannumber"))
-        set(:libraryid_ics, ics.empty? ? "XXX" : ics.join(", "))
         set(:libraryid_ccs, ccs.empty? ? "XXX" : ccs.join(", "))
         set(:libraryid_plan, p ? p.text : "XXX")
       end

data/lib/metanorma/gb/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Gb
-    VERSION = "1.3.20"
+    VERSION = "1.3.21"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-gb
 version: !ruby/object:Gem::Version
-  version: 1.3.20
+  version: 1.3.21
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso