metanorma-m3d 1.0.6 → 1.0.7

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/asciidoctor/m3d/biblio.rng +12 -0
  3. data/lib/asciidoctor/m3d/converter.rb +8 -1
  4. data/lib/asciidoctor/m3d/isostandard.rng +10 -5
  5. data/lib/asciidoctor/m3d/m3d.rng +3 -1
  6. data/lib/isodoc/m3d/html/m3d.scss +1 -1
  7. data/lib/isodoc/m3d/html/wordstyle.scss +67 -0
  8. data/lib/isodoc/m3d/m3dhtmlconvert.rb +0 -1
  9. data/lib/isodoc/m3d/m3dwordconvert.rb +0 -1
  10. data/lib/metanorma/m3d/version.rb +1 -1
  11. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 89e75265ae3c251c87442e438d0fa024dc6a10480c8cfeb92e32d4009b5971b6
4
- data.tar.gz: 3aa30e9bf2e09d17205cd27355fc6f069a74593ee5e9f7d17af7e4c0f859f4ec
3
+ metadata.gz: 888a159b277de928e7919cded97ed96c137be8113996d54860a850b04d918dfa
4
+ data.tar.gz: c10657db54eb7eec78cb5cd17bf56ea88e591225ccd2dc05b75825ecf5175a80
5
5
  SHA512:
6
- metadata.gz: 101fff3a2ada429ba4a4e278b9b985dbd62d79d35a65d61b1a89123fee2104520d2337f46134f2813a7b4193862c22d2792caccf3772d5a1aac7d9ca69b1a32b
7
- data.tar.gz: bbc002049a5cfb0ce4133edc5c04bbb67c087b8917d2aab397fd2b649dadc9072478768636e7beaa89c567493448af9e3216c8e74a5521918844c3cf7685238c
6
+ metadata.gz: 8180e4a569b1496ca29317345f8d1ea049dc1b1dcbd080a64983cf0431e168a845519c07c49496e12dea37b31fa689c8ed023a83c5e18b827ded0387b0a4b344
7
+ data.tar.gz: d33af34e65346c67ea7e38c376bb089c1f662e3c616f973ea250687b80c1b81be37f46c3b203618cb57cf88a9b68e79f689cd619f5d3f626739deb83d1a35016
data/lib/asciidoctor/m3d/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/m3d/converter.rb CHANGED
@@ -3,6 +3,7 @@ require "metanorma/m3d/version"
3
3
  require "isodoc/m3d/m3dhtmlconvert"
4
4
  require "isodoc/m3d/m3dwordconvert"
5
5
  require "asciidoctor/standoc/converter"
6
+ require "fileutils"
6
7
 
7
8
  module Asciidoctor
8
9
  module M3d
@@ -55,6 +56,12 @@ module Asciidoctor
55
56
  xml.editorialgroup do |a|
56
57
  a.committee node.attr("technical-committee"),
57
58
  **attr_code(type: node.attr("technical-committee-type"))
59
+ i = 2
60
+ while node.attr("technical-committee_#{i}") do
61
+ a.committee node.attr("technical-committee_#{i}"),
62
+ **attr_code(type: node.attr("technical-committee-type_#{i}"))
63
+ i += 1
64
+ end
58
65
  end
59
66
  end
60
67
 
@@ -124,7 +131,7 @@ module Asciidoctor
124
131
  pdf_converter(node).convert filename unless node.attr("nodoc")
125
132
  word_converter(node).convert filename unless node.attr("nodoc")
126
133
  end
127
- @files_to_delete.each { |f| system "rm #{f}" }
134
+ @files_to_delete.each { |f| FileUtils.rm f }
128
135
  ret
129
136
  end
130
137
 
data/lib/asciidoctor/m3d/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/m3d/m3d.rng CHANGED
@@ -110,7 +110,9 @@
110
110
  </define>
111
111
  <define name="editorialgroup">
112
112
  <element name="editorialgroup">
113
- <ref name="committee"/>
113
+ <oneOrMore>
114
+ <ref name="committee"/>
115
+ </oneOrMore>
114
116
  </element>
115
117
  </define>
116
118
  </include>
data/lib/isodoc/m3d/html/m3d.scss CHANGED
@@ -639,7 +639,7 @@ div.example {
639
639
  margin-left:70.9pt;
640
640
  text-indent:-70.9pt;
641
641
  }
642
- p.example, li.example, div.example, td.example, td.example p
642
+ p.example, li.example, div.example, td.example
643
643
  { margin:0in;
644
644
  margin-bottom:.0001pt;
645
645
  mso-pagination:none;
data/lib/isodoc/m3d/html/wordstyle.scss CHANGED
@@ -75,6 +75,70 @@
75
75
  mso-fareast-font-family:"Times New Roman";
76
76
  mso-ansi-language:EN-US;
77
77
  mso-fareast-language:EN-US;}
78
+ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
79
+ {mso-style-priority:34;
80
+ mso-style-unhide:no;
81
+ mso-style-qformat:yes;
82
+ margin-top:0cm;
83
+ margin-right:0cm;
84
+ margin-bottom:0cm;
85
+ /* do not put in margin-left, it is specific to list level */
86
+ margin-bottom:.0001pt;
87
+ mso-add-space:auto;
88
+ mso-pagination:widow-orphan;
89
+ font-size:11.0pt;
90
+ font-family:$bodyfont;
91
+ mso-ansi-language:EN-AU;
92
+ mso-fareast-language:EN-US;}
93
+ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphCxSpFirst
94
+ {mso-style-priority:34;
95
+ mso-style-unhide:no;
96
+ mso-style-qformat:yes;
97
+ mso-style-type:export-only;
98
+ margin-top:0cm;
99
+ margin-right:0cm;
100
+ margin-bottom:0cm;
101
+ /* do not put in margin-left, it is specific to list level */
102
+ margin-bottom:.0001pt;
103
+ mso-add-space:auto;
104
+ mso-pagination:widow-orphan;
105
+ font-size:11.0pt;
106
+ font-family:$bodyfont;
107
+ mso-ansi-language:EN-AU;
108
+ mso-fareast-language:EN-US;}
109
+ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagraphCxSpMiddle
110
+ {mso-style-priority:34;
111
+ mso-style-unhide:no;
112
+ mso-style-qformat:yes;
113
+ mso-style-type:export-only;
114
+ margin-top:0cm;
115
+ margin-right:0cm;
116
+ margin-bottom:0cm;
117
+ /* do not put in margin-left, it is specific to list level */
118
+ margin-bottom:.0001pt;
119
+ mso-add-space:auto;
120
+ mso-pagination:widow-orphan;
121
+ font-size:11.0pt;
122
+ font-family:$bodyfont;
123
+ mso-ansi-language:EN-AU;
124
+ mso-fareast-language:EN-US;}
125
+ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxSpLast
126
+ {mso-style-priority:34;
127
+ mso-style-unhide:no;
128
+ mso-style-qformat:yes;
129
+ mso-style-type:export-only;
130
+ margin-top:0cm;
131
+ margin-right:0cm;
132
+ margin-bottom:0cm;
133
+ /* do not put in margin-left, it is specific to list level */
134
+ margin-bottom:12.0pt;
135
+ mso-add-space:auto;
136
+ mso-pagination:widow-orphan;
137
+ font-size:11.0pt;
138
+ font-family:$bodyfont;
139
+ mso-ansi-language:EN-AU;
140
+ mso-fareast-language:EN-US;}
141
+
78
142
  p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
79
143
  {mso-style-noshow:yes;
80
144
  mso-style-unhide:no;
@@ -189,6 +253,8 @@ span.blackgraphtx
189
253
  .MsoChpDefault
190
254
  {mso-style-type:export-only;
191
255
  mso-default-props:yes;}
256
+ div.figure
257
+ {text-align: center;}
192
258
 
193
259
 
194
260
 
@@ -267,6 +333,7 @@ h1.Annex
267
333
  font-size:12.0pt;
268
334
  mso-bidi-font-size:11.0pt;
269
335
  font-family:$headerfont;
336
+ font-weight:bold;
270
337
  mso-fareast-font-family:$headerfont;
271
338
  mso-ansi-language:EN-GB;
272
339
  mso-fareast-language:JA;
data/lib/isodoc/m3d/m3dhtmlconvert.rb CHANGED
@@ -10,7 +10,6 @@ module IsoDoc
10
10
  class HtmlConvert < IsoDoc::HtmlConvert
11
11
  def add_image(filenames)
12
12
  filenames.each do |filename|
13
- #system "cp #{html_doc_path(filename)} #{filename}"
14
13
  FileUtils.cp html_doc_path(filename), filename
15
14
  @files_to_delete << filename
16
15
  end
data/lib/isodoc/m3d/m3dwordconvert.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.jpg')} logo.jpg"
15
14
  FileUtils.cp html_doc_path("logo.jpg"), "logo.jpg"
16
15
  end
17
16
 
data/lib/metanorma/m3d/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module M3d
3
- VERSION = "1.0.6"
3
+ VERSION = "1.0.7"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-m3d
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.6
4
+ version: 1.0.7
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