metanorma-gb 1.0.11 → 1.0.12

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/gb/biblio.rng +31 -0
  3. data/lib/asciidoctor/gb/gbstandard.rng +6 -3
  4. data/lib/asciidoctor/gb/isodoc.rng +3 -31
  5. data/lib/asciidoctor/gb/isostandard.rng +6 -3
  6. data/lib/isodoc/gb/html/gb.scss +0 -8
  7. data/lib/isodoc/gb/html/htmlcompliantstyle.scss +9 -1
  8. data/lib/isodoc/gb/html/htmlstyle.scss +14 -1
  9. data/lib/isodoc/gb/html/wordstyle.scss +0 -2
  10. data/lib/metanorma/gb/version.rb +1 -1
  11. data/metanorma-gb.gemspec +1 -1
  12. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: adb41d5c4e5191600fcc0120c46c021b99d9b5f7a411f99b30e86ee9ea3943de
4
- data.tar.gz: 5470c420878806da1bb943fd68abc74e547018bc051251c5a82e78a2b7f4ee94
3
+ metadata.gz: d4ccd7f3961a3138c3aa4126b3d6efb68fe3d2e2efd5216563c7bc5e48c7269c
4
+ data.tar.gz: c547a63cca08a9f0b3a46b536c893bc75ef4fdff233bc050ff906efc4f3ce347
5
5
  SHA512:
6
- metadata.gz: db404eaca69c05e342add0b4d19d91c481bf85b3efb5c58a042b5d79b2ba4af481acafd5ba9fccc243180a21fad492eac41a23e533f63bbc2242185024f523ab
7
- data.tar.gz: f1a79b357464eee2a15f9c8ac296baa204270b81b246f6767cce05156d87fb08d150bb9f0e938a70cc9b69ef34f499209453c934a9a5e267395d1a230f80bb11
6
+ metadata.gz: f60532239eae7906adea6f217d21d6a25f620c0686574fd791903072a3053355cc08e923616c8639171d6fe101a75ca33d476f4ffd88b5151831b7bdd34aea3a
7
+ data.tar.gz: b0b54bdb356f951dfa7b05a91c8f3b0ed8106e733382d61c9b2835c405df938a2cf14c7bbfc9154d9c097705eb57cf4d7e3130d5cd7fe34238d4cad0a20ae065
data/lib/asciidoctor/gb/biblio.rng CHANGED
@@ -488,6 +488,9 @@
488
488
  <optional>
489
489
  <ref name="edition"/>
490
490
  </optional>
491
+ <optional>
492
+ <ref name="version"/>
493
+ </optional>
491
494
  <zeroOrMore>
492
495
  <ref name="biblionote"/>
493
496
  </zeroOrMore>
@@ -866,6 +869,34 @@
866
869
  </zeroOrMore>
867
870
  </element>
868
871
  </define>
872
+ <define name="version">
873
+ <element name="version">
874
+ <optional>
875
+ <ref name="vedition"/>
876
+ </optional>
877
+ <optional>
878
+ <ref name="revision-date"/>
879
+ </optional>
880
+ <zeroOrMore>
881
+ <ref name="draft"/>
882
+ </zeroOrMore>
883
+ </element>
884
+ </define>
885
+ <define name="vedition">
886
+ <element name="edition">
887
+ <data type="int"/>
888
+ </element>
889
+ </define>
890
+ <define name="revision-date">
891
+ <element name="revision-date">
892
+ <data type="date"/>
893
+ </element>
894
+ </define>
895
+ <define name="draft">
896
+ <element name="draft">
897
+ <text/>
898
+ </element>
899
+ </define>
869
900
  <!--
870
901
  Anycontents = mixed {
871
902
  https://github.com/relaxng/jing-trang/issues/211
data/lib/asciidoctor/gb/gbstandard.rng CHANGED
@@ -105,6 +105,9 @@
105
105
  <optional>
106
106
  <ref name="edition"/>
107
107
  </optional>
108
+ <optional>
109
+ <ref name="version"/>
110
+ </optional>
108
111
  <zeroOrMore>
109
112
  <ref name="biblionote"/>
110
113
  </zeroOrMore>
@@ -175,6 +178,9 @@
175
178
  <optional>
176
179
  <ref name="edition"/>
177
180
  </optional>
181
+ <optional>
182
+ <ref name="version"/>
183
+ </optional>
178
184
  <zeroOrMore>
179
185
  <ref name="biblionote"/>
180
186
  </zeroOrMore>
@@ -299,9 +305,6 @@
299
305
  <define name="gb-standard">
300
306
  <element name="gb-standard">
301
307
  <ref name="bibdata"/>
302
- <optional>
303
- <ref name="version"/>
304
- </optional>
305
308
  <zeroOrMore>
306
309
  <ref name="termdocsource"/>
307
310
  </zeroOrMore>
data/lib/asciidoctor/gb/isodoc.rng CHANGED
@@ -39,9 +39,6 @@
39
39
  <define name="standard-document">
40
40
  <element name="standard-document">
41
41
  <ref name="bibdata"/>
42
- <optional>
43
- <ref name="version"/>
44
- </optional>
45
42
  <optional>
46
43
  <ref name="preface"/>
47
44
  </optional>
@@ -59,34 +56,6 @@
59
56
  <ref name="BibData"/>
60
57
  </element>
61
58
  </define>
62
- <define name="version">
63
- <element name="version">
64
- <optional>
65
- <ref name="vedition"/>
66
- </optional>
67
- <optional>
68
- <ref name="revision-date"/>
69
- </optional>
70
- <zeroOrMore>
71
- <ref name="draft"/>
72
- </zeroOrMore>
73
- </element>
74
- </define>
75
- <define name="vedition">
76
- <element name="edition">
77
- <data type="int"/>
78
- </element>
79
- </define>
80
- <define name="revision-date">
81
- <element name="revision-date">
82
- <data type="date"/>
83
- </element>
84
- </define>
85
- <define name="draft">
86
- <element name="draft">
87
- <text/>
88
- </element>
89
- </define>
90
59
  <define name="preface">
91
60
  <element name="preface">
92
61
  <oneOrMore>
@@ -1068,6 +1037,9 @@
1068
1037
  <optional>
1069
1038
  <ref name="edition"/>
1070
1039
  </optional>
1040
+ <optional>
1041
+ <ref name="version"/>
1042
+ </optional>
1071
1043
  <zeroOrMore>
1072
1044
  <ref name="biblionote"/>
1073
1045
  </zeroOrMore>
data/lib/asciidoctor/gb/isostandard.rng CHANGED
@@ -96,6 +96,9 @@
96
96
  <optional>
97
97
  <ref name="edition"/>
98
98
  </optional>
99
+ <optional>
100
+ <ref name="version"/>
101
+ </optional>
99
102
  <zeroOrMore>
100
103
  <ref name="biblionote"/>
101
104
  </zeroOrMore>
@@ -178,6 +181,9 @@
178
181
  <optional>
179
182
  <ref name="edition"/>
180
183
  </optional>
184
+ <optional>
185
+ <ref name="version"/>
186
+ </optional>
181
187
  <zeroOrMore>
182
188
  <ref name="biblionote"/>
183
189
  </zeroOrMore>
@@ -762,9 +768,6 @@
762
768
  <define name="iso-standard">
763
769
  <element name="iso-standard">
764
770
  <ref name="bibdata"/>
765
- <optional>
766
- <ref name="version"/>
767
- </optional>
768
771
  <zeroOrMore>
769
772
  <ref name="termdocsource"/>
770
773
  </zeroOrMore>
data/lib/isodoc/gb/html/gb.scss CHANGED
@@ -354,8 +354,6 @@ table.MsoISOTable
354
354
  mso-yfti-tbllook:480;
355
355
  mso-border-insideh:.75pt solid windowtext;
356
356
  mso-border-insidev:.75pt solid windowtext;
357
- mso-table-anchor-vertical:paragraph;
358
- mso-table-bspace:12.0pt;
359
357
  font-size:10.0pt;
360
358
  font-family:$bodyfont;
361
359
  mso-fareast-font-family:$bodyfont;}
@@ -383,8 +381,6 @@ table.MsoTableGrid
383
381
  mso-para-margin:0cm;
384
382
  mso-para-margin-bottom:.0001pt;
385
383
  mso-pagination:widow-orphan;
386
- mso-table-anchor-vertical:paragraph;
387
- mso-table-bspace:12.0pt;
388
384
  font-size:10.0pt;
389
385
  font-family:$bodyfont;
390
386
  mso-fareast-font-family:$bodyfont;}
@@ -450,10 +446,6 @@ table.example, table.Note {
450
446
  margin-left: 21.0pt;
451
447
  }
452
448
 
453
- table.example {
454
- margin-bottom:12pt;
455
- }
456
-
457
449
  p.example, li.example, div.example, td.example
458
450
  {mso-style-name:示例; /* NAME: Example */
459
451
  mso-style-unhide:no;
data/lib/isodoc/gb/html/htmlcompliantstyle.scss CHANGED
@@ -733,7 +733,7 @@ p.DeprecatedTerms {
733
733
  }
734
734
 
735
735
  @media screen {
736
- img:not(.logo) {
736
+ div.figure > img:not(.logo) {
737
737
  width: 100%;
738
738
  height: auto;
739
739
  }
@@ -1058,6 +1058,14 @@ font-family: $headerfont;
1058
1058
  /* text-align: left; */
1059
1059
  }
1060
1060
 
1061
+ .Admonition {
1062
+ background-color: #ffcccc;
1063
+ color: #47430c;
1064
+ padding: 1.2em;
1065
+ margin: 1.5em 0 1.5em 0;
1066
+ }
1067
+
1068
+
1061
1069
  /*
1062
1070
  .Note p, .note p {
1063
1071
  margin: 0;
data/lib/isodoc/gb/html/htmlstyle.scss CHANGED
@@ -571,7 +571,7 @@ p.DeprecatedTerms {
571
571
  }
572
572
 
573
573
  @media screen {
574
- img:not(.logo) {
574
+ div.figure > img:not(.logo) {
575
575
  width: 100%;
576
576
  height: auto;
577
577
  }
@@ -856,6 +856,19 @@ text-align: center;
856
856
  margin: 0;
857
857
  }
858
858
 
859
+ .Admonition {
860
+ background-color: #ffcccc;
861
+ color: #47430c;
862
+ padding: 0.5em;
863
+ margin: 1.5em 0 1.5em 0;
864
+ text-align: left;
865
+ }
866
+
867
+ .Admonition p {
868
+ margin: 0;
869
+ }
870
+
871
+
859
872
  /*
860
873
  3.8 Examples
861
874
  */
data/lib/isodoc/gb/html/wordstyle.scss CHANGED
@@ -2495,8 +2495,6 @@ table.MsoNormalTable
2495
2495
  mso-para-margin:0cm;
2496
2496
  mso-para-margin-bottom:.0001pt;
2497
2497
  mso-pagination:widow-orphan;
2498
- mso-table-anchor-vertical:paragraph;
2499
- mso-table-bspace:12.0pt;
2500
2498
  font-size:10.0pt;
2501
2499
  font-family:$bodyfont;
2502
2500
  mso-fareast-font-family:$bodyfont;}
data/lib/metanorma/gb/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Gb
3
- VERSION = "1.0.11"
3
+ VERSION = "1.0.12"
4
4
  end
5
5
  end
data/metanorma-gb.gemspec CHANGED
@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
33
33
  spec.add_dependency "twitter_cldr"
34
34
  spec.add_dependency "gb-agencies", "~> 0.0.4"
35
35
 
36
- spec.add_development_dependency "bundler", "~> 1.15"
36
+ spec.add_development_dependency "bundler", "~> 2.0.1"
37
37
  spec.add_development_dependency "byebug", "~> 9.1"
38
38
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
39
39
  spec.add_development_dependency "guard", "~> 2.14"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-gb
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.11
4
+ version: 1.0.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2018-12-19 00:00:00.000000000 Z
11
+ date: 2019-01-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-iso
@@ -72,14 +72,14 @@ dependencies:
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: '1.15'
75
+ version: 2.0.1
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: '1.15'
82
+ version: 2.0.1
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: byebug
85
85
  requirement: !ruby/object:Gem::Requirement