metanorma-ogc 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fb3db1e041457d27cb1d34f5971ba9dcaf10dbe7f9d47a04672bb20b58a7005
-  data.tar.gz: b47173282caad08a607cd043af6524a217291adefa21c2b1ecc2738bb313fc6c
+  metadata.gz: 4cee080dfddf34ac247b0913a4bdfa0a1a399c45cdb13821a3e0135ca20967c8
+  data.tar.gz: 9ba37a51168b6a5445f04da1f189ff3a560240fcadae5c688ed59baa291adbfb
 SHA512:
-  metadata.gz: 91997178e22d73ff0c38689485c94f0089f64aaa7e30c39ec3d2b215a724f3c576f3cc707d0bd90e8c9649290a134359f15178aef4d69ef5db8aa87d523925f9
-  data.tar.gz: 0fe1fa3a18a7ec534d32658094d6822f0d345161bec505fb422736f60359936ed511a8eaec5d6c4163d94faef1c25c5ddbc87fbc05a24eb44841feecdcb3bc71
+  metadata.gz: 1f03966af60358ff2e2d4c20f64e508f1605ab6995f75c923bae735a151ede61b55cc1a1a5c80cb9f07c9ff6fe67cbe88c566f824360724221ccb40e47271097
+  data.tar.gz: 3a71ba1576a89618248131d4266d09c7e86db3946e69f1ad260f9e3b3c5091f9505fda2a5a5e3cd5eeb3943c2ac717516ebd08d68dfead2571fe65a49d8115fc

data/lib/asciidoctor/ogc/converter.rb

@@ -26,16 +26,29 @@ module Asciidoctor
 
       def doctype(node)
         d = node.attr("doctype")
-        unless %w{abstract-specification-topic best-practice change-request-supporting-document 
-          community-practice community-standard discussion-paper engineering-report other policy 
-          reference-model release-notes standard user-guide white-paper test-suite}.include? d
-          warn "'#{d}' is not a legal document type: reverting to 'standard'" unless @warned_doctype
+        d1 = ::IsoDoc::Ogc::DOCTYPE_ABBR.invert[d] and d = d1
+        unless %w{abstract-specification-topic best-practice 
+          change-request-supporting-document community-practice 
+          community-standard discussion-paper engineering-report other policy 
+          reference-model release-notes standard user-guide white-paper 
+          test-suite}.include? d
+          @warned_doctype or
+            warn "'#{d}' is not a legal document type: reverting to 'standard'"
           @warned_doctype = true
           d = "standard"
         end
         d
       end
 
+      def sectiontype_streamline(ret)
+        case ret
+        when "preface" then "foreword"
+        when "foreword" then "donotrecognise-foreword"
+        else
+          super
+        end
+      end
+
       def document(node)
         init(node)
         ret1 = makexml(node)
@@ -68,7 +81,8 @@ module Asciidoctor
       def make_preface(x, s)
         super
         if x.at("//submitters")
-          preface = s.at("//preface") || s.add_previous_sibling("<preface/>").first
+          preface = s.at("//preface") || 
+            s.add_previous_sibling("<preface/>").first
           submitters = x.at("//submitters").remove
           preface.add_child submitters.remove
         end

data/lib/asciidoctor/ogc/front.rb

@@ -147,6 +147,7 @@ module Asciidoctor
 
       def metadata_subdoctype(node, xml)
         s = node.attr("docsubtype") 
+        s1 = ::IsoDoc::Ogc::DOCSUBTYPE_ABBR.invert[s] and s = s1
         case doctype(node)
         when "standard"
           unless %w{conceptual-model conceptual-model-and-encoding

data/lib/isodoc/ogc/base_convert.rb

@@ -33,11 +33,13 @@ module IsoDoc
           x = t.at("./thead") and x.replace(x.children)
           x = t.at("./tbody") and x.replace(x.children)
           x = t.at("./tfoot") and x.replace(x.children)
-          if x = t.at("./tr/th[@colspan = '2']") and y = t.at("./tr/td[@colspan = '2']")
+          if x = t.at("./tr/th[@colspan = '2']") and
+              y = t.at("./tr/td[@colspan = '2']")
             x["colspan"] = "1"
             y["colspan"] = "1"
             x.name = "td"
-            p = x.at("./p[@class = 'RecommendationTitle']") and p.delete("class")
+            p = x.at("./p[@class = 'RecommendationTitle']") and
+              p.delete("class")
             x << y.dup
             y.parent.remove
           end
@@ -103,6 +105,7 @@ module IsoDoc
 
       def submitters(docxml, out)
         f = docxml.at(ns("//submitters")) || return
+        @prefacenum += 1
         out.div **{ class: "Section3" } do |div|
           clause_name(anchor(f['id'], :label), "Submitters", div,
                       class: "IntroTitle")
@@ -110,14 +113,26 @@ module IsoDoc
         end
       end
 
+      def preface(isoxml, out)
+        title_attr = { class: "IntroTitle" }
+        isoxml.xpath(ns("//preface/clause")).each do |f|
+          @prefacenum += 1
+          out.div **{ class: "Section3", id: f["id"] } do |div|
+            clause_name(RomanNumerals.to_roman(@prefacenum).downcase,
+                        f&.at(ns("./title")), div, title_attr)
+            f.elements.each { |e| parse(e, div) unless e.name == "title" }
+          end
+        end
+      end
+
       def preface_names_numbered(clause)
         return if clause.nil?
         @prefacenum += 1
         @anchors[clause["id"]] =
           { label: RomanNumerals.to_roman(@prefacenum).downcase,
             level: 1, xref: preface_clause_name(clause), type: "clause" }
-        clause.xpath(ns("./clause | ./terms | ./term | ./definitions | ./references")).
-          each_with_index do |c, i|
+        clause.xpath(ns("./clause | ./terms | ./term | ./definitions | "\
+                        "./references")).each_with_index do |c, i|
           section_names1(c, "#{@prefacenum}.#{i + 1}", 2)
         end
       end
@@ -144,6 +159,16 @@ module IsoDoc
         end
       end
 
+      def acknowledgements(isoxml, out)
+        f = isoxml.at(ns("//acknowledgements")) || return
+        @prefacenum += 1
+        out.div **{ class: "Section3", id: f["id"] } do |div|
+          clause_name(anchor(f["id"], :label), f&.at(ns("./title")), div,
+                      class: "IntroTitle")
+          f.elements.each { |e| parse(e, div) unless e.name == "title" }
+        end
+      end
+
       def example_parse(node, out)
         name = node.at(ns("./name"))
         sourcecode_name_parse(node, out, name) if name
@@ -158,15 +183,21 @@ module IsoDoc
         preface_names_numbered(d.at(ns("//introduction")))
         @prefacenum += 1 if d.at(ns(SUBMITTINGORGS))
         preface_names_numbered(d.at(ns("//submitters")))
-        sequential_asset_names(d.xpath(ns("//preface/abstract | //foreword | "\
-                                          "//introduction | //submitters")))
+        d.xpath(ns("//preface/clause")).each do |c|
+          preface_names_numbered(c)
+        end
+        preface_names_numbered(d.at(ns("//acknowledgements")))
+        sequential_asset_names(d.xpath(ns(
+          "//preface/abstract | //foreword | //introduction | "\
+          "//submitters | //acknowledgements | //preface/clause")))
         n = section_names(d.at(ns("//clause[title = 'Scope']")), 0, 1)
         n = section_names(d.at(ns("//clause[title = 'Conformance']")), n, 1)
         n = section_names(d.at(ns(
           "//references[title = 'Normative References' or "\
           "title = 'Normative references']")), n, 1)
-        n = section_names(d.at(ns("//sections/terms | "\
-                                  "//sections/clause[descendant::terms]")), n, 1)
+        n = section_names(
+          d.at(ns("//sections/terms | //sections/clause[descendant::terms]")),
+          n, 1)
         n = section_names(d.at(ns("//sections/definitions")), n, 1)
         middle_section_asset_names(d)
         clause_names(d, n)
@@ -180,10 +211,10 @@ module IsoDoc
 
       def middle_section_asset_names(d)
         middle_sections = "//clause[title = 'Scope' or title = 'Conformance'] "\
-          "| //foreword | //introduction | "\
+          "| //foreword | //introduction | //preface/abstract | "\
+          "//submitters | //acknowledgements | //preface/clause | "\
           "//references[title = 'Normative References' or title = "\
-          "'Normative references'] | "\
-          "//sections/terms | "\
+          "'Normative references'] | //sections/terms | "\
           "//sections/definitions | //clause[parent::sections]"
         sequential_asset_names(d.xpath(ns(middle_sections)))
       end
@@ -193,9 +224,7 @@ module IsoDoc
         out.div **attr_code(id: f["id"]) do |div|
           num = num + 1
           clause_name(num, "Conformance", div, nil)
-          f.elements.each do |e|
-            parse(e, div) unless e.name == "title"
-          end
+          f.elements.each { |e| parse(e, div) unless e.name == "title" }
         end
         num
       end

data/lib/isodoc/ogc/html_convert.rb

@@ -72,6 +72,8 @@ module IsoDoc
           introduction docxml, div3
           submittingorgs docxml, div3
           submitters docxml, div3
+          preface docxml, div3
+          acknowledgements docxml, div3
           middle docxml, div3
           footnotes div3
           comments div3

data/lib/isodoc/ogc/metadata.rb

@@ -3,6 +3,35 @@ require "iso-639"
 
 module IsoDoc
   module Ogc
+    DOCTYPE_ABBR = {
+          "standard" => "IS",
+          "abstract-specification-topic" => "AST",
+          "best-practice" => "BP",
+          "change-request-supporting-document" => "CRSD",
+          "community-practice" => "CP",
+          "community-standard" => "CS",
+          "discussion-paper" => "DP",
+          "engineering-report" => "ER",
+          "policy" => "POL",
+          "reference-model" => "RM",
+          "release-notes" => "RN",
+          "test-suite" => "TS",
+          "user-guide" => "UG",
+          "white-paper" => "WP",
+          "other" => "other",
+        }
+
+        DOCSUBTYPE_ABBR = {
+          "implementation" => "IMP",
+          "conceptual-model" => "CM",
+          "conceptual-model-and-encoding" => "CME",
+          "conceptual-model-and-implementation" => "CMI",
+          "encoding" => "EN",
+          "extension" => "EXT",
+          "profile" => "PF",
+          "profile-with-extension" => "PFE",
+          "general" => "GE",
+        }
 
     class Metadata < IsoDoc::Metadata
       def initialize(lang, script, labels)
@@ -86,10 +115,22 @@ module IsoDoc
       end
 
       def doctype(isoxml, _out)
-        b = isoxml&.at(ns("//bibdata/ext/doctype"))&.text and
-        set(:doctype, type_capitalise(b))
-        b = isoxml&.at(ns("//bibdata/ext/docsubtype"))&.text and
-        set(:docsubtype, type_capitalise(b))
+        if t = isoxml&.at(ns("//bibdata/ext/doctype"))&.text
+          set(:doctype, type_capitalise(t))
+          set(:doctype_abbr, doctype_abbr(t))
+          if st = isoxml&.at(ns("//bibdata/ext/docsubtype"))&.text
+            set(:docsubtype, type_capitalise(st))
+            set(:docsubtype_abbr, docsubtype_abbr(st, t))
+          end
+        end
+      end
+
+      def doctype_abbr(b)
+        IsoDoc::Ogc::DOCTYPE_ABBR[b] || b
+      end
+
+      def docsubtype_abbr(st, t)
+        IsoDoc::Ogc::DOCSUBTYPE_ABBR[st] || st
       end
 
       def status_print(status)

data/lib/isodoc/ogc/pdf_convert.rb

@@ -76,6 +76,8 @@ module IsoDoc
           introduction docxml, div3
           submittingorgs docxml, div3
           submitters docxml, div3
+          preface docxml, div3
+          acknowledgements docxml, div3
           middle docxml, div3
           footnotes div3
           comments div3

data/lib/isodoc/ogc/word_convert.rb

@@ -134,6 +134,8 @@ module IsoDoc
           introduction docxml, div2
           submittingorgs docxml, div2
           submitters docxml, div2
+          preface docxml, div2
+          acknowledgements docxml, div2
           div2.p { |p| p << "&nbsp;" } # placeholder
         end
         section_break(body)

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities