[gnome-doc-utils/mallard: 20/87] Updates and restrictions on page and section attributes

[Shaun McCance <shaunm src gnome org>]

commit ad9c027700c58bd424a185123b9e7de62968201f
Author: Shaun McCance <shaunm gnome org>
Date:   Mon Nov 10 10:48:30 2008 -0600

    Updates and restrictions on page and section attributes
---
 doc/mallard/C/mal_page.xml    |   11 ++++++++---
 doc/mallard/C/mal_section.xml |    4 +++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/doc/mallard/C/mal_page.xml b/doc/mallard/C/mal_page.xml
index a03318b..30dc5fb 100644
--- a/doc/mallard/C/mal_page.xml
+++ b/doc/mallard/C/mal_page.xml
@@ -1,5 +1,6 @@
 <page xmlns="http://www.gnome.org/~shaunm/mallard";
-      type="guide" id="mal_page">
+      type="topic"
+      id="mal_page">
 
 <info>
   <version number="0.1" date="2008-02-21" status="stub"/>
@@ -13,16 +14,20 @@ default namespace mal = "http://www.gnome.org/~shaunm/mallard";
 start = mal_page
 mal_page = (mal_page_guide | mal_page_topic)
 mal_page_guide = element page {
-  attribute id { text },
+  attribute id { xsd:ID },
   attribute type { "guide" },
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
   <link xref="mal_info">mal_info</link>,
   <link xref="mal_title">mal_title</link>,
   <link xref="mal_block">mal_block</link> *,
   <link xref="mal_section">mal_section</link> *
 }
 mal_page_topic = element page {
-  attribute id { text },
+  attribute id { xsd:ID },
   attribute type { "topic" },
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
   <link xref="mal_info">mal_info</link>,
   <link xref="mal_title">mal_title</link>,
   <link xref="mal_block">mal_block</link> *,
diff --git a/doc/mallard/C/mal_section.xml b/doc/mallard/C/mal_section.xml
index ea5e6dd..f239d19 100644
--- a/doc/mallard/C/mal_section.xml
+++ b/doc/mallard/C/mal_section.xml
@@ -10,7 +10,9 @@
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_section = element section {
-  attribute id { text },
+  attribute id { xsd:ID },
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
   <link xref="mal_info">mal_info</link> ?,
   <link xref="mal_title">mal_title</link>,
   <link xref="mal_block">mal_block</link> *,