metanorma-csd 1.3.17 → 1.3.23
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/macos.yml +8 -7
- data/.github/workflows/ubuntu.yml +12 -9
- data/.github/workflows/windows.yml +8 -8
- data/lib/asciidoctor/csd/biblio.rng +142 -37
- data/lib/asciidoctor/csd/isodoc.rng +48 -2
- data/lib/isodoc/csd/csd.standard.xsl +2806 -0
- data/lib/isodoc/csd/html/htmlstyle.scss +5 -2
- data/lib/isodoc/csd/html/scripts.html +16 -29
- data/lib/isodoc/csd/html_convert.rb +5 -5
- data/lib/isodoc/csd/pdf_convert.rb +13 -37
- data/lib/isodoc/csd/word_convert.rb +3 -3
- data/lib/metanorma/csd/processor.rb +8 -0
- data/lib/metanorma/csd/version.rb +1 -1
- data/metanorma-csd.gemspec +1 -1
- metadata +5 -5
- data/lib/isodoc/csd/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: 924081990582e936da18b6acda86776f2923e710eea083d5d6bb73e0b40030e7
|
|
4
|
+
data.tar.gz: 5e817fb39293f074fc9718c9c0e4b6bcb3e91082633db7240c2a405d8248b815
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b9b05300d75a5f35c1537541a7e40962d75dcf8c64ebdef8c5f6b976a493fcd7ab65f14318c219a3391e245eba72c081351ce31eb3bdfcf2d9470c82862706d3
|
|
7
|
+
data.tar.gz: 86d4a7465ef8cd2ea9efb95c71d8fa3b727d4b95090aa5553241f3a11dbe3c46fee26d50faa847bc51f0bd7d320bc619fc45ff84024513a9aa2747c383bf6eec
|
data/.github/workflows/macos.yml
CHANGED
|
@@ -6,15 +6,23 @@ on:
|
|
|
6
6
|
push:
|
|
7
7
|
branches: [ master ]
|
|
8
8
|
pull_request:
|
|
9
|
+
paths-ignore:
|
|
10
|
+
- .github/workflows/ubuntu.yml
|
|
11
|
+
- .github/workflows/windows.yml
|
|
9
12
|
|
|
10
13
|
jobs:
|
|
11
14
|
test-macos:
|
|
12
15
|
name: Test on Ruby ${{ matrix.ruby }} macOS
|
|
13
16
|
runs-on: macos-latest
|
|
17
|
+
continue-on-error: ${{ matrix.experimental }}
|
|
14
18
|
strategy:
|
|
15
19
|
fail-fast: false
|
|
16
20
|
matrix:
|
|
17
21
|
ruby: [ '2.6', '2.5', '2.4' ]
|
|
22
|
+
experimental: [false]
|
|
23
|
+
include:
|
|
24
|
+
- ruby: '2.7'
|
|
25
|
+
experimental: true
|
|
18
26
|
steps:
|
|
19
27
|
- uses: actions/checkout@master
|
|
20
28
|
- name: Use Ruby
|
|
@@ -26,13 +34,6 @@ jobs:
|
|
|
26
34
|
run: |
|
|
27
35
|
sudo gem install bundler --force
|
|
28
36
|
bundle install --jobs 4 --retry 3
|
|
29
|
-
- name: Use Node
|
|
30
|
-
uses: actions/setup-node@v1
|
|
31
|
-
with:
|
|
32
|
-
node-version: '8'
|
|
33
|
-
- name: Install Puppeteer
|
|
34
|
-
run: |
|
|
35
|
-
npm install -g puppeteer
|
|
36
37
|
- name: Run specs
|
|
37
38
|
run: |
|
|
38
39
|
bundle exec rake
|
|
@@ -5,16 +5,26 @@ name: ubuntu
|
|
|
5
5
|
on:
|
|
6
6
|
push:
|
|
7
7
|
branches: [ master ]
|
|
8
|
+
tags:
|
|
9
|
+
- '*'
|
|
8
10
|
pull_request:
|
|
11
|
+
paths-ignore:
|
|
12
|
+
- .github/workflows/macos.yml
|
|
13
|
+
- .github/workflows/windows.yml
|
|
9
14
|
|
|
10
15
|
jobs:
|
|
11
16
|
test-linux:
|
|
12
17
|
name: Test on Ruby ${{ matrix.ruby }} Ubuntu
|
|
13
18
|
runs-on: ubuntu-latest
|
|
19
|
+
continue-on-error: ${{ matrix.experimental }}
|
|
14
20
|
strategy:
|
|
15
21
|
fail-fast: false
|
|
16
22
|
matrix:
|
|
17
23
|
ruby: [ '2.6', '2.5', '2.4' ]
|
|
24
|
+
experimental: [false]
|
|
25
|
+
include:
|
|
26
|
+
- ruby: '2.7'
|
|
27
|
+
experimental: true
|
|
18
28
|
steps:
|
|
19
29
|
- uses: actions/checkout@master
|
|
20
30
|
- name: Use Ruby
|
|
@@ -26,18 +36,11 @@ jobs:
|
|
|
26
36
|
run: |
|
|
27
37
|
gem install bundler
|
|
28
38
|
bundle install --jobs 4 --retry 3
|
|
29
|
-
- name: Use Node
|
|
30
|
-
uses: actions/setup-node@v1
|
|
31
|
-
with:
|
|
32
|
-
node-version: '8'
|
|
33
|
-
- name: Install Puppeteer
|
|
34
|
-
run: |
|
|
35
|
-
npm install -g puppeteer
|
|
36
39
|
- name: Run specs
|
|
37
40
|
run: |
|
|
38
41
|
bundle exec rake
|
|
39
42
|
- name: Trigger dependent repositories
|
|
40
|
-
if: github.ref == 'refs/heads/master'
|
|
43
|
+
if: github.ref == 'refs/heads/master' && matrix.ruby == '2.6'
|
|
41
44
|
env:
|
|
42
45
|
GH_USERNAME: ${{ secrets.PAT_USERNAME }}
|
|
43
46
|
GH_ACCESS_TOKEN: ${{ secrets.PAT_TOKEN }}
|
|
@@ -46,5 +49,5 @@ jobs:
|
|
|
46
49
|
[[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
|
|
47
50
|
for repo in $DEPENDENT_REPOS
|
|
48
51
|
do
|
|
49
|
-
sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY
|
|
52
|
+
sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "{ \"ref\": \"${GITHUB_REF}\" }"
|
|
50
53
|
done
|
|
@@ -6,15 +6,23 @@ on:
|
|
|
6
6
|
push:
|
|
7
7
|
branches: [ master ]
|
|
8
8
|
pull_request:
|
|
9
|
+
paths-ignore:
|
|
10
|
+
- .github/workflows/macos.yml
|
|
11
|
+
- .github/workflows/ubuntu.yml
|
|
9
12
|
|
|
10
13
|
jobs:
|
|
11
14
|
test-windows:
|
|
12
15
|
name: Test on Ruby ${{ matrix.ruby }} Windows
|
|
13
16
|
runs-on: windows-latest
|
|
17
|
+
continue-on-error: ${{ matrix.experimental }}
|
|
14
18
|
strategy:
|
|
15
19
|
fail-fast: false
|
|
16
20
|
matrix:
|
|
17
21
|
ruby: [ '2.6', '2.5', '2.4' ]
|
|
22
|
+
experimental: [false]
|
|
23
|
+
include:
|
|
24
|
+
- ruby: '2.7'
|
|
25
|
+
experimental: true
|
|
18
26
|
steps:
|
|
19
27
|
- uses: actions/checkout@master
|
|
20
28
|
- name: Use Ruby
|
|
@@ -27,15 +35,7 @@ jobs:
|
|
|
27
35
|
run: |
|
|
28
36
|
gem install bundler
|
|
29
37
|
bundle config --local path vendor/bundle
|
|
30
|
-
bundle update
|
|
31
38
|
bundle install --jobs 4 --retry 3
|
|
32
|
-
- name: Use Node
|
|
33
|
-
uses: actions/setup-node@v1
|
|
34
|
-
with:
|
|
35
|
-
node-version: '8'
|
|
36
|
-
- name: Install Puppeteer
|
|
37
|
-
run: |
|
|
38
|
-
npm install -g puppeteer
|
|
39
39
|
- name: Run specs
|
|
40
40
|
run: |
|
|
41
41
|
bundle exec rake
|
|
@@ -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"/>
|
|
@@ -611,9 +661,9 @@
|
|
|
611
661
|
<optional>
|
|
612
662
|
<ref name="status"/>
|
|
613
663
|
</optional>
|
|
614
|
-
<
|
|
664
|
+
<zeroOrMore>
|
|
615
665
|
<ref name="copyright"/>
|
|
616
|
-
</
|
|
666
|
+
</zeroOrMore>
|
|
617
667
|
<zeroOrMore>
|
|
618
668
|
<ref name="docrelation"/>
|
|
619
669
|
</zeroOrMore>
|
|
@@ -737,6 +787,8 @@
|
|
|
737
787
|
<value>unchanged</value>
|
|
738
788
|
<value>circulated</value>
|
|
739
789
|
<value>adapted</value>
|
|
790
|
+
<value>vote-started</value>
|
|
791
|
+
<value>vote-ended</value>
|
|
740
792
|
</choice>
|
|
741
793
|
</define>
|
|
742
794
|
<define name="bdate">
|
|
@@ -969,7 +1021,17 @@
|
|
|
969
1021
|
<optional>
|
|
970
1022
|
<ref name="to"/>
|
|
971
1023
|
</optional>
|
|
972
|
-
<
|
|
1024
|
+
<oneOrMore>
|
|
1025
|
+
<ref name="owner"/>
|
|
1026
|
+
</oneOrMore>
|
|
1027
|
+
<optional>
|
|
1028
|
+
<ref name="copyright_scope"/>
|
|
1029
|
+
</optional>
|
|
1030
|
+
</element>
|
|
1031
|
+
</define>
|
|
1032
|
+
<define name="copyright_scope">
|
|
1033
|
+
<element name="scope">
|
|
1034
|
+
<text/>
|
|
973
1035
|
</element>
|
|
974
1036
|
</define>
|
|
975
1037
|
<define name="from">
|
|
@@ -989,38 +1051,63 @@
|
|
|
989
1051
|
</define>
|
|
990
1052
|
<define name="DocRelationType">
|
|
991
1053
|
<choice>
|
|
992
|
-
<value>obsoletes</value>
|
|
993
|
-
<value>obsoletedBy</value>
|
|
994
|
-
<value>supersedes</value>
|
|
995
|
-
<value>supersededBy</value>
|
|
996
|
-
<value>updates</value>
|
|
997
|
-
<value>updatedBy</value>
|
|
998
|
-
<value>complements</value>
|
|
999
|
-
<value>derivedFrom</value>
|
|
1000
|
-
<value>translatedFrom</value>
|
|
1001
|
-
<value>hasTranslation</value>
|
|
1002
|
-
<value>adoptedFrom</value>
|
|
1003
|
-
<value>equivalent</value>
|
|
1004
|
-
<value>identical</value>
|
|
1005
|
-
<value>nonequivalent</value>
|
|
1006
|
-
<value>includedIn</value>
|
|
1007
1054
|
<value>includes</value>
|
|
1008
|
-
<value>
|
|
1009
|
-
<value>instanceOf</value>
|
|
1010
|
-
<value>partOf</value>
|
|
1055
|
+
<value>includedIn</value>
|
|
1011
1056
|
<value>hasPart</value>
|
|
1012
|
-
<value>
|
|
1013
|
-
<value>draftOf</value>
|
|
1057
|
+
<value>partOf</value>
|
|
1014
1058
|
<value>merges</value>
|
|
1059
|
+
<value>mergedInto</value>
|
|
1015
1060
|
<value>splits</value>
|
|
1016
|
-
<value>
|
|
1017
|
-
<value>
|
|
1018
|
-
<value>
|
|
1019
|
-
<value>
|
|
1020
|
-
<value>
|
|
1021
|
-
<value>
|
|
1061
|
+
<value>splitInto</value>
|
|
1062
|
+
<value>instance</value>
|
|
1063
|
+
<value>hasInstance</value>
|
|
1064
|
+
<value>exemplarOf</value>
|
|
1065
|
+
<value>hasExemplar</value>
|
|
1066
|
+
<value>manifestationOf</value>
|
|
1067
|
+
<value>hasManifestation</value>
|
|
1068
|
+
<value>reproductionOf</value>
|
|
1069
|
+
<value>hasReproduction</value>
|
|
1070
|
+
<value>reprintOf</value>
|
|
1071
|
+
<value>hasReprint</value>
|
|
1072
|
+
<value>expressionOf</value>
|
|
1073
|
+
<value>hasExpression</value>
|
|
1074
|
+
<value>translatedFrom</value>
|
|
1075
|
+
<value>hasTranslation</value>
|
|
1076
|
+
<value>arrangementOf</value>
|
|
1077
|
+
<value>hasArrangement</value>
|
|
1078
|
+
<value>abridgementOf</value>
|
|
1079
|
+
<value>hasAbridgement</value>
|
|
1080
|
+
<value>annotationOf</value>
|
|
1081
|
+
<value>hasAnnotation</value>
|
|
1082
|
+
<value>draftOf</value>
|
|
1083
|
+
<value>hasDraft</value>
|
|
1084
|
+
<value>editionOf</value>
|
|
1085
|
+
<value>hasEdition</value>
|
|
1086
|
+
<value>updates</value>
|
|
1087
|
+
<value>updatedBy</value>
|
|
1088
|
+
<value>derivedFrom</value>
|
|
1089
|
+
<value>derives</value>
|
|
1022
1090
|
<value>describes</value>
|
|
1023
1091
|
<value>describedBy</value>
|
|
1092
|
+
<value>catalogues</value>
|
|
1093
|
+
<value>cataloguedBy</value>
|
|
1094
|
+
<value>hasSuccessor</value>
|
|
1095
|
+
<value>successorOf</value>
|
|
1096
|
+
<value>adaptedFrom</value>
|
|
1097
|
+
<value>hasAdaptation</value>
|
|
1098
|
+
<value>adoptedFrom</value>
|
|
1099
|
+
<value>adoptedAs</value>
|
|
1100
|
+
<value>reviewOf</value>
|
|
1101
|
+
<value>hasReview</value>
|
|
1102
|
+
<value>commentaryOf</value>
|
|
1103
|
+
<value>hasCommentary</value>
|
|
1104
|
+
<value>related</value>
|
|
1105
|
+
<value>complements</value>
|
|
1106
|
+
<value>complementOf</value>
|
|
1107
|
+
<value>obsoletes</value>
|
|
1108
|
+
<value>obsoletedBy</value>
|
|
1109
|
+
<value>cited</value>
|
|
1110
|
+
<value>isCitedIn</value>
|
|
1024
1111
|
</choice>
|
|
1025
1112
|
</define>
|
|
1026
1113
|
<define name="docrelation">
|
|
@@ -1028,12 +1115,30 @@
|
|
|
1028
1115
|
<attribute name="type">
|
|
1029
1116
|
<ref name="DocRelationType"/>
|
|
1030
1117
|
</attribute>
|
|
1118
|
+
<optional>
|
|
1119
|
+
<element name="description">
|
|
1120
|
+
<ref name="FormattedString"/>
|
|
1121
|
+
</element>
|
|
1122
|
+
</optional>
|
|
1031
1123
|
<element name="bibitem">
|
|
1032
1124
|
<ref name="BibliographicItem"/>
|
|
1033
1125
|
</element>
|
|
1034
|
-
<
|
|
1035
|
-
<
|
|
1036
|
-
|
|
1126
|
+
<choice>
|
|
1127
|
+
<zeroOrMore>
|
|
1128
|
+
<ref name="locality"/>
|
|
1129
|
+
</zeroOrMore>
|
|
1130
|
+
<zeroOrMore>
|
|
1131
|
+
<ref name="localityStack"/>
|
|
1132
|
+
</zeroOrMore>
|
|
1133
|
+
</choice>
|
|
1134
|
+
<choice>
|
|
1135
|
+
<zeroOrMore>
|
|
1136
|
+
<ref name="sourceLocality"/>
|
|
1137
|
+
</zeroOrMore>
|
|
1138
|
+
<zeroOrMore>
|
|
1139
|
+
<ref name="sourceLocalityStack"/>
|
|
1140
|
+
</zeroOrMore>
|
|
1141
|
+
</choice>
|
|
1037
1142
|
</element>
|
|
1038
1143
|
</define>
|
|
1039
1144
|
<define name="version">
|
|
@@ -53,6 +53,14 @@
|
|
|
53
53
|
<optional>
|
|
54
54
|
<attribute name="alt"/>
|
|
55
55
|
</optional>
|
|
56
|
+
<optional>
|
|
57
|
+
<attribute name="case">
|
|
58
|
+
<choice>
|
|
59
|
+
<value>capital</value>
|
|
60
|
+
<value>lowercase</value>
|
|
61
|
+
</choice>
|
|
62
|
+
</attribute>
|
|
63
|
+
</optional>
|
|
56
64
|
<text/>
|
|
57
65
|
</element>
|
|
58
66
|
</define>
|
|
@@ -129,6 +137,9 @@
|
|
|
129
137
|
</choice>
|
|
130
138
|
</attribute>
|
|
131
139
|
</optional>
|
|
140
|
+
<attribute name="normative">
|
|
141
|
+
<data type="boolean"/>
|
|
142
|
+
</attribute>
|
|
132
143
|
<optional>
|
|
133
144
|
<ref name="section-title"/>
|
|
134
145
|
</optional>
|
|
@@ -305,6 +316,21 @@
|
|
|
305
316
|
</define>
|
|
306
317
|
</include>
|
|
307
318
|
<!-- end overrides -->
|
|
319
|
+
<define name="TextElement" combine="choice">
|
|
320
|
+
<ref name="concept"/>
|
|
321
|
+
</define>
|
|
322
|
+
<define name="concept">
|
|
323
|
+
<element name="concept">
|
|
324
|
+
<optional>
|
|
325
|
+
<attribute name="term"/>
|
|
326
|
+
</optional>
|
|
327
|
+
<choice>
|
|
328
|
+
<ref name="eref"/>
|
|
329
|
+
<ref name="xref"/>
|
|
330
|
+
<ref name="termref"/>
|
|
331
|
+
</choice>
|
|
332
|
+
</element>
|
|
333
|
+
</define>
|
|
308
334
|
<define name="BasicBlock" combine="choice">
|
|
309
335
|
<choice>
|
|
310
336
|
<ref name="requirement"/>
|
|
@@ -884,7 +910,15 @@
|
|
|
884
910
|
<attribute name="id">
|
|
885
911
|
<data type="ID"/>
|
|
886
912
|
</attribute>
|
|
887
|
-
<
|
|
913
|
+
<oneOrMore>
|
|
914
|
+
<choice>
|
|
915
|
+
<ref name="paragraph"/>
|
|
916
|
+
<ref name="ul"/>
|
|
917
|
+
<ref name="ol"/>
|
|
918
|
+
<ref name="dl"/>
|
|
919
|
+
<ref name="formula"/>
|
|
920
|
+
</choice>
|
|
921
|
+
</oneOrMore>
|
|
888
922
|
</element>
|
|
889
923
|
</define>
|
|
890
924
|
<define name="termexample">
|
|
@@ -911,7 +945,10 @@
|
|
|
911
945
|
</define>
|
|
912
946
|
<define name="origin">
|
|
913
947
|
<element name="origin">
|
|
914
|
-
<
|
|
948
|
+
<choice>
|
|
949
|
+
<ref name="erefType"/>
|
|
950
|
+
<ref name="termref"/>
|
|
951
|
+
</choice>
|
|
915
952
|
</element>
|
|
916
953
|
</define>
|
|
917
954
|
<define name="modification">
|
|
@@ -919,6 +956,15 @@
|
|
|
919
956
|
<ref name="paragraph"/>
|
|
920
957
|
</element>
|
|
921
958
|
</define>
|
|
959
|
+
<define name="termref">
|
|
960
|
+
<element name="termref">
|
|
961
|
+
<attribute name="base"/>
|
|
962
|
+
<attribute name="target"/>
|
|
963
|
+
<optional>
|
|
964
|
+
<text/>
|
|
965
|
+
</optional>
|
|
966
|
+
</element>
|
|
967
|
+
</define>
|
|
922
968
|
<define name="structuredidentifier">
|
|
923
969
|
<element name="structuredidentifier">
|
|
924
970
|
<optional>
|