metanorma-un 0.5.7 → 0.5.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (24) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +7 -5
  3. data/lib/asciidoctor/un/basicdoc.rng +52 -3
  4. data/lib/asciidoctor/un/converter.rb +1 -1
  5. data/lib/asciidoctor/un/isodoc.rng +51 -3
  6. data/lib/isodoc/un/base_convert.rb +1 -1
  7. data/lib/isodoc/un/html/html_unece_intro.html +1 -1
  8. data/lib/isodoc/un/html/htmlstyle.css +3 -3
  9. data/lib/isodoc/un/html/htmlstyle.scss +2 -2
  10. data/lib/isodoc/un/html/unece.css +19 -20
  11. data/lib/isodoc/un/html/unece.scss +19 -20
  12. data/lib/isodoc/un/html/word_unece_intro.html +1 -1
  13. data/lib/isodoc/un/html/wordstyle.css +17 -17
  14. data/lib/isodoc/un/html/wordstyle.scss +17 -17
  15. data/lib/isodoc/un/html_convert.rb +5 -3
  16. data/lib/isodoc/un/un.plenary-attachment.xsl +253 -45
  17. data/lib/isodoc/un/un.plenary.xsl +253 -45
  18. data/lib/isodoc/un/un.recommendation.xsl +254 -46
  19. data/lib/isodoc/un/word_convert.rb +7 -3
  20. data/lib/isodoc/un/xref.rb +4 -2
  21. data/lib/metanorma/un/processor.rb +11 -8
  22. data/lib/metanorma/un/version.rb +1 -1
  23. data/metanorma-unece.gemspec +2 -2
  24. metadata +6 -6
data/lib/isodoc/un/word_convert.rb CHANGED
@@ -16,11 +16,15 @@ module IsoDoc
16
16
 
17
17
  def default_fonts(options)
18
18
  {
19
- bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
19
+ bodyfont: (options[:script] == "Hans" ? '"Source Han Sans",serif' :
20
20
  '"Times New Roman",serif'),
21
- headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
21
+ headerfont: (options[:script] == "Hans" ? '"Source Han Sans",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
 
data/lib/isodoc/un/xref.rb CHANGED
@@ -23,8 +23,10 @@ module IsoDoc
23
23
  def clause_names(docxml, sect_num)
24
24
  q = "//clause[parent::sections]"
25
25
  @paranumber = 0
26
- docxml.xpath(ns(q)).each_with_index do |c, i|
27
- section_names(c, (i + sect_num), 1)
26
+ i = 0
27
+ docxml.xpath(ns(q)).each do |c|
28
+ section_names(c, i, 1)
29
+ i += 1
28
30
  end
29
31
  end
30
32
 
data/lib/metanorma/un/processor.rb CHANGED
@@ -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
@@ -26,6 +18,17 @@ module Metanorma
26
18
  )
27
19
  end
28
20
 
21
+ def fonts_manifest
22
+ {
23
+ "Arial" => nil,
24
+ "Arial Black" => nil,
25
+ "Courier" => nil,
26
+ "Times New Roman" => nil,
27
+ "STIX Two Math" => nil,
28
+ "Source Han Sans" => nil,
29
+ }
30
+ end
31
+
29
32
  def version
30
33
  "Metanorma::UN #{Metanorma::UN::VERSION}"
31
34
  end
data/lib/metanorma/un/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module UN
3
- VERSION = "0.5.7"
3
+ VERSION = "0.5.12"
4
4
  end
5
5
  end
data/metanorma-unece.gemspec CHANGED
@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
30
30
  spec.add_dependency "twitter_cldr"
31
31
  spec.add_dependency "iso-639"
32
32
 
33
- spec.add_dependency "metanorma-standoc", "~> 1.6.0"
34
- spec.add_dependency "isodoc", "~> 1.2.0"
33
+ spec.add_dependency "metanorma-standoc", "~> 1.8.0"
34
+ spec.add_dependency "isodoc", "~> 1.5.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.7
4
+ version: 0.5.12
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-11-09 00:00:00.000000000 Z
11
+ date: 2021-01-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: roman-numerals
@@ -58,28 +58,28 @@ dependencies:
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 1.6.0
61
+ version: 1.8.0
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 1.6.0
68
+ version: 1.8.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: isodoc
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 1.2.0
75
+ version: 1.5.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.5.0
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: byebug
85
85
  requirement: !ruby/object:Gem::Requirement