metanorma-ogc 1.0.3 → 1.0.8

data/lib/isodoc/ogc/sections.rb

@@ -0,0 +1,111 @@
+module IsoDoc
+  module Ogc
+    module BaseConvert
+      def annex_name(annex, name, div)
+        div.h1 **{ class: "Annex" } do |t|
+          t << "#{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(", ")
+        end
+      end
+
+      SUBMITTINGORGS =
+        "//bibdata/contributor[role/@type = 'author']/organization/name".freeze
+
+      def submittingorgs(docxml, out)
+        orgs = []
+        docxml.xpath(ns(SUBMITTINGORGS)).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
+      end
+
+      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")
+          f.elements.each { |e| parse(e, div) unless e.name == "title" }
+        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 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(anchor(f["id"], :label), @abstract_lbl, 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(anchor(f["id"], :label), @foreword_lbl, 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(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 conformance(isoxml, out, num)
+        f = isoxml.at(ns("//clause[title = 'Conformance']")) or return num
+        out.div **attr_code(id: f["id"]) do |div|
+          num = num + 1
+          clause_name(num, "Conformance", div, nil)
+          f.elements.each { |e| parse(e, div) unless e.name == "title" }
+        end
+        num
+      end
+    end
+  end
+end

data/lib/isodoc/ogc/word_convert.rb

@@ -11,15 +11,17 @@ module IsoDoc
     class WordConvert < IsoDoc::WordConvert
       def initialize(options)
         @libdir = File.dirname(__FILE__)
+        @reqtlabels = {}
         super
-        #FileUtils.cp html_doc_path('logo.jpg'), "logo.jpg"
       end
 
       def default_fonts(options)
         {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Times New Roman",serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Times New Roman",serif'),
-          monospacefont: '"Courier New",monospace'
+          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
+                     '"Times New Roman",serif'),
+                     headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
+                                  '"Times New Roman",serif'),
+                                  monospacefont: '"Courier New",monospace'
         }
       end
 
@@ -35,7 +37,6 @@ module IsoDoc
         }
       end
 
-
       def metadata_init(lang, script, labels)
         @meta = Metadata.new(lang, script, labels)
       end
@@ -144,17 +145,27 @@ module IsoDoc
       def word_cleanup(docxml)
         super
         word_recommend_cleanup(docxml)
+        word_copyright_cleanup(docxml)
         word_license_cleanup(docxml)
         word_term_cleanup(docxml)
         docxml
       end
 
       def word_license_cleanup(docxml)
-        docxml.xpath("//div[@class = 'boilerplate-license']//p[not(@class)]").each do |p|
+        x = "//div[@class = 'boilerplate-license']//p[not(@class)]"
+        docxml.xpath(x).each do |p|
           p["class"] = "license"
         end
       end
 
+      # center only the Copyright notice
+      def word_copyright_cleanup(docxml)
+        x = "//div[@class = 'boilerplate-copyright']/div[1]/p[not(@class)]"
+        docxml.xpath(x).each do |p|
+          p["align"] = "center"
+        end
+      end
+
       def word_term_cleanup(docxml)
         docxml.xpath("//p[@class = 'TermNum']//p[@class = 'Terms']").each do |p|
           p.replace(p.children)
@@ -175,11 +186,6 @@ module IsoDoc
         end
       end
 
-      def authority_cleanup(docxml)
-        docxml&.at("//div[@id = 'boilerplate-contact']")&.remove
-        super
-      end
-
       include BaseConvert
     end
   end

data/lib/metanorma/ogc/processor.rb

@@ -2,6 +2,14 @@ require "metanorma/processor"
 
 module Metanorma
   module Ogc
+    def self.fonts_used
+      {
+        doc: ["Arial", "Courier New", "Times New Roman"],
+        pdf: ["Arial", "Courier New", "Times New Roman"],
+        html: ["Overpass", "Space Mono"]
+      }
+    end
+
     class Processor < Metanorma::Processor
 
       def initialize

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "1.0.3"
+    VERSION = "1.0.8"
   end
 end

data/metanorma-ogc.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "metanorma-standoc", "~> 1.3.20"
+  spec.add_dependency "metanorma-standoc", "~> 1.4.0"
   spec.add_dependency "isodoc", "~> 1.0.20"
   spec.add_dependency "iso-639"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.20
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.20
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
@@ -250,15 +250,31 @@ files:
 - lib/isodoc/ogc/html/htmlstyle.scss
 - lib/isodoc/ogc/html/ogc.scss
 - lib/isodoc/ogc/html/scripts.html
-- lib/isodoc/ogc/html/scripts.pdf.html
 - lib/isodoc/ogc/html/word_ogc_intro.html
 - lib/isodoc/ogc/html/word_ogc_titlepage.html
 - lib/isodoc/ogc/html/wordstyle.scss
 - lib/isodoc/ogc/html_convert.rb
 - lib/isodoc/ogc/i18n-en.yaml
 - lib/isodoc/ogc/metadata.rb
+- lib/isodoc/ogc/ogc.abstract-specification-topic.xsl
+- lib/isodoc/ogc/ogc.best-practice.xsl
+- lib/isodoc/ogc/ogc.change-request-supporting-document.xsl
+- lib/isodoc/ogc/ogc.community-practice.xsl
+- lib/isodoc/ogc/ogc.community-standard.xsl
+- lib/isodoc/ogc/ogc.discussion-paper.xsl
+- lib/isodoc/ogc/ogc.engineering-report.xsl
+- lib/isodoc/ogc/ogc.other.xsl
+- lib/isodoc/ogc/ogc.policy.xsl
+- lib/isodoc/ogc/ogc.reference-model.xsl
+- lib/isodoc/ogc/ogc.release-notes.xsl
+- lib/isodoc/ogc/ogc.standard.xsl
+- lib/isodoc/ogc/ogc.test-suite.xsl
+- lib/isodoc/ogc/ogc.user-guide.xsl
+- lib/isodoc/ogc/ogc.white-paper.xsl
 - lib/isodoc/ogc/pdf_convert.rb
 - lib/isodoc/ogc/reqt.rb
+- lib/isodoc/ogc/reqt_xref.rb
+- lib/isodoc/ogc/sections.rb
 - lib/isodoc/ogc/word_convert.rb
 - lib/metanorma-ogc.rb
 - lib/metanorma/ogc.rb

data/lib/isodoc/ogc/html/scripts.pdf.html

@@ -1,72 +0,0 @@
-  <script>
-    //TOC generation
-      $('#toc').toc({
-          'selectors': toclevel(), //elements to use as headings
-          'container': 'main', //element to find all selectors in
-          'smoothScrolling': true, //enable or disable smooth scrolling on click
-          'prefix': 'toc', //prefix for anchor tags and class names
-          'onHighlight': function(el) {}, //called when a new section is highlighted 
-          'highlightOnScroll': false, //add class to heading that is currently in focus
-          'highlightOffset': 100, //offset to trigger the next headline
-          'anchorName': function(i, heading, prefix) { //custom function for anchor name
-              return prefix+i;
-          },
-          'headerText': function(i, heading, $heading) { //custom function building the header-item text
-              return $heading.text();
-          },
-      'itemClass': function(i, heading, $heading, prefix) { // custom function for item class
-        return $heading[0].tagName.toLowerCase();
-      }
-      });
-      
-  </script>
-
-<script>
-  //TOC toggle animation
-$('#toggle').on('click', function(){
-    if( $('nav').is(':visible') ) {
-        $('nav').animate({ 'left': '-353px' }, 'slow', function(){
-            $('nav').hide();
-        });
-        $('.container').animate({ 'padding-left': '31px' }, 'slow');
-    }
-    else {
-        $('nav').show();
-        $('nav').animate({ 'left': '0px' }, 'slow');
-        $('.container').animate({ 'padding-left': '360px' }, 'slow');
-    }
-});
-</script>
-
-<script>
-    // Scroll to top button
-    window.onscroll = function() {scrollFunction()};
-    
-    function scrollFunction() {
-        if (document.body.scrollTop > 100 || document.documentElement.scrollTop > 100) {
-            document.getElementById("myBtn").style.display = "block";
-        } else {
-            document.getElementById("myBtn").style.display = "none";
-        }
-    }
-    
-    // When the user clicks on the button, scroll to the top of the document
-    function topFunction() {
-        document.body.scrollTop = 0;
-        document.documentElement.scrollTop = 0;
-    }
-    </script>
-
-  <script>
-/*
-  $(document).ready(function() {
-          $('[id^=toc]').each(function ()
-          {
-             var currentToc = $(this);
-       var url = window.location.href;
-             currentToc.wrap("<a href='" + url + "#" + currentToc.attr("id") + "' </a>");
-          });
-});
-*/
-</script>
-