metanorma-gb 1.3.15 → 1.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb3b9977df2213d9d939aac3060ac0117f7e5846025681d09b533a53f03acf1e
-  data.tar.gz: b83c732d316e625225bb22202c682735601d01a4bef249c5009e70bf6e51aa70
+  metadata.gz: 6d7249dc6de3238469a43aacba0f948f627724f3741a06bdd7d68c1a4d0e04a6
+  data.tar.gz: c6b8a1441579a1a3130e304b8388d0ca9924c3368ae987da49f46ac6496cda82
 SHA512:
-  metadata.gz: 921ad993b51bf64ab8378c38adc3fc8e7bead72eb15aa98350082e0b952773dfe54e455c0d149a37bba567d55fa294d09ba1ddc2a92fee35cceb1a2f87cecd5a
-  data.tar.gz: 9f31546e62259e8ce754e08523814a7a29998158fce6aa9bab7240cd104d5e44e3351e1b19972ad25978363d4c3afc6456e7c873469563782750120c6adc3b04
+  metadata.gz: 997a008d8ba5dd0eb3c5a7be5a5058f6ee51d6d6c8787cf989911536d72a9a03a2e94c2d75f2ae0be7c159cdbbec95537c426f8674d6d4d4c960ef4a2997c794
+  data.tar.gz: ccec18189310fc771252d6ff176014839ea9974de5a290686aefbddea45cb3562445692939c17318421cfd09345080a521f0dff170715cfa7c82a0a7a8261123

data/lib/asciidoctor/gb/converter.rb

@@ -15,7 +15,7 @@ module Asciidoctor
     # schema encapsulation of the document for validation
     class Converter < ISO::Converter
       XML_ROOT_TAG = "gb-standard".freeze
-      XML_NAMESPACE = "https://www.metanorma.com/ns/gb".freeze
+      XML_NAMESPACE = "https://www.metanorma.org/ns/gb".freeze
 
       register_for "gb"
 
@@ -243,7 +243,6 @@ module Asciidoctor
                                 f.at(".//term"), f.at(".//p"), isodoc)
         f = xmldoc.at(self.class::NORM_REF) and
           norm_ref_preface(f)
-        initial_boilerplate(xmldoc, isodoc)
       end
     end
   end

data/lib/asciidoctor/gb/front.rb

@@ -199,7 +199,7 @@ module Asciidoctor
       def id_stage_prefix(dn, node)
         if node.attr("docstage") && node.attr("docstage").to_i < 60
           abbr = IsoDoc::Gb::Metadata.new("en", "Latn", {}).
-            stage_abbrev(node.attr("docstage"), node.attr("iteration"),
+            status_abbrev(node.attr("docstage"), node.attr("iteration"),
                          node.attr("draft"))
           dn = "/#{abbr} #{dn}" # prefixes added in cleanup
         else

data/lib/asciidoctor/gb/gbstandard.rng

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar ns="https://www.metanorma.com/ns/gb" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+<grammar ns="https://www.metanorma.org/ns/gb" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <!-- default namespace = "https://www.metanorma.com/ns/gb" -->
   <!--
     Currently we inherit from a namespaced grammar, isostandard. Unless we inherit from isodoc,

data/lib/isodoc/gb/gbwordconvert.rb

@@ -89,6 +89,32 @@ module IsoDoc
         end
       end
 
+      def make_body(xml, docxml)
+        body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72" }
+        xml.body **body_attr do |body|
+          make_body1(body, docxml)
+          make_body2(body, docxml)
+          make_body3(body, docxml)
+          colophon(body, docxml)
+        end
+      end
+
+      def colophon(body, docxml)
+        body.br **{ clear: "all", style: "page-break-before:left;"\
+                    "mso-break-type:section-break" }
+        body.div **{ class: "colophon" } do |div|
+          div.p **{ class: "colophon" }  do |p|
+            p << l10n(@meta.get[:standard_class]) # TODO break up into lines if needed
+          end
+          div.p **{ class: "colophon" }  do |p|
+            p << l10n("#{@meta.get[:docsubtitlezh]}")
+          end
+          div.p **{ class: "colophon" }  do |p|
+            p << l10n("#{@meta.get[:docidentifier]}")
+          end
+        end
+      end
+
       include BaseConvert
     end
   end

data/lib/isodoc/gb/metadata.rb

@@ -100,15 +100,19 @@ module IsoDoc
         "95": "obsolete",
       }
 
-      def stage_abbrev(stage, iter, draft)
+      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 stage_abbrev_cn(stage, iter, draft)
-        return stage_abbrev(stage, iter, draft) if @lang != "zh"
+      def status_abbrev_cn(stage, iter, draft)
+        return status_abbrev(stage, iter, draft) if @lang != "zh"
         stage = STAGE_ABBRS_CN[stage.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\./
@@ -117,18 +121,23 @@ module IsoDoc
 
       def docstatus(isoxml, _out)
         docstatus = isoxml.at(ns("//bibdata/status/stage"))
-        set(:unpublished, false)
+        set(:unpublished, true)
         if docstatus
           set(:stage, docstatus.text.to_i)
-          set(:unpublished, docstatus.text.to_i < 60)
-          abbr = stage_abbrev_cn(docstatus.text,
-                                 isoxml&.at(ns("//bibdata/status/iteration"))&.text,
-                                 isoxml&.at(ns("//version/draft"))&.text)
-          set(:stageabbr, abbr)
+          set(:unpublished, unpublished(docstatus.text))
+          set(:statusabbr, status_abbrev_cn(docstatus.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))
         end
       end
 
+      def unpublished(status)
+        status.to_i < 60
+      end
+
       def docid1(isoxml, _out)
         dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'gb']"))
         set(:docnumber, dn&.text)

data/lib/metanorma/gb/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Gb
-    VERSION = "1.3.15"
+    VERSION = "1.3.16"
   end
 end

metadata

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