metanorma-un 0.5.4 → 0.5.9

Sign up to get free protection for your applications and to get access to all the features.
@@ -20,7 +20,11 @@ module IsoDoc
20
20
  '"Times New Roman",serif'),
21
21
  headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
22
22
  '"Times New Roman",serif'),
23
- monospacefont: '"Courier New",monospace'
23
+ monospacefont: '"Courier New",monospace',
24
+ normalfontsize: "10.5pt",
25
+ monospacefontsize: "10.0pt",
26
+ smallerfontsize: "10.0pt",
27
+ footnotefontsize: "9.0pt",
24
28
  }
25
29
  end
26
30
 
@@ -56,14 +56,14 @@ module IsoDoc
56
56
  def label_leaf_section(clause, lvl)
57
57
  @paranumber += 1
58
58
  @anchors[clause["id"]] = {label: @paranumber.to_s,
59
- xref: "paragraph #{@paranumber}",
59
+ xref: l10n("#{@labels['paragraph']} #{@paranumber}"),
60
60
  level: lvl, type: "paragraph" }
61
61
  end
62
62
 
63
63
  def label_annex_leaf_section(clause, num, lvl)
64
64
  @paranumber += 1
65
65
  @anchors[clause["id"]] = {label: @paranumber.to_s,
66
- xref: "paragraph #{num}.#{@paranumber}",
66
+ xref: l10n("#{@labels['paragraph']} #{num}.#{@paranumber}"),
67
67
  level: lvl, type: "paragraph" }
68
68
  end
69
69
 
@@ -109,7 +109,7 @@ module IsoDoc
109
109
  label_annex_leaf_section(clause, num, 1) and return
110
110
  @anchors[clause["id"]] = { label: annex_name_lbl(clause, num),
111
111
  type: "clause", value: num,
112
- xref: "#{@labels['annex']} #{num}", level: 1 }
112
+ xref: l10n("#{@labels['annex']} #{num}"), level: 1 }
113
113
  if a = single_annex_special_section(clause)
114
114
  annex_names1(a, "#{num}", 1)
115
115
  else
@@ -126,7 +126,7 @@ module IsoDoc
126
126
  leaf_section?(clause) and
127
127
  label_annex_leaf_section(clause, num, level) and return
128
128
  /\.(?<leafnum>[^.]+$)/ =~ num
129
- @anchors[clause["id"]] = { label: leafnum, xref: "#{@labels['annex']} #{num}",
129
+ @anchors[clause["id"]] = { label: leafnum, xref: l10n("#{@labels['annex']} #{num}"),
130
130
  level: level, type: "clause" }
131
131
  i = 1
132
132
  clause.xpath(ns("./clause | ./references")).each do |c|
@@ -0,0 +1,6 @@
1
+ ---
2
+ Arial:
3
+ Arial Black:
4
+ Courier:
5
+ Times New Roman:
6
+ Source Han Sans:
@@ -2,14 +2,6 @@ require "metanorma/processor"
2
2
 
3
3
  module Metanorma
4
4
  module UN
5
- def self.fonts_used
6
- {
7
- html: ["Arial", "Arial Black", "Courier", "Times New Roman", "HanSans"],
8
- doc: ["Arial", "Arial Black", "Courier", "Times New Roman", "HanSans"],
9
- pdf: ["Arial", "Arial Black", "Courier", "Times New Roman", "HanSans"],
10
- }
11
- end
12
-
13
5
  class Processor < Metanorma::Processor
14
6
 
15
7
  def initialize
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module UN
3
- VERSION = "0.5.4"
3
+ VERSION = "0.5.9"
4
4
  end
5
5
  end
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
31
31
  spec.add_dependency "iso-639"
32
32
 
33
33
  spec.add_dependency "metanorma-standoc", "~> 1.6.0"
34
- spec.add_dependency "isodoc", "~> 1.2.0"
34
+ spec.add_dependency "isodoc", "~> 1.3.0"
35
35
 
36
36
  spec.add_development_dependency "byebug", "~> 9.1"
37
37
  spec.add_development_dependency "sassc", "2.4.0"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-un
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.4
4
+ version: 0.5.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-09-26 00:00:00.000000000 Z
11
+ date: 2020-12-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: roman-numerals
@@ -72,14 +72,14 @@ dependencies:
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 1.2.0
75
+ version: 1.3.0
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: 1.2.0
82
+ version: 1.3.0
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: byebug
85
85
  requirement: !ruby/object:Gem::Requirement
@@ -230,9 +230,7 @@ executables: []
230
230
  extensions: []
231
231
  extra_rdoc_files: []
232
232
  files:
233
- - ".github/workflows/macos.yml"
234
- - ".github/workflows/ubuntu.yml"
235
- - ".github/workflows/windows.yml"
233
+ - ".github/workflows/rake.yml"
236
234
  - ".gitignore"
237
235
  - ".hound.yml"
238
236
  - ".rubocop.yml"
@@ -285,6 +283,7 @@ files:
285
283
  - lib/metanorma-un.rb
286
284
  - lib/metanorma/un.rb
287
285
  - lib/metanorma/un/UN_emblem_blue.svg
286
+ - lib/metanorma/un/fonts_manifest.yaml
288
287
  - lib/metanorma/un/input.rb
289
288
  - lib/metanorma/un/processor.rb
290
289
  - lib/metanorma/un/version.rb
@@ -1,38 +0,0 @@
1
- # Auto-generated by Cimas: Do not edit it manually!
2
- # See https://github.com/metanorma/cimas
3
- name: macos
4
-
5
- on:
6
- push:
7
- branches: [ master ]
8
- pull_request:
9
- paths-ignore:
10
- - .github/workflows/ubuntu.yml
11
- - .github/workflows/windows.yml
12
-
13
- jobs:
14
- test-macos:
15
- name: Test on Ruby ${{ matrix.ruby }} macOS
16
- runs-on: macos-latest
17
- continue-on-error: ${{ matrix.experimental }}
18
- strategy:
19
- fail-fast: false
20
- matrix:
21
- ruby: [ '2.6', '2.5', '2.4' ]
22
- experimental: [false]
23
- include:
24
- - ruby: '2.7'
25
- experimental: true
26
- steps:
27
- - uses: actions/checkout@master
28
- - name: Use Ruby
29
- uses: actions/setup-ruby@v1
30
- with:
31
- ruby-version: ${{ matrix.ruby }}
32
- - name: Update gems
33
- run: |
34
- sudo gem install bundler --force
35
- bundle install --jobs 4 --retry 3
36
- - name: Run specs
37
- run: |
38
- bundle exec rake
@@ -1,56 +0,0 @@
1
- # Auto-generated by Cimas: Do not edit it manually!
2
- # See https://github.com/metanorma/cimas
3
- name: ubuntu
4
-
5
- on:
6
- push:
7
- branches: [ master ]
8
- tags:
9
- - '*'
10
- pull_request:
11
- paths-ignore:
12
- - .github/workflows/macos.yml
13
- - .github/workflows/windows.yml
14
-
15
- jobs:
16
- test-linux:
17
- name: Test on Ruby ${{ matrix.ruby }} Ubuntu
18
- runs-on: ubuntu-latest
19
- continue-on-error: ${{ matrix.experimental }}
20
- strategy:
21
- fail-fast: false
22
- matrix:
23
- ruby: [ '2.6', '2.5', '2.4' ]
24
- experimental: [false]
25
- include:
26
- - ruby: '2.7'
27
- experimental: true
28
- steps:
29
- - uses: actions/checkout@master
30
- - name: Use Ruby
31
- uses: actions/setup-ruby@v1
32
- with:
33
- ruby-version: ${{ matrix.ruby }}
34
- - name: Update gems
35
- run: |
36
- gem install bundler
37
- bundle install --jobs 4 --retry 3
38
- - name: Run specs
39
- run: |
40
- bundle exec rake
41
- - name: Trigger repositories
42
- if: matrix.ruby == '2.6'
43
- env:
44
- GH_USERNAME: metanorma-ci
45
- GH_ACCESS_TOKEN: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
46
- run: |
47
- curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
48
- [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
49
- CLIENT_PAYLOAD=$(cat <<EOF
50
- "{ "ref": "${GITHUB_REF}", "repo": "${GITHUB_REPOSITORY}" }"
51
- EOF
52
- )
53
- for repo in $REPOS
54
- do
55
- sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "$CLIENT_PAYLOAD"
56
- done
@@ -1,40 +0,0 @@
1
- # Auto-generated by Cimas: Do not edit it manually!
2
- # See https://github.com/metanorma/cimas
3
- name: windows
4
-
5
- on:
6
- push:
7
- branches: [ master ]
8
- pull_request:
9
- paths-ignore:
10
- - .github/workflows/macos.yml
11
- - .github/workflows/ubuntu.yml
12
-
13
- jobs:
14
- test-windows:
15
- name: Test on Ruby ${{ matrix.ruby }} Windows
16
- runs-on: windows-latest
17
- continue-on-error: ${{ matrix.experimental }}
18
- strategy:
19
- fail-fast: false
20
- matrix:
21
- ruby: [ '2.6', '2.5', '2.4' ]
22
- experimental: [false]
23
- include:
24
- - ruby: '2.7'
25
- experimental: true
26
- steps:
27
- - uses: actions/checkout@master
28
- - name: Use Ruby
29
- uses: actions/setup-ruby@v1
30
- with:
31
- ruby-version: ${{ matrix.ruby }}
32
- - name: Update gems
33
- shell: pwsh
34
- run: |
35
- gem install bundler
36
- bundle config --local path vendor/bundle
37
- bundle install --jobs 4 --retry 3
38
- - name: Run specs
39
- run: |
40
- bundle exec rake