metanorma-generic 2.1.1 → 2.1.2

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/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 +32 -34
  6. data/lib/metanorma/generic/isodoc.rng +9 -0
  7. data/lib/metanorma/generic/version.rb +1 -1
  8. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 05f89e4a6adb0222c1cc71f880010902337d92cde88328a4754a61c5f30eb7dc
4
- data.tar.gz: f506457c7e94d17694fe9512b559aa82a1665952bfdd06ae1554fc9b5e2d3d11
3
+ metadata.gz: f62fbca91a932dfd2962b5bc10e5fcb2ee58b26dbc1caead516decf679fa1fe3
4
+ data.tar.gz: 3b940ed44e676a48c5d263e57651e5e18883148fedc04776c27e31821552b083
5
5
  SHA512:
6
- metadata.gz: 704cda28036803f93d1cb11790dfe605fcc2c2eb4ff1ba09007b4ce30bf84cd511e307640f7803c83a1447d5f9af650dc32b00a447b0a704ca73ac198ea68523
7
- data.tar.gz: b70f01e52405512c56e8fd3ef3994a245972f92f49029b2700c54d16b3cf7179fed7fd706c7fe683da3aae9cd294db4cf1bd561333b2689315ec8e0a58ad30fe
6
+ metadata.gz: af9a7f040d1a5202ab38d52b34705bdff7130c3513a479bf2f9530bd9f012869359408c09da7e644995b897c925a3e2ffd2131d8f85f06b78c13de6734206f16
7
+ data.tar.gz: b4fa73685306cff6096ed6cb7689e755feee0666b494d56ea68d940e31f373ae146293c2fd4ccef9b4b025bb66db965762d2f4f4c852aa025dd7596d1fdea992
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,12 @@
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
623
  <zeroOrMore>
624
624
  <ref name="bsource"/>
625
625
  </zeroOrMore>
@@ -986,36 +986,34 @@
986
986
  <ref name="SeriesType"/>
987
987
  </attribute>
988
988
  </optional>
989
- <choice>
989
+ <optional>
990
990
  <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>
991
+ </optional>
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>
1019
1017
  </element>
1020
1018
  </define>
1021
1019
  <define name="SeriesType">
data/lib/metanorma/generic/isodoc.rng CHANGED
@@ -282,6 +282,9 @@
282
282
  <ref name="MultilingualRenderingType"/>
283
283
  </attribute>
284
284
  </optional>
285
+ <optional>
286
+ <ref name="tname"/>
287
+ </optional>
285
288
  <oneOrMore>
286
289
  <ref name="ul_li"/>
287
290
  </oneOrMore>
@@ -324,6 +327,9 @@
324
327
  </choice>
325
328
  </attribute>
326
329
  </optional>
330
+ <optional>
331
+ <ref name="tname"/>
332
+ </optional>
327
333
  <oneOrMore>
328
334
  <ref name="li"/>
329
335
  </oneOrMore>
@@ -360,6 +366,9 @@
360
366
  <ref name="MultilingualRenderingType"/>
361
367
  </attribute>
362
368
  </optional>
369
+ <optional>
370
+ <ref name="tname"/>
371
+ </optional>
363
372
  <oneOrMore>
364
373
  <ref name="dt"/>
365
374
  <ref name="dd"/>
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.1.2".freeze
4
4
  end
5
5
  end
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.1.2
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-06-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities
@@ -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.7
274
274
  signing_key:
275
275
  specification_version: 4
276
276
  summary: Metanorma template gem for customisation.