metanorma-ogc 1.2.14 → 1.3.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/rake.yml +9 -32
- data/.gitignore +2 -0
- data/.rubocop.yml +9 -1
- data/lib/asciidoctor/ogc/biblio.rng +4 -6
- data/lib/asciidoctor/ogc/boilerplate.xml +1 -1
- data/lib/asciidoctor/ogc/converter.rb +9 -10
- data/lib/asciidoctor/ogc/front.rb +21 -13
- data/lib/asciidoctor/ogc/isodoc.rng +172 -3
- data/lib/asciidoctor/ogc/ogc.rng +22 -0
- data/lib/isodoc/ogc/base_convert.rb +15 -1
- data/lib/isodoc/ogc/html/htmlstyle.css +10 -0
- data/lib/isodoc/ogc/html/htmlstyle.scss +4 -0
- data/lib/isodoc/ogc/html/ogc.css +3 -0
- data/lib/isodoc/ogc/html/ogc.scss +3 -0
- data/lib/isodoc/ogc/html_convert.rb +0 -1
- data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl +590 -129
- data/lib/isodoc/ogc/ogc.best-practice.xsl +590 -129
- data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +590 -129
- data/lib/isodoc/ogc/ogc.community-practice.xsl +590 -129
- data/lib/isodoc/ogc/ogc.community-standard.xsl +590 -129
- data/lib/isodoc/ogc/ogc.discussion-paper.xsl +590 -129
- data/lib/isodoc/ogc/ogc.engineering-report.xsl +590 -129
- data/lib/isodoc/ogc/ogc.other.xsl +590 -129
- data/lib/isodoc/ogc/ogc.policy.xsl +590 -129
- data/lib/isodoc/ogc/ogc.reference-model.xsl +590 -129
- data/lib/isodoc/ogc/ogc.release-notes.xsl +590 -129
- data/lib/isodoc/ogc/ogc.standard.xsl +590 -129
- data/lib/isodoc/ogc/ogc.test-suite.xsl +590 -129
- data/lib/isodoc/ogc/ogc.user-guide.xsl +590 -129
- data/lib/isodoc/ogc/ogc.white-paper.xsl +590 -129
- data/lib/metanorma/ogc/version.rb +1 -1
- data/metanorma-ogc.gemspec +6 -6
- metadata +32 -32
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c844c9413112ce478961eaee4dc1d9095cb45f7a9037e5fb2a017aa14df2570a
|
4
|
+
data.tar.gz: b18b7340a94b1ca58ae3e1acc4531fb27c64f65077a523ce725c5f0672beb9dc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d1322f1463bcf357d6528a2db5c3ce2e8b1f2b34123aab899896afb99c8036d47396b892085676222b466602a26656ae903d9cea1857fe9c730b0d39567b254c
|
7
|
+
data.tar.gz: d85779466d2a1f7f973b47888520a1c633ed45b0afb07d0f2cc78ec13e5c21807ca76e8486a15535b4126a831abdfa238e7cd1b51837339582d3b5150b4bdb2b
|
data/.github/workflows/rake.yml
CHANGED
@@ -4,7 +4,7 @@ name: rake
|
|
4
4
|
|
5
5
|
on:
|
6
6
|
push:
|
7
|
-
branches: [ master, main
|
7
|
+
branches: [ master, main ]
|
8
8
|
tags: [ v* ]
|
9
9
|
pull_request:
|
10
10
|
|
@@ -16,50 +16,27 @@ jobs:
|
|
16
16
|
strategy:
|
17
17
|
fail-fast: false
|
18
18
|
matrix:
|
19
|
-
ruby: [ '2.6', '2.5', '2.4' ]
|
19
|
+
ruby: [ '2.7', '2.6', '2.5', '2.4' ]
|
20
20
|
os: [ ubuntu-latest, windows-latest, macos-latest ]
|
21
21
|
experimental: [ false ]
|
22
22
|
include:
|
23
|
-
- ruby: '
|
23
|
+
- ruby: '3.0'
|
24
24
|
os: 'ubuntu-latest'
|
25
25
|
experimental: true
|
26
|
-
- ruby: '
|
26
|
+
- ruby: '3.0'
|
27
27
|
os: 'windows-latest'
|
28
28
|
experimental: true
|
29
|
-
- ruby: '
|
29
|
+
- ruby: '3.0'
|
30
30
|
os: 'macos-latest'
|
31
31
|
experimental: true
|
32
32
|
steps:
|
33
|
-
- uses: actions/checkout@
|
33
|
+
- uses: actions/checkout@v2
|
34
|
+
with:
|
35
|
+
submodules: true
|
34
36
|
|
35
37
|
- uses: ruby/setup-ruby@v1
|
36
38
|
with:
|
37
39
|
ruby-version: ${{ matrix.ruby }}
|
38
|
-
|
39
|
-
- if: matrix.os == 'macos-latest'
|
40
|
-
run: brew install autoconf automake libtool
|
41
|
-
|
42
|
-
- uses: actions/cache@v2
|
43
|
-
with:
|
44
|
-
path: vendor/bundle
|
45
|
-
key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
|
46
|
-
restore-keys: bundle-${{ matrix.os }}-${{ matrix.ruby }}
|
47
|
-
|
48
|
-
- run: bundle config set path 'vendor/bundle'
|
49
|
-
|
50
|
-
- run: bundle install --jobs 4 --retry 3
|
40
|
+
bundler-cache: true
|
51
41
|
|
52
42
|
- run: bundle exec rake
|
53
|
-
|
54
|
-
tests-passed:
|
55
|
-
needs: rake
|
56
|
-
runs-on: ubuntu-latest
|
57
|
-
steps:
|
58
|
-
- name: Trigger tests passed event
|
59
|
-
uses: Sibz/github-status-action@v1
|
60
|
-
with:
|
61
|
-
authToken: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
|
62
|
-
context: 'tests-passed-successfully'
|
63
|
-
description: 'Tests passed successfully'
|
64
|
-
state: 'success'
|
65
|
-
sha: ${{ github.event.pull_request.head.sha || github.sha }}
|
data/.gitignore
CHANGED
data/.rubocop.yml
CHANGED
@@ -1,6 +1,14 @@
|
|
1
1
|
# This project follows the Ribose OSS style guide.
|
2
2
|
# https://github.com/riboseinc/oss-guides
|
3
3
|
# All project-specific additions and overrides should be specified in this file.
|
4
|
-
|
5
4
|
inherit_from:
|
6
5
|
- https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
|
6
|
+
|
7
|
+
# local repo-specific modifications
|
8
|
+
|
9
|
+
AllCops:
|
10
|
+
DisplayCopNames: false
|
11
|
+
StyleGuideCopsOnly: false
|
12
|
+
TargetRubyVersion: 2.4
|
13
|
+
Rails:
|
14
|
+
Enabled: true
|
@@ -124,7 +124,7 @@
|
|
124
124
|
<value>application/tei+xml</value>
|
125
125
|
<value>text/x-asciidoc</value>
|
126
126
|
<value>text/markdown</value>
|
127
|
-
<value>application/x-
|
127
|
+
<value>application/x-metanorma+xml</value>
|
128
128
|
<text/>
|
129
129
|
</choice>
|
130
130
|
</attribute>
|
@@ -452,6 +452,7 @@
|
|
452
452
|
<attribute name="type">
|
453
453
|
<choice>
|
454
454
|
<value>isni</value>
|
455
|
+
<value>orcid</value>
|
455
456
|
<value>uri</value>
|
456
457
|
</choice>
|
457
458
|
</attribute>
|
@@ -461,10 +462,7 @@
|
|
461
462
|
<define name="org-identifier">
|
462
463
|
<element name="identifier">
|
463
464
|
<attribute name="type">
|
464
|
-
<
|
465
|
-
<value>orcid</value>
|
466
|
-
<value>uri</value>
|
467
|
-
</choice>
|
465
|
+
<data type="string" datatypeLibrary=""/>
|
468
466
|
</attribute>
|
469
467
|
<text/>
|
470
468
|
</element>
|
@@ -1106,7 +1104,7 @@
|
|
1106
1104
|
<value>complementOf</value>
|
1107
1105
|
<value>obsoletes</value>
|
1108
1106
|
<value>obsoletedBy</value>
|
1109
|
-
<value>
|
1107
|
+
<value>cites</value>
|
1110
1108
|
<value>isCitedIn</value>
|
1111
1109
|
</choice>
|
1112
1110
|
</define>
|
@@ -6,7 +6,7 @@
|
|
6
6
|
<p align="center">Copyright
|
7
7
|
© {{ docyear }} Open Geospatial Consortium<br/>
|
8
8
|
To obtain additional rights of use, visit
|
9
|
-
<link target="http://www.
|
9
|
+
<link target="http://www.ogc.org/legal/">http://www.ogc.org/legal/</link></p>
|
10
10
|
</clause>
|
11
11
|
<clause>
|
12
12
|
<title>Note</title>
|
@@ -55,18 +55,14 @@ module Asciidoctor
|
|
55
55
|
def outputs(node, ret)
|
56
56
|
File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
|
57
57
|
presentation_xml_converter(node).convert(@filename + ".xml")
|
58
|
-
html_converter(node).convert(@filename + ".presentation.xml",
|
59
|
-
|
60
|
-
|
61
|
-
nil, false, "#{@filename}.doc")
|
62
|
-
pdf_converter(node)&.convert(@filename + ".presentation.xml",
|
63
|
-
nil, false, "#{@filename}.pdf")
|
58
|
+
html_converter(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}.html")
|
59
|
+
doc_converter(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}.doc")
|
60
|
+
pdf_converter(node)&.convert(@filename + ".presentation.xml", nil, false, "#{@filename}.pdf")
|
64
61
|
end
|
65
62
|
|
66
63
|
def validate(doc)
|
67
64
|
content_validate(doc)
|
68
|
-
schema_validate(formattedstr_strip(doc.dup),
|
69
|
-
File.join(File.dirname(__FILE__), "ogc.rng"))
|
65
|
+
schema_validate(formattedstr_strip(doc.dup), File.join(File.dirname(__FILE__), "ogc.rng"))
|
70
66
|
end
|
71
67
|
|
72
68
|
def sections_cleanup(x)
|
@@ -132,8 +128,11 @@ module Asciidoctor
|
|
132
128
|
def bibdata_cleanup(xmldoc)
|
133
129
|
super
|
134
130
|
a = xmldoc.at("//bibdata/status/stage")
|
135
|
-
a.text == "published" and
|
136
|
-
|
131
|
+
a.text == "published" and a.children = "approved"
|
132
|
+
end
|
133
|
+
|
134
|
+
def highlight_parse(text, xml)
|
135
|
+
xml.hi { |s| s << text }
|
137
136
|
end
|
138
137
|
|
139
138
|
def presentation_xml_converter(node)
|
@@ -12,8 +12,9 @@ module Asciidoctor
|
|
12
12
|
|
13
13
|
def corporate_author(node, xml)
|
14
14
|
return unless node.attr("submitting-organizations")
|
15
|
-
|
16
|
-
|
15
|
+
|
16
|
+
csv_split(HTMLEntities.new
|
17
|
+
.decode(node.attr("submitting-organizations")), ";")&.each do |org|
|
17
18
|
xml.contributor do |c|
|
18
19
|
c.role **{ type: "author" }
|
19
20
|
c.organization do |a|
|
@@ -37,6 +38,7 @@ module Asciidoctor
|
|
37
38
|
|
38
39
|
def ogc_editor(node, xml)
|
39
40
|
return unless node.attr("editor")
|
41
|
+
|
40
42
|
xml.contributor do |c|
|
41
43
|
c.role **{ type: "editor" }
|
42
44
|
c.person do |p|
|
@@ -69,6 +71,7 @@ module Asciidoctor
|
|
69
71
|
|
70
72
|
def metadata_committee(node, xml)
|
71
73
|
return unless node.attr("committee")
|
74
|
+
|
72
75
|
xml.editorialgroup do |a|
|
73
76
|
a.committee(node.attr("committee") || "technical")
|
74
77
|
node.attr("subcommittee") and
|
@@ -84,9 +87,11 @@ module Asciidoctor
|
|
84
87
|
|
85
88
|
def externalid(node)
|
86
89
|
return node.attr("external-id") if node.attr("external-id")
|
90
|
+
|
87
91
|
d = doctype(node)
|
88
92
|
a = node.attr("abbrev")
|
89
|
-
return unless d
|
93
|
+
return unless d && a
|
94
|
+
|
90
95
|
url = "http://www.opengis.net/doc/#{IsoDoc::Ogc::DOCTYPE_ABBR[d]}/#{a}"
|
91
96
|
v = (node.attr("edition") || node.attr("version")) and url += "/#{v}"
|
92
97
|
url
|
@@ -107,7 +112,7 @@ module Asciidoctor
|
|
107
112
|
if doctype(node) == "engineering-report"
|
108
113
|
"http://www.opengis.net/doc/PER/t14-#{node.attr('referenceurlid')}"
|
109
114
|
else
|
110
|
-
node.attr(
|
115
|
+
node.attr("referenceurlid")
|
111
116
|
end
|
112
117
|
end
|
113
118
|
|
@@ -125,9 +130,9 @@ module Asciidoctor
|
|
125
130
|
|
126
131
|
def metadata_date(node, xml)
|
127
132
|
super
|
128
|
-
ogc_date(node, xml, "submissiondate", "received"
|
129
|
-
ogc_date(node, xml, "publicationdate", "published"
|
130
|
-
ogc_date(node, xml, "approvaldate", "issued"
|
133
|
+
ogc_date(node, xml, "submissiondate", "received")
|
134
|
+
ogc_date(node, xml, "publicationdate", "published")
|
135
|
+
ogc_date(node, xml, "approvaldate", "issued")
|
131
136
|
end
|
132
137
|
|
133
138
|
def ogc_date(node, xml, ogcname, metanormaname)
|
@@ -139,27 +144,30 @@ module Asciidoctor
|
|
139
144
|
end
|
140
145
|
|
141
146
|
def metadata_version(node, xml)
|
142
|
-
node.
|
147
|
+
node.attr("version") and
|
148
|
+
node.set_attr("edition", node.attr("version"), false)
|
143
149
|
super
|
144
150
|
end
|
145
151
|
|
146
152
|
def metadata_subdoctype(node, xml)
|
147
|
-
s = node.attr("docsubtype")
|
153
|
+
s = node.attr("docsubtype")
|
148
154
|
s1 = ::IsoDoc::Ogc::DOCSUBTYPE_ABBR.invert[s] and s = s1
|
149
155
|
case doctype(node)
|
150
156
|
when "standard"
|
151
157
|
unless %w{conceptual-model conceptual-model-and-encoding
|
152
158
|
conceptual-model-and-implementation encoding extension
|
153
159
|
implementation profile profile-with-extension}.include? s
|
154
|
-
@log.add("Document Attributes", nil,
|
155
|
-
|
160
|
+
@log.add("Document Attributes", nil,
|
161
|
+
"'#{s}' is not a permitted subtype of Standard: "\
|
162
|
+
"reverting to 'implementation'")
|
156
163
|
s = "implementation"
|
157
164
|
end
|
158
165
|
when "best-practice"
|
159
166
|
unless %w{general encoding extension profile
|
160
167
|
profile-with-extension}.include? s
|
161
|
-
@log.add("Document Attributes", nil,
|
162
|
-
|
168
|
+
@log.add("Document Attributes", nil,
|
169
|
+
"'#{s}' is not a permitted subtype of Standard: "\
|
170
|
+
"reverting to 'implementation'")
|
163
171
|
s = "general"
|
164
172
|
end
|
165
173
|
end
|
@@ -86,6 +86,35 @@
|
|
86
86
|
<text/>
|
87
87
|
</element>
|
88
88
|
</define>
|
89
|
+
<define name="erefType">
|
90
|
+
<optional>
|
91
|
+
<attribute name="normative">
|
92
|
+
<data type="boolean"/>
|
93
|
+
</attribute>
|
94
|
+
</optional>
|
95
|
+
<attribute name="citeas"/>
|
96
|
+
<attribute name="type">
|
97
|
+
<ref name="ReferenceFormat"/>
|
98
|
+
</attribute>
|
99
|
+
<optional>
|
100
|
+
<attribute name="alt"/>
|
101
|
+
</optional>
|
102
|
+
<optional>
|
103
|
+
<attribute name="case">
|
104
|
+
<choice>
|
105
|
+
<value>capital</value>
|
106
|
+
<value>lowercase</value>
|
107
|
+
</choice>
|
108
|
+
</attribute>
|
109
|
+
</optional>
|
110
|
+
<optional>
|
111
|
+
<attribute name="droploc">
|
112
|
+
<data type="boolean"/>
|
113
|
+
</attribute>
|
114
|
+
</optional>
|
115
|
+
<ref name="CitationType"/>
|
116
|
+
<text/>
|
117
|
+
</define>
|
89
118
|
<define name="ul">
|
90
119
|
<element name="ul">
|
91
120
|
<attribute name="id">
|
@@ -102,7 +131,7 @@
|
|
102
131
|
</attribute>
|
103
132
|
</optional>
|
104
133
|
<oneOrMore>
|
105
|
-
<ref name="
|
134
|
+
<ref name="ul_li"/>
|
106
135
|
</oneOrMore>
|
107
136
|
<zeroOrMore>
|
108
137
|
<ref name="note"/>
|
@@ -775,6 +804,78 @@
|
|
775
804
|
<ref name="paragraph"/>
|
776
805
|
</element>
|
777
806
|
</define>
|
807
|
+
<define name="em">
|
808
|
+
<element name="em">
|
809
|
+
<zeroOrMore>
|
810
|
+
<choice>
|
811
|
+
<ref name="PureTextElement"/>
|
812
|
+
<ref name="stem"/>
|
813
|
+
<ref name="index"/>
|
814
|
+
</choice>
|
815
|
+
</zeroOrMore>
|
816
|
+
</element>
|
817
|
+
</define>
|
818
|
+
<define name="strong">
|
819
|
+
<element name="strong">
|
820
|
+
<zeroOrMore>
|
821
|
+
<choice>
|
822
|
+
<ref name="PureTextElement"/>
|
823
|
+
<ref name="stem"/>
|
824
|
+
<ref name="index"/>
|
825
|
+
</choice>
|
826
|
+
</zeroOrMore>
|
827
|
+
</element>
|
828
|
+
</define>
|
829
|
+
<define name="tt">
|
830
|
+
<element name="tt">
|
831
|
+
<zeroOrMore>
|
832
|
+
<choice>
|
833
|
+
<ref name="PureTextElement"/>
|
834
|
+
<ref name="index"/>
|
835
|
+
</choice>
|
836
|
+
</zeroOrMore>
|
837
|
+
</element>
|
838
|
+
</define>
|
839
|
+
<define name="keyword">
|
840
|
+
<element name="keyword">
|
841
|
+
<zeroOrMore>
|
842
|
+
<choice>
|
843
|
+
<ref name="PureTextElement"/>
|
844
|
+
<ref name="index"/>
|
845
|
+
</choice>
|
846
|
+
</zeroOrMore>
|
847
|
+
</element>
|
848
|
+
</define>
|
849
|
+
<define name="strike">
|
850
|
+
<element name="strike">
|
851
|
+
<zeroOrMore>
|
852
|
+
<choice>
|
853
|
+
<ref name="PureTextElement"/>
|
854
|
+
<ref name="index"/>
|
855
|
+
</choice>
|
856
|
+
</zeroOrMore>
|
857
|
+
</element>
|
858
|
+
</define>
|
859
|
+
<define name="underline">
|
860
|
+
<element name="underline">
|
861
|
+
<zeroOrMore>
|
862
|
+
<choice>
|
863
|
+
<ref name="PureTextElement"/>
|
864
|
+
<ref name="index"/>
|
865
|
+
</choice>
|
866
|
+
</zeroOrMore>
|
867
|
+
</element>
|
868
|
+
</define>
|
869
|
+
<define name="smallcap">
|
870
|
+
<element name="smallcap">
|
871
|
+
<zeroOrMore>
|
872
|
+
<choice>
|
873
|
+
<ref name="PureTextElement"/>
|
874
|
+
<ref name="index"/>
|
875
|
+
</choice>
|
876
|
+
</zeroOrMore>
|
877
|
+
</element>
|
878
|
+
</define>
|
778
879
|
</include>
|
779
880
|
<!-- end overrides -->
|
780
881
|
<define name="colgroup">
|
@@ -793,7 +894,35 @@
|
|
793
894
|
<value>internal</value>
|
794
895
|
</define>
|
795
896
|
<define name="TextElement" combine="choice">
|
796
|
-
<
|
897
|
+
<choice>
|
898
|
+
<ref name="concept"/>
|
899
|
+
<ref name="add"/>
|
900
|
+
<ref name="del"/>
|
901
|
+
</choice>
|
902
|
+
</define>
|
903
|
+
<define name="add">
|
904
|
+
<element name="add">
|
905
|
+
<choice>
|
906
|
+
<ref name="PureTextElement"/>
|
907
|
+
<ref name="eref"/>
|
908
|
+
<ref name="stem"/>
|
909
|
+
<ref name="keyword"/>
|
910
|
+
<ref name="xref"/>
|
911
|
+
<ref name="hyperlink"/>
|
912
|
+
</choice>
|
913
|
+
</element>
|
914
|
+
</define>
|
915
|
+
<define name="del">
|
916
|
+
<element name="del">
|
917
|
+
<choice>
|
918
|
+
<ref name="PureTextElement"/>
|
919
|
+
<ref name="eref"/>
|
920
|
+
<ref name="stem"/>
|
921
|
+
<ref name="keyword"/>
|
922
|
+
<ref name="xref"/>
|
923
|
+
<ref name="hyperlink"/>
|
924
|
+
</choice>
|
925
|
+
</element>
|
797
926
|
</define>
|
798
927
|
<define name="concept">
|
799
928
|
<element name="concept">
|
@@ -919,6 +1048,9 @@
|
|
919
1048
|
</choice>
|
920
1049
|
</attribute>
|
921
1050
|
<ref name="bibdata"/>
|
1051
|
+
<optional>
|
1052
|
+
<ref name="misccontainer"/>
|
1053
|
+
</optional>
|
922
1054
|
<optional>
|
923
1055
|
<ref name="boilerplate"/>
|
924
1056
|
</optional>
|
@@ -929,11 +1061,21 @@
|
|
929
1061
|
<zeroOrMore>
|
930
1062
|
<ref name="annex"/>
|
931
1063
|
</zeroOrMore>
|
1064
|
+
<optional>
|
1065
|
+
<ref name="bibliography"/>
|
1066
|
+
</optional>
|
932
1067
|
<zeroOrMore>
|
933
|
-
<ref name="
|
1068
|
+
<ref name="indexsect"/>
|
934
1069
|
</zeroOrMore>
|
935
1070
|
</element>
|
936
1071
|
</define>
|
1072
|
+
<define name="misccontainer">
|
1073
|
+
<element name="misc-container">
|
1074
|
+
<oneOrMore>
|
1075
|
+
<ref name="AnyElement"/>
|
1076
|
+
</oneOrMore>
|
1077
|
+
</element>
|
1078
|
+
</define>
|
937
1079
|
<define name="preface">
|
938
1080
|
<element name="preface">
|
939
1081
|
<oneOrMore>
|
@@ -957,6 +1099,11 @@
|
|
957
1099
|
<ref name="Content-Section"/>
|
958
1100
|
</element>
|
959
1101
|
</define>
|
1102
|
+
<define name="indexsect">
|
1103
|
+
<element name="indexsect">
|
1104
|
+
<ref name="Content-Section"/>
|
1105
|
+
</element>
|
1106
|
+
</define>
|
960
1107
|
<define name="boilerplate">
|
961
1108
|
<element name="boilerplate">
|
962
1109
|
<optional>
|
@@ -1698,4 +1845,26 @@
|
|
1698
1845
|
</zeroOrMore>
|
1699
1846
|
</element>
|
1700
1847
|
</define>
|
1848
|
+
<define name="ul_li">
|
1849
|
+
<element name="li">
|
1850
|
+
<optional>
|
1851
|
+
<attribute name="id">
|
1852
|
+
<data type="ID"/>
|
1853
|
+
</attribute>
|
1854
|
+
</optional>
|
1855
|
+
<optional>
|
1856
|
+
<attribute name="uncheckedcheckbox">
|
1857
|
+
<data type="boolean"/>
|
1858
|
+
</attribute>
|
1859
|
+
</optional>
|
1860
|
+
<optional>
|
1861
|
+
<attribute name="checkedcheckbox">
|
1862
|
+
<data type="boolean"/>
|
1863
|
+
</attribute>
|
1864
|
+
</optional>
|
1865
|
+
<oneOrMore>
|
1866
|
+
<ref name="BasicBlock"/>
|
1867
|
+
</oneOrMore>
|
1868
|
+
</element>
|
1869
|
+
</define>
|
1701
1870
|
</grammar>
|