[gnome-doc-utils/mallard: 31/87] Adding attributes and fixing content model

[Shaun McCance <shaunm src gnome org>]

commit 712518736e3eb3ede454e7f04ae0cbb6c738afe6
Author: Shaun McCance <shaunm gnome org>
Date:   Tue Nov 11 09:04:05 2008 -0600

    Adding attributes and fixing content model
---
 doc/mallard/C/mal_block_caption.xml |    2 +-
 doc/mallard/C/mal_block_code.xml    |    3 +++
 doc/mallard/C/mal_block_p.xml       |    3 +++
 doc/mallard/C/mal_block_screen.xml  |    6 +++++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/doc/mallard/C/mal_block_caption.xml b/doc/mallard/C/mal_block_caption.xml
index eb0ad0f..580731c 100644
--- a/doc/mallard/C/mal_block_caption.xml
+++ b/doc/mallard/C/mal_block_caption.xml
@@ -26,7 +26,7 @@ mal_caption = element caption {
   attribute style { xsd:NMTOKENS } ?,
   attribute * - (mal:* | local:*) { text } *,
 
-  <link xref="mal_inline">mal_inline</link> +
+  <link xref="mal_inline">mal_inline</link>
 }
 </code></synopsis>
 
diff --git a/doc/mallard/C/mal_block_code.xml b/doc/mallard/C/mal_block_code.xml
index a3ecdc9..c6ee9cc 100644
--- a/doc/mallard/C/mal_block_code.xml
+++ b/doc/mallard/C/mal_block_code.xml
@@ -21,7 +21,10 @@
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_block_code = element code {
+  attribute style { xsd:NMTOKENS } ?,
   attribute mime { text } ?,
+  attribute * - (mal:* | local:*) { text } *,
+
   <link xref="mal_inline">mal_inline</link>
 }</code></synopsis>
 
diff --git a/doc/mallard/C/mal_block_p.xml b/doc/mallard/C/mal_block_p.xml
index 68a4f5e..35b3f4e 100644
--- a/doc/mallard/C/mal_block_p.xml
+++ b/doc/mallard/C/mal_block_p.xml
@@ -11,6 +11,9 @@
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_block_p = element p {
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
+
   <link xref="mal_inline">mal_inline</link>
 }
 </code></synopsis>
diff --git a/doc/mallard/C/mal_block_screen.xml b/doc/mallard/C/mal_block_screen.xml
index 3d7d676..7ba871f 100644
--- a/doc/mallard/C/mal_block_screen.xml
+++ b/doc/mallard/C/mal_block_screen.xml
@@ -12,7 +12,11 @@
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_block_screen = element screen {
-  <link xref="mal_inline">mal_inline</link> +
+  attribute style { xsd:NMTOKENS } ?,
+  attribute mime { text } ?,
+  attribute * - (mal:* | local:*) { text } *,
+
+  <link xref="mal_inline">mal_inline</link>
 }
 </code></synopsis>