metanorma-generic 1.8.2 → 1.9.0

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 (10) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/generic/basicdoc.rng +5 -3
  3. data/lib/asciidoctor/generic/converter.rb +1 -1
  4. data/lib/asciidoctor/generic/isodoc.rng +3 -0
  5. data/lib/isodoc/generic/html_convert.rb +2 -2
  6. data/lib/isodoc/generic/pdf_convert.rb +2 -2
  7. data/lib/isodoc/generic/word_convert.rb +2 -2
  8. data/lib/metanorma/generic/version.rb +1 -1
  9. data/metanorma-generic.gemspec +2 -2
  10. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: fe8ede218e4a08dcca9458e6c27ea4079c130723c5a66e6585949bbd9355bea7
4
- data.tar.gz: 8ddf9e1982c5b9b25909c49b7078bb2312e0fa4c7f446af8f914cd1c469785a8
3
+ metadata.gz: e582ecd8d43de406e8186a479152cf628582ffae80dc6f5430d1e11285457224
4
+ data.tar.gz: 3bbfbb2e35eee67d57135da7c4f53426ed25c45e9c665300fbfcacf9a506dff8
5
5
  SHA512:
6
- metadata.gz: d1e637f0f8b278addf710e060eb889316a83dd585da6856829ae505f1dae4ac0792b80652d1c1162b4350fb7ab7e04d3abace5e26e460c9fe4c48114c9322416
7
- data.tar.gz: 756fc1dad9d182e3a8830a06aaa8efd5e77569b8648ac10e7bd651b27f1800d0150171e8a49ee4d32d0e6b7e51e24c84b0ffc0dd6ef4f158a6efaa3ee9bcacc1
6
+ metadata.gz: 0edb8842be7662c773da294789c4fd0ce1c8d4b6efa653098bf220a3296dd889abf3348bcf77cd215fab4c6b8b28828c55cab82c1ed1033c79738f435f6f9f11
7
+ data.tar.gz: 30938a4bc5b6e60ebcb7e725a327d69baf0bab6a9694441792a176d7492a64953d0976159471fe6809564097cc8dc622171122e53c5ee77af1a5a3421d869960
data/lib/asciidoctor/generic/basicdoc.rng CHANGED
@@ -729,9 +729,11 @@
729
729
  </define>
730
730
  <define name="index">
731
731
  <element name="index">
732
- <attribute name="to">
733
- <data type="IDREF"/>
734
- </attribute>
732
+ <optional>
733
+ <attribute name="to">
734
+ <data type="IDREF"/>
735
+ </attribute>
736
+ </optional>
735
737
  <element name="primary">
736
738
  <oneOrMore>
737
739
  <ref name="PureTextElement"/>
data/lib/asciidoctor/generic/converter.rb CHANGED
@@ -150,7 +150,7 @@ module Asciidoctor
150
150
  def boilerplate_isodoc(xmldoc)
151
151
  conv = super
152
152
  Metanorma::Generic::Configuration::CONFIG_ATTRS.each do |a|
153
- conv.i18n.set(a, configuration.send(a))
153
+ conv.meta.set(a, configuration.send(a))
154
154
  end
155
155
  conv
156
156
  end
data/lib/asciidoctor/generic/isodoc.rng CHANGED
@@ -789,6 +789,9 @@
789
789
  <attribute name="width"/>
790
790
  </element>
791
791
  </define>
792
+ <define name="BibItemType" combine="choice">
793
+ <value>internal</value>
794
+ </define>
792
795
  <define name="TextElement" combine="choice">
793
796
  <ref name="concept"/>
794
797
  </define>
data/lib/isodoc/generic/html_convert.rb CHANGED
@@ -25,11 +25,11 @@ module IsoDoc
25
25
  def default_fonts(options)
26
26
  {
27
27
  bodyfont: (
28
- options[:script] == "Hans" ? '"SimSun",serif' :
28
+ options[:script] == "Hans" ? '"Source Han Sans",serif' :
29
29
  configuration.html_bodyfont || '"Overpass",sans-serif'
30
30
  ),
31
31
  headerfont: (
32
- options[:script] == "Hans" ? '"SimHei",sans-serif' :
32
+ options[:script] == "Hans" ? '"Source Han Sans",sans-serif' :
33
33
  configuration.html_headerfont || '"Overpass",sans-serif'
34
34
  ),
35
35
  monospacefont: configuration.html_monospacefont || '"Space Mono",monospace',
data/lib/isodoc/generic/pdf_convert.rb CHANGED
@@ -22,9 +22,9 @@ module IsoDoc
22
22
 
23
23
  def default_fonts(options)
24
24
  {
25
- bodyfont: (options[:script] == "Hans" ? '"SimSun",serif'
25
+ bodyfont: (options[:script] == "Hans" ? '"Source Han Sans",serif'
26
26
  : configuration.html_bodyfont || '"Overpass",sans-serif'),
27
- headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
27
+ headerfont: (options[:script] == "Hans" ? '"Source Han Sans",sans-serif' :
28
28
  configuration.html_headerfont || '"Overpass",sans-serif'),
29
29
  monospacefont: configuration.html_monospacefont || '"Space Mono",monospace'
30
30
  }.transform_values { |v| v&.empty? ? nil : v }
data/lib/isodoc/generic/word_convert.rb CHANGED
@@ -24,11 +24,11 @@ module IsoDoc
24
24
  def default_fonts(options)
25
25
  {
26
26
  bodyfont: (
27
- options[:script] == "Hans" ? '"SimSun",serif' :
27
+ options[:script] == "Hans" ? '"Source Han Sans",serif' :
28
28
  configuration.word_bodyfont || '"Arial",sans-serif'
29
29
  ),
30
30
  headerfont: (
31
- options[:script] == "Hans" ? '"SimHei",sans-serif' :
31
+ options[:script] == "Hans" ? '"Source Han Sans",sans-serif' :
32
32
  configuration.word_headerfont || '"Arial",sans-serif'
33
33
  ),
34
34
  monospacefont: configuration.word_monospacefont || '"Courier New",monospace',
data/lib/metanorma/generic/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Generic
3
- VERSION = "1.8.2"
3
+ VERSION = "1.9.0"
4
4
  end
5
5
  end
data/metanorma-generic.gemspec CHANGED
@@ -28,8 +28,8 @@ Gem::Specification.new do |spec|
28
28
 
29
29
  spec.add_dependency "htmlentities", "~> 4.3.4"
30
30
  spec.add_dependency "ruby-jing"
31
- spec.add_dependency "metanorma-standoc", "~> 1.7.0"
32
- spec.add_dependency "isodoc", "~> 1.4.2"
31
+ spec.add_dependency "metanorma-standoc", "~> 1.8.0"
32
+ spec.add_dependency "isodoc", "~> 1.5.0"
33
33
 
34
34
  spec.add_development_dependency "byebug", "~> 9.1"
35
35
  spec.add_development_dependency "sassc", "2.4.0"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-generic
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.8.2
4
+ version: 1.9.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-01-11 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: htmlentities
@@ -44,28 +44,28 @@ dependencies:
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 1.7.0
47
+ version: 1.8.0
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: 1.7.0
54
+ version: 1.8.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: isodoc
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 1.4.2
61
+ version: 1.5.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.4.2
68
+ version: 1.5.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: byebug
71
71
  requirement: !ruby/object:Gem::Requirement