metanorma-ogc 1.1.1 → 1.2.2

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"
@@ -36,6 +37,20 @@ module IsoDoc
         }
       end
 
+      def convert1(docxml, filename, dir)
+        if docxml&.at(ns('//bibdata/ext/doctype'))&.text == "white-paper"
+          @wordstylesheet_name = html_doc_path("wordstyle_wp.scss")
+          @standardstylesheet_name = html_doc_path("ogc_wp.scss")
+          @wordcoverpage = html_doc_path("word_ogc_titlepage_wp.html")
+          @wordintropage = html_doc_path("word_ogc_intro_wp.html")
+          @header = html_doc_path("header_wp.html")
+          @doctype = "white-paper"
+          options[:bodyfont] = '"Arial",sans-serif'
+          options[:headerfont] = '"Lato",sans-serif'
+        end
+        super
+      end
+
       def make_body(xml, docxml)
         body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72" }
         xml.body **body_attr do |body|
@@ -124,6 +139,7 @@ module IsoDoc
           @prefacenum = 0
           info docxml, div2
           boilerplate docxml, div2
+          preface_block docxml, div2
           abstract docxml, div2
           keywords docxml, div2
           foreword docxml, div2
@@ -156,9 +172,12 @@ module IsoDoc
       # 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
+        docxml.xpath(x).each { |p| p["align"] = "center" }
+        return unless @doctype == "white-paper"
+        docxml.xpath("//div[@class = 'boilerplate-copyright']//p[not(@class)]").
+          each { |p| p["class"] = "license" }
+        docxml.xpath("//div[@class = 'boilerplate-legal']//p[not(@class)]").
+          each { |p| p["class"] = "license" }
       end
 
       def word_term_cleanup(docxml)
@@ -182,6 +201,7 @@ module IsoDoc
       end
 
       include BaseConvert
+      include Init
     end
   end
 end

data/lib/isodoc/ogc/xref.rb

@@ -17,7 +17,8 @@ module IsoDoc
         clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}")).each do |t|
           next if t["id"].nil? || t["id"].empty?
           id = c.increment(t).print
-          @anchors[t["id"]] = anchor_struct(id, t, label, klass, t["unnumbered"])
+          @anchors[t["id"]] = anchor_struct(id, t, label, klass,
+                                            t["unnumbered"])
           l = t.at(ns("./label"))&.text and @reqtlabels[l] = t["id"]
           sequential_permission_children(t, id)
         end
@@ -38,9 +39,8 @@ module IsoDoc
       def sequential_permission_children(t, id)
         req_class_paths.each do |k, v|
           %w(permission requirement recommendation).each do |r|
-            sequential_permission_names1(t, id, "#{r}[#{v}]", @labels["#{r}#{k}"])
-            sequential_permission_names1(t, id, "#{r}[#{v}]", @labels["#{r}#{k}"])
-            sequential_permission_names1(t, id, "#{r}[#{v}]", @labels["#{r}#{k}"])
+            sequential_permission_names1(t, id, "#{r}[#{v}]",
+                                         @labels["#{r}#{k}"])
           end
         end
         req_class_paths2.each do |k, v|
@@ -53,7 +53,8 @@ module IsoDoc
         block.xpath(ns("./#{klass}")).each do |t|
           next if t["id"].nil? || t["id"].empty?
           id = "#{lbl}#{hierfigsep}#{c.increment(t).print}"
-          @anchors[t["id"]] = anchor_struct(id, t, label, klass, t["unnumbered"])
+          @anchors[t["id"]] = anchor_struct(id, t, label, klass,
+                                            t["unnumbered"])
           sequential_permission_children(t, id)
         end
       end
@@ -64,9 +65,8 @@ module IsoDoc
         sequential_formula_names(clause)
         req_class_paths.each do |k, v|
           %w(permission requirement recommendation).each do |r|
-            sequential_permission_names(clause, "#{r}[#{v}]", @labels["#{r}#{k}"])
-            sequential_permission_names(clause, "#{r}[#{v}]", @labels["#{r}#{k}"])
-            sequential_permission_names(clause, "#{r}[#{v}]", @labels["#{r}#{k}"])
+            sequential_permission_names(clause, "#{r}[#{v}]",
+                                        @labels["#{r}#{k}"])
           end
         end
         req_class_paths2.each do |k, v|
@@ -80,9 +80,8 @@ module IsoDoc
         hierarchical_formula_names(clause, num)
         req_class_paths.each do |k, v|
           %w(permission requirement recommendation).each do |r|
-            hierarchical_permission_names(clause, num, "#{r}[#{v}]", @labels["#{r}#{k}"])
-            hierarchical_permission_names(clause, num, "#{r}[#{v}]", @labels["#{r}#{k}"])
-            hierarchical_permission_names(clause, num, "#{r}[#{v}]",  @labels["#{r}#{k}"])
+            hierarchical_permission_names(clause, num, "#{r}[#{v}]",
+                                          @labels["#{r}#{k}"])
           end
         end
         req_class_paths2.each do |k, v|
@@ -95,7 +94,8 @@ module IsoDoc
         clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}")).each do |t|
           next if t["id"].nil? || t["id"].empty?
           lbl = "#{num}#{hiersep}#{c.increment(t).print}"
-          @anchors[t["id"]] = anchor_struct(lbl, t, label, klass, t["unnumbered"])
+          @anchors[t["id"]] = anchor_struct(lbl, t, label, klass,
+                                            t["unnumbered"])
           l = t.at(ns("./label"))&.text and @reqtlabels[l] = t["id"]
           sequential_permission_children(t, lbl)
         end
@@ -104,23 +104,23 @@ 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 +132,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
@@ -153,6 +152,12 @@ module IsoDoc
           section_names1(c, "#{pref}.#{i + 1}", 2)
         end
       end
+
+      def reference_names(ref)
+        super
+        return unless @klass.ogc_draft_ref?(ref)
+        @anchors[ref["id"]] = { xref: @anchors[ref["id"]][:xref] + " (draft)" }
+      end
     end
   end
 end

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "1.1.1"
+    VERSION = "1.2.2"
   end
 end

data/metanorma-ogc.gemspec

@@ -24,13 +24,12 @@ 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"
+  spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"

metadata

@@ -1,71 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2020-08-27 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
@@ -94,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '9.1'
+- !ruby/object:Gem::Dependency
+  name: sassc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -243,18 +229,32 @@ files:
 - lib/isodoc/ogc.rb
 - lib/isodoc/ogc/base_convert.rb
 - lib/isodoc/ogc/biblio.rb
+- lib/isodoc/ogc/html/_coverpage.css
 - lib/isodoc/ogc/html/_coverpage.scss
 - lib/isodoc/ogc/html/header.html
+- lib/isodoc/ogc/html/header_wp.html
 - lib/isodoc/ogc/html/html_ogc_intro.html
 - lib/isodoc/ogc/html/html_ogc_titlepage.html
+- lib/isodoc/ogc/html/htmlstyle.css
 - lib/isodoc/ogc/html/htmlstyle.scss
+- lib/isodoc/ogc/html/logo.png
+- lib/isodoc/ogc/html/ogc.css
 - lib/isodoc/ogc/html/ogc.scss
+- lib/isodoc/ogc/html/ogc_wp.css
+- lib/isodoc/ogc/html/ogc_wp.scss
 - lib/isodoc/ogc/html/scripts.html
 - lib/isodoc/ogc/html/word_ogc_intro.html
+- lib/isodoc/ogc/html/word_ogc_intro_wp.html
 - lib/isodoc/ogc/html/word_ogc_titlepage.html
+- lib/isodoc/ogc/html/word_ogc_titlepage_wp.html
+- lib/isodoc/ogc/html/wordstyle.css
 - lib/isodoc/ogc/html/wordstyle.scss
+- lib/isodoc/ogc/html/wordstyle_wp.css
+- lib/isodoc/ogc/html/wordstyle_wp.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