metanorma-gb 1.1.4 → 1.1.5

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 (8) hide show
  1. checksums.yaml +4 -4
  2. data/appveyor.yml +30 -0
  3. data/lib/asciidoctor/gb/biblio.rng +20 -17
  4. data/lib/isodoc/gb/html/scripts.html +1 -1
  5. data/lib/isodoc/gb/metadata.rb +3 -2
  6. data/lib/metanorma/gb/version.rb +1 -1
  7. data/metanorma-gb.gemspec +2 -1
  8. metadata +21 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4b188cd8949516d5a329e9359dffc4d2d4435093d0828eee08fccb1b4f2fd56f
4
- data.tar.gz: dd5f07e29f3929c69cc2eb14f7302caafee0b949f7a847a781f185bcd1aabafa
3
+ metadata.gz: 3fec842de3e1c5c0f4ad6fe1c9b13a3fe448066251a60c4d66dd50886e72190b
4
+ data.tar.gz: ec0412344ccab13f63993aa343336afa7a7d0dce3cc15c821b7ec8a5f1deb6c3
5
5
  SHA512:
6
- metadata.gz: f6e44b4c312a86af41d5a1a4ab4f5da0ee1e5d6ea68ee5b45d73b2d4911d085d2b2b5cf05c02ae6b15019554b97fb6eaf96e5c002a5e152b4ef5aee56237b6a9
7
- data.tar.gz: f954252119693d800bcf4eca0f475f4bed5ef6b514da40972f591dae5d594f6f21b8e3216d7caa590b1c0a290aaa573a10f0d92919a4af35af6d251c6c110f14
6
+ metadata.gz: 475de33defa1d053ed391c9ab7f5c0ec321b3a2d6416ebb9b03c7e13a1c418935f7c978d5c188328ec760b60cb3e2c59b8934d2cd27ba2c7b84749a658e75c00
7
+ data.tar.gz: c4143a0860cbc6b5f406c6335d718c8e6a0ca7d1c498e152ac16e549baedec8a48ed6cedde6e9a2da417c5f003980dc8011bff4a70d4e32a462b054ce1d1fc43
data/appveyor.yml ADDED
@@ -0,0 +1,30 @@
1
+ version: '{build}'
2
+
3
+ environment:
4
+ matrix:
5
+ - RUBY_VERSION: 25
6
+ - RUBY_VERSION: 24
7
+ - RUBY_VERSION: 23
8
+ - RUBY_VERSION: _trunk
9
+
10
+ matrix:
11
+ allow_failures:
12
+ - RUBY_VERSION: _trunk
13
+
14
+ install:
15
+ - ps: . { iwr -useb https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/appveyor.ps1 } | iex
16
+ - refreshenv
17
+
18
+ build_script:
19
+ - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
20
+ - bundle update
21
+ - bundle install
22
+
23
+ before_test:
24
+ - ruby -v
25
+ - gem -v
26
+ - bundle -v
27
+
28
+ test_script:
29
+ - bundle exec rake
30
+
data/lib/asciidoctor/gb/biblio.rng CHANGED
@@ -837,26 +837,29 @@
837
837
  <ref name="ContributorInfo"/>
838
838
  </element>
839
839
  </define>
840
+ <define name="DocRelationType">
841
+ <choice>
842
+ <value>obsoletes</value>
843
+ <value>updates</value>
844
+ <value>updatedBy</value>
845
+ <value>complements</value>
846
+ <value>derivedFrom</value>
847
+ <value>translatedFrom</value>
848
+ <value>adoptedFrom</value>
849
+ <value>equivalent</value>
850
+ <value>identical</value>
851
+ <value>nonequivalent</value>
852
+ <value>includedIn</value>
853
+ <value>includes</value>
854
+ <value>instance</value>
855
+ <value>partOf</value>
856
+ <value>hasDraft</value>
857
+ </choice>
858
+ </define>
840
859
  <define name="docrelation">
841
860
  <element name="relation">
842
861
  <attribute name="type">
843
- <choice>
844
- <value>obsoletes</value>
845
- <value>updates</value>
846
- <value>updatedBy</value>
847
- <value>complements</value>
848
- <value>derivedFrom</value>
849
- <value>translatedFrom</value>
850
- <value>adoptedFrom</value>
851
- <value>equivalent</value>
852
- <value>identical</value>
853
- <value>nonequivalent</value>
854
- <value>includedIn</value>
855
- <value>includes</value>
856
- <value>instance</value>
857
- <value>partOf</value>
858
- <value>hasDraft</value>
859
- </choice>
862
+ <ref name="DocRelationType"/>
860
863
  </attribute>
861
864
  <element name="bibitem">
862
865
  <ref name="BibliographicItem"/>
data/lib/isodoc/gb/html/scripts.html CHANGED
@@ -1,7 +1,7 @@
1
1
  <script>
2
2
  //TOC generation
3
3
  $('#toc').toc({
4
- 'selectors': 'h1,h2:not(.TermNum)', //elements to use as headings
4
+ 'selectors': toclevel(), //elements to use as headings
5
5
  'container': 'main', //element to find all selectors in
6
6
  'smoothScrolling': true, //enable or disable smooth scrolling on click
7
7
  'prefix': 'toc', //prefix for anchor tags and class names
data/lib/isodoc/gb/metadata.rb CHANGED
@@ -1,5 +1,6 @@
1
1
  require "isodoc"
2
2
  require "twitter_cldr"
3
+ require "htmlentities"
3
4
 
4
5
  module IsoDoc
5
6
  module Gb
@@ -109,8 +110,8 @@ module IsoDoc
109
110
  def stage_abbrev_cn(stage, iter, draft)
110
111
  return stage_abbrev(stage, iter, draft) if @lang != "zh"
111
112
  stage = STAGE_ABBRS_CN[stage.to_sym] || "??"
112
- stage = "#{iter.text.to_i.localize(:zh).spellout}次#{stage}" if iter
113
- stage = "Pre" + stage if draft&.text =~ /^0\./
113
+ stage = "#{iter.text.to_i.localize(:zh).spellout.force_encoding("UTF-8")}次#{stage}" if iter
114
+ stage = "Pre" + HTMLEntities.new.encode(stage, :hexadecimal) if draft&.text =~ /^0\./
114
115
  stage
115
116
  end
116
117
 
data/lib/metanorma/gb/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Gb
3
- VERSION = "1.1.4"
3
+ VERSION = "1.1.5"
4
4
  end
5
5
  end
data/metanorma-gb.gemspec CHANGED
@@ -30,8 +30,9 @@ Gem::Specification.new do |spec|
30
30
 
31
31
  spec.add_dependency "metanorma-iso", "~> 1.1.0"
32
32
  spec.add_dependency "isodoc", "~> 0.9.1"
33
- spec.add_dependency "twitter_cldr"
33
+ spec.add_dependency "twitter_cldr", "~> 4.4.4"
34
34
  spec.add_dependency "gb-agencies", "~> 0.0.4"
35
+ spec.add_dependency "htmlentities", "~> 4.3.4"
35
36
 
36
37
  spec.add_development_dependency "bundler", "~> 2.0.1"
37
38
  spec.add_development_dependency "byebug", "~> 9.1"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-gb
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.4
4
+ version: 1.1.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2019-03-23 00:00:00.000000000 Z
11
+ date: 2019-04-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-iso
@@ -42,16 +42,16 @@ dependencies:
42
42
  name: twitter_cldr
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ">="
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: '0'
47
+ version: 4.4.4
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ">="
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: '0'
54
+ version: 4.4.4
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: gb-agencies
57
57
  requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
68
  version: 0.0.4
69
+ - !ruby/object:Gem::Dependency
70
+ name: htmlentities
71
+ requirement: !ruby/object:Gem::Requirement
72
+ requirements:
73
+ - - "~>"
74
+ - !ruby/object:Gem::Version
75
+ version: 4.3.4
76
+ type: :runtime
77
+ prerelease: false
78
+ version_requirements: !ruby/object:Gem::Requirement
79
+ requirements:
80
+ - - "~>"
81
+ - !ruby/object:Gem::Version
82
+ version: 4.3.4
69
83
  - !ruby/object:Gem::Dependency
70
84
  name: bundler
71
85
  requirement: !ruby/object:Gem::Requirement
@@ -243,6 +257,7 @@ files:
243
257
  - LICENSE
244
258
  - README.adoc
245
259
  - Rakefile
260
+ - appveyor.yml
246
261
  - asciidoctor-gb.gemspec.old
247
262
  - bin/console
248
263
  - bin/rspec