metanorma-un 0.3.4 → 0.3.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/.github/workflows/macos.yml +10 -10
- data/.github/workflows/ubuntu.yml +25 -11
- data/.github/workflows/windows.yml +11 -12
- data/README.adoc +2 -2
- data/lib/asciidoctor/un/biblio.rng +131 -46
- data/lib/asciidoctor/un/boilerplate.xml +1 -1
- data/lib/asciidoctor/un/converter.rb +21 -5
- data/lib/asciidoctor/un/isodoc.rng +32 -4
- data/lib/asciidoctor/un/un.rng +107 -1
- data/lib/isodoc/un/base_convert.rb +1 -170
- data/lib/isodoc/un/html/html_unece_plenary_titlepage.html +7 -15
- data/lib/isodoc/un/html/html_unece_titlepage.html +1 -2
- data/lib/isodoc/un/html/htmlstyle.scss +191 -137
- data/lib/isodoc/un/html/scripts.html +14 -27
- data/lib/isodoc/un/html/word_unece_plenary_titlepage.html +113 -65
- data/lib/isodoc/un/html_convert.rb +3 -3
- data/lib/isodoc/un/metadata.rb +3 -30
- data/lib/isodoc/un/pdf_convert.rb +13 -115
- data/lib/isodoc/un/un.plenary.xsl +3621 -0
- data/lib/isodoc/un/un.recommendation.xsl +13050 -0
- data/lib/isodoc/un/word_convert.rb +1 -0
- data/lib/isodoc/un/xref.rb +188 -0
- data/lib/metanorma/un/processor.rb +8 -0
- data/lib/metanorma/un/version.rb +1 -1
- metadata +5 -3
- data/lib/isodoc/un/html/scripts.pdf.html +0 -72
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 165a43762ea2750902fa7087fef248e5afc750cf880d99d39e308126aa7803f1
|
|
4
|
+
data.tar.gz: bbd3152032b437081396591891a0c7ec467c665c7affd7cafacaa065c4477290
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5c28260f9ba2ec03524ece04bfb721be2a8a4bad1818026f360ee7bd3c08c167cd672da66b6a2337fa4fbe3af79fbb8cd22585db93e0a60d84850c1d4dd42327
|
|
7
|
+
data.tar.gz: d4a0e0de49f6fec3b23a37fdd2abdffaff38cc3b247fad27fd036be4a2255faf3bc26ae03d9162c9474abfe7cbbfa8fa45665b5ca7412ea3cb28075d058420b0
|
data/.github/workflows/macos.yml
CHANGED
|
@@ -1,21 +1,28 @@
|
|
|
1
|
-
# Auto-generated
|
|
2
|
-
#
|
|
1
|
+
# Auto-generated by Cimas: Do not edit it manually!
|
|
2
|
+
# See https://github.com/metanorma/cimas
|
|
3
3
|
name: macos
|
|
4
4
|
|
|
5
5
|
on:
|
|
6
6
|
push:
|
|
7
7
|
branches: [ master ]
|
|
8
8
|
pull_request:
|
|
9
|
-
|
|
9
|
+
paths-ignore:
|
|
10
|
+
- .github/workflows/ubuntu.yml
|
|
11
|
+
- .github/workflows/windows.yml
|
|
10
12
|
|
|
11
13
|
jobs:
|
|
12
14
|
test-macos:
|
|
13
15
|
name: Test on Ruby ${{ matrix.ruby }} macOS
|
|
14
16
|
runs-on: macos-latest
|
|
17
|
+
continue-on-error: ${{ matrix.experimental }}
|
|
15
18
|
strategy:
|
|
16
19
|
fail-fast: false
|
|
17
20
|
matrix:
|
|
18
21
|
ruby: [ '2.6', '2.5', '2.4' ]
|
|
22
|
+
experimental: [false]
|
|
23
|
+
include:
|
|
24
|
+
- ruby: '2.7'
|
|
25
|
+
experimental: true
|
|
19
26
|
steps:
|
|
20
27
|
- uses: actions/checkout@master
|
|
21
28
|
- name: Use Ruby
|
|
@@ -27,13 +34,6 @@ jobs:
|
|
|
27
34
|
run: |
|
|
28
35
|
sudo gem install bundler --force
|
|
29
36
|
bundle install --jobs 4 --retry 3
|
|
30
|
-
- name: Use Node
|
|
31
|
-
uses: actions/setup-node@v1
|
|
32
|
-
with:
|
|
33
|
-
node-version: '8'
|
|
34
|
-
- name: Install Puppeteer
|
|
35
|
-
run: |
|
|
36
|
-
npm install -g puppeteer
|
|
37
37
|
- name: Run specs
|
|
38
38
|
run: |
|
|
39
39
|
bundle exec rake
|
|
@@ -1,21 +1,30 @@
|
|
|
1
|
-
# Auto-generated
|
|
2
|
-
#
|
|
1
|
+
# Auto-generated by Cimas: Do not edit it manually!
|
|
2
|
+
# See https://github.com/metanorma/cimas
|
|
3
3
|
name: ubuntu
|
|
4
4
|
|
|
5
5
|
on:
|
|
6
6
|
push:
|
|
7
7
|
branches: [ master ]
|
|
8
|
+
tags:
|
|
9
|
+
- '*'
|
|
8
10
|
pull_request:
|
|
9
|
-
|
|
11
|
+
paths-ignore:
|
|
12
|
+
- .github/workflows/macos.yml
|
|
13
|
+
- .github/workflows/windows.yml
|
|
10
14
|
|
|
11
15
|
jobs:
|
|
12
16
|
test-linux:
|
|
13
17
|
name: Test on Ruby ${{ matrix.ruby }} Ubuntu
|
|
14
18
|
runs-on: ubuntu-latest
|
|
19
|
+
continue-on-error: ${{ matrix.experimental }}
|
|
15
20
|
strategy:
|
|
16
21
|
fail-fast: false
|
|
17
22
|
matrix:
|
|
18
23
|
ruby: [ '2.6', '2.5', '2.4' ]
|
|
24
|
+
experimental: [false]
|
|
25
|
+
include:
|
|
26
|
+
- ruby: '2.7'
|
|
27
|
+
experimental: true
|
|
19
28
|
steps:
|
|
20
29
|
- uses: actions/checkout@master
|
|
21
30
|
- name: Use Ruby
|
|
@@ -25,15 +34,20 @@ jobs:
|
|
|
25
34
|
architecture: 'x64'
|
|
26
35
|
- name: Update gems
|
|
27
36
|
run: |
|
|
28
|
-
gem install bundler
|
|
37
|
+
gem install bundler
|
|
29
38
|
bundle install --jobs 4 --retry 3
|
|
30
|
-
- name: Use Node
|
|
31
|
-
uses: actions/setup-node@v1
|
|
32
|
-
with:
|
|
33
|
-
node-version: '8'
|
|
34
|
-
- name: Install Puppeteer
|
|
35
|
-
run: |
|
|
36
|
-
npm install -g puppeteer
|
|
37
39
|
- name: Run specs
|
|
38
40
|
run: |
|
|
39
41
|
bundle exec rake
|
|
42
|
+
- name: Trigger dependent repositories
|
|
43
|
+
if: github.ref == 'refs/heads/master' && matrix.ruby == '2.6'
|
|
44
|
+
env:
|
|
45
|
+
GH_USERNAME: ${{ secrets.PAT_USERNAME }}
|
|
46
|
+
GH_ACCESS_TOKEN: ${{ secrets.PAT_TOKEN }}
|
|
47
|
+
run: |
|
|
48
|
+
curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
|
|
49
|
+
[[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
|
|
50
|
+
for repo in $DEPENDENT_REPOS
|
|
51
|
+
do
|
|
52
|
+
sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "{ \"ref\": \"${GITHUB_REF}\" }"
|
|
53
|
+
done
|
|
@@ -1,21 +1,28 @@
|
|
|
1
|
-
# Auto-generated
|
|
2
|
-
#
|
|
1
|
+
# Auto-generated by Cimas: Do not edit it manually!
|
|
2
|
+
# See https://github.com/metanorma/cimas
|
|
3
3
|
name: windows
|
|
4
4
|
|
|
5
5
|
on:
|
|
6
6
|
push:
|
|
7
7
|
branches: [ master ]
|
|
8
8
|
pull_request:
|
|
9
|
-
|
|
9
|
+
paths-ignore:
|
|
10
|
+
- .github/workflows/macos.yml
|
|
11
|
+
- .github/workflows/ubuntu.yml
|
|
10
12
|
|
|
11
13
|
jobs:
|
|
12
14
|
test-windows:
|
|
13
15
|
name: Test on Ruby ${{ matrix.ruby }} Windows
|
|
14
16
|
runs-on: windows-latest
|
|
17
|
+
continue-on-error: ${{ matrix.experimental }}
|
|
15
18
|
strategy:
|
|
16
19
|
fail-fast: false
|
|
17
20
|
matrix:
|
|
18
21
|
ruby: [ '2.6', '2.5', '2.4' ]
|
|
22
|
+
experimental: [false]
|
|
23
|
+
include:
|
|
24
|
+
- ruby: '2.7'
|
|
25
|
+
experimental: true
|
|
19
26
|
steps:
|
|
20
27
|
- uses: actions/checkout@master
|
|
21
28
|
- name: Use Ruby
|
|
@@ -26,17 +33,9 @@ jobs:
|
|
|
26
33
|
- name: Update gems
|
|
27
34
|
shell: pwsh
|
|
28
35
|
run: |
|
|
29
|
-
gem install bundler
|
|
36
|
+
gem install bundler
|
|
30
37
|
bundle config --local path vendor/bundle
|
|
31
|
-
bundle update
|
|
32
38
|
bundle install --jobs 4 --retry 3
|
|
33
|
-
- name: Use Node
|
|
34
|
-
uses: actions/setup-node@v1
|
|
35
|
-
with:
|
|
36
|
-
node-version: '8'
|
|
37
|
-
- name: Install Puppeteer
|
|
38
|
-
run: |
|
|
39
|
-
npm install -g puppeteer
|
|
40
39
|
- name: Run specs
|
|
41
40
|
run: |
|
|
42
41
|
bundle exec rake
|
data/README.adoc
CHANGED
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
(Formerly known as metanorma-unece)
|
|
4
4
|
|
|
5
|
-
|
|
5
|
+
image:https://img.shields.io/gem/v/metanorma-un.svg["Gem Version", link="https://rubygems.org/gems/metanorma-un"]::
|
|
6
6
|
image:https://github.com/metanorma/metanorma-un/workflows/macos/badge.svg["Build Status (macOS)", link="https://github.com/metanorma/metanorma-un/actions?workflow=macos"]
|
|
7
7
|
image:https://github.com/metanorma/metanorma-un/workflows/windows/badge.svg["Build Status (Windows)", link="https://github.com/metanorma/metanorma-un/actions?workflow=windows"]
|
|
8
8
|
image:https://github.com/metanorma/metanorma-un/workflows/ubuntu/badge.svg["Build Status (Ubuntu)", link="https://github.com/metanorma/metanorma-un/actions?workflow=ubuntu"]
|
|
9
|
-
image:https://codeclimate.com/github/metanorma/metanorma-
|
|
9
|
+
image:https://codeclimate.com/github/metanorma/metanorma-unece/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-unece"]
|
|
10
10
|
image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-un.svg["Pull Requests", link="https://github.com/metanorma/metanorma-un/pulls"]
|
|
11
11
|
image:https://img.shields.io/github/commits-since/metanorma/metanorma-un/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-un/releases"]
|
|
12
12
|
|
|
@@ -49,11 +49,17 @@
|
|
|
49
49
|
</define>
|
|
50
50
|
<define name="stage">
|
|
51
51
|
<element name="stage">
|
|
52
|
+
<optional>
|
|
53
|
+
<attribute name="abbreviation"/>
|
|
54
|
+
</optional>
|
|
52
55
|
<text/>
|
|
53
56
|
</element>
|
|
54
57
|
</define>
|
|
55
58
|
<define name="substage">
|
|
56
59
|
<element name="substage">
|
|
60
|
+
<optional>
|
|
61
|
+
<attribute name="abbreviation"/>
|
|
62
|
+
</optional>
|
|
57
63
|
<text/>
|
|
58
64
|
</element>
|
|
59
65
|
</define>
|
|
@@ -82,7 +88,7 @@
|
|
|
82
88
|
<text/>
|
|
83
89
|
</element>
|
|
84
90
|
</define>
|
|
85
|
-
<define name="
|
|
91
|
+
<define name="LocalizedString1">
|
|
86
92
|
<optional>
|
|
87
93
|
<!-- multiple languages and scripts possible: comma delimit them if so -->
|
|
88
94
|
<attribute name="language"/>
|
|
@@ -92,6 +98,16 @@
|
|
|
92
98
|
</optional>
|
|
93
99
|
<text/>
|
|
94
100
|
</define>
|
|
101
|
+
<define name="LocalizedString">
|
|
102
|
+
<choice>
|
|
103
|
+
<ref name="LocalizedString1"/>
|
|
104
|
+
<oneOrMore>
|
|
105
|
+
<element name="variant">
|
|
106
|
+
<ref name="LocalizedString1"/>
|
|
107
|
+
</element>
|
|
108
|
+
</oneOrMore>
|
|
109
|
+
</choice>
|
|
110
|
+
</define>
|
|
95
111
|
<!--
|
|
96
112
|
Unlike UML, change type to format: type is overloaded
|
|
97
113
|
Would be need if plain were default value and could omit the attribute
|
|
@@ -115,7 +131,7 @@
|
|
|
115
131
|
</optional>
|
|
116
132
|
<ref name="LocalizedStringOrXsAny"/>
|
|
117
133
|
</define>
|
|
118
|
-
<define name="
|
|
134
|
+
<define name="LocalizedStringOrXsAny1">
|
|
119
135
|
<optional>
|
|
120
136
|
<!-- multiple languages and scripts possible: comma delimit them if so -->
|
|
121
137
|
<attribute name="language"/>
|
|
@@ -130,6 +146,16 @@
|
|
|
130
146
|
</choice>
|
|
131
147
|
</oneOrMore>
|
|
132
148
|
</define>
|
|
149
|
+
<define name="LocalizedStringOrXsAny">
|
|
150
|
+
<choice>
|
|
151
|
+
<ref name="LocalizedStringOrXsAny1"/>
|
|
152
|
+
<oneOrMore>
|
|
153
|
+
<element name="variant">
|
|
154
|
+
<ref name="LocalizedStringOrXsAny1"/>
|
|
155
|
+
</element>
|
|
156
|
+
</oneOrMore>
|
|
157
|
+
</choice>
|
|
158
|
+
</define>
|
|
133
159
|
<define name="contributor">
|
|
134
160
|
<element name="contributor">
|
|
135
161
|
<zeroOrMore>
|
|
@@ -452,9 +478,14 @@
|
|
|
452
478
|
<attribute name="bibitemid">
|
|
453
479
|
<data type="IDREF"/>
|
|
454
480
|
</attribute>
|
|
455
|
-
<
|
|
456
|
-
<
|
|
457
|
-
|
|
481
|
+
<choice>
|
|
482
|
+
<zeroOrMore>
|
|
483
|
+
<ref name="locality"/>
|
|
484
|
+
</zeroOrMore>
|
|
485
|
+
<zeroOrMore>
|
|
486
|
+
<ref name="localityStack"/>
|
|
487
|
+
</zeroOrMore>
|
|
488
|
+
</choice>
|
|
458
489
|
<optional>
|
|
459
490
|
<ref name="date"/>
|
|
460
491
|
</optional>
|
|
@@ -469,6 +500,25 @@
|
|
|
469
500
|
<ref name="BibItemLocality"/>
|
|
470
501
|
</element>
|
|
471
502
|
</define>
|
|
503
|
+
<define name="localityStack">
|
|
504
|
+
<element name="localityStack">
|
|
505
|
+
<zeroOrMore>
|
|
506
|
+
<ref name="locality"/>
|
|
507
|
+
</zeroOrMore>
|
|
508
|
+
</element>
|
|
509
|
+
</define>
|
|
510
|
+
<define name="sourceLocality">
|
|
511
|
+
<element name="sourceLocality">
|
|
512
|
+
<ref name="BibItemLocality"/>
|
|
513
|
+
</element>
|
|
514
|
+
</define>
|
|
515
|
+
<define name="sourceLocalityStack">
|
|
516
|
+
<element name="sourceLocalityStack">
|
|
517
|
+
<zeroOrMore>
|
|
518
|
+
<ref name="sourceLocality"/>
|
|
519
|
+
</zeroOrMore>
|
|
520
|
+
</element>
|
|
521
|
+
</define>
|
|
472
522
|
<define name="BibItemLocality">
|
|
473
523
|
<attribute name="type">
|
|
474
524
|
<ref name="LocalityType"/>
|
|
@@ -703,21 +753,11 @@
|
|
|
703
753
|
</define>
|
|
704
754
|
<define name="TypedTitleString">
|
|
705
755
|
<optional>
|
|
706
|
-
<attribute name="type"
|
|
707
|
-
<ref name="TitleType"/>
|
|
708
|
-
</attribute>
|
|
756
|
+
<attribute name="type"/>
|
|
709
757
|
</optional>
|
|
710
758
|
<ref name="FormattedString"/>
|
|
711
759
|
</define>
|
|
712
|
-
|
|
713
|
-
<choice>
|
|
714
|
-
<value>alternative</value>
|
|
715
|
-
<value>original</value>
|
|
716
|
-
<value>unofficial</value>
|
|
717
|
-
<value>subtitle</value>
|
|
718
|
-
<value>main</value>
|
|
719
|
-
</choice>
|
|
720
|
-
</define>
|
|
760
|
+
<!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
|
|
721
761
|
<define name="TypedUri">
|
|
722
762
|
<optional>
|
|
723
763
|
<attribute name="type"/>
|
|
@@ -747,6 +787,8 @@
|
|
|
747
787
|
<value>unchanged</value>
|
|
748
788
|
<value>circulated</value>
|
|
749
789
|
<value>adapted</value>
|
|
790
|
+
<value>vote-started</value>
|
|
791
|
+
<value>vote-ended</value>
|
|
750
792
|
</choice>
|
|
751
793
|
</define>
|
|
752
794
|
<define name="bdate">
|
|
@@ -999,38 +1041,63 @@
|
|
|
999
1041
|
</define>
|
|
1000
1042
|
<define name="DocRelationType">
|
|
1001
1043
|
<choice>
|
|
1002
|
-
<value>obsoletes</value>
|
|
1003
|
-
<value>obsoletedBy</value>
|
|
1004
|
-
<value>supersedes</value>
|
|
1005
|
-
<value>supersededBy</value>
|
|
1006
|
-
<value>updates</value>
|
|
1007
|
-
<value>updatedBy</value>
|
|
1008
|
-
<value>complements</value>
|
|
1009
|
-
<value>derivedFrom</value>
|
|
1010
|
-
<value>translatedFrom</value>
|
|
1011
|
-
<value>hasTranslation</value>
|
|
1012
|
-
<value>adoptedFrom</value>
|
|
1013
|
-
<value>equivalent</value>
|
|
1014
|
-
<value>identical</value>
|
|
1015
|
-
<value>nonequivalent</value>
|
|
1016
|
-
<value>includedIn</value>
|
|
1017
1044
|
<value>includes</value>
|
|
1018
|
-
<value>
|
|
1019
|
-
<value>instanceOf</value>
|
|
1020
|
-
<value>partOf</value>
|
|
1045
|
+
<value>includedIn</value>
|
|
1021
1046
|
<value>hasPart</value>
|
|
1022
|
-
<value>
|
|
1023
|
-
<value>draftOf</value>
|
|
1047
|
+
<value>partOf</value>
|
|
1024
1048
|
<value>merges</value>
|
|
1049
|
+
<value>mergedInto</value>
|
|
1025
1050
|
<value>splits</value>
|
|
1026
|
-
<value>
|
|
1027
|
-
<value>
|
|
1028
|
-
<value>
|
|
1029
|
-
<value>
|
|
1030
|
-
<value>
|
|
1031
|
-
<value>
|
|
1051
|
+
<value>splitInto</value>
|
|
1052
|
+
<value>instance</value>
|
|
1053
|
+
<value>hasInstance</value>
|
|
1054
|
+
<value>exemplarOf</value>
|
|
1055
|
+
<value>hasExemplar</value>
|
|
1056
|
+
<value>manifestationOf</value>
|
|
1057
|
+
<value>hasManifestation</value>
|
|
1058
|
+
<value>reproductionOf</value>
|
|
1059
|
+
<value>hasReproduction</value>
|
|
1060
|
+
<value>reprintOf</value>
|
|
1061
|
+
<value>hasReprint</value>
|
|
1062
|
+
<value>expressionOf</value>
|
|
1063
|
+
<value>hasExpression</value>
|
|
1064
|
+
<value>translatedFrom</value>
|
|
1065
|
+
<value>hasTranslation</value>
|
|
1066
|
+
<value>arrangementOf</value>
|
|
1067
|
+
<value>hasArrangement</value>
|
|
1068
|
+
<value>abridgementOf</value>
|
|
1069
|
+
<value>hasAbridgement</value>
|
|
1070
|
+
<value>annotationOf</value>
|
|
1071
|
+
<value>hasAnnotation</value>
|
|
1072
|
+
<value>draftOf</value>
|
|
1073
|
+
<value>hasDraft</value>
|
|
1074
|
+
<value>editionOf</value>
|
|
1075
|
+
<value>hasEdition</value>
|
|
1076
|
+
<value>updates</value>
|
|
1077
|
+
<value>updatedBy</value>
|
|
1078
|
+
<value>derivedFrom</value>
|
|
1079
|
+
<value>derives</value>
|
|
1032
1080
|
<value>describes</value>
|
|
1033
1081
|
<value>describedBy</value>
|
|
1082
|
+
<value>catalogues</value>
|
|
1083
|
+
<value>cataloguedBy</value>
|
|
1084
|
+
<value>hasSuccessor</value>
|
|
1085
|
+
<value>successorOf</value>
|
|
1086
|
+
<value>adaptedFrom</value>
|
|
1087
|
+
<value>hasAdaptation</value>
|
|
1088
|
+
<value>adoptedFrom</value>
|
|
1089
|
+
<value>adoptedAs</value>
|
|
1090
|
+
<value>reviewOf</value>
|
|
1091
|
+
<value>hasReview</value>
|
|
1092
|
+
<value>commentaryOf</value>
|
|
1093
|
+
<value>hasCommentary</value>
|
|
1094
|
+
<value>related</value>
|
|
1095
|
+
<value>complements</value>
|
|
1096
|
+
<value>complementOf</value>
|
|
1097
|
+
<value>obsoletes</value>
|
|
1098
|
+
<value>obsoletedBy</value>
|
|
1099
|
+
<value>cited</value>
|
|
1100
|
+
<value>isCitedIn</value>
|
|
1034
1101
|
</choice>
|
|
1035
1102
|
</define>
|
|
1036
1103
|
<define name="docrelation">
|
|
@@ -1038,12 +1105,30 @@
|
|
|
1038
1105
|
<attribute name="type">
|
|
1039
1106
|
<ref name="DocRelationType"/>
|
|
1040
1107
|
</attribute>
|
|
1108
|
+
<optional>
|
|
1109
|
+
<element name="description">
|
|
1110
|
+
<ref name="FormattedString"/>
|
|
1111
|
+
</element>
|
|
1112
|
+
</optional>
|
|
1041
1113
|
<element name="bibitem">
|
|
1042
1114
|
<ref name="BibliographicItem"/>
|
|
1043
1115
|
</element>
|
|
1044
|
-
<
|
|
1045
|
-
<
|
|
1046
|
-
|
|
1116
|
+
<choice>
|
|
1117
|
+
<zeroOrMore>
|
|
1118
|
+
<ref name="locality"/>
|
|
1119
|
+
</zeroOrMore>
|
|
1120
|
+
<zeroOrMore>
|
|
1121
|
+
<ref name="localityStack"/>
|
|
1122
|
+
</zeroOrMore>
|
|
1123
|
+
</choice>
|
|
1124
|
+
<choice>
|
|
1125
|
+
<zeroOrMore>
|
|
1126
|
+
<ref name="sourceLocality"/>
|
|
1127
|
+
</zeroOrMore>
|
|
1128
|
+
<zeroOrMore>
|
|
1129
|
+
<ref name="sourceLocalityStack"/>
|
|
1130
|
+
</zeroOrMore>
|
|
1131
|
+
</choice>
|
|
1047
1132
|
</element>
|
|
1048
1133
|
</define>
|
|
1049
1134
|
<define name="version">
|