[gnome-doc-utils/mallard: 50/87] Fleshing out content model for inline_media and inline_link

[Shaun McCance <shaunm src gnome org>]

commit 7e610c940cd29484dff0da0f8e38cab5c9f863ed
Author: Shaun McCance <shaunm gnome org>
Date:   Mon Dec 1 12:12:02 2008 -0600

    Fleshing out content model for inline_media and inline_link
---
 doc/mallard/C/mal_inline_link.xml  |   55 ++++++++++++++++++++++++++++-------
 doc/mallard/C/mal_inline_media.xml |   50 ++++++++++++++++++++++++++++++--
 2 files changed, 90 insertions(+), 15 deletions(-)

diff --git a/doc/mallard/C/mal_inline_link.xml b/doc/mallard/C/mal_inline_link.xml
index bbbc430..f8b42eb 100644
--- a/doc/mallard/C/mal_inline_link.xml
+++ b/doc/mallard/C/mal_inline_link.xml
@@ -22,18 +22,51 @@
 <title>Hyperlinks</title>
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
-mal_inline_link = element link
-  { ( attribute xref { text }
-    , <link xref="mal_inline">mal_inline</link> ?
-    )
-  | ( attribute dref { text }
-    , attribute href { text }?
-    , <link xref="mal_inline">mal_inline</link>
-    )
-  | ( attribute href { text }
-    , <link xref="mal_inline">mal_inline</link>
+mal_inline_link = element link {
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
+
+  ( ( attribute xref { text },
+      <link xref="mal_inline">mal_inline</link> ?
+    ) |
+    ( attribute dref { text },
+      attribute href { text } ?,
+      <link xref="mal_inline">mal_inline</link>
+    ) |
+    ( attribute href { text },
+      <link xref="mal_inline">mal_inline</link>
     )
-  }
+  )
+}
 </code></synopsis>
 
+
+<!-- BEGIN notes -->
+<section id="notes">
+  <title>Notes</title>
+  <list type="bullet">
+    <item><p>The <code>style</code> attribute takes a space-seperated list of
+    style hints.  Processing tools should adjust their rendering according to
+    those style hints they understand.</p></item>
+
+    <item><p>The <code>app</code> element can have attributes from external
+    namespaces.  See <link xref="mal_attr_external"/> for more information
+    on external-namespace attributes on inline elements.</p></item>
+
+    <item><p>The <code>xref</code> attribute creates a link to another page
+    or section within the same document.  When text content is omitted, the
+    content is automatically taken from the title of the page or section
+    being linked to.</p></item>
+
+    <item><p>The <code>dref</code> attribute creates a link to a page or
+    section in another document.  An <code>href</code> attribute can be
+    provide as a fallback for systems that don't understand document
+    links.</p></item>
+
+    <item><p>The <code>href</code> attribute creates a link to a web page
+    or other network-accessible resource.</p></item>
+  </list>
+</section>
+<!-- END notes -->
+
 </page>
diff --git a/doc/mallard/C/mal_inline_media.xml b/doc/mallard/C/mal_inline_media.xml
index baa1039..bfb8b31 100644
--- a/doc/mallard/C/mal_inline_media.xml
+++ b/doc/mallard/C/mal_inline_media.xml
@@ -14,13 +14,55 @@
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_inline_media = element media {
-  attribute type { "image" | "video" | "audio" | "application" | "text" } ?,
+  mal_inline_media_container |
+  mal_inline_media_application |
+  mal_inline_media_audio |
+  mal_inline_media_image |
+  mal_inline_media_text |
+  mal_inline_media_video
+}
+mal_inline_media_container = element media {
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
+  ( mal_inline_media_application |
+    mal_inline_media_audio |
+    mal_inline_media_image |
+    mal_inline_media_text |
+    mal_inline_media_video
+  )
+}
+mal_inline_media_audio = element media {
+  attribute type { "audio" },
   attribute mime { text } ?,
-  attribute href { text },
+  attribute src { text },
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
+}
+mal_inline_media_application = element media {
+  attribute type { "application" },
+  attribute mime { text } ?,
+  attribute src { text },
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
+}
+mal_inline_media_image = element media {
+  attribute type { "image" },
+  attribute mime { text } ?,
+  attribute src { text },
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
+}
+mal_inline_media_text = element media {
+  attribute type { "text" },
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
+}
+mal_inline_media_video = element media {
+  attribute type { "video" },
+  attribute mime { text } ?,
+  attribute src { text },
   attribute style { xsd:NMTOKENS } ?,
   attribute * - (mal:* | local:*) { text } *,
-
-  mal_inline_media ?
 }
 </code></synopsis>