metanorma-nist 0.0.9 → 0.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (23) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +4 -2
  3. data/README.adoc +7 -8
  4. data/appveyor.yml +7 -2
  5. data/lib/asciidoctor/nist/biblio.rng +2 -2
  6. data/lib/asciidoctor/nist/cleanup.rb +8 -0
  7. data/lib/asciidoctor/nist/front.rb +16 -12
  8. data/lib/asciidoctor/nist/isodoc.rng +44 -48
  9. data/lib/asciidoctor/nist/isostandard.rng +28 -248
  10. data/lib/asciidoctor/nist/nist.rng +16 -222
  11. data/lib/asciidoctor/nist/reqt.rng +5 -0
  12. data/lib/asciidoctor/nist/validate.rb +50 -4
  13. data/lib/isodoc/nist/base_convert.rb +15 -36
  14. data/lib/isodoc/nist/html/html_nist_titlepage.html +134 -45
  15. data/lib/isodoc/nist/html/htmlstyle.scss +129 -30
  16. data/lib/isodoc/nist/html/word_nist_titlepage.html +2 -2
  17. data/lib/isodoc/nist/html_convert.rb +10 -0
  18. data/lib/isodoc/nist/metadata.rb +14 -22
  19. data/lib/isodoc/nist/pdf_convert.rb +10 -18
  20. data/lib/isodoc/nist/render.rb +6 -6
  21. data/lib/metanorma/nist/version.rb +1 -1
  22. data/metanorma-nist.gemspec +5 -4
  23. metadata +36 -22
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 553e8bf36b10720beecc7e76b0bf8cc2141ea7dfa18b9389adb2355521df72cb
4
- data.tar.gz: 4d050660b0d6954dd58bbee575fd62374bcdb2c931b9cce5f4271f30a79a6ecb
3
+ metadata.gz: 7e2116c19f5daea959497e608d2a19599645a3b827aa4d50f218e8bcc873ff6a
4
+ data.tar.gz: 47edb544f7e6379637bc9165c5c9b920cb3221c4f16407161edc531661bb8867
5
5
  SHA512:
6
- metadata.gz: 84ae66bfe9a43d1e79f65c9532116c73eec1a562020e206ce05883391e049dc46fe44a73f60d1ab66396eac6406065d5c36cc84a51b0c927f30b885c33aeee24
7
- data.tar.gz: e7bf0c5bc1e70fab341d8c98f0cef3194e3795bae8c705b38bec555822a670b6a4c5682e4663dfbcc8663969b7bc7fe307856f97ba5e9274e261e2893464ce2c
6
+ metadata.gz: e607121469a2d8d3c96579459a4ab6266a0a2f53dfcbe0bf0c2c35dfe53edf62501d44ba9b124e4c757dfbf940fdfba03cbc91b8ef2dec28509530f524bc2d34
7
+ data.tar.gz: 885616b6cc0281fa7f06c97c70e7859631ee5857a7543f0c8fa4d9142d3a0406eea165a461e44b6ebf6a06f21b4056652f9f5802ff61c03970ed6d00f745709e
data/.travis.yml CHANGED
@@ -1,3 +1,5 @@
1
+ # Auto-generated !!! Do not edit it manually
2
+ # use ci-master https://github.com/metanorma/metanorma-build-scripts
1
3
  language: ruby
2
4
  cache: bundler
3
5
  os:
@@ -6,11 +8,11 @@ os:
6
8
  rvm:
7
9
  - 2.5
8
10
  - 2.4
9
- - 2.3
10
11
  - ruby-head
11
- before_install:
12
+ before_install:
12
13
  - nvm install 8
13
14
  - npm install -g puppeteer
15
+ - npm install
14
16
  - gem install bundler -v 2.0.1
15
17
  - bundle update
16
18
  matrix:
data/README.adoc CHANGED
@@ -150,9 +150,6 @@ as the document identifier is composed from the document series, document number
150
150
  and edition/revision (e.g. _NIST SP 800 Revision 1_).
151
151
  If the `:docidentifier:` value is provided, it will override this composed value.
152
152
 
153
- `:edition:`:: Edition (revision) of the document. The value of
154
- this attribute will be displayed as part of the heading, prefixed with "Revision".
155
-
156
153
  `:status:`:: Document status/stage. The permitted types are:
157
154
  +
158
155
  --
@@ -160,6 +157,7 @@ this attribute will be displayed as part of the heading, prefixed with "Revision
160
157
  * `draft-wip`
161
158
  * `draft-prelim`
162
159
  * `draft-public`
160
+ * `draft-approval`
163
161
  * `final` (default: document is published)
164
162
  * `final-review`
165
163
  --
@@ -233,7 +231,8 @@ Added to authority statement as document contact. Use line breaks (in Asciidocto
233
231
  ` + \`) if necessary. Default value is
234
232
  "100 Bureau Drive (Mail Stop 8930) Gaithersburg, MD 20899-8930"
235
233
 
236
- `:revision:`:: The document revision; e.g. `1` (Revision 1).
234
+ `:revision:`:: The document revision; e.g. `1` (Revision 1). Will be stored in Metanorma XML
235
+ under the `<edition>` tag, with the prefix `Revision `.
237
236
 
238
237
  `:volume:`::
239
238
  The number of the volume of a standard. Is ignored if a precomposed
@@ -626,10 +625,10 @@ using `:status:`, `:substage:`, `:iteration:`, and `:confirmed-date`.
626
625
  | ISO stage | NIST | 93 Repeat current phase | 98 Abandon | 99 Proceed
627
626
 
628
627
  | 00 Preliminary | `:status: draft-internal` | | (stop work) | `:status: draft-wip`, `:status: draft-public`, or `:status: final` (amend)
629
- | 10 Proposal | `:status: draft-wip` | | `:status: draft-wip`, `:substage: retired` | `:status: draft-wip`, `:substage: withdrawn`
630
- | 20 Preparatory | `status: draft-prelim` | | `status: draft-prelim`, `substage: retired` | `status: draft-prelim`, `substage: withdrawn`
631
- | 40 Enquiry | `status: draft-public` | `status: draft-public`, `:iteration: 2`, `:iteration: 3` ... `:iteration: final` | `:status: draft-public`, `:substage: retired` | `:status: draft-public`, `:substage: withdrawn`
632
- | 50 Approval | (NIST ERB review) | | `:status: draft-public`, `:substage: retired` | `:status: final`
628
+ | 10 Proposal | `:status: draft-wip` | | `:status: draft-wip`, `:substage: retired` | `:status: draft-wip`, `:substage: withdrawn` or `status: draft-prelim`
629
+ | 20 Preparatory | `status: draft-prelim` | | `status: draft-prelim`, `substage: retired` | `status: draft-prelim`, `substage: withdrawn` or `status: draft-public`
630
+ | 40 Enquiry | `status: draft-public` | `status: draft-public`, `:iteration: 2`, `:iteration: 3` ... `:iteration: final` | `:status: draft-public`, `:substage: retired` | `:status: draft-public`, `:substage: withdrawn` or `draft-approval`
631
+ | 50 Approval | `status: draft-approval` | | `:status: draft-approval`, `:substage: retired` | `:status: final`
633
632
  | 60 Publication | `:status: final`
634
633
  | 90 Review | `:status: final-review` | `:status: final`, `:confirmed-date: XXXX-XX-XX` | `:status: final`, `:substage: withdrawn` | `:status: draft-internal` (revise or amend)
635
634
  | 95 Withdrawal | `:status: final`, `:substage: withdrawn` | | |
data/appveyor.yml CHANGED
@@ -1,10 +1,14 @@
1
+ # Auto-generated !!! Do not edit it manually
2
+ # use ci-master https://github.com/metanorma/metanorma-build-scripts
1
3
  version: '{build}'
2
4
 
5
+ cache:
6
+ - vendor/bundle
7
+
3
8
  environment:
4
9
  matrix:
5
10
  - RUBY_VERSION: 25
6
11
  - RUBY_VERSION: 24
7
- - RUBY_VERSION: 23
8
12
  - RUBY_VERSION: _trunk
9
13
 
10
14
  matrix:
@@ -17,6 +21,8 @@ install:
17
21
 
18
22
  build_script:
19
23
  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
24
+ - set GIT_TERMINAL_PROMPT=0
25
+ - bundle config --local path vendor/bundle
20
26
  - bundle update
21
27
  - bundle install
22
28
 
@@ -27,4 +33,3 @@ before_test:
27
33
 
28
34
  test_script:
29
35
  - bundle exec rake
30
-
data/lib/asciidoctor/nist/biblio.rng CHANGED
@@ -544,9 +544,9 @@
544
544
  <zeroOrMore>
545
545
  <ref name="script"/>
546
546
  </zeroOrMore>
547
- <optional>
547
+ <zeroOrMore>
548
548
  <ref name="abstract"/>
549
- </optional>
549
+ </zeroOrMore>
550
550
  <optional>
551
551
  <ref name="status"/>
552
552
  </optional>
data/lib/asciidoctor/nist/cleanup.rb CHANGED
@@ -33,6 +33,11 @@ module Asciidoctor
33
33
  end
34
34
 
35
35
  def move_clauses_into_preface(x, preface)
36
+ move_clauses_into_preface1(x, preface)
37
+ move_execsummary_into_preface(x, preface)
38
+ end
39
+
40
+ def move_clauses_into_preface1(x, preface)
36
41
  x.xpath("//clause[@preface]").each do |c|
37
42
  c.delete("preface")
38
43
  title = c&.at("./title")&.text.downcase
@@ -40,6 +45,9 @@ module Asciidoctor
40
45
  c.name = "executivesummary" if title == "executive summary"
41
46
  preface.add_child c.remove
42
47
  end
48
+ end
49
+
50
+ def move_execsummary_into_preface(x, preface)
43
51
  x.xpath("//clause[@executivesummary]").each do |c|
44
52
  c.delete("executivesummary")
45
53
  title = c&.at("./title")&.text.downcase
data/lib/asciidoctor/nist/front.rb CHANGED
@@ -16,7 +16,7 @@ module Asciidoctor
16
16
 
17
17
  def metadata_version(node, xml)
18
18
  xml.edition node.attr("edition") if node.attr("edition")
19
- xml.revision node.attr("revision") if node.attr("revision")
19
+ xml.edition "Revision #{node.attr("revision")}" if node.attr("revision")
20
20
  xml.version do |v|
21
21
  v.revision_date node.attr("revdate") if node.attr("revdate")
22
22
  v.draft node.attr("draft") if node.attr("draft")
@@ -64,7 +64,7 @@ module Asciidoctor
64
64
  did = node.attr("docidentifier")
65
65
  dn = node.attr("docnumber")
66
66
  if did
67
- xml.docidentifier did, **attr_code(type: "nist")
67
+ xml.docidentifier did, **attr_code(type: "NIST")
68
68
  xml.docidentifier unabbreviate(did), **attr_code(type: "nist-long")
69
69
  else
70
70
  metadata_id_compose(node, xml, dn)
@@ -95,7 +95,7 @@ module Asciidoctor
95
95
  def metadata_id_compose(node, xml, dn0)
96
96
  return unless dn0
97
97
  args = id_args(node, dn0)
98
- xml.docidentifier add_id_parts(args, false), **attr_code(type: "nist")
98
+ xml.docidentifier add_id_parts(args, false), **attr_code(type: "NIST")
99
99
  xml.docidentifier add_id_parts(args, true),
100
100
  **attr_code(type: "nist-long")
101
101
  xml.docidentifier add_id_parts_mr(args), **attr_code(type: "nist-mr")
@@ -236,12 +236,7 @@ module Asciidoctor
236
236
  b.uri doi, **{ type: "doi" }
237
237
  url = node.attr("superseding-url") and
238
238
  b.uri url, **{ type: "uri" }
239
- did = xml&.parent&.at("./ancestor::bibdata/docidentifier"\
240
- "[@type = 'nist']")&.text
241
- didl = xml&.parent&.at("./ancestor::bibdata/docidentifier"\
242
- "[@type = 'nist-long']")&.text
243
- b.docidentifier did, **{ type: "nist" }
244
- b.docidentifier didl, **{ type: "nist-long" }
239
+ metadata_superseding_ids(b, xml)
245
240
  metadata_superseding_authors(b, node)
246
241
  metadata_superseding_dates(b, node)
247
242
  b.status do |s|
@@ -253,6 +248,15 @@ module Asciidoctor
253
248
  end
254
249
  end
255
250
 
251
+ def metadata_superseding_ids(b, xml)
252
+ did = xml&.parent&.at("./ancestor::bibdata/docidentifier"\
253
+ "[@type = 'NIST']")&.text
254
+ didl = xml&.parent&.at("./ancestor::bibdata/docidentifier"\
255
+ "[@type = 'nist-long']")&.text
256
+ b.docidentifier did, **{ type: "NIST" }
257
+ b.docidentifier didl, **{ type: "nist-long" }
258
+ end
259
+
256
260
  def metadata_superseding_dates(b, node)
257
261
  cdate = node.attr("superseding-circulated-date") and
258
262
  b.date **{ type: "circulated" } do |d|
@@ -302,9 +306,9 @@ module Asciidoctor
302
306
  xml.note note, **{ type: "withdrawal-announcement-link" }
303
307
  end
304
308
 
305
- def metadata(node, xml)
306
- super
307
- metadata_series(node, xml)
309
+ def metadata_ext(node, xml)
310
+ metadata_doctype(node, xml)
311
+ metadata_committee(node, xml)
308
312
  metadata_keywords(node, xml)
309
313
  metadata_commentperiod(node, xml)
310
314
  end
data/lib/asciidoctor/nist/isodoc.rng CHANGED
@@ -471,6 +471,11 @@
471
471
  <attribute name="id">
472
472
  <data type="ID"/>
473
473
  </attribute>
474
+ <optional>
475
+ <attribute name="unnumbered">
476
+ <data type="boolean"/>
477
+ </attribute>
478
+ </optional>
474
479
  <ref name="stem"/>
475
480
  <optional>
476
481
  <ref name="dl"/>
@@ -519,6 +524,11 @@
519
524
  <attribute name="id">
520
525
  <data type="ID"/>
521
526
  </attribute>
527
+ <optional>
528
+ <attribute name="unnumbered">
529
+ <data type="boolean"/>
530
+ </attribute>
531
+ </optional>
522
532
  <optional>
523
533
  <attribute name="lang"/>
524
534
  </optional>
@@ -558,6 +568,11 @@
558
568
  <attribute name="id">
559
569
  <data type="ID"/>
560
570
  </attribute>
571
+ <optional>
572
+ <attribute name="unnumbered">
573
+ <data type="boolean"/>
574
+ </attribute>
575
+ </optional>
561
576
  <optional>
562
577
  <attribute name="alt"/>
563
578
  </optional>
@@ -675,6 +690,11 @@
675
690
  <attribute name="id">
676
691
  <data type="ID"/>
677
692
  </attribute>
693
+ <optional>
694
+ <attribute name="unnumbered">
695
+ <data type="boolean"/>
696
+ </attribute>
697
+ </optional>
678
698
  <oneOrMore>
679
699
  <choice>
680
700
  <ref name="formula"/>
@@ -718,6 +738,11 @@
718
738
  <attribute name="id">
719
739
  <data type="ID"/>
720
740
  </attribute>
741
+ <optional>
742
+ <attribute name="unnumbered">
743
+ <data type="boolean"/>
744
+ </attribute>
745
+ </optional>
721
746
  <optional>
722
747
  <ref name="source"/>
723
748
  </optional>
@@ -1080,57 +1105,28 @@
1080
1105
  </zeroOrMore>
1081
1106
  </element>
1082
1107
  </define>
1083
- <define name="BibData">
1084
- <optional>
1085
- <attribute name="type">
1086
- <ref name="BibItemType"/>
1087
- </attribute>
1088
- </optional>
1089
- <oneOrMore>
1090
- <ref name="btitle"/>
1091
- </oneOrMore>
1092
- <optional>
1093
- <ref name="formattedref"/>
1094
- </optional>
1095
- <zeroOrMore>
1096
- <ref name="bsource"/>
1097
- </zeroOrMore>
1098
- <zeroOrMore>
1099
- <ref name="docidentifier"/>
1100
- </zeroOrMore>
1101
- <optional>
1102
- <ref name="docnumber"/>
1103
- </optional>
1104
- <zeroOrMore>
1105
- <ref name="bdate"/>
1106
- </zeroOrMore>
1107
- <zeroOrMore>
1108
- <ref name="contributor"/>
1109
- </zeroOrMore>
1110
- <optional>
1111
- <ref name="edition"/>
1112
- </optional>
1113
- <optional>
1114
- <ref name="version"/>
1115
- </optional>
1116
- <zeroOrMore>
1117
- <ref name="biblionote"/>
1118
- </zeroOrMore>
1119
- <zeroOrMore>
1120
- <ref name="language"/>
1121
- </zeroOrMore>
1122
- <zeroOrMore>
1123
- <ref name="script"/>
1124
- </zeroOrMore>
1108
+ <define name="ext">
1109
+ <element name="ext">
1110
+ <ref name="BibDataExtensionType"/>
1111
+ </element>
1112
+ </define>
1113
+ <define name="BibDataExtensionType">
1125
1114
  <optional>
1126
- <ref name="abstract"/>
1115
+ <ref name="doctype"/>
1127
1116
  </optional>
1117
+ </define>
1118
+ <define name="doctype">
1119
+ <element name="doctype">
1120
+ <ref name="DocumentType"/>
1121
+ </element>
1122
+ </define>
1123
+ <define name="DocumentType">
1124
+ <value>document</value>
1125
+ </define>
1126
+ <define name="BibData">
1127
+ <ref name="BibliographicItem"/>
1128
1128
  <optional>
1129
- <ref name="status"/>
1129
+ <ref name="ext"/>
1130
1130
  </optional>
1131
- <ref name="copyright"/>
1132
- <zeroOrMore>
1133
- <ref name="docrelation"/>
1134
- </zeroOrMore>
1135
1131
  </define>
1136
1132
  </grammar>
data/lib/asciidoctor/nist/isostandard.rng CHANGED
@@ -4,28 +4,6 @@
4
4
  <start>
5
5
  <ref name="iso-standard"/>
6
6
  </start>
7
- <define name="script">
8
- <element name="script">
9
- <value>Latn</value>
10
- </element>
11
- </define>
12
- <!-- add type to docidentifier in isodoc? -->
13
- <define name="docidentifier">
14
- <element name="docidentifier">
15
- <optional>
16
- <attribute name="type"/>
17
- </optional>
18
- <choice>
19
- <text/>
20
- <group>
21
- <ref name="documentnumber"/>
22
- <optional>
23
- <ref name="tc-documentnumber"/>
24
- </optional>
25
- </group>
26
- </choice>
27
- </element>
28
- </define>
29
7
  <define name="organization">
30
8
  <element name="organization">
31
9
  <ref name="orgname"/>
@@ -55,190 +33,24 @@
55
33
  </optional>
56
34
  </element>
57
35
  </define>
58
- <define name="BibliographicItem">
59
- <optional>
60
- <attribute name="type">
61
- <ref name="BibItemType"/>
62
- </attribute>
63
- </optional>
64
- <optional>
65
- <ref name="fetched"/>
66
- </optional>
67
- <choice>
68
- <oneOrMore>
69
- <ref name="btitle"/>
70
- </oneOrMore>
71
- <ref name="formattedref"/>
72
- </choice>
73
- <zeroOrMore>
74
- <ref name="bsource"/>
75
- </zeroOrMore>
76
- <zeroOrMore>
77
- <ref name="docidentifier"/>
78
- </zeroOrMore>
79
- <optional>
80
- <ref name="docnumber"/>
81
- </optional>
82
- <zeroOrMore>
83
- <ref name="bdate"/>
84
- </zeroOrMore>
85
- <zeroOrMore>
86
- <ref name="contributor"/>
87
- </zeroOrMore>
88
- <optional>
89
- <ref name="edition"/>
90
- </optional>
91
- <optional>
92
- <ref name="version"/>
93
- </optional>
94
- <zeroOrMore>
95
- <ref name="biblionote"/>
96
- </zeroOrMore>
97
- <zeroOrMore>
98
- <ref name="language"/>
99
- </zeroOrMore>
100
- <zeroOrMore>
101
- <ref name="script"/>
102
- </zeroOrMore>
103
- <zeroOrMore>
104
- <ref name="abstract"/>
105
- </zeroOrMore>
106
- <optional>
107
- <ref name="status"/>
108
- </optional>
109
- <optional>
110
- <ref name="copyright"/>
111
- </optional>
112
- <zeroOrMore>
113
- <ref name="docrelation"/>
114
- </zeroOrMore>
115
- <zeroOrMore>
116
- <ref name="series"/>
117
- </zeroOrMore>
118
- <optional>
119
- <ref name="medium"/>
120
- </optional>
121
- <zeroOrMore>
122
- <ref name="bplace"/>
123
- </zeroOrMore>
124
- <zeroOrMore>
125
- <ref name="extent"/>
126
- </zeroOrMore>
127
- <zeroOrMore>
128
- <ref name="accesslocation"/>
129
- </zeroOrMore>
130
- <optional>
131
- <ref name="bclassification"/>
132
- </optional>
133
- <optional>
134
- <ref name="validity"/>
135
- </optional>
136
- <optional>
137
- <ref name="editorialgroup"/>
138
- </optional>
139
- <zeroOrMore>
140
- <ref name="ics"/>
141
- </zeroOrMore>
142
- <optional>
143
- <ref name="allParts"/>
144
- </optional>
145
- </define>
146
- <define name="BibData">
147
- <optional>
148
- <attribute name="type">
149
- <ref name="BibItemType"/>
150
- </attribute>
151
- </optional>
152
- <oneOrMore>
153
- <ref name="btitle"/>
154
- </oneOrMore>
36
+ <define name="BibDataExtensionType">
155
37
  <optional>
156
- <ref name="formattedref"/>
157
- </optional>
158
- <zeroOrMore>
159
- <ref name="bsource"/>
160
- </zeroOrMore>
161
- <zeroOrMore>
162
- <ref name="docidentifier"/>
163
- </zeroOrMore>
164
- <optional>
165
- <ref name="docnumber"/>
166
- </optional>
167
- <zeroOrMore>
168
- <ref name="bdate"/>
169
- </zeroOrMore>
170
- <zeroOrMore>
171
- <ref name="contributor"/>
172
- </zeroOrMore>
173
- <optional>
174
- <ref name="edition"/>
175
- </optional>
176
- <optional>
177
- <ref name="version"/>
178
- </optional>
179
- <zeroOrMore>
180
- <ref name="biblionote"/>
181
- </zeroOrMore>
182
- <zeroOrMore>
183
- <ref name="language"/>
184
- </zeroOrMore>
185
- <zeroOrMore>
186
- <ref name="script"/>
187
- </zeroOrMore>
188
- <zeroOrMore>
189
- <ref name="abstract"/>
190
- </zeroOrMore>
191
- <optional>
192
- <ref name="status"/>
193
- </optional>
194
- <ref name="copyright"/>
195
- <zeroOrMore>
196
- <ref name="docrelation"/>
197
- </zeroOrMore>
198
- <zeroOrMore>
199
- <ref name="series"/>
200
- </zeroOrMore>
201
- <optional>
202
- <ref name="medium"/>
203
- </optional>
204
- <zeroOrMore>
205
- <ref name="bplace"/>
206
- </zeroOrMore>
207
- <zeroOrMore>
208
- <ref name="extent"/>
209
- </zeroOrMore>
210
- <zeroOrMore>
211
- <ref name="accesslocation"/>
212
- </zeroOrMore>
213
- <optional>
214
- <ref name="bclassification"/>
215
- </optional>
216
- <optional>
217
- <ref name="validity"/>
38
+ <ref name="doctype"/>
218
39
  </optional>
219
40
  <ref name="editorialgroup"/>
220
41
  <zeroOrMore>
221
42
  <ref name="ics"/>
222
43
  </zeroOrMore>
223
- <optional>
224
- <ref name="allParts"/>
225
- </optional>
44
+ <ref name="structuredidentifier"/>
226
45
  </define>
227
46
  <define name="bdate">
228
47
  <element name="date">
229
48
  <attribute name="type">
230
49
  <choice>
231
- <value>published</value>
232
- <value>accessed</value>
233
- <value>created</value>
234
- <value>implemented</value>
235
- <value>obsoleted</value>
236
- <value>confirmed</value>
237
- <value>updated</value>
238
- <value>issued</value>
50
+ <ref name="BibliographicDateType"/>
51
+ <text/>
239
52
  </choice>
240
53
  </attribute>
241
- <!-- ( ( bfrom, bto? ) | date_on ) -->
242
54
  <choice>
243
55
  <group>
244
56
  <element name="from">
@@ -259,31 +71,6 @@
259
71
  </choice>
260
72
  </element>
261
73
  </define>
262
- <define name="biblionote">
263
- <element name="note">
264
- <optional>
265
- <!-- Biblio date notes can be footnoted -->
266
- <attribute name="reference"/>
267
- </optional>
268
- <ref name="FormattedString"/>
269
- </element>
270
- </define>
271
- <define name="btitle">
272
- <element name="title">
273
- <choice>
274
- <ref name="FormattedString"/>
275
- <group>
276
- <optional>
277
- <ref name="title-intro"/>
278
- </optional>
279
- <ref name="title-main"/>
280
- <optional>
281
- <ref name="title-part"/>
282
- </optional>
283
- </group>
284
- </choice>
285
- </element>
286
- </define>
287
74
  <define name="sections">
288
75
  <element name="sections">
289
76
  <ref name="clause"/>
@@ -728,6 +515,16 @@
728
515
  </optional>
729
516
  </element>
730
517
  </define>
518
+ <define name="DocumentType">
519
+ <choice>
520
+ <value>international-standard</value>
521
+ <value>technical-specification</value>
522
+ <value>technical-report</value>
523
+ <value>publicly-available-specification</value>
524
+ <value>international-workshop-agreement</value>
525
+ <value>guide</value>
526
+ </choice>
527
+ </define>
731
528
  </include>
732
529
  <!-- end overrides -->
733
530
  <!--
@@ -763,16 +560,6 @@
763
560
  </oneOrMore>
764
561
  </element>
765
562
  </define>
766
- <define name="BibItemType" combine="choice">
767
- <choice>
768
- <value>international-standard</value>
769
- <value>technical-specification</value>
770
- <value>technical-report</value>
771
- <value>publicly-available-specification</value>
772
- <value>international-workshop-agreement</value>
773
- <value>guide</value>
774
- </choice>
775
- </define>
776
563
  <define name="editorialgroup">
777
564
  <element name="editorialgroup">
778
565
  <oneOrMore>
@@ -804,6 +591,19 @@
804
591
  <ref name="Content-Section"/>
805
592
  </element>
806
593
  </define>
594
+ <define name="structuredidentifier">
595
+ <element name="structuredidentifier">
596
+ <optional>
597
+ <attribute name="type"/>
598
+ </optional>
599
+ <group>
600
+ <ref name="documentnumber"/>
601
+ <optional>
602
+ <ref name="tc-documentnumber"/>
603
+ </optional>
604
+ </group>
605
+ </element>
606
+ </define>
807
607
  <define name="documentnumber">
808
608
  <element name="project-number">
809
609
  <optional>
@@ -855,26 +655,6 @@
855
655
  <text/>
856
656
  </element>
857
657
  </define>
858
- <define name="title-intro">
859
- <element name="title-intro">
860
- <ref name="FormattedString"/>
861
- </element>
862
- </define>
863
- <define name="title-main">
864
- <element name="title-main">
865
- <ref name="FormattedString"/>
866
- </element>
867
- </define>
868
- <define name="title-part">
869
- <element name="title-part">
870
- <ref name="FormattedString"/>
871
- </element>
872
- </define>
873
- <define name="allParts">
874
- <element name="allparts">
875
- <data type="boolean"/>
876
- </element>
877
- </define>
878
658
  <define name="clause-hanging-paragraph-with-footnote">
879
659
  <element name="clause">
880
660
  <optional>