1 |
commit: 8b179602deb8179086c418108b4de43492d9acbb |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 3 11:28:03 2021 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 3 11:28:03 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=8b179602 |
7 |
|
8 |
devbook.rnc, metadata.rnc: Update from DTDs |
9 |
|
10 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
11 |
|
12 |
devbook.rnc | 8 ++++---- |
13 |
metadata.rnc | 1 + |
14 |
2 files changed, 5 insertions(+), 4 deletions(-) |
15 |
|
16 |
diff --git a/devbook.rnc b/devbook.rnc |
17 |
index 529471e..54659de 100644 |
18 |
--- a/devbook.rnc |
19 |
+++ b/devbook.rnc |
20 |
@@ -21,7 +21,8 @@ block.class = |
21 |
| ul |
22 |
| ol |
23 |
| dl |
24 |
-inline.class = b | c | e | d | uri |
25 |
+attrib.class = b | c | e |
26 |
+inline.class = attrib.class | d | uri |
27 |
all.class = block.class | inline.class |
28 |
guide = element guide { guide.attlist, chapter, \include* } |
29 |
guide.attlist &= |
30 |
@@ -45,9 +46,8 @@ subsection.attlist &= empty |
31 |
subsubsection = |
32 |
element subsubsection { subsubsection.attlist, title, body } |
33 |
subsubsection.attlist &= empty |
34 |
-# Title texts are used as anchors, so we shouldn't allow any formatting, |
35 |
-# but unfortunately it is used in the document. |
36 |
-title = element title { title.attlist, (text | inline.class)* } |
37 |
+# Title texts are used as anchors, so allow only text attributes |
38 |
+title = element title { title.attlist, (text | attrib.class)* } |
39 |
title.attlist &= empty |
40 |
body = |
41 |
element body { body.attlist, (authors | contentsTree | block.class)+ } |
42 |
|
43 |
diff --git a/metadata.rnc b/metadata.rnc |
44 |
index 6225eaf..bc2a43d 100644 |
45 |
--- a/metadata.rnc |
46 |
+++ b/metadata.rnc |
47 |
@@ -96,6 +96,7 @@ attlist.remote-id &= |
48 |
| "gitlab" |
49 |
| "gitorious" |
50 |
| "google-code" |
51 |
+ | "heptapod" |
52 |
| "launchpad" |
53 |
| "pear" |
54 |
| "pecl" |