1 |
commit: 0af560f9e5ad607b40ef222f9b9b2c687a14fa3f |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 27 09:41:10 2019 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 27 09:41:10 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=0af560f9 |
7 |
|
8 |
devbook.rnc: Update. |
9 |
|
10 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
11 |
|
12 |
devbook.rnc | 25 +++++-------------------- |
13 |
1 file changed, 5 insertions(+), 20 deletions(-) |
14 |
|
15 |
diff --git a/devbook.rnc b/devbook.rnc |
16 |
index 1d24153..758d836 100644 |
17 |
--- a/devbook.rnc |
18 |
+++ b/devbook.rnc |
19 |
@@ -21,11 +21,9 @@ block.class = |
20 |
| ul |
21 |
| ol |
22 |
| dl |
23 |
- | list-group-u |
24 |
- | list-group-d |
25 |
-inline.class = sup | sub | b | c | d | e | path | uri |
26 |
+inline.class = b | c | e | d | uri |
27 |
all.class = block.class | inline.class |
28 |
-guide = element guide { guide.attlist, (\include | chapter)+ } |
29 |
+guide = element guide { guide.attlist, chapter, \include* } |
30 |
guide.attlist &= |
31 |
attribute root { "true" }?, |
32 |
attribute self { text }? |
33 |
@@ -107,36 +105,23 @@ ti.attlist &= |
34 |
[ a:defaultValue = "left" ] |
35 |
attribute align { "left" | "center" | "right" }? |
36 |
ul = element ul { ul.attlist, li+ } |
37 |
-ul.attlist &= empty |
38 |
+ul.attlist &= attribute class { text }? |
39 |
ol = element ol { ol.attlist, li+ } |
40 |
ol.attlist &= empty |
41 |
li = element li { li.attlist, (text | all.class)* } |
42 |
li.attlist &= empty |
43 |
-dl = element dl { dl.attlist, (dt, dd)+ } |
44 |
+dl = element dl { dl.attlist, (dt, dd+)+ } |
45 |
dl.attlist &= empty |
46 |
dt = element dt { dt.attlist, (text | inline.class)* } |
47 |
dt.attlist &= empty |
48 |
-# The following is strange, but devbook.xsl expects only p elements |
49 |
-dd = element dd { dd.attlist, p+ } |
50 |
+dd = element dd { dd.attlist, (text | inline.class)* } |
51 |
dd.attlist &= empty |
52 |
-list-group-u = |
53 |
- element list-group-u { list-group-u.attlist, (text | all.class)* } |
54 |
-list-group-u.attlist &= empty |
55 |
-list-group-d = |
56 |
- element list-group-d { list-group-d.attlist, (text | all.class)* } |
57 |
-list-group-d.attlist &= empty |
58 |
-sup = element sup { sup.attlist, (text | inline.class)* } |
59 |
-sup.attlist &= empty |
60 |
-sub = element sub { sub.attlist, (text | inline.class)* } |
61 |
-sub.attlist &= empty |
62 |
b = element b { b.attlist, (text | inline.class)* } |
63 |
b.attlist &= empty |
64 |
c = element c { c.attlist, (text | inline.class)* } |
65 |
c.attlist &= empty |
66 |
e = element e { e.attlist, (text | inline.class)* } |
67 |
e.attlist &= empty |
68 |
-path = element path { path.attlist, (text | inline.class)* } |
69 |
-path.attlist &= empty |
70 |
d = element d { d.attlist, empty } |
71 |
d.attlist &= empty |
72 |
uri = element uri { uri.attlist, (text | inline.class)* } |