metanorma-m3aawg 2.1.8.1 → 2.1.9

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 045ce58a3bfec9df2645c1d5aa0ec057946625b1e051813958d7cc8534dec911
4
- data.tar.gz: 47dd69ec834652367ff9887cc86ea286b94954e9da9a8ce9d82c8c674bb46b9c
3
+ metadata.gz: 3e6a8c255816fe32ee11b897d828b8ff054615270bf59444c1f4677d72e09cad
4
+ data.tar.gz: a5abf0ed95b7a5689b1ed6ededcc36a5987ca8766b878474be47434866580ba8
5
5
  SHA512:
6
- metadata.gz: a7f023448dab072f412abf8621796233838483a7d794107a1fc44bbb3e9743d72ce95326116009258c6785eec5635cf2c15b27fc392de870ca25bfa9f15dc4e4
7
- data.tar.gz: 8c955a578e69be60898499e29ed39e0370d374d8a3953bb8fbc79eda613918afd7b68c4f6a7661b7fe8dbb32d638f691e84684054102c6ef56c2c83b82d36f5d
6
+ metadata.gz: 2ce181dddebcd450322f87b3d45f6677ca0e1eba51c61421a8a4ce84d452b85cf5870a20d1789152fa208aa8f0a0ce01b6ffdb53d0d11ad451b624da32d06cd4
7
+ data.tar.gz: 86cbb014f8661cf8caa1a1ec008bdcc6ddf3fcabb00a4f210730ebdc0766bdce0c49f0ef27d627f5f6051489f76e8f51e5915b9ed0129ed29e1a7fbcaefbfeb7
@@ -6,8 +6,8 @@ require_relative "i18n"
6
6
  module IsoDoc
7
7
  module M3AAWG
8
8
  module Init
9
- def metadata_init(lang, script, labels)
10
- @meta = Metadata.new(lang, script, labels)
9
+ def metadata_init(lang, script, locale, labels)
10
+ @meta = Metadata.new(lang, script, locale, labels)
11
11
  end
12
12
 
13
13
  def xref_init(lang, script, _klass, labels, options)
@@ -15,10 +15,10 @@ module IsoDoc
15
15
  @xrefs = Xref.new(lang, script, html, labels, options)
16
16
  end
17
17
 
18
- def i18n_init(lang, script, i18nyaml = nil)
19
- @i18n = I18n.new(lang, script, i18nyaml: i18nyaml || @i18nyaml)
18
+ def i18n_init(lang, script, locale, i18nyaml = nil)
19
+ @i18n = I18n.new(lang, script, locale: locale,
20
+ i18nyaml: i18nyaml || @i18nyaml)
20
21
  end
21
22
  end
22
23
  end
23
24
  end
24
-
@@ -6422,6 +6422,18 @@
6422
6422
  </xsl:copy>
6423
6423
  </xsl:template>
6424
6424
 
6425
+ <xsl:template match="*[local-name() = 'sub']" mode="contents_item">
6426
+ <xsl:copy>
6427
+ <xsl:apply-templates mode="contents_item"/>
6428
+ </xsl:copy>
6429
+ </xsl:template>
6430
+
6431
+ <xsl:template match="*[local-name() = 'sup']" mode="contents_item">
6432
+ <xsl:copy>
6433
+ <xsl:apply-templates mode="contents_item"/>
6434
+ </xsl:copy>
6435
+ </xsl:template>
6436
+
6425
6437
  <xsl:template match="*[local-name() = 'stem']" mode="contents_item">
6426
6438
  <xsl:copy-of select="."/>
6427
6439
  </xsl:template>
@@ -6422,6 +6422,18 @@
6422
6422
  </xsl:copy>
6423
6423
  </xsl:template>
6424
6424
 
6425
+ <xsl:template match="*[local-name() = 'sub']" mode="contents_item">
6426
+ <xsl:copy>
6427
+ <xsl:apply-templates mode="contents_item"/>
6428
+ </xsl:copy>
6429
+ </xsl:template>
6430
+
6431
+ <xsl:template match="*[local-name() = 'sup']" mode="contents_item">
6432
+ <xsl:copy>
6433
+ <xsl:apply-templates mode="contents_item"/>
6434
+ </xsl:copy>
6435
+ </xsl:template>
6436
+
6425
6437
  <xsl:template match="*[local-name() = 'stem']" mode="contents_item">
6426
6438
  <xsl:copy-of select="."/>
6427
6439
  </xsl:template>
@@ -3,11 +3,11 @@ require "isodoc"
3
3
  module IsoDoc
4
4
  module M3AAWG
5
5
  class Metadata < IsoDoc::Generic::Metadata
6
- def configuration
6
+ def configuration
7
7
  Metanorma::M3AAWG.configuration
8
8
  end
9
9
 
10
- def initialize(lang, script, labels)
10
+ def initialize(lang, script, locale, labels)
11
11
  super
12
12
  here = File.dirname(__FILE__)
13
13
  set(:logo_html,
@@ -73,8 +73,14 @@
73
73
  <text/>
74
74
  </element>
75
75
  </define>
76
- <define name="script">
76
+ <define name="locale">
77
77
  <a:documentation>ISO-639</a:documentation>
78
+ <element name="locale">
79
+ <text/>
80
+ </element>
81
+ </define>
82
+ <define name="script">
83
+ <a:documentation>ISO-3166</a:documentation>
78
84
  <element name="script">
79
85
  <text/>
80
86
  </element>
@@ -93,6 +99,9 @@
93
99
  <!-- multiple languages and scripts possible: comma delimit them if so -->
94
100
  <attribute name="language"/>
95
101
  </optional>
102
+ <optional>
103
+ <attribute name="locale"/>
104
+ </optional>
96
105
  <optional>
97
106
  <attribute name="script"/>
98
107
  </optional>
@@ -136,6 +145,9 @@
136
145
  <!-- multiple languages and scripts possible: comma delimit them if so -->
137
146
  <attribute name="language"/>
138
147
  </optional>
148
+ <optional>
149
+ <attribute name="locale"/>
150
+ </optional>
139
151
  <optional>
140
152
  <attribute name="script"/>
141
153
  </optional>
@@ -650,6 +662,9 @@
650
662
  <zeroOrMore>
651
663
  <ref name="language"/>
652
664
  </zeroOrMore>
665
+ <zeroOrMore>
666
+ <ref name="locale"/>
667
+ </zeroOrMore>
653
668
  <zeroOrMore>
654
669
  <ref name="script"/>
655
670
  </zeroOrMore>
@@ -741,6 +756,9 @@
741
756
  <zeroOrMore>
742
757
  <ref name="language"/>
743
758
  </zeroOrMore>
759
+ <zeroOrMore>
760
+ <ref name="locale"/>
761
+ </zeroOrMore>
744
762
  <zeroOrMore>
745
763
  <ref name="script"/>
746
764
  </zeroOrMore>
@@ -854,6 +872,15 @@
854
872
  <optional>
855
873
  <attribute name="type"/>
856
874
  </optional>
875
+ <optional>
876
+ <attribute name="language"/>
877
+ </optional>
878
+ <optional>
879
+ <attribute name="locale"/>
880
+ </optional>
881
+ <optional>
882
+ <attribute name="script"/>
883
+ </optional>
857
884
  <data type="anyURI"/>
858
885
  </define>
859
886
  <define name="DateType">
@@ -882,6 +909,7 @@
882
909
  <value>vote-started</value>
883
910
  <value>vote-ended</value>
884
911
  <value>announced</value>
912
+ <value>stable-until</value>
885
913
  </choice>
886
914
  </define>
887
915
  <define name="bdate">
@@ -930,6 +958,9 @@
930
958
  <optional>
931
959
  <attribute name="language"/>
932
960
  </optional>
961
+ <optional>
962
+ <attribute name="locale"/>
963
+ </optional>
933
964
  <optional>
934
965
  <attribute name="script"/>
935
966
  </optional>
@@ -3,12 +3,12 @@ require "metanorma/processor"
3
3
  module Metanorma
4
4
  module M3AAWG
5
5
  class Processor < Metanorma::Generic::Processor
6
- def configuration
6
+ def configuration
7
7
  Metanorma::Ribose.configuration
8
8
  end
9
9
 
10
- def initialize
11
- @short = [:m3d, :m3aawg]
10
+ def initialize # rubocop:disable Lint/MissingSuper
11
+ @short = %i[m3d m3aawg]
12
12
  @input_format = :asciidoc
13
13
  @asciidoctor_backend = :m3aawg
14
14
  end
@@ -17,7 +17,7 @@ module Metanorma
17
17
  super.merge(
18
18
  html: "html",
19
19
  doc: "doc",
20
- pdf: "pdf"
20
+ pdf: "pdf",
21
21
  )
22
22
  end
23
23
 
@@ -36,21 +36,24 @@ module Metanorma
36
36
  "Metanorma::M3AAWG #{Metanorma::M3AAWG::VERSION}"
37
37
  end
38
38
 
39
- def output(isodoc_node, inname, outname, format, options={})
39
+ def output(isodoc_node, inname, outname, format, options = {})
40
40
  case format
41
41
  when :html
42
- IsoDoc::M3AAWG::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
42
+ IsoDoc::M3AAWG::HtmlConvert.new(options)
43
+ .convert(inname, isodoc_node, nil, outname)
43
44
  when :doc
44
- IsoDoc::M3AAWG::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
45
+ IsoDoc::M3AAWG::WordConvert.new(options)
46
+ .convert(inname, isodoc_node, nil, outname)
45
47
  when :pdf
46
- IsoDoc::M3AAWG::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
48
+ IsoDoc::M3AAWG::PdfConvert.new(options)
49
+ .convert(inname, isodoc_node, nil, outname)
47
50
  when :presentation
48
- IsoDoc::M3AAWG::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
51
+ IsoDoc::M3AAWG::PresentationXMLConvert.new(options)
52
+ .convert(inname, isodoc_node, nil, outname)
49
53
  else
50
54
  super
51
55
  end
52
56
  end
53
-
54
57
  end
55
58
  end
56
59
  end
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module M3AAWG
3
- VERSION = "2.1.8.1".freeze
3
+ VERSION = "2.1.9".freeze
4
4
  end
5
5
  end
@@ -6,9 +6,6 @@ module Metanorma
6
6
  module M3AAWG
7
7
 
8
8
  class Configuration < Metanorma::Generic::Configuration
9
- def initialize(*args)
10
- super
11
- end
12
9
  end
13
10
 
14
11
  class << self
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
31
31
  spec.add_dependency "htmlentities", "~> 4.3.4"
32
32
  spec.add_dependency "thread_safe"
33
33
 
34
- spec.add_dependency "metanorma-generic", "~> 2.2.0"
34
+ spec.add_dependency "metanorma-generic", "~> 2.2.2"
35
35
 
36
36
  spec.add_development_dependency "debug"
37
37
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-m3aawg
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.8.1
4
+ version: 2.1.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: 2022-09-07 00:00:00.000000000 Z
11
+ date: 2022-09-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities
@@ -44,14 +44,14 @@ dependencies:
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 2.2.0
47
+ version: 2.2.2
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: 2.2.0
54
+ version: 2.2.2
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: debug
57
57
  requirement: !ruby/object:Gem::Requirement