[gnome-doc-utils/mallard] [mallard] Some work on block_media

[Shaun McCance <shaunm src gnome org>]

commit 728fa89d25e907c6431223b04095f859f4f82ecb
Author: Shaun McCance <shaunm gnome org>
Date:   Sat May 2 21:51:10 2009 -0500

    [mallard] Some work on block_media
---
 doc/mallard/C/mal_block_desc.xml     |    4 +-
 doc/mallard/C/mal_block_media.xml    |   44 +++++++++++++++++++++++++++++++--
 xslt/mallard/html/mal2html-media.xsl |    2 +-
 3 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/doc/mallard/C/mal_block_desc.xml b/doc/mallard/C/mal_block_desc.xml
index 9c2320f..c825a50 100644
--- a/doc/mallard/C/mal_block_desc.xml
+++ b/doc/mallard/C/mal_block_desc.xml
@@ -47,13 +47,13 @@ for the formal element.</p>
   <example>
     <code><![CDATA[
 <figure>
-  <media type="image" mime="image/png" href="figures/mallard.png"/>
+  <media type="image" mime="image/png" src="figures/mallard.png"/>
   <desc>Drake, the Mallard mascot</desc>
 </figure>
 ]]></code>
     <figure>
       <desc>Drake, the Mallard mascot</desc>
-      <media type="image" mime="image/png" href="figures/mallard.png"/>
+      <media type="image" mime="image/png" src="figures/mallard.png"/>
     </figure>
   </example>
 
diff --git a/doc/mallard/C/mal_block_media.xml b/doc/mallard/C/mal_block_media.xml
index 9be862f..8ff837e 100644
--- a/doc/mallard/C/mal_block_media.xml
+++ b/doc/mallard/C/mal_block_media.xml
@@ -11,14 +11,52 @@
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_block_media = element media {
-  attribute type { "image" | "video" | "audio" | "application" | "text" } ?,
+  attribute type { "image" | "video" | "audio" | "application" } ?,
   attribute mime { text } ?,
-  attribute href { text },
+  attribute src { text },
   attribute style { xsd:NMTOKENS } ?,
   attribute * - (mal:* | local:*) { text } *,
 
-  mal_block_media ?
+  <link xref="mal_block">mal_block</link> *
 }
 </code></synopsis>
 
+<p>Use the <code>media</code> element to insert an image, video, or other
+multimedia object into your document.  Since not all display tools will be
+able to display all types of objects, you can provide fallback elements in
+the contents of a <code>media</code> element.  See <link xref="#processing"/>
+for details on how fallback elements are handled.</p>
+
+
+<!-- BEGIN examples -->
+<section id="examples">
+  <title>Examples</title>
+
+  <p>Use <code>media</code> to insert an image into your document:</p>
+
+  <example>
+    <code><![CDATA[
+<media type="image" mime="image/png" src="figures/mallard.png"/>
+]]></code>
+    <media type="image" mime="image/png" src="figures/mallard.png"/>
+  </example>
+
+</section>
+<!-- END examples -->
+
+
+<!-- BEGIN processing -->
+<section id="processing">
+  <title>Processing Expectations</title>
+</section>
+<!-- END processing -->
+
+
+<!-- BEGIN comparison -->
+<section id="comparison">
+  <title>Comparison to Other Formats</title>
+</section>
+<!-- END comparison -->
+
+
 </page>
diff --git a/xslt/mallard/html/mal2html-media.xsl b/xslt/mallard/html/mal2html-media.xsl
index 0d56215..3aae961 100644
--- a/xslt/mallard/html/mal2html-media.xsl
+++ b/xslt/mallard/html/mal2html-media.xsl
@@ -34,7 +34,7 @@ REMARK: Describe this module
 <xsl:template mode="mal2html.block.mode"
               match="mal:media[ type='image']">
   <div class="media media-image">
-    <img src="{ href}"/>
+    <img src="{ src}"/>
   </div>
 </xsl:template>