metanorma-ogc 1.2.7 → 1.2.12

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -148,6 +148,19 @@ module IsoDoc
         recommendation_to_table(docxml)
       end
 
+      def section(docxml)
+        super
+        references(docxml)
+      end
+
+      def references(docxml)
+        docxml.xpath(ns("//bibitem/date")).each do |d|
+          d.xpath(ns("./on | ./from | ./to")).each do |d1|
+            d1.children = d1.text.sub(/^(\d\d\d\d).*$/, "\\1")
+          end
+        end
+      end
+
       include Init
     end
   end

data/lib/isodoc/ogc/word_convert.rb

@@ -17,11 +17,13 @@ module IsoDoc
 
       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: '"Times New Roman",serif',
+          headerfont: '"Times New Roman",serif',
+          monospacefont: '"Courier New",monospace',
+          normalfontsize: "10.5pt",
+          monospacefontsize: "10.0pt",
+          footnotefontsize: "10.0pt",
+          smallerfontsize: "10.0pt",
         }
       end
 
@@ -47,6 +49,8 @@ module IsoDoc
           @doctype = "white-paper"
           options[:bodyfont] = '"Arial",sans-serif'
           options[:headerfont] = '"Lato",sans-serif'
+          options[:normalfontsize] = "11.0pt"
+          options[:footnotefontsize] = "11.0pt"
         end
         super
       end

data/lib/isodoc/ogc/xref.rb

@@ -1,5 +1,8 @@
 module IsoDoc
   module Ogc
+    class Counter < IsoDoc::XrefGen::Counter
+    end
+
     class Xref < IsoDoc::Xref
       def initialize(lang, script, klass, labels, options)
         @reqtlabels = {}
@@ -13,7 +16,7 @@ module IsoDoc
       FIRST_LVL_REQ = IsoDoc::XrefGen::Blocks::FIRST_LVL_REQ
 
       def sequential_permission_names(clause, klass, label)
-        c = ::IsoDoc::XrefGen::Counter.new
+        c = Counter.new
         clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}")).each do |t|
           next if t["id"].nil? || t["id"].empty?
           id = c.increment(t).print
@@ -49,7 +52,7 @@ module IsoDoc
       end
 
       def sequential_permission_names1(block, lbl, klass, label)
-        c = ::IsoDoc::XrefGen::Counter.new
+        c = Counter.new
         block.xpath(ns("./#{klass}")).each do |t|
           next if t["id"].nil? || t["id"].empty?
           id = "#{lbl}#{hierfigsep}#{c.increment(t).print}"
@@ -90,7 +93,7 @@ module IsoDoc
       end
 
       def hierarchical_permission_names(clause, num, klass, label)
-        c = ::IsoDoc::XrefGen::Counter.new
+        c = Counter.new
         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}"
@@ -119,7 +122,8 @@ module IsoDoc
         sequential_asset_names(d.xpath(ns(
           "//preface/abstract | //foreword | //introduction | "\
           "//submitters | //acknowledgements | //preface/clause")))
-        n = section_names(d.at(ns("//clause[@type = 'scope']")), 0, 1)
+        n = Counter.new
+        n = section_names(d.at(ns("//clause[@type = 'scope']")), n, 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(

data/lib/metanorma/ogc.rb

@@ -3,6 +3,13 @@ require "metanorma/ogc/processor"
 
 module Metanorma
   module Ogc
+    def self.fonts_used
+      {
+        html: ["Overpass", "SpaceMono"],
+        doc: ["Times New Roman", "Cambria Math", "HanSans", "Courier New"],
+        pdf: ["Lato", "Arial"],
+      }
+    end
 
     ORGANIZATION_NAME_SHORT = "OGC"
     ORGANIZATION_NAME_LONG = "Open Geospatial Consortium"

data/lib/metanorma/ogc/processor.rb

@@ -2,14 +2,6 @@ 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
@@ -26,6 +18,22 @@ module Metanorma
         )
       end
 
+
+      def fonts_manifest
+        {
+          "Lato" => nil,
+          "Arial" => nil,
+          "STIX Two Math" => nil,
+          "Source Han Sans" => nil,
+          "Fira Code" => nil,
+          "Courier" => nil,
+          "Courier New" => nil,
+          "Times New Roman" => nil,
+          "Overpass" => nil,
+          "Space Mono" => nil,
+        }
+      end
+
       def version
         "Metanorma::Ogc #{Metanorma::Ogc::VERSION}"
       end

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "1.2.7"
+    VERSION = "1.2.12"
   end
 end

data/metanorma-ogc.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: iso-639
   requirement: !ruby/object:Gem::Requirement