metanorma-itu 0.1.3 → 0.1.4

Sign up to get free protection for your applications and to get access to all the features.
@@ -73,6 +73,9 @@
73
73
  <define name="edition">
74
74
  <a:documentation>ISO-15924: Latn</a:documentation>
75
75
  <element name="edition">
76
+ <optional>
77
+ <attribute name="number"/>
78
+ </optional>
76
79
  <text/>
77
80
  </element>
78
81
  </define>
@@ -184,29 +187,35 @@
184
187
  </define>
185
188
  <define name="fullname">
186
189
  <element name="name">
187
- <choice>
188
- <group>
189
- <zeroOrMore>
190
- <ref name="prefix"/>
191
- </zeroOrMore>
192
- <zeroOrMore>
193
- <ref name="forename"/>
194
- </zeroOrMore>
195
- <zeroOrMore>
196
- <ref name="initial"/>
197
- </zeroOrMore>
198
- <ref name="surname"/>
199
- <zeroOrMore>
200
- <ref name="addition"/>
201
- </zeroOrMore>
202
- </group>
203
- <ref name="completeName"/>
204
- </choice>
205
- <zeroOrMore>
206
- <ref name="biblionote"/>
207
- </zeroOrMore>
190
+ <ref name="FullNameType"/>
208
191
  </element>
209
192
  </define>
193
+ <define name="FullNameType">
194
+ <choice>
195
+ <group>
196
+ <zeroOrMore>
197
+ <ref name="prefix"/>
198
+ </zeroOrMore>
199
+ <zeroOrMore>
200
+ <ref name="forename"/>
201
+ </zeroOrMore>
202
+ <zeroOrMore>
203
+ <ref name="initial"/>
204
+ </zeroOrMore>
205
+ <ref name="surname"/>
206
+ <zeroOrMore>
207
+ <ref name="addition"/>
208
+ </zeroOrMore>
209
+ </group>
210
+ <ref name="completeName"/>
211
+ </choice>
212
+ <zeroOrMore>
213
+ <ref name="biblionote"/>
214
+ </zeroOrMore>
215
+ <zeroOrMore>
216
+ <ref name="variantname"/>
217
+ </zeroOrMore>
218
+ </define>
210
219
  <define name="prefix">
211
220
  <element name="prefix">
212
221
  <ref name="LocalizedString"/>
@@ -237,6 +246,12 @@
237
246
  <ref name="LocalizedString"/>
238
247
  </element>
239
248
  </define>
249
+ <define name="variantname">
250
+ <element name="variant">
251
+ <attribute name="type"/>
252
+ <ref name="FullNameType"/>
253
+ </element>
254
+ </define>
240
255
  <define name="affiliation">
241
256
  <element name="affiliation">
242
257
  <optional>
@@ -280,13 +295,40 @@
280
295
  </define>
281
296
  <define name="orgname">
282
297
  <element name="name">
283
- <ref name="LocalizedString"/>
298
+ <choice>
299
+ <ref name="LocalizedString"/>
300
+ <ref name="NameWithVariants"/>
301
+ </choice>
284
302
  </element>
285
303
  </define>
286
304
  <define name="subdivision">
287
305
  <element name="subdivision">
306
+ <choice>
307
+ <ref name="LocalizedString"/>
308
+ <ref name="NameWithVariants"/>
309
+ </choice>
310
+ </element>
311
+ </define>
312
+ <define name="NameWithVariants">
313
+ <element name="primary">
314
+ <ref name="LocalizedString"/>
315
+ </element>
316
+ <zeroOrMore>
317
+ <element name="variant">
318
+ <ref name="NameWithVariants1"/>
319
+ </element>
320
+ </zeroOrMore>
321
+ </define>
322
+ <define name="NameWithVariants1">
323
+ <attribute name="type"/>
324
+ <element name="primary">
288
325
  <ref name="LocalizedString"/>
289
326
  </element>
327
+ <zeroOrMore>
328
+ <element name="variant">
329
+ <ref name="NameWithVariants1"/>
330
+ </element>
331
+ </zeroOrMore>
290
332
  </define>
291
333
  <define name="abbreviation">
292
334
  <element name="abbreviation">
@@ -423,14 +465,16 @@
423
465
  <attribute name="type">
424
466
  <ref name="LocalityType"/>
425
467
  </attribute>
426
- <ref name="referenceFrom"/>
468
+ <optional>
469
+ <ref name="referenceFrom"/>
470
+ </optional>
427
471
  <optional>
428
472
  <ref name="referenceTo"/>
429
473
  </optional>
430
474
  </define>
431
475
  <define name="LocalityType">
432
476
  <data type="string">
433
- <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|locality:[a-zA-Z0-9_]+</param>
477
+ <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|locality:[a-zA-Z0-9_]+</param>
434
478
  </data>
435
479
  </define>
436
480
  <define name="referenceFrom">
@@ -476,7 +520,6 @@
476
520
  <value>article</value>
477
521
  <value>book</value>
478
522
  <value>booklet</value>
479
- <value>conference</value>
480
523
  <value>manual</value>
481
524
  <value>proceedings</value>
482
525
  <value>presentation</value>
@@ -490,6 +533,7 @@
490
533
  <value>film</value>
491
534
  <value>video</value>
492
535
  <value>broadcast</value>
536
+ <value>software</value>
493
537
  <value>graphic_work</value>
494
538
  <value>music</value>
495
539
  <value>patent</value>
@@ -497,6 +541,15 @@
497
541
  <value>incollection</value>
498
542
  <value>inproceedings</value>
499
543
  <value>journal</value>
544
+ <value>website</value>
545
+ <value>webresource</value>
546
+ <value>dataset</value>
547
+ <value>archival</value>
548
+ <value>social_media</value>
549
+ <value>alert</value>
550
+ <value>message</value>
551
+ <value>conversation</value>
552
+ <value>misc</value>
500
553
  </choice>
501
554
  </define>
502
555
  <define name="BibliographicItem">
@@ -545,7 +598,7 @@
545
598
  <ref name="script"/>
546
599
  </zeroOrMore>
547
600
  <zeroOrMore>
548
- <ref name="abstract"/>
601
+ <ref name="bibabstract"/>
549
602
  </zeroOrMore>
550
603
  <optional>
551
604
  <ref name="status"/>
@@ -565,15 +618,24 @@
565
618
  <zeroOrMore>
566
619
  <ref name="bplace"/>
567
620
  </zeroOrMore>
621
+ <zeroOrMore>
622
+ <ref name="bprice"/>
623
+ </zeroOrMore>
568
624
  <zeroOrMore>
569
625
  <ref name="extent"/>
570
626
  </zeroOrMore>
571
627
  <zeroOrMore>
572
628
  <ref name="accesslocation"/>
573
629
  </zeroOrMore>
630
+ <zeroOrMore>
631
+ <ref name="license"/>
632
+ </zeroOrMore>
574
633
  <optional>
575
634
  <ref name="bclassification"/>
576
635
  </optional>
636
+ <zeroOrMore>
637
+ <ref name="bkeyword"/>
638
+ </zeroOrMore>
577
639
  <optional>
578
640
  <ref name="validity"/>
579
641
  </optional>
@@ -593,6 +655,11 @@
593
655
  <ref name="FormattedString"/>
594
656
  </element>
595
657
  </define>
658
+ <define name="license">
659
+ <element name="license">
660
+ <text/>
661
+ </element>
662
+ </define>
596
663
  <define name="fetched">
597
664
  <element name="fetched">
598
665
  <ref name="ISO8601DateTime"/>
@@ -671,6 +738,7 @@
671
738
  <value>copied</value>
672
739
  <value>unchanged</value>
673
740
  <value>circulated</value>
741
+ <value>adapted</value>
674
742
  </choice>
675
743
  </define>
676
744
  <define name="bdate">
@@ -681,21 +749,26 @@
681
749
  <text/>
682
750
  </choice>
683
751
  </attribute>
684
- <choice>
685
- <group>
686
- <element name="from">
687
- <ref name="ISO8601Date"/>
688
- </element>
689
- <optional>
690
- <element name="to">
752
+ <optional>
753
+ <attribute name="text"/>
754
+ </optional>
755
+ <optional>
756
+ <choice>
757
+ <group>
758
+ <element name="from">
691
759
  <ref name="ISO8601Date"/>
692
760
  </element>
693
- </optional>
694
- </group>
695
- <element name="on">
696
- <ref name="ISO8601Date"/>
697
- </element>
698
- </choice>
761
+ <optional>
762
+ <element name="to">
763
+ <ref name="ISO8601Date"/>
764
+ </element>
765
+ </optional>
766
+ </group>
767
+ <element name="on">
768
+ <ref name="ISO8601Date"/>
769
+ </element>
770
+ </choice>
771
+ </optional>
699
772
  </element>
700
773
  </define>
701
774
  <define name="docidentifier">
@@ -703,6 +776,9 @@
703
776
  <optional>
704
777
  <attribute name="type"/>
705
778
  </optional>
779
+ <optional>
780
+ <attribute name="scope"/>
781
+ </optional>
706
782
  <text/>
707
783
  </element>
708
784
  </define>
@@ -721,14 +797,37 @@
721
797
  </define>
722
798
  <define name="bplace">
723
799
  <element name="place">
800
+ <optional>
801
+ <attribute name="uri">
802
+ <data type="anyURI"/>
803
+ </attribute>
804
+ </optional>
805
+ <optional>
806
+ <attribute name="region"/>
807
+ </optional>
808
+ <text/>
809
+ </element>
810
+ </define>
811
+ <define name="bprice">
812
+ <element name="price">
813
+ <attribute name="currency"/>
724
814
  <text/>
725
815
  </element>
726
816
  </define>
727
817
  <define name="medium">
728
818
  <element name="medium">
819
+ <optional>
820
+ <ref name="bcontent"/>
821
+ </optional>
822
+ <optional>
823
+ <ref name="genre"/>
824
+ </optional>
729
825
  <optional>
730
826
  <ref name="form"/>
731
827
  </optional>
828
+ <optional>
829
+ <ref name="carrier"/>
830
+ </optional>
732
831
  <optional>
733
832
  <ref name="size"/>
734
833
  </optional>
@@ -737,11 +836,26 @@
737
836
  </optional>
738
837
  </element>
739
838
  </define>
839
+ <define name="bcontent">
840
+ <element name="content">
841
+ <text/>
842
+ </element>
843
+ </define>
844
+ <define name="genre">
845
+ <element name="genre">
846
+ <text/>
847
+ </element>
848
+ </define>
740
849
  <define name="form">
741
850
  <element name="form">
742
851
  <text/>
743
852
  </element>
744
853
  </define>
854
+ <define name="carrier">
855
+ <element name="carrier">
856
+ <text/>
857
+ </element>
858
+ </define>
745
859
  <define name="size">
746
860
  <element name="size">
747
861
  <text/>
@@ -794,6 +908,9 @@
794
908
  <optional>
795
909
  <ref name="seriespartnumber"/>
796
910
  </optional>
911
+ <optional>
912
+ <ref name="seriesrun"/>
913
+ </optional>
797
914
  </group>
798
915
  </choice>
799
916
  </element>
@@ -829,6 +946,11 @@
829
946
  <text/>
830
947
  </element>
831
948
  </define>
949
+ <define name="seriesrun">
950
+ <element name="run">
951
+ <text/>
952
+ </element>
953
+ </define>
832
954
  <define name="biblionote">
833
955
  <element name="note">
834
956
  <optional>
@@ -837,7 +959,7 @@
837
959
  <ref name="FormattedString"/>
838
960
  </element>
839
961
  </define>
840
- <define name="abstract">
962
+ <define name="bibabstract">
841
963
  <element name="abstract">
842
964
  <ref name="FormattedString"/>
843
965
  </element>
@@ -869,11 +991,15 @@
869
991
  <define name="DocRelationType">
870
992
  <choice>
871
993
  <value>obsoletes</value>
994
+ <value>obsoletedBy</value>
995
+ <value>supersedes</value>
996
+ <value>supersededBy</value>
872
997
  <value>updates</value>
873
998
  <value>updatedBy</value>
874
999
  <value>complements</value>
875
1000
  <value>derivedFrom</value>
876
1001
  <value>translatedFrom</value>
1002
+ <value>hasTranslation</value>
877
1003
  <value>adoptedFrom</value>
878
1004
  <value>equivalent</value>
879
1005
  <value>identical</value>
@@ -881,8 +1007,19 @@
881
1007
  <value>includedIn</value>
882
1008
  <value>includes</value>
883
1009
  <value>instance</value>
1010
+ <value>instanceOf</value>
884
1011
  <value>partOf</value>
1012
+ <value>hasPart</value>
885
1013
  <value>hasDraft</value>
1014
+ <value>draftOf</value>
1015
+ <value>merges</value>
1016
+ <value>splits</value>
1017
+ <value>amends</value>
1018
+ <value>amendedBy</value>
1019
+ <value>corrects</value>
1020
+ <value>correctedBy</value>
1021
+ <value>revises</value>
1022
+ <value>revisedBy</value>
886
1023
  </choice>
887
1024
  </define>
888
1025
  <define name="docrelation">
@@ -923,6 +1060,51 @@
923
1060
  <text/>
924
1061
  </element>
925
1062
  </define>
1063
+ <define name="bkeyword">
1064
+ <element name="keyword">
1065
+ <choice>
1066
+ <ref name="LocalizedString"/>
1067
+ <group>
1068
+ <element name="vocab">
1069
+ <ref name="LocalizedString"/>
1070
+ </element>
1071
+ <oneOrMore>
1072
+ <ref name="vocabid"/>
1073
+ </oneOrMore>
1074
+ </group>
1075
+ <group>
1076
+ <oneOrMore>
1077
+ <element name="taxon">
1078
+ <ref name="LocalizedString"/>
1079
+ </element>
1080
+ </oneOrMore>
1081
+ <oneOrMore>
1082
+ <ref name="vocabid"/>
1083
+ </oneOrMore>
1084
+ </group>
1085
+ </choice>
1086
+ </element>
1087
+ </define>
1088
+ <define name="vocabid">
1089
+ <element name="vocabid">
1090
+ <attribute name="type"/>
1091
+ <optional>
1092
+ <attribute name="uri">
1093
+ <data type="anyURI"/>
1094
+ </attribute>
1095
+ </optional>
1096
+ <optional>
1097
+ <element name="code">
1098
+ <text/>
1099
+ </element>
1100
+ </optional>
1101
+ <optional>
1102
+ <element name="term">
1103
+ <text/>
1104
+ </element>
1105
+ </optional>
1106
+ </element>
1107
+ </define>
926
1108
  <!--
927
1109
  Anycontents = mixed {
928
1110
  https://github.com/relaxng/jing-trang/issues/211
@@ -87,7 +87,7 @@ module Asciidoctor
87
87
  end
88
88
 
89
89
  def section(node)
90
- a = { id: Asciidoctor::Standoc::Utils::anchor_or_uuid(node) }
90
+ a = section_attributes(node)
91
91
  noko do |xml|
92
92
  case sectiontype(node)
93
93
  when "references" then norm_ref_parse(a, xml, node)
@@ -136,13 +136,6 @@ module Asciidoctor
136
136
  end
137
137
  end
138
138
 
139
- def metadata_keywords(node, xml)
140
- return unless node.attr("keywords")
141
- node.attr("keywords").split(/,[ ]*/).each do |kw|
142
- xml.keyword kw
143
- end
144
- end
145
-
146
139
  def metadata_recommendationstatus(node, xml)
147
140
  return unless node.attr("recommendation-from")
148
141
  xml.recommendationstatus do |s|
@@ -164,7 +157,6 @@ module Asciidoctor
164
157
  metadata_doctype(node, xml)
165
158
  metadata_committee(node, xml)
166
159
  metadata_ics(node, xml)
167
- metadata_keywords(node, xml)
168
160
  metadata_recommendationstatus(node, xml)
169
161
  metadata_ip_notice(node, xml)
170
162
  end