metanorma-generic 2.1.2 → 2.2.1

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: f62fbca91a932dfd2962b5bc10e5fcb2ee58b26dbc1caead516decf679fa1fe3
4
- data.tar.gz: 3b940ed44e676a48c5d263e57651e5e18883148fedc04776c27e31821552b083
3
+ metadata.gz: 6d63bf1d87c09663880e45e6331afa0a2364d49820bb245018c3c96694177713
4
+ data.tar.gz: d3e942091b59f89c572911e6174822f8c730760fafd2d5e259a132c38bb533ba
5
5
  SHA512:
6
- metadata.gz: af9a7f040d1a5202ab38d52b34705bdff7130c3513a479bf2f9530bd9f012869359408c09da7e644995b897c925a3e2ffd2131d8f85f06b78c13de6734206f16
7
- data.tar.gz: b4fa73685306cff6096ed6cb7689e755feee0666b494d56ea68d940e31f373ae146293c2fd4ccef9b4b025bb66db965762d2f4f4c852aa025dd7596d1fdea992
6
+ metadata.gz: 8ff667157f85378d802293fea0c04f423006b7275ff4d5432adfda56d4690f0db7377207716779c50f5a89244402a714764d02e970058e545ffcbde13e8766b5
7
+ data.tar.gz: d01432c7ea3fa4c73bd3087afa78b734af835bf9946d2c2788c36ac145985e68c927a1ed1c9b32ee357bb27e538d3ccaad909356994536a231a150b67a91bf1a
@@ -10,6 +10,6 @@ on:
10
10
 
11
11
  jobs:
12
12
  notify:
13
- uses: metanorma/metanorma-build-scripts/.github/workflows/mn-processor-rake.yml@main
13
+ uses: metanorma/ci/.github/workflows/mn-processor-rake.yml@main
14
14
  secrets:
15
15
  pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
@@ -0,0 +1,24 @@
1
+ # Auto-generated by Cimas: Do not edit it manually!
2
+ # See https://github.com/metanorma/cimas
3
+ name: release
4
+
5
+ on:
6
+ workflow_dispatch:
7
+ inputs:
8
+ next_version:
9
+ description: |
10
+ Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
11
+ required: true
12
+ default: 'skip'
13
+ push:
14
+ tags: [ v* ]
15
+
16
+ jobs:
17
+ release:
18
+ uses: metanorma/ci/.github/workflows/rubygems-release.yml@main
19
+ with:
20
+ next_version: ${{ github.event.inputs.next_version }}
21
+ secrets:
22
+ rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
23
+ pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
24
+
@@ -75,7 +75,7 @@
75
75
  <div class="info-section">
76
76
  <div class="copyright">
77
77
  <p class="year">
78
- &copy; {{ docyear }} {{ publisher }}
78
+ &#xa9; {{ docyear }} {{ publisher }}
79
79
  </p>
80
80
 
81
81
  <p class="message">
@@ -225,9 +225,9 @@
225
225
  <zeroOrMore>
226
226
  <ref name="forename"/>
227
227
  </zeroOrMore>
228
- <zeroOrMore>
229
- <ref name="initial"/>
230
- </zeroOrMore>
228
+ <optional>
229
+ <ref name="formatted-initials"/>
230
+ </optional>
231
231
  <ref name="surname"/>
232
232
  <zeroOrMore>
233
233
  <ref name="addition"/>
@@ -247,8 +247,8 @@
247
247
  <ref name="LocalizedString"/>
248
248
  </element>
249
249
  </define>
250
- <define name="initial">
251
- <element name="initial">
250
+ <define name="formatted-initials">
251
+ <element name="formatted-initials">
252
252
  <ref name="LocalizedString"/>
253
253
  </element>
254
254
  </define>
@@ -264,6 +264,9 @@
264
264
  </define>
265
265
  <define name="forename">
266
266
  <element name="forename">
267
+ <optional>
268
+ <attribute name="initial"/>
269
+ </optional>
267
270
  <ref name="LocalizedString"/>
268
271
  </element>
269
272
  </define>
@@ -623,6 +626,97 @@
623
626
  <zeroOrMore>
624
627
  <ref name="bsource"/>
625
628
  </zeroOrMore>
629
+ <oneOrMore>
630
+ <ref name="docidentifier"/>
631
+ </oneOrMore>
632
+ <optional>
633
+ <ref name="docnumber"/>
634
+ </optional>
635
+ <zeroOrMore>
636
+ <ref name="bdate"/>
637
+ </zeroOrMore>
638
+ <zeroOrMore>
639
+ <ref name="contributor"/>
640
+ </zeroOrMore>
641
+ <optional>
642
+ <ref name="edition"/>
643
+ </optional>
644
+ <zeroOrMore>
645
+ <ref name="version"/>
646
+ </zeroOrMore>
647
+ <zeroOrMore>
648
+ <ref name="biblionote"/>
649
+ </zeroOrMore>
650
+ <zeroOrMore>
651
+ <ref name="language"/>
652
+ </zeroOrMore>
653
+ <zeroOrMore>
654
+ <ref name="script"/>
655
+ </zeroOrMore>
656
+ <zeroOrMore>
657
+ <ref name="bibabstract"/>
658
+ </zeroOrMore>
659
+ <optional>
660
+ <ref name="status"/>
661
+ </optional>
662
+ <zeroOrMore>
663
+ <ref name="copyright"/>
664
+ </zeroOrMore>
665
+ <zeroOrMore>
666
+ <ref name="docrelation"/>
667
+ </zeroOrMore>
668
+ <zeroOrMore>
669
+ <ref name="series"/>
670
+ </zeroOrMore>
671
+ <optional>
672
+ <ref name="medium"/>
673
+ </optional>
674
+ <zeroOrMore>
675
+ <ref name="bplace"/>
676
+ </zeroOrMore>
677
+ <zeroOrMore>
678
+ <ref name="bprice"/>
679
+ </zeroOrMore>
680
+ <zeroOrMore>
681
+ <ref name="extent"/>
682
+ </zeroOrMore>
683
+ <optional>
684
+ <ref name="bibliographic_size"/>
685
+ </optional>
686
+ <zeroOrMore>
687
+ <ref name="accesslocation"/>
688
+ </zeroOrMore>
689
+ <zeroOrMore>
690
+ <ref name="license"/>
691
+ </zeroOrMore>
692
+ <zeroOrMore>
693
+ <ref name="bclassification"/>
694
+ </zeroOrMore>
695
+ <zeroOrMore>
696
+ <ref name="bkeyword"/>
697
+ </zeroOrMore>
698
+ <optional>
699
+ <ref name="validity"/>
700
+ </optional>
701
+ </define>
702
+ <define name="ReducedBibliographicItem">
703
+ <optional>
704
+ <attribute name="type">
705
+ <ref name="BibItemType"/>
706
+ </attribute>
707
+ </optional>
708
+ <optional>
709
+ <ref name="fetched"/>
710
+ </optional>
711
+ <optional>
712
+ <ref name="formattedref"/>
713
+ </optional>
714
+ <zeroOrMore>
715
+ <ref name="btitle"/>
716
+ </zeroOrMore>
717
+ <zeroOrMore>
718
+ <ref name="bsource"/>
719
+ </zeroOrMore>
626
720
  <zeroOrMore>
627
721
  <ref name="docidentifier"/>
628
722
  </zeroOrMore>
@@ -638,9 +732,9 @@
638
732
  <optional>
639
733
  <ref name="edition"/>
640
734
  </optional>
641
- <optional>
735
+ <zeroOrMore>
642
736
  <ref name="version"/>
643
- </optional>
737
+ </zeroOrMore>
644
738
  <zeroOrMore>
645
739
  <ref name="biblionote"/>
646
740
  </zeroOrMore>
@@ -833,6 +927,12 @@
833
927
  <data type="boolean"/>
834
928
  </attribute>
835
929
  </optional>
930
+ <optional>
931
+ <attribute name="language"/>
932
+ </optional>
933
+ <optional>
934
+ <attribute name="script"/>
935
+ </optional>
836
936
  <text/>
837
937
  </element>
838
938
  </define>
@@ -1172,7 +1272,7 @@
1172
1272
  </element>
1173
1273
  </optional>
1174
1274
  <element name="bibitem">
1175
- <ref name="BibliographicItem"/>
1275
+ <ref name="ReducedBibliographicItem"/>
1176
1276
  </element>
1177
1277
  <choice>
1178
1278
  <zeroOrMore>
@@ -1197,9 +1297,9 @@
1197
1297
  <optional>
1198
1298
  <ref name="revision-date"/>
1199
1299
  </optional>
1200
- <zeroOrMore>
1300
+ <optional>
1201
1301
  <ref name="draft"/>
1202
- </zeroOrMore>
1302
+ </optional>
1203
1303
  </element>
1204
1304
  </define>
1205
1305
  <define name="vedition">
@@ -65,7 +65,7 @@ module Metanorma
65
65
  elsif configuration&.bibliography_titles&.map(&:downcase)&.include? ret
66
66
  "bibliography"
67
67
  else
68
- ret
68
+ super
69
69
  end
70
70
  end
71
71
 
@@ -69,6 +69,17 @@
69
69
  </zeroOrMore>
70
70
  </element>
71
71
  </define>
72
+ <define name="AdmonitionType">
73
+ <choice>
74
+ <value>warning</value>
75
+ <value>note</value>
76
+ <value>tip</value>
77
+ <value>important</value>
78
+ <value>caution</value>
79
+ <value>statement</value>
80
+ <value>editorial</value>
81
+ </choice>
82
+ </define>
72
83
  <define name="index">
73
84
  <element name="index">
74
85
  <optional>
@@ -116,6 +127,11 @@
116
127
  <data type="boolean"/>
117
128
  </attribute>
118
129
  </optional>
130
+ <optional>
131
+ <attribute name="suppress_identifier">
132
+ <data type="boolean"/>
133
+ </attribute>
134
+ </optional>
119
135
  <ref name="BibliographicItem"/>
120
136
  </element>
121
137
  </define>
@@ -703,6 +719,9 @@
703
719
  <optional>
704
720
  <attribute name="tag"/>
705
721
  </optional>
722
+ <optional>
723
+ <attribute name="type"/>
724
+ </optional>
706
725
  <optional>
707
726
  <attribute name="multilingual-rendering">
708
727
  <ref name="MultilingualRenderingType"/>
@@ -738,6 +757,9 @@
738
757
  <optional>
739
758
  <attribute name="tag"/>
740
759
  </optional>
760
+ <optional>
761
+ <attribute name="type"/>
762
+ </optional>
741
763
  <optional>
742
764
  <attribute name="multilingual-rendering">
743
765
  <ref name="MultilingualRenderingType"/>
@@ -1263,7 +1285,12 @@
1263
1285
  </define>
1264
1286
  <define name="span">
1265
1287
  <element name="span">
1266
- <attribute name="class"/>
1288
+ <optional>
1289
+ <attribute name="class"/>
1290
+ </optional>
1291
+ <optional>
1292
+ <attribute name="style"/>
1293
+ </optional>
1267
1294
  <oneOrMore>
1268
1295
  <ref name="TextElement"/>
1269
1296
  </oneOrMore>
@@ -2059,6 +2086,7 @@
2059
2086
  <value>compare</value>
2060
2087
  <value>contrast</value>
2061
2088
  <value>see</value>
2089
+ <value>seealso</value>
2062
2090
  </choice>
2063
2091
  </define>
2064
2092
  <define name="deprecates">
@@ -2481,6 +2509,16 @@
2481
2509
  <text/>
2482
2510
  </element>
2483
2511
  </optional>
2512
+ <optional>
2513
+ <element name="amendment">
2514
+ <text/>
2515
+ </element>
2516
+ </optional>
2517
+ <optional>
2518
+ <element name="corrigendum">
2519
+ <text/>
2520
+ </element>
2521
+ </optional>
2484
2522
  <optional>
2485
2523
  <element name="language">
2486
2524
  <text/>
@@ -108,7 +108,7 @@
108
108
  </element>
109
109
  </define>
110
110
  <define name="label">
111
- <element name="label">
111
+ <element name="identifier">
112
112
  <oneOrMore>
113
113
  <ref name="TextElement"/>
114
114
  </oneOrMore>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Generic
3
- VERSION = "2.1.2".freeze
3
+ VERSION = "2.2.1".freeze
4
4
  end
5
5
  end
@@ -2,7 +2,8 @@ require "metanorma/generic"
2
2
  require "asciidoctor"
3
3
  require "metanorma/generic/converter"
4
4
  require "isodoc/generic"
5
+ require "metanorma"
5
6
 
6
- if defined? Metanorma
7
+ if defined? Metanorma::Registry
7
8
  Metanorma::Registry.instance.register(Metanorma::Generic::Processor)
8
9
  end
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
27
27
  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
28
28
 
29
29
  spec.add_dependency "htmlentities", "~> 4.3.4"
30
- spec.add_dependency "metanorma-standoc", "~> 2.1.0"
30
+ spec.add_dependency "metanorma-standoc", "~> 2.2.2"
31
31
  spec.add_dependency "ruby-jing"
32
32
 
33
33
  spec.add_development_dependency "debug"
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: 2.1.2
4
+ version: 2.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
- autorequire:
8
+ autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-06-06 00:00:00.000000000 Z
11
+ date: 2022-09-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities
@@ -30,14 +30,14 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 2.1.0
33
+ version: 2.2.2
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 2.1.0
40
+ version: 2.2.2
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: ruby-jing
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -201,6 +201,7 @@ extensions: []
201
201
  extra_rdoc_files: []
202
202
  files:
203
203
  - ".github/workflows/rake.yml"
204
+ - ".github/workflows/release.yml"
204
205
  - ".gitignore"
205
206
  - ".hound.yml"
206
207
  - ".rubocop.yml"
@@ -255,7 +256,7 @@ homepage: https://github.com/metanorma/metanorma-generic
255
256
  licenses:
256
257
  - BSD-2-Clause
257
258
  metadata: {}
258
- post_install_message:
259
+ post_install_message:
259
260
  rdoc_options: []
260
261
  require_paths:
261
262
  - lib
@@ -270,8 +271,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
270
271
  - !ruby/object:Gem::Version
271
272
  version: '0'
272
273
  requirements: []
273
- rubygems_version: 3.3.7
274
- signing_key:
274
+ rubygems_version: 3.1.6
275
+ signing_key:
275
276
  specification_version: 4
276
277
  summary: Metanorma template gem for customisation.
277
278
  test_files: []