metanorma-un 0.5.3 → 0.5.8

data/lib/isodoc/un/word_convert.rb

@@ -20,7 +20,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",
+                       smallerfontsize: "10.0pt",
+                       footnotefontsize: "9.0pt",
         }
       end
 

data/lib/isodoc/un/xref.rb

@@ -56,14 +56,14 @@ module IsoDoc
       def label_leaf_section(clause, lvl)
         @paranumber += 1
         @anchors[clause["id"]] = {label: @paranumber.to_s, 
-                                  xref: "paragraph #{@paranumber}", 
+                                  xref: l10n("#{@labels['paragraph']} #{@paranumber}"), 
                                   level: lvl, type: "paragraph" }
       end
 
       def label_annex_leaf_section(clause, num, lvl)
         @paranumber += 1
         @anchors[clause["id"]] = {label: @paranumber.to_s, 
-                                  xref: "paragraph #{num}.#{@paranumber}", 
+                                  xref: l10n("#{@labels['paragraph']} #{num}.#{@paranumber}"), 
                                   level: lvl, type: "paragraph" }
       end
 
@@ -108,8 +108,8 @@ module IsoDoc
         leaf_section?(clause) and
           label_annex_leaf_section(clause, num, 1) and return
         @anchors[clause["id"]] = { label: annex_name_lbl(clause, num),
-                                   type: "clause",
-                                   xref: "#{@labels['annex']} #{num}", level: 1 }
+                                   type: "clause", value: num,
+                                   xref: l10n("#{@labels['annex']} #{num}"), level: 1 }
         if a = single_annex_special_section(clause)
           annex_names1(a, "#{num}", 1)
         else
@@ -126,7 +126,7 @@ module IsoDoc
         leaf_section?(clause) and
           label_annex_leaf_section(clause, num, level) and return
         /\.(?<leafnum>[^.]+$)/ =~ num
-        @anchors[clause["id"]] = { label: leafnum, xref: "#{@labels['annex']} #{num}",
+        @anchors[clause["id"]] = { label: leafnum, xref: l10n("#{@labels['annex']} #{num}"),
                                    level: level, type: "clause" }
         i = 1
         clause.xpath(ns("./clause | ./references")).each do |c|

data/lib/metanorma/un/fonts_manifest.yaml

@@ -0,0 +1,6 @@
+---
+Arial:
+Arial Black:
+Courier:
+Times New Roman:
+Source Han Sans:

data/lib/metanorma/un/processor.rb

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

data/lib/metanorma/un/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module UN
-    VERSION = "0.5.3"
+    VERSION = "0.5.8"
   end
 end

data/metanorma-unece.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "twitter_cldr"
   spec.add_dependency "iso-639"
 
-  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_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "sassc", "2.4.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-un
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.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: roman-numerals
@@ -58,28 +58,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: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -230,9 +230,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"
@@ -285,6 +283,7 @@ files:
 - lib/metanorma-un.rb
 - lib/metanorma/un.rb
 - lib/metanorma/un/UN_emblem_blue.svg
+- lib/metanorma/un/fonts_manifest.yaml
 - lib/metanorma/un/input.rb
 - lib/metanorma/un/processor.rb
 - lib/metanorma/un/version.rb

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