Skip to content

Commit c5006ae

Browse files
duncdrumduncdrum
committed
fix(schema): cleanup schema and increase consistency of articles
close #262
1 parent 4bfd2cd commit c5006ae

File tree

16 files changed

+1925
-2091
lines changed

16 files changed

+1925
-2091
lines changed

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@
175175
</dependencies>
176176
<executions>
177177
<execution>
178+
<phase>validate</phase>
178179
<goals>
179180
<goal>validate</goal>
180181
</goals>

‎src/main/relaxng/exist-docs.rng‎

Lines changed: 103 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -37,74 +37,71 @@
3737
<data type="NCName"/>
3838
</attribute>
3939
<ref name="title"/>
40-
<zeroOrMore>
41-
<choice>
42-
<ref name="example"/>
43-
<ref name="figure"/>
44-
<ref name="important"/>
45-
<ref name="informalfigure"/>
46-
<ref name="itemizedlist"/>
47-
<ref name="note"/>
48-
<ref name="orderedlist"/>
49-
<ref name="para"/>
50-
<ref name="programlisting"/>
51-
<ref name="table"/>
52-
<ref name="variablelist"/>
53-
<ref name="warning"/>
54-
</choice>
55-
</zeroOrMore>
40+
<oneOrMore>
41+
<choice>
42+
<ref name="example"/>
43+
<ref name="figure"/>
44+
<ref name="important"/>
45+
<ref name="informalfigure"/>
46+
<ref name="informaltable"/>
47+
<ref name="itemizedlist"/>
48+
<ref name="note"/>
49+
<ref name="orderedlist"/>
50+
<ref name="para"/>
51+
<ref name="programlisting"/>
52+
<ref name="table"/>
53+
<ref name="variablelist"/>
54+
<ref name="warning"/>
55+
</choice>
56+
</oneOrMore>
5657
<zeroOrMore>
5758
<element name="sect2">
5859
<attribute>
5960
<name ns="http://www.w3.org/XML/1998/namespace">id</name>
6061
<data type="NCName"/>
6162
</attribute>
6263
<ref name="title"/>
63-
<optional>
64-
<ref name="figure"/>
65-
</optional>
66-
<zeroOrMore>
67-
<choice>
68-
<ref name="example"/>
69-
<ref name="important"/>
70-
<ref name="informalfigure"/>
71-
<ref name="informaltable"/>
72-
<ref name="itemizedlist"/>
73-
<ref name="note"/>
74-
<ref name="orderedlist"/>
75-
<ref name="para"/>
76-
<ref name="programlisting"/>
77-
<ref name="table"/>
78-
<ref name="variablelist"/>
79-
<ref name="warning"/>
80-
</choice>
81-
</zeroOrMore>
64+
<oneOrMore>
65+
<choice>
66+
<ref name="example"/>
67+
<ref name="figure"/>
68+
<ref name="important"/>
69+
<ref name="informalfigure"/>
70+
<ref name="informaltable"/>
71+
<ref name="itemizedlist"/>
72+
<ref name="note"/>
73+
<ref name="orderedlist"/>
74+
<ref name="para"/>
75+
<ref name="programlisting"/>
76+
<ref name="table"/>
77+
<ref name="variablelist"/>
78+
<ref name="warning"/>
79+
</choice>
80+
</oneOrMore>
8281
<zeroOrMore>
8382
<element name="sect3">
8483
<attribute>
8584
<name ns="http://www.w3.org/XML/1998/namespace">id</name>
8685
<data type="NCName"/>
8786
</attribute>
8887
<ref name="title"/>
89-
<oneOrMore>
90-
<choice>
91-
<ref name="example"/>
92-
<ref name="important"/>
93-
<ref name="informalfigure"/>
94-
<ref name="informaltable"/>
95-
<ref name="itemizedlist"/>
96-
<ref name="note"/>
97-
<ref name="para"/>
98-
<ref name="programlisting"/>
99-
<ref name="variablelist"/>
100-
</choice>
101-
</oneOrMore>
102-
<optional>
103-
<ref name="table"/>
104-
</optional>
105-
<optional>
106-
<ref name="warning"/>
107-
</optional>
88+
<oneOrMore>
89+
<choice>
90+
<ref name="example"/>
91+
<ref name="figure"/>
92+
<ref name="important"/>
93+
<ref name="informalfigure"/>
94+
<ref name="informaltable"/>
95+
<ref name="itemizedlist"/>
96+
<ref name="note"/>
97+
<ref name="orderedlist"/>
98+
<ref name="para"/>
99+
<ref name="programlisting"/>
100+
<ref name="table"/>
101+
<ref name="variablelist"/>
102+
<ref name="warning"/>
103+
</choice>
104+
</oneOrMore>
108105
</element>
109106
</zeroOrMore>
110107
</element>
@@ -211,55 +208,8 @@
211208
</optional>
212209
</element>
213210
</define>
214-
<define name="orderedlist">
215-
<element name="orderedlist">
216-
<zeroOrMore>
217-
<ref name="listitem"/>
218-
</zeroOrMore>
219-
</element>
220-
</define>
221-
<define name="informalfigure">
222-
<element name="informalfigure">
223-
<ref name="mediaobject"/>
224-
</element>
225-
</define>
226-
<define name="table">
227-
<element name="table">
228-
<optional>
229-
<attribute>
230-
<name ns="http://www.w3.org/XML/1998/namespace">id</name>
231-
<data type="NCName"/>
232-
</attribute>
233-
</optional>
234-
<ref name="title"/>
235-
<ref name="tgroup"/>
236-
</element>
237-
</define>
238-
<define name="programlisting">
239-
<element name="programlisting">
240-
<optional>
241-
<attribute name="language">
242-
<data type="NCName"/>
243-
</attribute>
244-
</optional>
245-
<optional>
246-
<attribute name="xlink:href"/>
247-
</optional>
248-
<oneOrMore>
249-
<choice>
250-
<text/>
251-
<ref name="tag"/>
252-
</choice>
253-
</oneOrMore>
254-
</element>
255-
</define>
256211
<define name="variablelist">
257212
<element name="variablelist">
258-
<optional>
259-
<attribute name="spacing">
260-
<data type="NCName"/>
261-
</attribute>
262-
</optional>
263213
<optional>
264214
<choice>
265215
<ref name="para"/>
@@ -300,14 +250,32 @@
300250
</zeroOrMore>
301251
</element>
302252
</define>
253+
<define name="orderedlist">
254+
<element name="orderedlist">
255+
<zeroOrMore>
256+
<ref name="listitem"/>
257+
</zeroOrMore>
258+
</element>
259+
</define>
303260
<define name="important">
304261
<element name="important">
305262
<ref name="para"/>
306263
</element>
307264
</define>
308-
<define name="figure">
309-
<element name="figure">
265+
<define name="table">
266+
<element name="table">
267+
<optional>
268+
<attribute>
269+
<name ns="http://www.w3.org/XML/1998/namespace">id</name>
270+
<data type="NCName"/>
271+
</attribute>
272+
</optional>
310273
<ref name="title"/>
274+
<ref name="tgroup"/>
275+
</element>
276+
</define>
277+
<define name="informalfigure">
278+
<element name="informalfigure">
311279
<ref name="mediaobject"/>
312280
</element>
313281
</define>
@@ -325,6 +293,30 @@
325293
</choice>
326294
</element>
327295
</define>
296+
<define name="programlisting">
297+
<element name="programlisting">
298+
<optional>
299+
<attribute name="language">
300+
<data type="NCName"/>
301+
</attribute>
302+
</optional>
303+
<optional>
304+
<attribute name="xlink:href"/>
305+
</optional>
306+
<oneOrMore>
307+
<choice>
308+
<text/>
309+
<ref name="tag"/>
310+
</choice>
311+
</oneOrMore>
312+
</element>
313+
</define>
314+
<define name="figure">
315+
<element name="figure">
316+
<ref name="title"/>
317+
<ref name="mediaobject"/>
318+
</element>
319+
</define>
328320
<define name="informaltable">
329321
<element name="informaltable">
330322
<optional>
@@ -413,6 +405,9 @@
413405
</define>
414406
<define name="listitem">
415407
<element name="listitem">
408+
<optional>
409+
<ref name="example"/>
410+
</optional>
416411
<zeroOrMore>
417412
<choice>
418413
<ref name="figure"/>
@@ -427,19 +422,13 @@
427422
</zeroOrMore>
428423
<optional>
429424
<choice>
430-
<ref name="example"/>
431425
<ref name="informaltable"/>
432426
<ref name="table"/>
433427
<ref name="warning"/>
434428
</choice>
435429
</optional>
436430
</element>
437431
</define>
438-
<define name="mediaobject">
439-
<element name="mediaobject">
440-
<ref name="imageobject"/>
441-
</element>
442-
</define>
443432
<define name="tgroup">
444433
<element name="tgroup">
445434
<attribute name="cols">
@@ -469,6 +458,11 @@
469458
</element>
470459
</element>
471460
</define>
461+
<define name="mediaobject">
462+
<element name="mediaobject">
463+
<ref name="imageobject"/>
464+
</element>
465+
</define>
472466
<define name="row">
473467
<element name="row">
474468
<oneOrMore>

‎src/main/xar-resources/data/author-reference/listings/structure.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
<date>
99
1Q18
1010
</date>
11+
<keywordset>
12+
<keyword>blah</keyword>
13+
</keywordset>
1114
</info>
1215
<para>
1316
Introductory paragraph(s)

0 commit comments

Comments
 (0)