metanorma-rsd 1.0.5 → 1.0.6

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 (12) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/rsd/biblio.rng +12 -0
  3. data/lib/asciidoctor/rsd/converter.rb +8 -1
  4. data/lib/asciidoctor/rsd/isostandard.rng +10 -5
  5. data/lib/asciidoctor/rsd/rsd.rng +3 -1
  6. data/lib/isodoc/rsd/html/htmlstyle.scss +1 -1
  7. data/lib/isodoc/rsd/html/wordstyle.scss +67 -0
  8. data/lib/isodoc/rsd/html_convert.rb +0 -1
  9. data/lib/isodoc/rsd/pdf_convert.rb +0 -1
  10. data/lib/isodoc/rsd/word_convert.rb +0 -1
  11. data/lib/metanorma/rsd/version.rb +1 -1
  12. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: '0393d46e98fda93e01f93d3d6f976e76e326946f5966853050a0fa581c76777e'
4
- data.tar.gz: 7180371d306426d04eee371d48192703f0f9bd73848f708b0a0abe112697dfea
3
+ metadata.gz: 9934a2e81bcaa0b44cbb9fcefca5bc966bc951e3d9c5b91681e5ddd8bf4a660c
4
+ data.tar.gz: 3114106ea0ada7fa5536197227b84fd23acefda5122e6a8ab07c03d9f3c75f53
5
5
  SHA512:
6
- metadata.gz: a15d524356f98314230ad324acf71b15b25624fad11a80f61bc8ccab80f7d3b712dbf2f47bbf59bdbef56bae5d7b302fcdfa122398ec4a474dbee44a4686c176
7
- data.tar.gz: fe4ee887b9b22c8dd65341442568a65aa1b81bd97a8c5f12b7d9bd0534d55337645b6acb195bcc6f6257f39cf0ce643c11034e81672b9ca72fc91d5044f609ba
6
+ metadata.gz: 15e46c71c99be72bcc98be58ee5c84b593d35df3e9a178bc257fce8ebbc7221bf34d16eca3cdd017852d2cb120430ef22205a19b12b19d38e38bbd159f392c67
7
+ data.tar.gz: fb47f1d2194099deef65c936669984f17c013ce21361c0a0fba5d782f2e6ec554473fb24336ecd0c5c55118e30af74486bd90be16751791ed1d88c5ba6bdf5a7
data/lib/asciidoctor/rsd/biblio.rng CHANGED
@@ -259,6 +259,9 @@
259
259
  </define>
260
260
  <define name="uri">
261
261
  <element name="uri">
262
+ <optional>
263
+ <attribute name="type"/>
264
+ </optional>
262
265
  <data type="anyURI"/>
263
266
  </element>
264
267
  </define>
@@ -444,6 +447,9 @@
444
447
  <ref name="BibItemType"/>
445
448
  </attribute>
446
449
  </optional>
450
+ <optional>
451
+ <ref name="fetched"/>
452
+ </optional>
447
453
  <choice>
448
454
  <oneOrMore>
449
455
  <ref name="btitle"/>
@@ -523,6 +529,11 @@
523
529
  <ref name="FormattedString"/>
524
530
  </element>
525
531
  </define>
532
+ <define name="fetched">
533
+ <element name="fetched">
534
+ <data type="dateTime"/>
535
+ </element>
536
+ </define>
526
537
  <define name="validity">
527
538
  <element name="validity">
528
539
  <optional>
@@ -599,6 +610,7 @@
599
610
  <value>issued</value>
600
611
  <value>transmitted</value>
601
612
  <value>copied</value>
613
+ <value>unchanged</value>
602
614
  </choice>
603
615
  </attribute>
604
616
  <choice>
data/lib/asciidoctor/rsd/converter.rb CHANGED
@@ -3,6 +3,7 @@ require "asciidoctor/rsd"
3
3
  require "asciidoctor/standoc/converter"
4
4
  require "isodoc/rsd/html_convert"
5
5
  require "isodoc/rsd/word_convert"
6
+ require "fileutils"
6
7
 
7
8
  module Asciidoctor
8
9
  module Rsd
@@ -41,6 +42,12 @@ module Asciidoctor
41
42
  xml.editorialgroup do |a|
42
43
  a.committee node.attr("committee"),
43
44
  **attr_code(type: node.attr("committee-type"))
45
+ i = 2
46
+ while node.attr("committee_#{i}") do
47
+ a.committee node.attr("committee_#{i}"),
48
+ **attr_code(type: node.attr("committee-type_#{i}"))
49
+ i += 1
50
+ end
44
51
  end
45
52
  end
46
53
 
@@ -128,7 +135,7 @@ module Asciidoctor
128
135
  word_converter(node).convert filename unless node.attr("nodoc")
129
136
  pdf_convert(filename.sub(/\.xml$/, "")) unless node.attr("nodoc")
130
137
  end
131
- @files_to_delete.each { |f| system "rm #{f}" }
138
+ @files_to_delete.each { |f| FileUtils.rm f }
132
139
  ret
133
140
  end
134
141
 
data/lib/asciidoctor/rsd/isostandard.rng CHANGED
@@ -69,6 +69,9 @@
69
69
  <ref name="BibItemType"/>
70
70
  </attribute>
71
71
  </optional>
72
+ <optional>
73
+ <ref name="fetched"/>
74
+ </optional>
72
75
  <choice>
73
76
  <oneOrMore>
74
77
  <ref name="btitle"/>
@@ -788,13 +791,15 @@
788
791
  </define>
789
792
  <define name="editorialgroup">
790
793
  <element name="editorialgroup">
791
- <ref name="technical-committee"/>
792
- <optional>
794
+ <oneOrMore>
795
+ <ref name="technical-committee"/>
796
+ </oneOrMore>
797
+ <zeroOrMore>
793
798
  <ref name="subcommittee"/>
794
- </optional>
795
- <optional>
799
+ </zeroOrMore>
800
+ <zeroOrMore>
796
801
  <ref name="workgroup"/>
797
- </optional>
802
+ </zeroOrMore>
798
803
  <optional>
799
804
  <ref name="secretariat"/>
800
805
  </optional>
data/lib/asciidoctor/rsd/rsd.rng CHANGED
@@ -117,7 +117,9 @@
117
117
  </define>
118
118
  <define name="editorialgroup">
119
119
  <element name="editorialgroup">
120
- <ref name="committee"/>
120
+ <oneOrMore>
121
+ <ref name="committee"/>
122
+ </oneOrMore>
121
123
  </element>
122
124
  </define>
123
125
  <define name="BibData">
data/lib/isodoc/rsd/html/htmlstyle.scss CHANGED
@@ -516,7 +516,7 @@ p.document-stage {
516
516
  margin-left: -1.2em;
517
517
  }
518
518
 
519
- ul li p {
519
+ ul li p:first-child {
520
520
  display: inline;
521
521
  }
522
522
 
data/lib/isodoc/rsd/html/wordstyle.scss CHANGED
@@ -76,6 +76,70 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal
76
76
  mso-fareast-font-family:"Times New Roman";
77
77
  mso-ansi-language:EN-US;
78
78
  mso-fareast-language:EN-US;}
79
+ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
80
+ {mso-style-priority:34;
81
+ mso-style-unhide:no;
82
+ mso-style-qformat:yes;
83
+ margin-top:0cm;
84
+ margin-right:0cm;
85
+ margin-bottom:0cm;
86
+ /* do not put in margin-left, it is specific to list level */
87
+ margin-bottom:.0001pt;
88
+ mso-add-space:auto;
89
+ mso-pagination:widow-orphan;
90
+ font-size:10.5pt;
91
+ font-family:$bodyfont;
92
+ mso-ansi-language:EN-AU;
93
+ mso-fareast-language:EN-US;}
94
+ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphCxSpFirst
95
+ {mso-style-priority:34;
96
+ mso-style-unhide:no;
97
+ mso-style-qformat:yes;
98
+ mso-style-type:export-only;
99
+ margin-top:0cm;
100
+ margin-right:0cm;
101
+ margin-bottom:0cm;
102
+ /* do not put in margin-left, it is specific to list level */
103
+ margin-bottom:.0001pt;
104
+ mso-add-space:auto;
105
+ mso-pagination:widow-orphan;
106
+ font-size:10.5pt;
107
+ font-family:$bodyfont;
108
+ mso-ansi-language:EN-AU;
109
+ mso-fareast-language:EN-US;}
110
+ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagraphCxSpMiddle
111
+ {mso-style-priority:34;
112
+ mso-style-unhide:no;
113
+ mso-style-qformat:yes;
114
+ mso-style-type:export-only;
115
+ margin-top:0cm;
116
+ margin-right:0cm;
117
+ margin-bottom:0cm;
118
+ /* do not put in margin-left, it is specific to list level */
119
+ margin-bottom:.0001pt;
120
+ mso-add-space:auto;
121
+ mso-pagination:widow-orphan;
122
+ font-size:10.5pt;
123
+ font-family:$bodyfont;
124
+ mso-ansi-language:EN-AU;
125
+ mso-fareast-language:EN-US;}
126
+ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxSpLast
127
+ {mso-style-priority:34;
128
+ mso-style-unhide:no;
129
+ mso-style-qformat:yes;
130
+ mso-style-type:export-only;
131
+ margin-top:0cm;
132
+ margin-right:0cm;
133
+ margin-bottom:0cm;
134
+ /* do not put in margin-left, it is specific to list level */
135
+ margin-bottom:12.0pt;
136
+ mso-add-space:auto;
137
+ mso-pagination:widow-orphan;
138
+ font-size:10.5pt;
139
+ font-family:$bodyfont;
140
+ mso-ansi-language:EN-AU;
141
+ mso-fareast-language:EN-US;}
142
+
79
143
  p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
80
144
  {mso-style-noshow:yes;
81
145
  mso-style-unhide:no;
@@ -334,6 +398,8 @@ span.blackgraphtx
334
398
  .MsoChpDefault
335
399
  {mso-style-type:export-only;
336
400
  mso-default-props:yes;}
401
+ div.figure
402
+ {text-align: center;}
337
403
 
338
404
 
339
405
 
@@ -414,6 +480,7 @@ h1.Annex
414
480
  font-size:12.0pt;
415
481
  mso-bidi-font-size:11.0pt;
416
482
  font-family:$headerfont;
483
+ font-weight:bold;
417
484
  mso-fareast-font-family:$headerfont;
418
485
  color:#0E1A85;
419
486
  mso-ansi-language:EN-GB;
data/lib/isodoc/rsd/html_convert.rb CHANGED
@@ -12,7 +12,6 @@ module IsoDoc
12
12
  def initialize(options)
13
13
  @libdir = File.dirname(__FILE__)
14
14
  super
15
- #system "cp #{html_doc_path('logo.svg')} logo.svg"
16
15
  FileUtils.cp html_doc_path('logo.svg'), "logo.svg"
17
16
  @files_to_delete << "logo.svg"
18
17
  end
data/lib/isodoc/rsd/pdf_convert.rb CHANGED
@@ -10,7 +10,6 @@ module IsoDoc
10
10
  def initialize(options)
11
11
  @libdir = File.dirname(__FILE__)
12
12
  super
13
- #system "cp #{html_doc_path('logo.svg')} logo.svg"
14
13
  FileUtils.cp html_doc_path('logo.svg'), "logo.svg"
15
14
  @files_to_delete << "logo.svg"
16
15
  end
data/lib/isodoc/rsd/word_convert.rb CHANGED
@@ -11,7 +11,6 @@ module IsoDoc
11
11
  def initialize(options)
12
12
  @libdir = File.dirname(__FILE__)
13
13
  super
14
- #system "cp #{html_doc_path('logo.svg')} logo.svg"
15
14
  FileUtils.cp html_doc_path('logo.svg'), "logo.svg"
16
15
  @files_to_delete << "logo.svg"
17
16
  end
data/lib/metanorma/rsd/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Rsd
3
- VERSION = "1.0.5"
3
+ VERSION = "1.0.6"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-rsd
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.5
4
+ version: 1.0.6
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-09-15 00:00:00.000000000 Z
11
+ date: 2018-10-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: asciidoctor