metanorma-nist 0.2.8 → 0.2.9
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.
- checksums.yaml +4 -4
- data/lib/asciidoctor/nist/basicdoc.rng +3 -0
- data/lib/asciidoctor/nist/biblio.rng +11 -4
- data/lib/asciidoctor/nist/boilerplate.rb +3 -2
- data/lib/asciidoctor/nist/front.rb +1 -1
- data/lib/asciidoctor/nist/isostandard.rng +3 -1
- data/lib/asciidoctor/nist/nist.rng +13 -42
- data/lib/asciidoctor/nist/nist_intro.xml +29 -0
- data/lib/asciidoctor/nist/nist_intro_cswp.xml +29 -0
- data/lib/isodoc/nist/base_convert.rb +1 -0
- data/lib/isodoc/nist/html/_coverpage.scss +2 -1
- data/lib/isodoc/nist/html/html_nist_titlepage.html +14 -2
- data/lib/isodoc/nist/html/nist.scss +22 -0
- data/lib/isodoc/nist/html/word_nist_titlepage.html +14 -0
- data/lib/isodoc/nist/html_convert.rb +4 -4
- data/lib/isodoc/nist/pdf_convert.rb +5 -0
- data/lib/isodoc/nist/word_convert.rb +8 -0
- data/lib/metanorma/nist/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 6078cd636ca24db811529a026c324f4c86252ca08eefff7bf7ec32af86d28ec8
|
|
4
|
+
data.tar.gz: 2be8abf10e94df1164a1f885c3d944813e89337d822c09528a1a8ac8041ee591
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 2324ac3828b7fb1aab2892dbf362bcb7debac2d3bb608652c54ae175a86506b05821a3424dc334261c168998adad6725741967ed124c35b269d93fd21434d91b
|
|
7
|
+
data.tar.gz: 454a9b7a52affeaceed28ca2aeeca746e101ec287f69af13aa67df88fa7e6fcb9771407c68a6f9f2984c2ba1ba17b36c4d0ea965b466a9ed73d27bdacafc5166
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
</data>
|
|
35
35
|
</define>
|
|
36
36
|
<start>
|
|
37
|
-
<ref name="
|
|
37
|
+
<ref name="bibitem"/>
|
|
38
38
|
</start>
|
|
39
39
|
<define name="status">
|
|
40
40
|
<element name="status">
|
|
@@ -278,10 +278,12 @@
|
|
|
278
278
|
</define>
|
|
279
279
|
<define name="organization">
|
|
280
280
|
<element name="organization">
|
|
281
|
-
<
|
|
282
|
-
|
|
281
|
+
<oneOrMore>
|
|
282
|
+
<ref name="orgname"/>
|
|
283
|
+
</oneOrMore>
|
|
284
|
+
<zeroOrMore>
|
|
283
285
|
<ref name="subdivision"/>
|
|
284
|
-
</
|
|
286
|
+
</zeroOrMore>
|
|
285
287
|
<optional>
|
|
286
288
|
<ref name="abbreviation"/>
|
|
287
289
|
</optional>
|
|
@@ -357,6 +359,9 @@
|
|
|
357
359
|
</define>
|
|
358
360
|
<define name="phone">
|
|
359
361
|
<element name="phone">
|
|
362
|
+
<optional>
|
|
363
|
+
<attribute name="type"/>
|
|
364
|
+
</optional>
|
|
360
365
|
<text/>
|
|
361
366
|
</element>
|
|
362
367
|
</define>
|
|
@@ -1024,6 +1029,8 @@
|
|
|
1024
1029
|
<value>correctedBy</value>
|
|
1025
1030
|
<value>revises</value>
|
|
1026
1031
|
<value>revisedBy</value>
|
|
1032
|
+
<value>describes</value>
|
|
1033
|
+
<value>describedBy</value>
|
|
1027
1034
|
</choice>
|
|
1028
1035
|
</define>
|
|
1029
1036
|
<define name="docrelation">
|
|
@@ -97,10 +97,11 @@ module Asciidoctor
|
|
|
97
97
|
x.root.add_namespace(nil, EXAMPLE_NAMESPACE)
|
|
98
98
|
x = Nokogiri::XML(x.to_xml)
|
|
99
99
|
conv = IsoDoc::NIST::HtmlConvert.new({})
|
|
100
|
+
conv.i18n_init("en", "Latn")
|
|
100
101
|
conv.metadata_init("en", "Latn", {})
|
|
101
102
|
conv.info(x, nil)
|
|
102
|
-
conv.labels = {nist_division: @nistdivision,
|
|
103
|
-
nist_division_address: @nistdivisionaddress}
|
|
103
|
+
conv.labels = conv.labels.merge({nist_division: @nistdivision,
|
|
104
|
+
nist_division_address: @nistdivisionaddress})
|
|
104
105
|
file = @boilerplateauthority ? "#{@localdir}/#{@boilerplateauthority}" :
|
|
105
106
|
File.join(File.dirname(__FILE__), @series == "nist-cswp" ? "nist_intro_cswp.xml" : "nist_intro.xml")
|
|
106
107
|
conv.populate_template((File.read(file, encoding: "UTF-8")), nil)
|
|
@@ -128,7 +128,7 @@ module Asciidoctor
|
|
|
128
128
|
def add_id_parts_mr(args)
|
|
129
129
|
args[:series] and
|
|
130
130
|
name = SERIES_ABBR&.dig(args[:series].to_sym)&.sub(/^NIST /, "")
|
|
131
|
-
"NIST.#{name}.#{args[:vol]}.#{args[:revision]}.#{args[:date]}"
|
|
131
|
+
"NIST.#{name}.#{args[:id]}.#{args[:vol]}.#{args[:revision]}.#{args[:date]}"
|
|
132
132
|
end
|
|
133
133
|
|
|
134
134
|
def metadata_author(node, xml)
|
|
@@ -61,48 +61,6 @@
|
|
|
61
61
|
<value>main</value>
|
|
62
62
|
</choice>
|
|
63
63
|
</define>
|
|
64
|
-
<!-- DocRelationType |= "obsoletedBy" | "supersedes" | "supersededBy" -->
|
|
65
|
-
<define name="DocRelationType">
|
|
66
|
-
<choice>
|
|
67
|
-
<value>obsoletes</value>
|
|
68
|
-
<value>updates</value>
|
|
69
|
-
<value>updatedBy</value>
|
|
70
|
-
<value>complements</value>
|
|
71
|
-
<value>derivedFrom</value>
|
|
72
|
-
<value>translatedFrom</value>
|
|
73
|
-
<value>adoptedFrom</value>
|
|
74
|
-
<value>equivalent</value>
|
|
75
|
-
<value>identical</value>
|
|
76
|
-
<value>nonequivalent</value>
|
|
77
|
-
<value>includedIn</value>
|
|
78
|
-
<value>includes</value>
|
|
79
|
-
<value>instance</value>
|
|
80
|
-
<value>partOf</value>
|
|
81
|
-
<value>hasDraft</value>
|
|
82
|
-
<value>obsoletedBy</value>
|
|
83
|
-
<value>supersedes</value>
|
|
84
|
-
<value>supersededBy</value>
|
|
85
|
-
</choice>
|
|
86
|
-
</define>
|
|
87
|
-
<!-- BibliographicDateType |= "abandoned" | "superseded" -->
|
|
88
|
-
<define name="BibliographicDateType">
|
|
89
|
-
<choice>
|
|
90
|
-
<value>published</value>
|
|
91
|
-
<value>accessed</value>
|
|
92
|
-
<value>created</value>
|
|
93
|
-
<value>implemented</value>
|
|
94
|
-
<value>obsoleted</value>
|
|
95
|
-
<value>confirmed</value>
|
|
96
|
-
<value>updated</value>
|
|
97
|
-
<value>issued</value>
|
|
98
|
-
<value>transmitted</value>
|
|
99
|
-
<value>copied</value>
|
|
100
|
-
<value>unchanged</value>
|
|
101
|
-
<value>circulated</value>
|
|
102
|
-
<value>abandoned</value>
|
|
103
|
-
<value>superseded</value>
|
|
104
|
-
</choice>
|
|
105
|
-
</define>
|
|
106
64
|
<define name="preface">
|
|
107
65
|
<element name="preface">
|
|
108
66
|
<optional>
|
|
@@ -178,6 +136,19 @@
|
|
|
178
136
|
</optional>
|
|
179
137
|
</define>
|
|
180
138
|
</include>
|
|
139
|
+
<define name="DocRelationType" combine="choice">
|
|
140
|
+
<choice>
|
|
141
|
+
<value>obsoletedBy</value>
|
|
142
|
+
<value>supersedes</value>
|
|
143
|
+
<value>supersededBy</value>
|
|
144
|
+
</choice>
|
|
145
|
+
</define>
|
|
146
|
+
<define name="BibliographicDateType" combine="choice">
|
|
147
|
+
<choice>
|
|
148
|
+
<value>abandoned</value>
|
|
149
|
+
<value>superseded</value>
|
|
150
|
+
</choice>
|
|
151
|
+
</define>
|
|
181
152
|
<define name="commentperiod">
|
|
182
153
|
<element name="commentperiod">
|
|
183
154
|
<element name="from">
|
|
@@ -1,4 +1,33 @@
|
|
|
1
1
|
<boilerplate>
|
|
2
|
+
{%if substage == "retired" or substage == "withdrawn" or status == "Internal Draft" or status == "Work-in-Progress Draft" or status == "Preliminary Draft" or status == "Public Draft" or status == "Approval Draft" %}
|
|
3
|
+
<license-statement>
|
|
4
|
+
<clause id="authority6">
|
|
5
|
+
<title>Warning Notice</title>
|
|
6
|
+
<p>
|
|
7
|
+
{%- if substage == "retired" or substage == "withdrawn" -%}
|
|
8
|
+
{%- if unpublished -%}
|
|
9
|
+
{%- if substage == "retired" %}{{draft-retired-boilerplate}}{% else %}{{draft-withdrawn-boilerplate}}{% endif -%}
|
|
10
|
+
{%- else -%}
|
|
11
|
+
{%- if withdrawal_pending %}{{ withdrawal-pending-boilerplate}}{% else %}{{ publication-withdrawn-boilerplate }}{% endif -%}
|
|
12
|
+
{%- endif -%}
|
|
13
|
+
{%- else -%}
|
|
14
|
+
{%- if status == "Internal Draft" -%}
|
|
15
|
+
{{- draft-internal-boilerplate -}}
|
|
16
|
+
{%- elsif status == "Work-in-Progress Draft" -%}
|
|
17
|
+
{{- draft-wip-boilerplate -}}
|
|
18
|
+
{%- elsif status == "Preliminary Draft" -%}
|
|
19
|
+
{{- draft-prelim-boilerplate -}}
|
|
20
|
+
{%- elsif status == "Public Draft" -%}
|
|
21
|
+
{{- draft-public-boilerplate -}}
|
|
22
|
+
{%- elsif status == "Approval Draft" -%}
|
|
23
|
+
{{- draft-public-boilerplate -}}
|
|
24
|
+
{%- endif -%}
|
|
25
|
+
{%- endif -%}
|
|
26
|
+
</p>
|
|
27
|
+
</clause>
|
|
28
|
+
</license-statement>
|
|
29
|
+
{% endif %}
|
|
30
|
+
|
|
2
31
|
<legal-statement>
|
|
3
32
|
|
|
4
33
|
<clause id="authority1">
|
|
@@ -1,4 +1,33 @@
|
|
|
1
1
|
<boilerplate>
|
|
2
|
+
{%if substage == "retired" or substage == "withdrawn" or status == "Internal Draft" or status == "Work-in-Progress Draft" or status == "Preliminary Draft" or status == "Public Draft" or status == "Approval Draft" %}
|
|
3
|
+
<license-statement>
|
|
4
|
+
<clause id="authority6">
|
|
5
|
+
<title>Warning Notice</title>
|
|
6
|
+
<p>
|
|
7
|
+
{%- if substage == "retired" or substage == "withdrawn" -%}
|
|
8
|
+
{%- if unpublished -%}
|
|
9
|
+
{%- if substage == "retired" %}{{draft-retired-boilerplate}}{% else %}{{draft-withdrawn-boilerplate}}{% endif -%}
|
|
10
|
+
{%- else -%}
|
|
11
|
+
{%- if withdrawal_pending %}{{ withdrawal-pending-boilerplate}}{% else %}{{ publication-withdrawn-boilerplate }}{% endif -%}
|
|
12
|
+
{%- endif -%}
|
|
13
|
+
{%- else -%}
|
|
14
|
+
{%- if status == "Internal Draft" -%}
|
|
15
|
+
{{- draft-internal-boilerplate -}}
|
|
16
|
+
{%- elsif status == "Work-in-Progress Draft" -%}
|
|
17
|
+
{{- draft-wip-boilerplate -}}
|
|
18
|
+
{%- elsif status == "Preliminary Draft" -%}
|
|
19
|
+
{{- draft-prelim-boilerplate -}}
|
|
20
|
+
{%- elsif status == "Public Draft" -%}
|
|
21
|
+
{{- draft-public-boilerplate -}}
|
|
22
|
+
{%- elsif status == "Approval Draft" -%}
|
|
23
|
+
{{- draft-public-boilerplate -}}
|
|
24
|
+
{%- endif -%}
|
|
25
|
+
{%- endif -%}
|
|
26
|
+
</p>
|
|
27
|
+
</clause>
|
|
28
|
+
</license-statement>
|
|
29
|
+
{% endif %}
|
|
30
|
+
|
|
2
31
|
<legal-statement>
|
|
3
32
|
|
|
4
33
|
<clause id="authority3">
|
|
@@ -97,6 +97,7 @@ module IsoDoc
|
|
|
97
97
|
when "permission" then permission_parse(node, out)
|
|
98
98
|
when "errata" then errata_parse(node, out)
|
|
99
99
|
when "legal-statement" then children_parse(node, out)
|
|
100
|
+
when "license-statement" then children_parse(node, out)
|
|
100
101
|
when "feedback-statement" then children_parse(node, out)
|
|
101
102
|
else
|
|
102
103
|
super
|
|
@@ -85,8 +85,10 @@
|
|
|
85
85
|
{% if substage == "retired" or substage == "withdrawn" %}
|
|
86
86
|
{% if unpublished %}
|
|
87
87
|
<div class="coverpage-warning">
|
|
88
|
-
|
|
88
|
+
<!--
|
|
89
89
|
<p>{% if substage == "retired" %}{{draft-retired-boilerplate}}{% else %}{{draft-withdrawn-boilerplate}}{% endif %}</p>
|
|
90
|
+
-->
|
|
91
|
+
<div class="authority6"/>
|
|
90
92
|
|
|
91
93
|
<div class="retired-date"><b>{% if substage == "retired" %}Retired Date{% else %}Withdrawal Date{% endif %}:</b>
|
|
92
94
|
{% if substage == "retired" %}{{ abandoneddate_MMMddyyyy }}{% else %}{{ obsoleteddate_MMMddyyyy}}{% endif %}</div>
|
|
@@ -101,12 +103,14 @@
|
|
|
101
103
|
</div>
|
|
102
104
|
{% else %}
|
|
103
105
|
<div class="coverpage-warning">
|
|
104
|
-
|
|
106
|
+
<!--
|
|
105
107
|
{% if withdrawal_pending %}
|
|
106
108
|
<p>{{ withdrawal-pending-boilerplate}}</p>
|
|
107
109
|
{% else %}
|
|
108
110
|
<p>{{ publication-withdrawn-boilerplate }}</p>
|
|
109
111
|
{% endif %}
|
|
112
|
+
-->
|
|
113
|
+
<div class="authority6"/>
|
|
110
114
|
|
|
111
115
|
<div class="retired-date"><b>Retired date:</b> {{ obsoleteddate_MMMddyyyy }}</div>
|
|
112
116
|
<div class="retired-date"><b>Superseded date:</b> {% if superseded_date %}{{ supersededdate_MMMddyyyy}}{% else %}{{ obsoleteddate_MMMddyyyy}}{% endif %}</div>
|
|
@@ -150,6 +154,14 @@
|
|
|
150
154
|
</div>
|
|
151
155
|
{% endif %}
|
|
152
156
|
{% else %}
|
|
157
|
+
|
|
158
|
+
{% if unpublished %}
|
|
159
|
+
<div class="coverpage-warning">
|
|
160
|
+
<div class="authority6"/>
|
|
161
|
+
</div>
|
|
162
|
+
{% endif %}
|
|
163
|
+
|
|
164
|
+
|
|
153
165
|
{% unless unpublished %}
|
|
154
166
|
<div class="coverpage-logo">
|
|
155
167
|
<span>{{ issueddate_monthyear }}</span>
|
|
@@ -25,6 +25,28 @@ div.authority1 p, div.authority2 p, div.authority3 p, div.authority4 p, div.auth
|
|
|
25
25
|
font-size:11.0pt;
|
|
26
26
|
}
|
|
27
27
|
|
|
28
|
+
div.authority6 p.h2Preface, div.authority6 p.h1Preface {
|
|
29
|
+
font-weight: bold;
|
|
30
|
+
margin-bottom: 12pt;
|
|
31
|
+
text-align: center;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
div.authority6 p {
|
|
35
|
+
font-size: 12pt;
|
|
36
|
+
font-family:"Times New Roman",serif;
|
|
37
|
+
margin:0cm;
|
|
38
|
+
margin-bottom:.0001pt;
|
|
39
|
+
mso-pagination:widow-orphan;
|
|
40
|
+
mso-layout-grid-align:none;
|
|
41
|
+
text-autospace:none;
|
|
42
|
+
text-align:justify;
|
|
43
|
+
text-justify:inter-ideograph;
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
div.withdrawn div.authority6 p {
|
|
47
|
+
font-family:"Calibri",sans-serif;
|
|
48
|
+
}
|
|
49
|
+
|
|
28
50
|
p.Default, li.Default, div.Default
|
|
29
51
|
{mso-style-name:Default;
|
|
30
52
|
mso-style-unhide:no;
|
|
@@ -54,6 +54,7 @@ AABkcnMvZG93bnJldi54bWxQSwUGAAAAAAQABADzAAAAkwUAAAAA
|
|
|
54
54
|
<v:textbox>
|
|
55
55
|
|
|
56
56
|
<div>
|
|
57
|
+
<!--
|
|
57
58
|
<p class="Default" align="center" style='text-align:center;font-size:12.0pt;'><b
|
|
58
59
|
style='mso-bidi-font-weight:normal'><span lang="EN-US">Warning Notice<o:p></o:p></span></b></p>
|
|
59
60
|
<p class="Default"><span lang="EN-US" style='mso-fareast-font-family:"Times New Roman"'><o:p> </o:p></span></p>
|
|
@@ -62,6 +63,8 @@ AABkcnMvZG93bnJldi54bWxQSwUGAAAAAAQABADzAAAAkwUAAAAA
|
|
|
62
63
|
{% else %}
|
|
63
64
|
<p class="Default" style='font-size:12.0pt;'><span lang="EN-US" style='mso-fareast-font-family:"Times New Roman"'>{{draft-withdrawn-boilerplate}}<o:p></o:p></span></p>
|
|
64
65
|
{% endif %}
|
|
66
|
+
-->
|
|
67
|
+
<div class="authority6"/>
|
|
65
68
|
<p class="Default" align="center" style='text-align:center'><span lang="EN-US"
|
|
66
69
|
style='mso-fareast-font-family:"Times New Roman"'><o:p> </o:p></span></p>
|
|
67
70
|
<table class="MsoTableGrid" border="0" cellspacing="0" cellpadding="0" width="636"
|
|
@@ -367,10 +370,13 @@ AABkcnMvZG93bnJldi54bWxQSwUGAAAAAAQABADzAAAAkwUAAAAA
|
|
|
367
370
|
<v:textbox>
|
|
368
371
|
|
|
369
372
|
<div>
|
|
373
|
+
<div class="authority6"/>
|
|
374
|
+
<!--
|
|
370
375
|
<p class="Default" align="center" style='text-align:center;font-size:12.0pt;'><b
|
|
371
376
|
style='mso-bidi-font-weight:normal'><span lang="EN-US">Warning Notice<o:p></o:p></span></b></p>
|
|
372
377
|
<p class="Default"><span lang="EN-US" style='mso-fareast-font-family:"Times New Roman"'><o:p> </o:p></span></p>
|
|
373
378
|
<p class="Default" style='font-size:12.0pt;'><span lang="EN-US" style='mso-fareast-font-family:"Times New Roman"'>{{ withdrawal-pending-boilerplate}}<o:p></o:p></span></p>
|
|
379
|
+
-->
|
|
374
380
|
<p class="Default" align="center" style='text-align:center'><span lang="EN-US"
|
|
375
381
|
style='mso-fareast-font-family:"Times New Roman"'><o:p> </o:p></span></p>
|
|
376
382
|
<table class="MsoTableGrid" border="0" cellspacing="0" cellpadding="0" width="636"
|
|
@@ -576,6 +582,7 @@ style='width:477.0pt;margin-left:-5.25pt;border-collapse:collapse;border:none;ms
|
|
|
576
582
|
<td width="636" colspan="2" valign="top" style='width:477.0pt;border:solid windowtext 1.5pt;
|
|
577
583
|
border-bottom:solid windowtext 1.0pt;mso-border-alt:solid windowtext 1.5pt;
|
|
578
584
|
mso-border-bottom-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
|
|
585
|
+
<!--
|
|
579
586
|
<p class="Default" align="center" style='text-align:center'><b style='mso-bidi-font-weight:
|
|
580
587
|
normal'><span lang="EN-US" style='font-size:12.0pt;font-family:"Calibri",sans-serif;
|
|
581
588
|
mso-ascii-theme-font:major-latin;mso-hansi-theme-font:major-latin;mso-bidi-font-family:
|
|
@@ -587,6 +594,10 @@ style='width:477.0pt;margin-left:-5.25pt;border-collapse:collapse;border:none;ms
|
|
|
587
594
|
<p class="Default"><span lang="EN-US" style='font-size:11.0pt;font-family:"Calibri",sans-serif;
|
|
588
595
|
mso-ascii-theme-font:major-latin;mso-fareast-font-family:"Times New Roman";
|
|
589
596
|
mso-hansi-theme-font:major-latin;mso-bidi-font-family:"Times New Roman"'>{{publication-withdrawn-boilerplate}}<o:p></o:p></span></p>
|
|
597
|
+
-->
|
|
598
|
+
<div class="withdrawn">
|
|
599
|
+
<div class="authority6"/>
|
|
600
|
+
</div>
|
|
590
601
|
<p class="Default"><span lang="EN-US" style='font-family:"Times New Roman",serif;
|
|
591
602
|
color:black;mso-themecolor:text1'><o:p> </o:p></span></p>
|
|
592
603
|
</td>
|
|
@@ -1093,6 +1104,7 @@ style='font-size:14.0pt;color:black;mso-themecolor:text1'> </span></p>
|
|
|
1093
1104
|
|
|
1094
1105
|
<div align="center" style='text-align:center;border:none;mso-border-alt:solid windowtext 1.5pt;padding:0cm;mso-padding-alt:8.0pt 4.0pt 8.0pt 4.0pt'>
|
|
1095
1106
|
|
|
1107
|
+
<!--
|
|
1096
1108
|
<p class="Default" align="center" style='text-align:center'><b
|
|
1097
1109
|
style='mso-bidi-font-weight:normal'><span lang="EN-US" style='font-size:12.0pt'>Warning Notice</span></b></p>
|
|
1098
1110
|
<p class="Default" align="center" style='text-align:center'><span lang="EN-US"
|
|
@@ -1109,6 +1121,8 @@ style='font-size:14.0pt;color:black;mso-themecolor:text1'> </span></p>
|
|
|
1109
1121
|
{% else %}
|
|
1110
1122
|
{{status}}
|
|
1111
1123
|
{% endif %}</span></p>
|
|
1124
|
+
-->
|
|
1125
|
+
<div class="authority6"/>
|
|
1112
1126
|
{% if status != "Internal Draft" %}
|
|
1113
1127
|
<p class="Default" style='text-align:justify;text-justify:inter-ideograph'><span
|
|
1114
1128
|
lang="EN-US"> </span></p>
|
|
@@ -15,10 +15,6 @@ module IsoDoc
|
|
|
15
15
|
|
|
16
16
|
def convert1(docxml, filename, dir)
|
|
17
17
|
@bibliographycount = docxml.xpath(ns("//bibliography/references | //annex/references | //bibliography/clause/references")).size
|
|
18
|
-
#FileUtils.cp html_doc_path('logo.png'), "#{@localdir}/logo.png"
|
|
19
|
-
#FileUtils.cp html_doc_path('commerce-logo-color.png'), "#{@localdir}/commerce-logo-color.png"
|
|
20
|
-
#@files_to_delete << "#{@localdir}/logo.png"
|
|
21
|
-
#@files_to_delete << "#{@localdir}/commerce-logo-color.png"
|
|
22
18
|
super
|
|
23
19
|
end
|
|
24
20
|
|
|
@@ -89,6 +85,9 @@ module IsoDoc
|
|
|
89
85
|
dest = docxml.at("//div[@id = 'authority']") || return
|
|
90
86
|
auth = docxml.at("//div[@class = 'authority']") || return
|
|
91
87
|
auth.xpath(".//h1 | .//h2").each { |h| h["class"] = "IntroTitle" }
|
|
88
|
+
dest1 = docxml.xpath("//div[@class = 'authority6']")
|
|
89
|
+
auth1 = docxml&.at("//div[@id = 'authority6']")&.remove
|
|
90
|
+
dest1 and auth1 and dest1.each { |d| d.replace(auth1) }
|
|
92
91
|
dest.replace(auth.remove)
|
|
93
92
|
a = docxml.at("//div[@id = 'authority1']") and a["class"] = "authority1"
|
|
94
93
|
a = docxml.at("//div[@id = 'authority2']") and a["class"] = "authority2"
|
|
@@ -96,6 +95,7 @@ module IsoDoc
|
|
|
96
95
|
a = docxml.at("//div[@id = 'authority3a']") and a["class"] = "authority3"
|
|
97
96
|
a = docxml.at("//div[@id = 'authority4']") and a["class"] = "authority4"
|
|
98
97
|
a = docxml.at("//div[@id = 'authority5']") and a["class"] = "authority5"
|
|
98
|
+
a = docxml.at("//div[@id = 'authority6']") and a["class"] = "authority6"
|
|
99
99
|
end
|
|
100
100
|
|
|
101
101
|
def cleanup(docxml)
|
|
@@ -89,6 +89,10 @@ module IsoDoc
|
|
|
89
89
|
def authority_cleanup(docxml)
|
|
90
90
|
dest = docxml.at("//div[@id = 'authority']") || return
|
|
91
91
|
auth = docxml.at("//div[@class = 'authority']") || return
|
|
92
|
+
auth.xpath(".//h1 | .//h2").each { |h| h["class"] = "IntroTitle" }
|
|
93
|
+
dest1 = docxml.xpath("//div[@class = 'authority6']")
|
|
94
|
+
auth1 = docxml&.at("//div[@id = 'authority6']")&.remove
|
|
95
|
+
dest1 and auth1 and dest1.each { |d| d.replace(auth1) }
|
|
92
96
|
dest.replace(auth.remove)
|
|
93
97
|
a = docxml.at("//div[@id = 'authority1']") and a["class"] = "authority1"
|
|
94
98
|
a = docxml.at("//div[@id = 'authority2']") and a["class"] = "authority2"
|
|
@@ -96,6 +100,7 @@ module IsoDoc
|
|
|
96
100
|
a = docxml.at("//div[@id = 'authority3a']") and a["class"] = "authority3"
|
|
97
101
|
a = docxml.at("//div[@id = 'authority4']") and a["class"] = "authority4"
|
|
98
102
|
a = docxml.at("//div[@id = 'authority5']") and a["class"] = "authority5"
|
|
103
|
+
a = docxml.at("//div[@id = 'authority6']") and a["class"] = "authority6"
|
|
99
104
|
end
|
|
100
105
|
|
|
101
106
|
def cleanup(docxml)
|
|
@@ -84,6 +84,13 @@ module IsoDoc
|
|
|
84
84
|
end
|
|
85
85
|
|
|
86
86
|
def authority_cleanup(docxml)
|
|
87
|
+
docxml.xpath("//div[@class = 'authority']//h1 | //div[@class = 'authority']//h2").each do |h|
|
|
88
|
+
h.name = p
|
|
89
|
+
h["class"] = "IntroTitle"
|
|
90
|
+
end
|
|
91
|
+
dest1 = docxml.xpath("//div[@class = 'authority6']")
|
|
92
|
+
auth1 = docxml&.at("//div[@id = 'authority6']")&.remove
|
|
93
|
+
dest1 and auth1 and dest1.each { |d| d.replace(auth1) }
|
|
87
94
|
insert = docxml.at("//div[@class = 'WordSection2']")
|
|
88
95
|
if @series != "NIST CSWP"
|
|
89
96
|
auth = docxml&.at("//div[@class = 'authority']")&.remove || return
|
|
@@ -96,6 +103,7 @@ module IsoDoc
|
|
|
96
103
|
a["class"] = "authority3"
|
|
97
104
|
a = docxml.at("//div[@id = 'authority4']") and a["class"] = "authority4"
|
|
98
105
|
a = docxml.at("//div[@id = 'authority5']") and a["class"] = "authority5"
|
|
106
|
+
a = docxml.at("//div[@id = 'authority6']") and a["class"] = "authority6"
|
|
99
107
|
end
|
|
100
108
|
|
|
101
109
|
def cleanup(docxml)
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-nist
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.2.
|
|
4
|
+
version: 0.2.9
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-
|
|
11
|
+
date: 2019-12-13 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: htmlentities
|