metanorma-ogc 1.4.2 → 1.4.5

Sign up to get free protection for your applications and to get access to all the features.
@@ -58,6 +58,14 @@
58
58
  <optional>
59
59
  <attribute name="type"/>
60
60
  </optional>
61
+ <optional>
62
+ <attribute name="tag"/>
63
+ </optional>
64
+ <optional>
65
+ <attribute name="multilingual-rendering">
66
+ <ref name="MultilingualRenderingType"/>
67
+ </attribute>
68
+ </optional>
61
69
  <optional>
62
70
  <ref name="reqtitle"/>
63
71
  </optional>
@@ -101,7 +109,9 @@
101
109
  </define>
102
110
  <define name="label">
103
111
  <element name="label">
104
- <text/>
112
+ <oneOrMore>
113
+ <ref name="TextElement"/>
114
+ </oneOrMore>
105
115
  </element>
106
116
  </define>
107
117
  <define name="subject">
@@ -175,8 +185,19 @@
175
185
  <data type="boolean"/>
176
186
  </attribute>
177
187
  </optional>
188
+ <optional>
189
+ <attribute name="tag"/>
190
+ </optional>
191
+ <optional>
192
+ <attribute name="multilingual-rendering">
193
+ <ref name="MultilingualRenderingType"/>
194
+ </attribute>
195
+ </optional>
178
196
  <oneOrMore>
179
- <ref name="BasicBlock"/>
197
+ <choice>
198
+ <ref name="BasicBlock"/>
199
+ <ref name="component"/>
200
+ </choice>
180
201
  </oneOrMore>
181
202
  </define>
182
203
  <define name="ObligationType">
@@ -109,7 +109,7 @@ module IsoDoc
109
109
  end
110
110
 
111
111
  def extract_uri(bib)
112
- bib.at(ns("./uri"))
112
+ bib.at(ns("./uri[@type = 'src']")) || bib.at(ns("./uri"))
113
113
  end
114
114
 
115
115
  # {author}: {document identifier}, {title}. {publisher}, {city} ({year})
@@ -153,6 +153,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
153
153
  p.MsoCommentText, li.MsoCommentText, div.MsoCommentText {
154
154
  mso-style-noshow: yes;
155
155
  mso-style-unhide: no;
156
+ mso-style-name: "Comment Text";
156
157
  margin: 0cm;
157
158
  margin-bottom: .0001pt;
158
159
  mso-pagination: widow-orphan;
@@ -373,6 +374,7 @@ h1 {
373
374
  mso-style-priority: 1;
374
375
  mso-style-unhide: no;
375
376
  mso-style-qformat: yes;
377
+ mso-style-name: "Heading 1";
376
378
  mso-style-link: "Heading 1 Char";
377
379
  mso-style-next: Normal;
378
380
  margin-top: 13.5pt;
@@ -459,6 +461,7 @@ h2 {
459
461
  mso-style-priority: 2;
460
462
  mso-style-unhide: no;
461
463
  mso-style-qformat: yes;
464
+ mso-style-name: "Heading 2";
462
465
  mso-style-parent: "Heading 1";
463
466
  mso-style-link: "Heading 2 Char";
464
467
  mso-style-next: Normal;
@@ -487,7 +490,8 @@ h3 {
487
490
  mso-style-priority: 3;
488
491
  mso-style-unhide: no;
489
492
  mso-style-qformat: yes;
490
- mso-style-parent: "Heading 1";
493
+ mso-style-name: "Heading 3";
494
+ mso-style-parent: "Heading 2";
491
495
  mso-style-link: "Heading 3 Char";
492
496
  mso-style-next: Normal;
493
497
  margin-top: 3.0pt;
@@ -514,6 +518,7 @@ h4 {
514
518
  mso-style-priority: 4;
515
519
  mso-style-unhide: no;
516
520
  mso-style-qformat: yes;
521
+ mso-style-name: "Heading 4";
517
522
  mso-style-parent: "Heading 3";
518
523
  mso-style-link: "Heading 4 Char";
519
524
  mso-style-next: Normal;
@@ -541,6 +546,7 @@ h5 {
541
546
  mso-style-priority: 5;
542
547
  mso-style-unhide: no;
543
548
  mso-style-qformat: yes;
549
+ mso-style-name: "Heading 5";
544
550
  mso-style-parent: "Heading 4";
545
551
  mso-style-link: "Heading 5 Char";
546
552
  mso-style-next: Normal;
@@ -568,6 +574,7 @@ h6 {
568
574
  mso-style-priority: 6;
569
575
  mso-style-unhide: no;
570
576
  mso-style-qformat: yes;
577
+ mso-style-name: "Heading 6";
571
578
  mso-style-parent: "Heading 5";
572
579
  mso-style-link: "Heading 6 Char";
573
580
  mso-style-next: Normal;
@@ -594,6 +601,7 @@ h6 {
594
601
  p.MsoToc1, li.MsoToc1, div.MsoToc1 {
595
602
  mso-style-priority: 39;
596
603
  mso-style-unhide: no;
604
+ mso-style-name: "TOC 1";
597
605
  mso-style-next: Normal;
598
606
  margin-top: 6.0pt;
599
607
  margin-right: 25.0pt;
@@ -617,6 +625,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2 {
617
625
  mso-style-noshow: yes;
618
626
  mso-style-priority: 39;
619
627
  mso-style-unhide: no;
628
+ mso-style-name: "TOC 2";
620
629
  mso-style-parent: "TOC 1";
621
630
  mso-style-next: Normal;
622
631
  margin-top: 0cm;
@@ -641,6 +650,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
641
650
  mso-style-noshow: yes;
642
651
  mso-style-priority: 39;
643
652
  mso-style-unhide: no;
653
+ mso-style-name: "TOC 3";
644
654
  mso-style-parent: "TOC 2";
645
655
  mso-style-next: Normal;
646
656
  margin-top: 0cm;
@@ -663,6 +673,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
663
673
 
664
674
  span.MsoFootnoteReference {
665
675
  mso-style-priority: 99;
676
+ mso-style-name: "Footnote Reference";
666
677
  vertical-align: super; }
667
678
 
668
679
  p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText {
@@ -139,6 +139,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
139
139
  p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
140
140
  {mso-style-noshow:yes;
141
141
  mso-style-unhide:no;
142
+ mso-style-name:"Comment Text";
142
143
  margin:0cm;
143
144
  margin-bottom:.0001pt;
144
145
  mso-pagination:widow-orphan;
@@ -342,6 +343,7 @@ h1
342
343
  {mso-style-priority:1;
343
344
  mso-style-unhide:no;
344
345
  mso-style-qformat:yes;
346
+ mso-style-name:"Heading 1";
345
347
  mso-style-link:"Heading 1 Char";
346
348
  mso-style-next:Normal;
347
349
  margin-top:13.5pt;
@@ -425,6 +427,7 @@ h2
425
427
  {mso-style-priority:2;
426
428
  mso-style-unhide:no;
427
429
  mso-style-qformat:yes;
430
+ mso-style-name:"Heading 2";
428
431
  mso-style-parent:"Heading 1";
429
432
  mso-style-link:"Heading 2 Char";
430
433
  mso-style-next:Normal;
@@ -452,7 +455,8 @@ h3
452
455
  {mso-style-priority:3;
453
456
  mso-style-unhide:no;
454
457
  mso-style-qformat:yes;
455
- mso-style-parent:"Heading 1";
458
+ mso-style-name:"Heading 3";
459
+ mso-style-parent:"Heading 2";
456
460
  mso-style-link:"Heading 3 Char";
457
461
  mso-style-next:Normal;
458
462
  margin-top:3.0pt;
@@ -478,6 +482,7 @@ h4
478
482
  {mso-style-priority:4;
479
483
  mso-style-unhide:no;
480
484
  mso-style-qformat:yes;
485
+ mso-style-name:"Heading 4";
481
486
  mso-style-parent:"Heading 3";
482
487
  mso-style-link:"Heading 4 Char";
483
488
  mso-style-next:Normal;
@@ -504,6 +509,7 @@ h5
504
509
  {mso-style-priority:5;
505
510
  mso-style-unhide:no;
506
511
  mso-style-qformat:yes;
512
+ mso-style-name:"Heading 5";
507
513
  mso-style-parent:"Heading 4";
508
514
  mso-style-link:"Heading 5 Char";
509
515
  mso-style-next:Normal;
@@ -530,6 +536,7 @@ h6
530
536
  {mso-style-priority:6;
531
537
  mso-style-unhide:no;
532
538
  mso-style-qformat:yes;
539
+ mso-style-name:"Heading 6";
533
540
  mso-style-parent:"Heading 5";
534
541
  mso-style-link:"Heading 6 Char";
535
542
  mso-style-next:Normal;
@@ -555,6 +562,7 @@ h6
555
562
  p.MsoToc1, li.MsoToc1, div.MsoToc1
556
563
  {mso-style-priority:39;
557
564
  mso-style-unhide:no;
565
+ mso-style-name:"TOC 1";
558
566
  mso-style-next:Normal;
559
567
  margin-top:6.0pt;
560
568
  margin-right:25.0pt;
@@ -577,6 +585,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
577
585
  {mso-style-noshow:yes;
578
586
  mso-style-priority:39;
579
587
  mso-style-unhide:no;
588
+ mso-style-name:"TOC 2";
580
589
  mso-style-parent:"TOC 1";
581
590
  mso-style-next:Normal;
582
591
  margin-top:0cm;
@@ -600,6 +609,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
600
609
  {mso-style-noshow:yes;
601
610
  mso-style-priority:39;
602
611
  mso-style-unhide:no;
612
+ mso-style-name:"TOC 3";
603
613
  mso-style-parent:"TOC 2";
604
614
  mso-style-next:Normal;
605
615
  margin-top:0cm;
@@ -621,6 +631,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
621
631
  mso-bidi-font-weight:normal;}
622
632
  span.MsoFootnoteReference
623
633
  {mso-style-priority:99;
634
+ mso-style-name:"Footnote Reference";
624
635
  vertical-align:super;}
625
636
  p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
626
637
  {mso-style-noshow:yes;
@@ -161,6 +161,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
161
161
  p.MsoCommentText, li.MsoCommentText, div.MsoCommentText {
162
162
  mso-style-noshow: yes;
163
163
  mso-style-unhide: no;
164
+ mso-style-name: "Comment Text";
164
165
  margin-top: 8.0pt;
165
166
  margin-right: 0cm;
166
167
  margin-bottom: 0cm;
@@ -470,6 +471,7 @@ h1 {
470
471
  mso-style-priority: 1;
471
472
  mso-style-unhide: no;
472
473
  mso-style-qformat: yes;
474
+ mso-style-name: "Heading 1";
473
475
  mso-style-link: "Heading 1 Char";
474
476
  mso-style-next: Normal;
475
477
  margin-top: 18.0pt;
@@ -539,6 +541,7 @@ h1.Annex
539
541
  mso-style-priority: 2;
540
542
  mso-style-unhide: no;
541
543
  mso-style-qformat: yes;
544
+ mso-style-name: "Heading 2";
542
545
  mso-style-parent: "Heading 1";
543
546
  mso-style-link: "Heading 2 Char";
544
547
  mso-style-next: Normal;
@@ -568,7 +571,8 @@ h3 {
568
571
  mso-style-priority: 3;
569
572
  mso-style-unhide: no;
570
573
  mso-style-qformat: yes;
571
- mso-style-parent: "Heading 1";
574
+ mso-style-name: "Heading 3";
575
+ mso-style-parent: "Heading 2";
572
576
  mso-style-link: "Heading 3 Char";
573
577
  mso-style-next: Normal;
574
578
  margin-top: 2.0pt;
@@ -594,6 +598,7 @@ h4 {
594
598
  mso-style-priority: 4;
595
599
  mso-style-unhide: no;
596
600
  mso-style-qformat: yes;
601
+ mso-style-name: "Heading 4";
597
602
  mso-style-parent: "Heading 3";
598
603
  mso-style-link: "Heading 4 Char";
599
604
  mso-style-next: Normal;
@@ -620,6 +625,7 @@ h5 {
620
625
  mso-style-priority: 5;
621
626
  mso-style-unhide: no;
622
627
  mso-style-qformat: yes;
628
+ mso-style-name: "Heading 5";
623
629
  mso-style-parent: "Heading 4";
624
630
  mso-style-link: "Heading 5 Char";
625
631
  mso-style-next: Normal;
@@ -645,6 +651,7 @@ h6 {
645
651
  mso-style-priority: 6;
646
652
  mso-style-unhide: no;
647
653
  mso-style-qformat: yes;
654
+ mso-style-name: "Heading 6";
648
655
  mso-style-parent: "Heading 5";
649
656
  mso-style-link: "Heading 6 Char";
650
657
  mso-style-next: Normal;
@@ -674,6 +681,7 @@ h6 {
674
681
  p.MsoToc1, li.MsoToc1, div.MsoToc1 {
675
682
  mso-style-priority: 39;
676
683
  mso-style-unhide: no;
684
+ mso-style-name: "TOC 1";
677
685
  mso-style-next: Normal;
678
686
  margin-top: 8.0pt;
679
687
  margin-right: 0cm;
@@ -693,6 +701,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2 {
693
701
  mso-style-noshow: yes;
694
702
  mso-style-priority: 39;
695
703
  mso-style-unhide: no;
704
+ mso-style-name: "TOC 2";
696
705
  mso-style-parent: "TOC 1";
697
706
  mso-style-next: Normal;
698
707
  mso-pagination: widow-orphan;
@@ -714,6 +723,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
714
723
  mso-style-noshow: yes;
715
724
  mso-style-priority: 39;
716
725
  mso-style-unhide: no;
726
+ mso-style-name: "TOC 3";
717
727
  mso-style-parent: "TOC 2";
718
728
  mso-style-next: Normal;
719
729
  margin-top: 8.0pt;
@@ -732,6 +742,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
732
742
 
733
743
  span.MsoFootnoteReference {
734
744
  mso-style-priority: 99;
745
+ mso-style-name: "Footnote Reference";
735
746
  vertical-align: super; }
736
747
 
737
748
  p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText {
@@ -147,6 +147,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
147
147
  p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
148
148
  {mso-style-noshow:yes;
149
149
  mso-style-unhide:no;
150
+ mso-style-name:"Comment Text";
150
151
  margin-top:8.0pt;
151
152
  margin-right:0cm;
152
153
  margin-bottom:0cm;
@@ -438,6 +439,7 @@ h1
438
439
  {mso-style-priority:1;
439
440
  mso-style-unhide:no;
440
441
  mso-style-qformat:yes;
442
+ mso-style-name:"Heading 1";
441
443
  mso-style-link:"Heading 1 Char";
442
444
  mso-style-next:Normal;
443
445
  margin-top:18.0pt;
@@ -506,6 +508,7 @@ h1.Annex
506
508
  {mso-style-priority:2;
507
509
  mso-style-unhide:no;
508
510
  mso-style-qformat:yes;
511
+ mso-style-name:"Heading 2";
509
512
  mso-style-parent:"Heading 1";
510
513
  mso-style-link:"Heading 2 Char";
511
514
  mso-style-next:Normal;
@@ -535,7 +538,8 @@ h3
535
538
  {mso-style-priority:3;
536
539
  mso-style-unhide:no;
537
540
  mso-style-qformat:yes;
538
- mso-style-parent:"Heading 1";
541
+ mso-style-name:"Heading 3";
542
+ mso-style-parent:"Heading 2";
539
543
  mso-style-link:"Heading 3 Char";
540
544
  mso-style-next:Normal;
541
545
  margin-top:2.0pt;
@@ -560,6 +564,7 @@ h4
560
564
  {mso-style-priority:4;
561
565
  mso-style-unhide:no;
562
566
  mso-style-qformat:yes;
567
+ mso-style-name:"Heading 4";
563
568
  mso-style-parent:"Heading 3";
564
569
  mso-style-link:"Heading 4 Char";
565
570
  mso-style-next:Normal;
@@ -585,6 +590,7 @@ h5
585
590
  {mso-style-priority:5;
586
591
  mso-style-unhide:no;
587
592
  mso-style-qformat:yes;
593
+ mso-style-name:"Heading 5";
588
594
  mso-style-parent:"Heading 4";
589
595
  mso-style-link:"Heading 5 Char";
590
596
  mso-style-next:Normal;
@@ -609,6 +615,7 @@ h6
609
615
  {mso-style-priority:6;
610
616
  mso-style-unhide:no;
611
617
  mso-style-qformat:yes;
618
+ mso-style-name:"Heading 6";
612
619
  mso-style-parent:"Heading 5";
613
620
  mso-style-link:"Heading 6 Char";
614
621
  mso-style-next:Normal;
@@ -637,6 +644,7 @@ h6
637
644
  p.MsoToc1, li.MsoToc1, div.MsoToc1
638
645
  {mso-style-priority:39;
639
646
  mso-style-unhide:no;
647
+ mso-style-name:"TOC 1";
640
648
  mso-style-next:Normal;
641
649
  margin-top:8.0pt;
642
650
  margin-right:0cm;
@@ -655,6 +663,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
655
663
  {mso-style-noshow:yes;
656
664
  mso-style-priority:39;
657
665
  mso-style-unhide:no;
666
+ mso-style-name:"TOC 2";
658
667
  mso-style-parent:"TOC 1";
659
668
  mso-style-next:Normal;
660
669
  mso-pagination:widow-orphan;
@@ -675,6 +684,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
675
684
  {mso-style-noshow:yes;
676
685
  mso-style-priority:39;
677
686
  mso-style-unhide:no;
687
+ mso-style-name:"TOC 3";
678
688
  mso-style-parent:"TOC 2";
679
689
  mso-style-next:Normal;
680
690
  margin-top:8.0pt;
@@ -692,6 +702,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
692
702
  mso-bidi-font-weight:normal;}
693
703
  span.MsoFootnoteReference
694
704
  {mso-style-priority:99;
705
+ mso-style-name:"Footnote Reference";
695
706
  vertical-align:super;}
696
707
  p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
697
708
  {mso-style-noshow:yes;