metanorma-generic 2.1.1 → 2.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/generic/html/generic.scss +16 -10
  3. data/lib/isodoc/generic/html/htmlstyle.scss +1 -0
  4. data/lib/isodoc/generic/i18n.rb +10 -5
  5. data/lib/metanorma/generic/biblio.rng +134 -39
  6. data/lib/metanorma/generic/converter.rb +1 -1
  7. data/lib/metanorma/generic/isodoc.rng +48 -1
  8. data/lib/metanorma/generic/reqt.rng +1 -1
  9. data/lib/metanorma/generic/version.rb +1 -1
  10. data/metanorma-generic.gemspec +1 -1
  11. metadata +5 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 05f89e4a6adb0222c1cc71f880010902337d92cde88328a4754a61c5f30eb7dc
4
- data.tar.gz: f506457c7e94d17694fe9512b559aa82a1665952bfdd06ae1554fc9b5e2d3d11
3
+ metadata.gz: 59a0bc61bb3f85604409957eca8092b40e2f9e09917bbb147ef5a58beffa196b
4
+ data.tar.gz: 1595b4c89c4ad8f94a10cb47ea2457aa8dbc834951783c5d3af9ff3d8111064a
5
5
  SHA512:
6
- metadata.gz: 704cda28036803f93d1cb11790dfe605fcc2c2eb4ff1ba09007b4ce30bf84cd511e307640f7803c83a1447d5f9af650dc32b00a447b0a704ca73ac198ea68523
7
- data.tar.gz: b70f01e52405512c56e8fd3ef3994a245972f92f49029b2700c54d16b3cf7179fed7fd706c7fe683da3aae9cd294db4cf1bd561333b2689315ec8e0a58ad30fe
6
+ metadata.gz: a4c87263e31e78368481797483f20d2aa1c0d6d541d8615343fc45dbac458b3cbf74b284877e2f7cf2c06541756fcb48fbf6cc83434d58137a0f351bc6a1d0bb
7
+ data.tar.gz: 8df5e1ba0be302fcc9a1605eadfa1c6a3c62b500f282c33507ad50d17d517fd21fccb38b3ca344efa14740456bd36095600ea339fac1ac6933c632e4e0014cb2
data/lib/isodoc/generic/html/generic.scss CHANGED
@@ -105,7 +105,7 @@ p.AdmonitionTitle, p.RecommendationTitle
105
105
  mso-fareast-font-family:$bodyfont;
106
106
  mso-bidi-font-family:$bodyfont;
107
107
  mso-ansi-language:EN-GB;}
108
- p.TableTitle
108
+ p.TableTitle, p.ListTitle
109
109
  {mso-style-unhide:no;
110
110
  mso-style-qformat:yes;
111
111
  mso-style-parent:"";
@@ -135,13 +135,14 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
135
135
  line-height:12.0pt;
136
136
  mso-pagination:widow-orphan;
137
137
  tab-stops:20.15pt;
138
- font-size:10.0pt;
139
138
  mso-bidi-font-size:11.0pt;
140
- font-family:$bodyfont;
141
- font-size:10.0pt;
142
139
  mso-fareast-font-family:$bodyfont;
143
140
  mso-bidi-font-family:$bodyfont;
144
141
  mso-ansi-language:EN-GB;}
142
+ p.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote {
143
+ font-family:$bodyfont;
144
+ font-size:10.0pt;
145
+ }
145
146
  p.ANNEX, li.ANNEX, div.ANNEX
146
147
  {mso-style-name:ANNEX;
147
148
  mso-style-priority:10;
@@ -471,11 +472,13 @@ p.Quote, li.Quote, div.Quote
471
472
  line-height:12.0pt;
472
473
  mso-pagination:widow-orphan;
473
474
  tab-stops:20.15pt;
474
- font-size:10.5pt;
475
- font-family:$bodyfont;
476
475
  mso-fareast-font-family:$bodyfont;
477
476
  mso-bidi-font-family:$bodyfont;
478
477
  mso-ansi-language:EN-GB;}
478
+ p.Quote, li.Quote {
479
+ font-size:10.5pt;
480
+ font-family:$bodyfont;
481
+ }
479
482
  p.QuoteAttribution
480
483
  {text-align:right;
481
484
  mso-style-priority:99;
@@ -505,8 +508,6 @@ p.Admonition, li.Admonition, div.Admonition
505
508
  mso-border-themecolor:accent1;
506
509
  padding:0cm;
507
510
  mso-padding-alt:10.0pt 10.0pt 10.0pt 10.0pt;
508
- font-size:12.0pt;
509
- font-family:$bodyfont;
510
511
  mso-ascii-font-family:$bodyfont;
511
512
  mso-ascii-theme-font:minor-latin;
512
513
  mso-fareast-font-family:$bodyfont;
@@ -519,6 +520,10 @@ p.Admonition, li.Admonition, div.Admonition
519
520
  mso-themecolor:accent1;
520
521
  mso-ansi-language:EN-AU;
521
522
  font-style:italic;}
523
+ p.Admonition, li.Admonition {
524
+ font-size:12.0pt;
525
+ font-family:$bodyfont;
526
+ }
522
527
  p.Code, li.Code, div.Code
523
528
  {mso-style-name:Code;
524
529
  mso-style-priority:16;
@@ -732,12 +737,13 @@ div.example {
732
737
  p.example, li.example, td.example {
733
738
  margin-right: 0pt;
734
739
  margin-left: 0pt;
740
+ font-size:10.0pt;
741
+ font-family:$bodyfont;
735
742
  }
736
743
 
737
744
  p.example, li.example, div.example, td.example {
738
745
  mso-pagination:none;
739
- font-size:10.0pt;
740
- font-family:$bodyfont;}
746
+ }
741
747
 
742
748
  td.example p.MsoListParagraph {
743
749
  font-size: 10.0pt;
data/lib/isodoc/generic/html/htmlstyle.scss CHANGED
@@ -336,6 +336,7 @@ pre {
336
336
 
337
337
  @include admonitionBlock();
338
338
  @include recommendationBlock();
339
+ @include listBlock();
339
340
 
340
341
  .FigureTitle, .SourceTitle {
341
342
  @include blockTitle()
data/lib/isodoc/generic/i18n.rb CHANGED
@@ -7,17 +7,22 @@ module IsoDoc
7
7
  attr_accessor :_file
8
8
  end
9
9
 
10
- def self.inherited( k )
11
- k._file = caller_locations.first.absolute_path
10
+ def self.inherited(k)
11
+ k._file = caller_locations(1..1).first.absolute_path
12
12
  end
13
13
 
14
14
  def load_yaml1(lang, script)
15
15
  return super unless configuration.i18nyaml
16
- file = configuration.i18nyaml.is_a?(Hash) ?
17
- configuration.i18nyaml[lang] : configuration.i18nyaml
16
+
17
+ file = if configuration.i18nyaml.is_a?(Hash)
18
+ configuration.i18nyaml[lang]
19
+ else
20
+ configuration.i18nyaml
21
+ end
18
22
  return super if file.nil?
23
+
19
24
  y = YAML.load_file(baselocation(file))
20
- super.merge(y)
25
+ super.deep_merge(y)
21
26
  end
22
27
 
23
28
  include Utils
data/lib/metanorma/generic/biblio.rng CHANGED
@@ -614,12 +614,103 @@
614
614
  <optional>
615
615
  <ref name="fetched"/>
616
616
  </optional>
617
- <choice>
618
- <oneOrMore>
619
- <ref name="btitle"/>
620
- </oneOrMore>
617
+ <optional>
621
618
  <ref name="formattedref"/>
622
- </choice>
619
+ </optional>
620
+ <oneOrMore>
621
+ <ref name="btitle"/>
622
+ </oneOrMore>
623
+ <zeroOrMore>
624
+ <ref name="bsource"/>
625
+ </zeroOrMore>
626
+ <oneOrMore>
627
+ <ref name="docidentifier"/>
628
+ </oneOrMore>
629
+ <optional>
630
+ <ref name="docnumber"/>
631
+ </optional>
632
+ <zeroOrMore>
633
+ <ref name="bdate"/>
634
+ </zeroOrMore>
635
+ <zeroOrMore>
636
+ <ref name="contributor"/>
637
+ </zeroOrMore>
638
+ <optional>
639
+ <ref name="edition"/>
640
+ </optional>
641
+ <zeroOrMore>
642
+ <ref name="version"/>
643
+ </zeroOrMore>
644
+ <zeroOrMore>
645
+ <ref name="biblionote"/>
646
+ </zeroOrMore>
647
+ <zeroOrMore>
648
+ <ref name="language"/>
649
+ </zeroOrMore>
650
+ <zeroOrMore>
651
+ <ref name="script"/>
652
+ </zeroOrMore>
653
+ <zeroOrMore>
654
+ <ref name="bibabstract"/>
655
+ </zeroOrMore>
656
+ <optional>
657
+ <ref name="status"/>
658
+ </optional>
659
+ <zeroOrMore>
660
+ <ref name="copyright"/>
661
+ </zeroOrMore>
662
+ <zeroOrMore>
663
+ <ref name="docrelation"/>
664
+ </zeroOrMore>
665
+ <zeroOrMore>
666
+ <ref name="series"/>
667
+ </zeroOrMore>
668
+ <optional>
669
+ <ref name="medium"/>
670
+ </optional>
671
+ <zeroOrMore>
672
+ <ref name="bplace"/>
673
+ </zeroOrMore>
674
+ <zeroOrMore>
675
+ <ref name="bprice"/>
676
+ </zeroOrMore>
677
+ <zeroOrMore>
678
+ <ref name="extent"/>
679
+ </zeroOrMore>
680
+ <optional>
681
+ <ref name="bibliographic_size"/>
682
+ </optional>
683
+ <zeroOrMore>
684
+ <ref name="accesslocation"/>
685
+ </zeroOrMore>
686
+ <zeroOrMore>
687
+ <ref name="license"/>
688
+ </zeroOrMore>
689
+ <zeroOrMore>
690
+ <ref name="bclassification"/>
691
+ </zeroOrMore>
692
+ <zeroOrMore>
693
+ <ref name="bkeyword"/>
694
+ </zeroOrMore>
695
+ <optional>
696
+ <ref name="validity"/>
697
+ </optional>
698
+ </define>
699
+ <define name="ReducedBibliographicItem">
700
+ <optional>
701
+ <attribute name="type">
702
+ <ref name="BibItemType"/>
703
+ </attribute>
704
+ </optional>
705
+ <optional>
706
+ <ref name="fetched"/>
707
+ </optional>
708
+ <optional>
709
+ <ref name="formattedref"/>
710
+ </optional>
711
+ <zeroOrMore>
712
+ <ref name="btitle"/>
713
+ </zeroOrMore>
623
714
  <zeroOrMore>
624
715
  <ref name="bsource"/>
625
716
  </zeroOrMore>
@@ -638,9 +729,9 @@
638
729
  <optional>
639
730
  <ref name="edition"/>
640
731
  </optional>
641
- <optional>
732
+ <zeroOrMore>
642
733
  <ref name="version"/>
643
- </optional>
734
+ </zeroOrMore>
644
735
  <zeroOrMore>
645
736
  <ref name="biblionote"/>
646
737
  </zeroOrMore>
@@ -833,6 +924,12 @@
833
924
  <data type="boolean"/>
834
925
  </attribute>
835
926
  </optional>
927
+ <optional>
928
+ <attribute name="language"/>
929
+ </optional>
930
+ <optional>
931
+ <attribute name="script"/>
932
+ </optional>
836
933
  <text/>
837
934
  </element>
838
935
  </define>
@@ -986,36 +1083,34 @@
986
1083
  <ref name="SeriesType"/>
987
1084
  </attribute>
988
1085
  </optional>
989
- <choice>
1086
+ <optional>
990
1087
  <ref name="formattedref"/>
991
- <group>
992
- <ref name="btitle"/>
993
- <optional>
994
- <ref name="bplace"/>
995
- </optional>
996
- <optional>
997
- <ref name="seriesorganization"/>
998
- </optional>
999
- <optional>
1000
- <ref name="abbreviation"/>
1001
- </optional>
1002
- <optional>
1003
- <ref name="seriesfrom"/>
1004
- </optional>
1005
- <optional>
1006
- <ref name="seriesto"/>
1007
- </optional>
1008
- <optional>
1009
- <ref name="seriesnumber"/>
1010
- </optional>
1011
- <optional>
1012
- <ref name="seriespartnumber"/>
1013
- </optional>
1014
- <optional>
1015
- <ref name="seriesrun"/>
1016
- </optional>
1017
- </group>
1018
- </choice>
1088
+ </optional>
1089
+ <ref name="btitle"/>
1090
+ <optional>
1091
+ <ref name="bplace"/>
1092
+ </optional>
1093
+ <optional>
1094
+ <ref name="seriesorganization"/>
1095
+ </optional>
1096
+ <optional>
1097
+ <ref name="abbreviation"/>
1098
+ </optional>
1099
+ <optional>
1100
+ <ref name="seriesfrom"/>
1101
+ </optional>
1102
+ <optional>
1103
+ <ref name="seriesto"/>
1104
+ </optional>
1105
+ <optional>
1106
+ <ref name="seriesnumber"/>
1107
+ </optional>
1108
+ <optional>
1109
+ <ref name="seriespartnumber"/>
1110
+ </optional>
1111
+ <optional>
1112
+ <ref name="seriesrun"/>
1113
+ </optional>
1019
1114
  </element>
1020
1115
  </define>
1021
1116
  <define name="SeriesType">
@@ -1174,7 +1269,7 @@
1174
1269
  </element>
1175
1270
  </optional>
1176
1271
  <element name="bibitem">
1177
- <ref name="BibliographicItem"/>
1272
+ <ref name="ReducedBibliographicItem"/>
1178
1273
  </element>
1179
1274
  <choice>
1180
1275
  <zeroOrMore>
@@ -1199,9 +1294,9 @@
1199
1294
  <optional>
1200
1295
  <ref name="revision-date"/>
1201
1296
  </optional>
1202
- <zeroOrMore>
1297
+ <optional>
1203
1298
  <ref name="draft"/>
1204
- </zeroOrMore>
1299
+ </optional>
1205
1300
  </element>
1206
1301
  </define>
1207
1302
  <define name="vedition">
data/lib/metanorma/generic/converter.rb CHANGED
@@ -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
 
data/lib/metanorma/generic/isodoc.rng CHANGED
@@ -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>
@@ -282,6 +298,9 @@
282
298
  <ref name="MultilingualRenderingType"/>
283
299
  </attribute>
284
300
  </optional>
301
+ <optional>
302
+ <ref name="tname"/>
303
+ </optional>
285
304
  <oneOrMore>
286
305
  <ref name="ul_li"/>
287
306
  </oneOrMore>
@@ -324,6 +343,9 @@
324
343
  </choice>
325
344
  </attribute>
326
345
  </optional>
346
+ <optional>
347
+ <ref name="tname"/>
348
+ </optional>
327
349
  <oneOrMore>
328
350
  <ref name="li"/>
329
351
  </oneOrMore>
@@ -360,6 +382,9 @@
360
382
  <ref name="MultilingualRenderingType"/>
361
383
  </attribute>
362
384
  </optional>
385
+ <optional>
386
+ <ref name="tname"/>
387
+ </optional>
363
388
  <oneOrMore>
364
389
  <ref name="dt"/>
365
390
  <ref name="dd"/>
@@ -694,6 +719,9 @@
694
719
  <optional>
695
720
  <attribute name="tag"/>
696
721
  </optional>
722
+ <optional>
723
+ <attribute name="type"/>
724
+ </optional>
697
725
  <optional>
698
726
  <attribute name="multilingual-rendering">
699
727
  <ref name="MultilingualRenderingType"/>
@@ -729,6 +757,9 @@
729
757
  <optional>
730
758
  <attribute name="tag"/>
731
759
  </optional>
760
+ <optional>
761
+ <attribute name="type"/>
762
+ </optional>
732
763
  <optional>
733
764
  <attribute name="multilingual-rendering">
734
765
  <ref name="MultilingualRenderingType"/>
@@ -1254,7 +1285,12 @@
1254
1285
  </define>
1255
1286
  <define name="span">
1256
1287
  <element name="span">
1257
- <attribute name="class"/>
1288
+ <optional>
1289
+ <attribute name="class"/>
1290
+ </optional>
1291
+ <optional>
1292
+ <attribute name="style"/>
1293
+ </optional>
1258
1294
  <oneOrMore>
1259
1295
  <ref name="TextElement"/>
1260
1296
  </oneOrMore>
@@ -2050,6 +2086,7 @@
2050
2086
  <value>compare</value>
2051
2087
  <value>contrast</value>
2052
2088
  <value>see</value>
2089
+ <value>seealso</value>
2053
2090
  </choice>
2054
2091
  </define>
2055
2092
  <define name="deprecates">
@@ -2472,6 +2509,16 @@
2472
2509
  <text/>
2473
2510
  </element>
2474
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>
2475
2522
  <optional>
2476
2523
  <element name="language">
2477
2524
  <text/>
data/lib/metanorma/generic/reqt.rng CHANGED
@@ -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>
data/lib/metanorma/generic/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Generic
3
- VERSION = "2.1.1".freeze
3
+ VERSION = "2.2.0".freeze
4
4
  end
5
5
  end
data/metanorma-generic.gemspec CHANGED
@@ -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.0"
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.1
4
+ version: 2.2.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: 2022-05-16 00:00:00.000000000 Z
11
+ date: 2022-08-08 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.0
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.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: ruby-jing
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
270
270
  - !ruby/object:Gem::Version
271
271
  version: '0'
272
272
  requirements: []
273
- rubygems_version: 3.3.9
273
+ rubygems_version: 3.3.16
274
274
  signing_key:
275
275
  specification_version: 4
276
276
  summary: Metanorma template gem for customisation.