metanorma-ogc 1.2.3 → 1.2.8

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -15,6 +15,7 @@ module IsoDoc
       def insert_preface_sections(docxml)
         insert_keywords(docxml)
         insert_submitting_orgs(docxml)
+        insert_security(docxml)
       end
 
       def preface_init_insert_pt(docxml)
@@ -30,6 +31,17 @@ module IsoDoc
         docxml.at(ns("//preface/abstract"))
       end
 
+      def insert_security(docxml)
+        s = docxml&.at(ns("//preface/clause[@type = 'security']"))&.remove or
+          return
+        if a = submit_orgs_append_pt(docxml)
+          a.next = s
+        else
+          preface_init_insert_pt(docxml)&.children&.first&.
+            add_previous_sibling(s)
+        end
+      end
+
       def insert_submitting_orgs(docxml)
         orgs = []
         docxml.xpath(ns(submittingorgs_path)).each { |org| orgs << org.text }
@@ -136,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/sections.rb

@@ -18,6 +18,11 @@ module IsoDoc
         intro_clause(f, out)
       end
 
+      def security(docxml, out)
+        f = docxml.at(ns("//preface/clause[@type = 'security']")) || return
+        intro_clause(f, out)
+      end
+
       def submitters(docxml, out)
         f = docxml.at(ns("//submitters")) || return
         intro_clause(f, out)
@@ -25,7 +30,7 @@ module IsoDoc
 
       def preface(isoxml, out)
         isoxml.xpath(ns("//preface/clause[not(@type = 'keywords' or "\
-                        "@type = 'submitting_orgs')]")).each do |f|
+                        "@type = 'submitting_orgs' or @type = 'security')]")).each do |f|
           intro_clause(f, out)
         end
       end

data/lib/isodoc/ogc/word_convert.rb

@@ -21,7 +21,11 @@ module IsoDoc
                      '"Times New Roman",serif'),
                      headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
                                   '"Times New Roman",serif'),
-                                  monospacefont: '"Courier New",monospace'
+                                  monospacefont: '"Courier New",monospace',
+                                  normalfontsize: "10.5pt",
+                                  monospacefontsize: "10.0pt",
+                                  footnotefontsize: "10.0pt",
+                                  smallerfontsize: "10.0pt",
         }
       end
 
@@ -47,6 +51,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
@@ -144,6 +150,7 @@ module IsoDoc
           keywords docxml, div2
           foreword docxml, div2
           introduction docxml, div2
+          security docxml, div2
           submittingorgs docxml, div2
           submitters docxml, div2
           preface docxml, div2

data/lib/isodoc/ogc/xref.rb

@@ -107,11 +107,12 @@ 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 = 'security']")))
         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|
+                   "@type = 'submitting_orgs' or @type = 'security')]")).each do |c|
           preface_names_numbered(c)
         end
         preface_names_numbered(d.at(ns("//acknowledgements")))
@@ -143,13 +144,37 @@ module IsoDoc
       def preface_names_numbered(clause)
         return if clause.nil?
         @prefacenum += 1
-        pref = RomanNumerals.to_roman(@prefacenum).downcase
+        pref = preface_number(@prefacenum, 1)
         @anchors[clause["id"]] =
           { label: pref,
             level: 1, xref: preface_clause_name(clause), type: "clause" }
-        clause.xpath(ns("./clause | ./terms | ./term | ./definitions | "\
-                        "./references")).each_with_index do |c, i|
-          section_names1(c, "#{pref}.#{i + 1}", 2)
+        clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
+          preface_names_numbered1(c, "#{pref}.#{preface_number(i + 1, 2)}", 2)
+        end
+      end
+
+      def preface_names_numbered1(clause, num, level)
+        @anchors[clause["id"]] =
+          { label: num, level: level, xref: l10n("#{@labels["clause"]} #{num}"),
+            type: "clause" }
+        clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
+          lbl = "#{num}.#{preface_number(i + 1, level + 1)}"
+          preface_names_numbered1(c, lbl, level + 1)
+        end
+      end
+
+      def preface_number(num, level)
+        case level
+        when 1 then RomanNumerals.to_roman(num).upcase
+        when 2 then (64 + num).chr.to_s
+        when 3 then num.to_s
+        when 4 then (96 + num).chr.to_s
+        when 5 then RomanNumerals.to_roman(num).downcase
+        when 6 then "(#{num.to_s})"
+        when 7 then "(#{(96 + num).chr.to_s})"
+        when 8 then "(#{RomanNumerals.to_roman(num).downcase})"
+        else
+          num.to_s
         end
       end
 

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/fonts_manifest.yaml

@@ -0,0 +1,6 @@
+---
+Arial:
+Courier New:
+Times New Roman:
+Overpass:
+Space Mono:

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

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "1.2.3"
+    VERSION = "1.2.8"
   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.5.0"
-  spec.add_dependency "isodoc", "~> 1.2.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.6.0"
+  spec.add_dependency "isodoc", "~> 1.3.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.3
+  version: 1.2.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-11-30 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.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: iso-639
   requirement: !ruby/object:Gem::Requirement
@@ -201,9 +201,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/macos.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
+- ".github/workflows/rake.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -279,6 +277,7 @@ files:
 - lib/isodoc/ogc/xref.rb
 - lib/metanorma-ogc.rb
 - lib/metanorma/ogc.rb
+- lib/metanorma/ogc/fonts_manifest.yaml
 - lib/metanorma/ogc/processor.rb
 - lib/metanorma/ogc/version.rb
 - metanorma-ogc.gemspec

data/.github/workflows/macos.yml

@@ -1,38 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: macos
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/ubuntu.yml
-      - .github/workflows/windows.yml
-
-jobs:
-  test-macos:
-    name: Test on Ruby ${{ matrix.ruby }} macOS
-    runs-on: macos-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        run: |
-          sudo gem install bundler --force
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -1,56 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: ubuntu
-
-on:
-  push:
-    branches: [ master ]
-    tags:
-      - '*'
-  pull_request:
-    paths-ignore:
-      - .github/workflows/macos.yml
-      - .github/workflows/windows.yml
-
-jobs:
-  test-linux:
-    name: Test on Ruby ${{ matrix.ruby }} Ubuntu
-    runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake
-      - name: Trigger repositories
-        if: matrix.ruby == '2.6'
-        env:
-          GH_USERNAME: metanorma-ci
-          GH_ACCESS_TOKEN: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
-        run: |
-          curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
-          [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
-          CLIENT_PAYLOAD=$(cat <<EOF
-          "{ "ref": "${GITHUB_REF}", "repo": "${GITHUB_REPOSITORY}" }"
-          EOF
-          )
-          for repo in $REPOS
-          do
-            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "$CLIENT_PAYLOAD"
-          done

data/.github/workflows/windows.yml

@@ -1,40 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: windows
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/macos.yml
-      - .github/workflows/ubuntu.yml
-
-jobs:
-  test-windows:
-    name: Test on Ruby ${{ matrix.ruby }} Windows
-    runs-on: windows-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        shell: pwsh
-        run: |
-          gem install bundler
-          bundle config --local path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake