metanorma-ogc 1.2.0 → 1.2.1

data/lib/isodoc/ogc/word_convert.rb

@@ -37,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|
@@ -157,9 +171,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)

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
@@ -107,7 +107,8 @@ module IsoDoc
         preface_names_numbered(d.at(ns("//preface/clause[@type = 'keywords']")))
         preface_names_numbered(d.at(ns("//foreword")))
         preface_names_numbered(d.at(ns("//introduction")))
-        preface_names_numbered(d.at(ns("//preface/clause[@type = 'submitting_orgs']")))
+        preface_names_numbered(d.at(ns("//preface/clause"\
+                                       "[@type = 'submitting_orgs']")))
         preface_names_numbered(d.at(ns("//submitters")))
         d.xpath(ns("//preface/clause[not(@type = 'keywords' or "\
                    "@type = 'submitting_orgs')]")).each do |c|
@@ -151,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.2.0"
+    VERSION = "1.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -232,17 +232,25 @@ files:
 - 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