metanorma-ogc 1.1.3 → 1.2.0

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -1,9 +1,136 @@
-require_relative "base_convert"
+require_relative "init"
 require "isodoc"
+require "uuidtools"
 
 module IsoDoc
   module Ogc
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+      def convert1(docxml, filename, dir)
+        info docxml, nil
+        insert_preface_sections(docxml)
+        super
+      end
+
+      def insert_preface_sections(docxml)
+        insert_keywords(docxml)
+        insert_submitting_orgs(docxml)
+      end
+
+      def preface_init_insert_pt(docxml)
+        docxml.at(ns("//preface")) ||
+          docxml.at(ns("//sections")).
+          add_previous_sibling("<preface> </preface>").first
+      end
+
+      def submit_orgs_append_pt(docxml)
+        docxml.at(ns("//introduction")) ||
+        docxml.at(ns("//foreword")) ||
+        docxml.at(ns("//preface/clause[@type = 'keywords']")) ||
+        docxml.at(ns("//preface/abstract"))
+      end
+
+      def insert_submitting_orgs(docxml)
+        orgs = []
+        docxml.xpath(ns(submittingorgs_path)).each { |org| orgs << org.text }
+        return if orgs.empty?
+        if a = submit_orgs_append_pt(docxml)
+          a.next = submitting_orgs_clause(orgs)
+        else
+          preface_init_insert_pt(docxml)&.children&.first&.
+            add_previous_sibling(submitting_orgs_clause(orgs))
+        end
+      end
+
+      def submitting_orgs_clause(orgs)
+        <<~END
+        <clause id="_#{UUIDTools::UUID.random_create}" type="submitting_orgs">
+        <title>Submitting Organizations</title>
+        <p>The following organizations submitted this Document to the
+           Open Geospatial Consortium (OGC):</p>
+         <ul>#{orgs.map { |m| "<li>#{m}</li>" }.join("\n")}</ul>
+         </clause>
+        END
+      end
+
+      def keyword_clause(kw)
+        <<~END
+        <clause id="_#{UUIDTools::UUID.random_create}" type="keywords">
+        <title>Keywords</title>
+        <p>The following are keywords to be used by search engines and
+            document catalogues.</p>
+        <p>#{kw.join(", ")}</p></clause>
+        END
+      end
+
+      def insert_keywords(docxml)
+        kw = @meta.get[:keywords]
+        kw.empty? and return
+        if abstract = docxml.at(ns("//preface/abstract"))
+          abstract.next = keyword_clause(kw)
+        else
+          preface_init_insert_pt(docxml)&.children&.first&.
+            add_previous_sibling(keyword_clause(kw))
+        end
+      end
+
+      def example1(f)
+        lbl = @xrefs.anchor(f['id'], :label, false) or return
+        prefix_name(f, "&nbsp;&mdash; ", l10n("#{@i18n.example} #{lbl}"), "name")
+      end
+
+      def recommendation1(f, type)
+        type = recommendation_class(f)
+        label = f&.at(ns("./label"))&.text
+        if inject_crossreference_reqt?(f, label)
+          n = @xrefs.anchor(@xrefs.reqtlabels[label], :xref, false)
+          lbl = (n.nil? ? type : n)
+          f&.at(ns("./title"))&.remove # suppress from display if embedded
+        else
+          n = @xrefs.anchor(f['id'], :label, false)
+          lbl = (n.nil? ? type : l10n("#{type} #{n}"))
+        end
+        prefix_name(f, "", lbl, "name")
+      end
+
+      # embedded reqts xref to top level reqts via label lookup
+      def inject_crossreference_reqt?(node, label)
+        !node.ancestors("requirement, recommendation, permission").empty? &&
+          @xrefs.reqtlabels[label]
+      end
+
+      def recommendation_class(node)
+        case node["type"]
+        when "verification" then @i18n.get["#{node.name}test"]
+        when "class" then @i18n.get["#{node.name}class"]
+        when "abstracttest" then @i18n.get["abstracttest"]
+        when "conformanceclass" then @i18n.get["conformanceclass"]
+        else
+          case node.name
+          when "recommendation" then @i18n.recommendation
+          when "requirement" then @i18n.requirement
+          when "permission" then @i18n.permission
+          end
+        end
+      end
+
+      def annex1(f)
+        lbl = @xrefs.anchor(f['id'], :label)
+        if t = f.at(ns("./title"))
+          t.children = "<strong>#{t.children.to_xml}</strong>"
+        end
+        prefix_name(f, "<br/>", lbl, "title")
+      end
+
+      def clause(docxml)
+        super
+        docxml.xpath(ns("//foreword | //preface/abstract | "\
+                        "//submitters | //introduction | //acknowledgements")).
+                       each do |f|
+          clause1(f)
+        end
+      end
+
+      include Init
     end
   end
 end

data/lib/isodoc/ogc/reqt.rb

@@ -28,18 +28,14 @@ module IsoDoc
       def recommendation_name(node, out, type)
         label, title, lbl = recommendation_labels(node)
         out.p **{ class: recommendation_class(node) } do |b|
-          if inject_crossreference_reqt?(node, label)
-            lbl = @xrefs.anchor(@xrefs.reqtlabels[label.text], :xref, false)
-            b << (lbl.nil? ? l10n("#{type}:") : l10n("#{lbl}:"))
-          else
-            b << (lbl.nil? ? l10n("#{type}:") : l10n("#{type} #{lbl}:"))
-          end
+          lbl and lbl.children.each { |n| parse(n, b) }
+          b << l10n(":")
           recommendation_name1(title, node, label, b)
         end
       end
 
       def recommendation_name1(title, node, label, b)
-        return unless  title && !inject_crossreference_reqt?(node, label)
+        return unless title
         b << " "
         title.children.each { |n| parse(n,b) }
       end
@@ -55,12 +51,6 @@ module IsoDoc
         end
       end
 
-      # embedded reqts xref to top level reqts via label lookup
-      def inject_crossreference_reqt?(node, label)
-        !node.ancestors("requirement, recommendation, permission").empty? &&
-          @xrefs.reqtlabels[label&.text]
-      end
-
       def recommendation_attributes1(node)
         out = []
         oblig = node["obligation"] and out << ["Obligation", oblig]
@@ -163,19 +153,7 @@ module IsoDoc
       end
 
       def recommendation_parse0(node, out, r)
-        label = case node["type"]
-                when "verification" then @labels["#{r}test"]
-                when "class" then @labels["#{r}class"]
-                when "abstracttest" then @labels["abstracttest"]
-                when "conformanceclass" then @labels["conformanceclass"]
-                else 
-                  case r
-                  when "recommendation" then @recommendation_lbl
-                  when "requirement" then @requirement_lbl
-                  when "permission" then @permission_lbl
-                  end
-                end
-        recommendation_parse1(node, out, label)
+        recommendation_parse1(node, out, nil)
       end
 
       def requirement_parse(node, out)

data/lib/isodoc/ogc/sections.rb

@@ -1,108 +1,62 @@
 module IsoDoc
   module Ogc
     module BaseConvert
-      def annex_name(annex, name, div)
-        div.h1 **{ class: "Annex" } do |t|
-          t << "#{@xrefs.anchor(annex['id'], :label)} "
-          t.br
-          t.b do |b|
-            name&.children&.each { |c2| parse(c2, b) }
-          end
-        end
-      end
-
-      def keywords(_docxml, out)
-        kw = @meta.get[:keywords]
-        kw.empty? and return
-        @prefacenum += 1
-        out.div **{ class: "Section3" } do |div|
-          clause_name(RomanNumerals.to_roman(@prefacenum).downcase,
-                      "Keywords", div,  class: "IntroTitle")
-          div.p "The following are keywords to be used by search engines and "\
-            "document catalogues."
-          div.p kw.join(", ")
+      def intro_clause(f, out)
+        out.div **{ class: "Section3", id: f["id"] } do |div|
+          clause_name(nil, f&.at(ns("./title")), div, class: "IntroTitle")
+          f.elements.each { |e| parse(e, div) unless e.name == "title" }
         end
       end
 
-      def submittingorgs_path
-        "//bibdata/contributor[role/@type = 'author']/organization/name"
+      def keywords(docxml, out)
+        f = docxml.at(ns("//preface/clause[@type = 'keywords']")) || return
+        intro_clause(f, out)
       end
 
       def submittingorgs(docxml, out)
-        orgs = []
-        docxml.xpath(ns(submittingorgs_path)).each { |org| orgs << org.text }
-        return if orgs.empty?
-        @prefacenum += 1
-        out.div **{ class: "Section3" } do |div|
-          clause_name(RomanNumerals.to_roman(@prefacenum).downcase,
-                      "Submitting Organizations", div,  class: "IntroTitle")
-          div.p "The following organizations submitted this Document to the "\
-            "Open Geospatial Consortium (OGC):"
-          div.ul do |ul|
-            orgs.each { |org| ul.li org }
-          end
-        end
+        f = docxml.at(ns("//preface/clause[@type = 'submitting_orgs']")) || return
+        intro_clause(f, out)
       end
 
       def submitters(docxml, out)
         f = docxml.at(ns("//submitters")) || return
-        @prefacenum += 1
-        out.div **{ class: "Section3" } do |div|
-          clause_name(@xrefs.anchor(f['id'], :label), "Submitters", div,
-                      class: "IntroTitle")
-          f.elements.each { |e| parse(e, div) unless e.name == "title" }
-        end
+        intro_clause(f, out)
       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
+        isoxml.xpath(ns("//preface/clause[not(@type = 'keywords' or "\
+                        "@type = 'submitting_orgs')]")).each do |f|
+          intro_clause(f, out)
         end
       end
 
       def abstract(isoxml, out)
         f = isoxml.at(ns("//preface/abstract")) || return
-        @prefacenum += 1
         page_break(out)
         out.div **attr_code(id: f["id"]) do |s|
-          clause_name(@xrefs.anchor(f["id"], :label), @abstract_lbl, s,
-                      class: "AbstractTitle")
+          clause_name(nil, f&.at(ns("./title")), s, class: "AbstractTitle")
           f.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
 
       def foreword(isoxml, out)
         f = isoxml.at(ns("//foreword")) || return
-        @prefacenum += 1
         page_break(out)
         out.div **attr_code(id: f["id"]) do |s|
-          clause_name(@xrefs.anchor(f["id"], :label), @foreword_lbl, s,
-                      class: "ForewordTitle")
+          clause_name(nil, f&.at(ns("./title")), s, class: "ForewordTitle")
           f.elements.each { |e| parse(e, s) unless e.name == "title" }
         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(@xrefs.anchor(f["id"], :label), f&.at(ns("./title")), div,
-                      class: "IntroTitle")
-          f.elements.each { |e| parse(e, div) unless e.name == "title" }
-        end
+        intro_clause(f, out)
       end
 
       def conformance(isoxml, out, num)
-        f = isoxml.at(ns("//clause[title = 'Conformance']")) or return num
+        f = isoxml.at(ns("//clause[@type = 'conformance']")) or return num
         out.div **attr_code(id: f["id"]) do |div|
-          num = num + 1
-          clause_name(num, "Conformance", div, nil)
+          clause_name(nil, f&.at(ns("./title")), div, nil)
           f.elements.each { |e| parse(e, div) unless e.name == "title" }
         end
         num

data/lib/isodoc/ogc/word_convert.rb

@@ -1,4 +1,5 @@
 require_relative "base_convert"
+require_relative "init"
 require "fileutils"
 require "isodoc"
 require_relative "metadata"
@@ -182,6 +183,7 @@ module IsoDoc
       end
 
       include BaseConvert
+      include Init
     end
   end
 end

data/lib/isodoc/ogc/xref.rb

@@ -104,23 +104,22 @@ module IsoDoc
       def initial_anchor_names(d)
         @prefacenum = 0
         preface_names_numbered(d.at(ns("//preface/abstract")))
-        @prefacenum += 1 if d.at(ns("//keyword"))
+        preface_names_numbered(d.at(ns("//preface/clause[@type = 'keywords']")))
         preface_names_numbered(d.at(ns("//foreword")))
         preface_names_numbered(d.at(ns("//introduction")))
-        @prefacenum += 1 if d.at(ns(@klass.submittingorgs_path))
+        preface_names_numbered(d.at(ns("//preface/clause[@type = 'submitting_orgs']")))
         preface_names_numbered(d.at(ns("//submitters")))
-        d.xpath(ns("//preface/clause")).each do |c|
+        d.xpath(ns("//preface/clause[not(@type = 'keywords' or "\
+                   "@type = 'submitting_orgs')]")).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("//clause[@type = 'scope']")), 0, 1)
+        n = section_names(d.at(ns("//clause[@type = 'conformance']")), n, 1)
+        n = section_names(d.at(ns(@klass.norm_ref_xpath)), n, 1)
         n = section_names(
           d.at(ns("//sections/terms | //sections/clause[descendant::terms]")),
           n, 1)
@@ -132,11 +131,10 @@ module IsoDoc
       end
 
       def middle_section_asset_names(d)
-        middle_sections = "//clause[title = 'Scope' or title = 'Conformance'] "\
+        middle_sections = "//clause[@type = 'scope' or @type = 'conformance'] "\
           "| //foreword | //introduction | //preface/abstract | "\
           "//submitters | //acknowledgements | //preface/clause | "\
-          "//references[title = 'Normative References' or title = "\
-          "'Normative references'] | //sections/terms | "\
+          " #{@klass.norm_ref_xpath} | //sections/terms | "\
           "//sections/definitions | //clause[parent::sections]"
         sequential_asset_names(d.xpath(ns(middle_sections)))
       end

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "1.1.3"
+    VERSION = "1.2.0"
   end
 end

data/metanorma-ogc.gemspec

@@ -24,10 +24,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "ruby-jing"
-  spec.add_dependency "metanorma-standoc", "~> 1.4.0"
-  spec.add_dependency "isodoc", "~> 1.1.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.5.0"
+  spec.add_dependency "isodoc", "~> 1.2.0"
   spec.add_dependency "iso-639"
 
   spec.add_development_dependency "byebug", "~> 9.1"

metadata

@@ -1,71 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-26 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: htmlentities
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.4
-- !ruby/object:Gem::Dependency
-  name: ruby-jing
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: iso-639
   requirement: !ruby/object:Gem::Requirement
@@ -273,6 +245,8 @@ files:
 - lib/isodoc/ogc/html/wordstyle.scss
 - lib/isodoc/ogc/html_convert.rb
 - lib/isodoc/ogc/i18n-en.yaml
+- lib/isodoc/ogc/i18n.rb
+- lib/isodoc/ogc/init.rb
 - lib/isodoc/ogc/metadata.rb
 - lib/isodoc/ogc/ogc.abstract-specification-topic.xsl
 - lib/isodoc/ogc/ogc.best-practice.xsl