From dave at badgers-in-foil.co.uk  Sun Jan  2 23:51:25 2005
From: dave at badgers-in-foil.co.uk (David Holroyd)
Date: Sun, 2 Jan 2005 23:51:25 +0000
Subject: [docbook-css] Generating URLs for empty <ulink>
Message-ID: <20050102235124.GA20471@vhost.badgers-in-foil.co.uk>

<ulink> is supposed to generate content if it's empty.  I've added this
rule to do this:

  ulink:empty:after {
         content: " <" attr(url) ">";
  }

The :empty selector is CSS3, but seems to have been implemented in
Gecko.


dave

-- 
http://david.holroyd.me.uk/


From dave at badgers-in-foil.co.uk  Mon Jan  3 01:33:46 2005
From: dave at badgers-in-foil.co.uk (David Holroyd)
Date: Mon, 3 Jan 2005 01:33:46 +0000
Subject: [docbook-css] <xref> support
Message-ID: <20050103013346.GB20471@vhost.badgers-in-foil.co.uk>

--vtzGhvizbBRQ85DL
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

I've been playing with adding Mozilla support for internal links within
a document using the DocBook <xref> element.  Getting clickable
links was fairly easy in the end, but I've come across a sticky problem
generating the content for the <xref>.

<xref> content is typically derived from the element targeted by the
element's 'linkend' attribute.  I therefore implemented some code to
have Mozilla retrieve the referenced element for interrogation.

The JavaScript 'getElementById(...)' would normally be the thing to use
for this, so I was a bit surprised when it didn't work.  It turns out,
however that the 'Id' in getElementById doesn't refer to an 'id'
attribute as I'd thought, but to attributes of type 'ID', as defined by
the document's DTD.

Mozilla doesn't inspect the DTD specified for XML documents, so the
current implementation can never find the target of an <xref>.


I've found that my testcase starts working if the ID attributes are
defined in an internal subset of the DOCTYPE, like this:

  <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
            "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
  [
    <!ATTLIST chapter id ID #IMPLIED>
    <!ATTLIST section id ID #IMPLIED>
    ...etc...
  ]>

This is a nasty hack though, so I strongly recommend against it.



dave

-- 
http://david.holroyd.me.uk/

--vtzGhvizbBRQ85DL
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="xref_support-patch1.diff"

Index: db-bindings.xml
===================================================================
RCS file: /var/lib/cvs/docbook-css/db-bindings.xml,v
retrieving revision 1.5
diff -u -r1.5 db-bindings.xml
--- db-bindings.xml	16 Oct 2004 22:40:50 -0000	1.5
+++ db-bindings.xml	3 Jan 2005 00:43:53 -0000
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <bindings xmlns="http://www.mozilla.org/xbl"
      xmlns:html="http://www.w3.org/1999/xhtml">
+
   <binding id="ulink">
     <handlers>
       <handler event="click" button="0"
@@ -10,6 +11,74 @@
       <handler event="mouseout"
                action="window.status=null;"/>
     </handlers>
+  </binding>
+
+  <!--
+    Binding for <xref>
+
+    This binding both creates content for the <xref>, and defines its behaviour
+    as a UI element.
+
+    Current implementation relies on getElementById() for content genetration,
+    which will usually not work, since Mozilla browsers don't use the DTD.
+  -->
+  <binding id="xref">
+
+    <!-- This span is used to hold the content generated by the constructor -->
+    <content>
+      <html:span/>
+    </content>
+
+    <stylesheet src="plain-xref.css"/>
+
+    <handlers>
+      <!--
+	I had a complicated action for "click", implemented with
+	window.scrollTo().  This is *much* nicer, being simpler and making
+	the back button work as expected.
+      -->
+      <handler event="click" button="0"
+               action="window.location.hash = this.attributes.linkend.value"/>
+      <handler event="mouseover"
+               action="window.status=this.attributes.linkend.value;"/>
+      <handler event="mouseout"
+               action="window.status=null;"/>
+    </handlers>
+
+    <implementation>
+      <constructor><![CDATA[
+	var node = document.getAnonymousNodes(this)[0];
+	var child = document.createTextNode(generateXrefText());
+	var f = function() { node.appendChild(child); }
+	setTimeout(f, 0);
+      ]]></constructor>
+
+      <method name="generateXrefText">
+	<body><![CDATA[
+	  if (this.attributes.endterm) {
+	    var node = document.getElementById(this.attributes.endterm.value);
+	    return node.textContent;
+	  }
+	  var targetNode = this.findLinkend();
+	  if (targetNode == null) {
+	    return this.attributes.linkend.value;
+	  }
+	  if (targetNode.attributes.xreflabel) {
+	    return targetNode.attributes.xreflabel.value;
+	  }
+	  if (targetNode.getElementsByTagName('title')[0]) {
+	    return targetNode.getElementsByTagName('title')[0].textContent;
+	  }
+	  return this.attributes.linkend.value;
+	]]></body>
+      </method>
+
+      <method name="findLinkend">
+	<body><![CDATA[
+	  return document.getElementById(this.attributes.linkend.value);
+	]]></body>
+      </method>
+    </implementation>
   </binding>
 
   <binding id="image">
Index: mozilla.css
===================================================================
RCS file: /var/lib/cvs/docbook-css/mozilla.css,v
retrieving revision 1.6
diff -u -r1.6 mozilla.css
--- mozilla.css	21 Nov 2004 19:34:59 -0000	1.6
+++ mozilla.css	3 Jan 2005 00:43:53 -0000
@@ -17,6 +17,11 @@
 /* make <ulink>s clickable */
 ulink {
 	-moz-binding:url('db-bindings.xml#ulink');
+}
+xref {
+	-moz-binding:url('db-bindings.xml#xref');
+}
+ulink, xref {
 	cursor: pointer;
 	-moz-user-focus: normal;
 }
Index: styles.css
===================================================================
RCS file: /var/lib/cvs/docbook-css/styles.css,v
retrieving revision 1.10
diff -u -r1.10 styles.css
--- styles.css	2 Jan 2005 23:52:32 -0000	1.10
+++ styles.css	3 Jan 2005 00:43:53 -0000
@@ -348,12 +348,20 @@
 	content: "]";
 }
 
-xref:after {
-	/* simple symbol - content: "#" attr(linkend);*/
-	/* 'section' symbol */
-	content: "\00a7" attr(linkend);
+/* TODO: group with other 'link' styles */
+xref {
 	color:#0000ff;
 	text-decoration: underline;
+}
+xref:before {
+	/*
+	 * Generates a section symbol before the xref, to try and indicate
+	 * that there is 'something' here (this will hopefully make
+	 * surrounding text that refers to 'see ...' make sense).  We could
+	 * insert attr(linkend) too, but that would clash with the presentation
+	 * in Mozilla, where we are able to generate better content text.
+	 */
+	content: "\00a7";
 }
 
 blockquote {

--vtzGhvizbBRQ85DL--


From dave at badgers-in-foil.co.uk  Mon Jan  3 15:22:11 2005
From: dave at badgers-in-foil.co.uk (David Holroyd)
Date: Mon, 3 Jan 2005 15:22:11 +0000
Subject: [docbook-css] <orderedlist> numeration
Message-ID: <20050103152211.GB1010@vhost.badgers-in-foil.co.uk>

These rules, just added to styles.css, allow for the different possible
values of the 'numeration' attribute for <orderedlist>:

  orderedlist[numeration=loweralpha] {
         list-style-type: lower-alpha;
  }
  orderedlist[numeration=upperalpha] {
         list-style-type: upper-alpha;
  }
  orderedlist[numeration=lowerroman] {
         list-style-type: lower-roman;
  }
  orderedlist[numeration=upperroman] {
         list-style-type: upper-roman;
  }


dave

-- 
http://david.holroyd.me.uk/


From dave at badgers-in-foil.co.uk  Mon Jan  3 15:44:41 2005
From: dave at badgers-in-foil.co.uk (David Holroyd)
Date: Mon, 3 Jan 2005 15:44:41 +0000
Subject: [docbook-css] Inline Images: Changes to styles.css
In-Reply-To: <OF0937E329.7668B63C-ON80256F51.004B60E0-80256F51.00487596@myrnham.co.uk>
References: <OF0937E329.7668B63C-ON80256F51.004B60E0-80256F51.00487596@myrnham.co.uk>
Message-ID: <20050103154440.GC1010@vhost.badgers-in-foil.co.uk>

On Fri, Nov 19, 2004 at 01:49:24PM +0000, martin.gautier@myrnham.co.uk wrote:
> Changes to styles.css
>
> /*imageobject {
>         display: block;
> } */

You're correct, that rule shouldn't have been there.  I've removed it.


dave

-- 
http://david.holroyd.me.uk/


From martin.gautier at myrnham.co.uk  Thu Jan 20 18:14:14 2005
From: martin.gautier at myrnham.co.uk (martin.gautier@myrnham.co.uk)
Date: Thu, 20 Jan 2005 18:14:14 +0000
Subject: [docbook-css] New mod. - revhistory
Message-ID: <OF6A16FFDC.061F680A-ON80256F8F.0063B35C-80256F8F.006103D2@myrnham.co.uk>

I've just added the following to my customisation layer. I don't think 
it's something I'd want to see via the Browser under normal usage...

revhistory {
    display: none;
}


From martin.gautier at myrnham.co.uk  Thu Jan 20 18:18:12 2005
From: martin.gautier at myrnham.co.uk (martin.gautier@myrnham.co.uk)
Date: Thu, 20 Jan 2005 18:18:12 +0000
Subject: [docbook-css] ulinks
Message-ID: <OF97FE913C.1744EF57-ON80256F8F.00646ED3-80256F8F.006160D5@myrnham.co.uk>

What's the deal with ulinks currently?

ie. <para>This book lives at <ulink 
url="http://www.linktomywebsite.org/"/></para>

Should these display as links in Firefox?

Mart


From martin.gautier at myrnham.co.uk  Thu Jan 20 18:25:34 2005
From: martin.gautier at myrnham.co.uk (martin.gautier@myrnham.co.uk)
Date: Thu, 20 Jan 2005 18:25:34 +0000
Subject: [docbook-css] Another New Mod - titleabbrev
Message-ID: <OFBFFDCD69.86237DFA-ON80256F8F.0064DFE7-80256F8F.00620D88@myrnham.co.uk>

>From DB:TDG

<titleabbrev>
[Processing Expectations]...Abbreviated titles are usually used only in 
specific contexts, such as headers and footers, and suppressed everywhere 
else. 

On this basis, I'm suppressing css processing this in my customisation 
layer.

Mart


From dave at badgers-in-foil.co.uk  Thu Jan 20 18:14:34 2005
From: dave at badgers-in-foil.co.uk (David Holroyd)
Date: Thu, 20 Jan 2005 18:14:34 +0000
Subject: [docbook-css] ulinks
In-Reply-To: <OF97FE913C.1744EF57-ON80256F8F.00646ED3-80256F8F.006160D5@myrnham.co.uk>
References: <OF97FE913C.1744EF57-ON80256F8F.00646ED3-80256F8F.006160D5@myrnham.co.uk>
Message-ID: <20050120181434.GB26276@vhost.badgers-in-foil.co.uk>

On Thu, Jan 20, 2005 at 06:18:12PM +0000, martin.gautier@myrnham.co.uk wrote:
> What's the deal with ulinks currently?
> 
> ie. <para>This book lives at <ulink 
> url="http://www.linktomywebsite.org/"/></para>
> 
> Should these display as links in Firefox?

I've comitted support for this to CVS, but it's not in the distributed
stylesheets yet -- those only allow for <ulink>s that contain content.

See my earlier message:

  http://lists.badgers-in-foil.co.uk/pipermail/docbook-css/2005-January/000039.html


dave

-- 
http://david.holroyd.me.uk/


From dave at badgers-in-foil.co.uk  Thu Jan 20 18:19:13 2005
From: dave at badgers-in-foil.co.uk (David Holroyd)
Date: Thu, 20 Jan 2005 18:19:13 +0000
Subject: [docbook-css] New mod. - revhistory
In-Reply-To: <OF6A16FFDC.061F680A-ON80256F8F.0063B35C-80256F8F.006103D2@myrnham.co.uk>
References: <OF6A16FFDC.061F680A-ON80256F8F.0063B35C-80256F8F.006103D2@myrnham.co.uk>
Message-ID: <20050120181912.GC26276@vhost.badgers-in-foil.co.uk>

On Thu, Jan 20, 2005 at 06:14:14PM +0000, martin.gautier@myrnham.co.uk wrote:
> I've just added the following to my customisation layer. I don't think 
> it's something I'd want to see via the Browser under normal usage...
> 
> revhistory {
>     display: none;
> }

Good call.

I'm planning on doing some work some time soon to try and make the
stylesheets useful for the Vex visual XML editor project.  One of the
changes I forsee if the movement of rules to suppress various bits of
content into a seperate module; as, in an editing environment, it would
not be wise to hide anything (I guess).  Better modularisation may allow
us to produce a seperate 'driver' file specific to editors.

(I just installed Vex for the first time today!)


dave

-- 
http://david.holroyd.me.uk/


From martin.gautier at myrnham.co.uk  Thu Jan 20 19:45:56 2005
From: martin.gautier at myrnham.co.uk (martin.gautier@myrnham.co.uk)
Date: Thu, 20 Jan 2005 19:45:56 +0000
Subject: [docbook-css] New mod. - revhistory
In-Reply-To: <20050120181912.GC26276@vhost.badgers-in-foil.co.uk>
Message-ID: <OFF844AF83.43975C4E-ON80256F8F.006C2614-80256F8F.00696807@myrnham.co.uk>

>> (I just installed Vex for the first time today!)
Yeah. Vex has the potential to be very nice.

I can't use it until they support images, tables and code templates though 
:o(

>>the movement of rules to suppress various bits of content into a 
seperate module
...
>>to produce a seperate 'driver' file specific to editors.

Good plan.

>>Good call.
Cheers. I've just started editing a big project today so there may be some 
more of these snippets cropping up soon...

Mart


From martin.gautier at myrnham.co.uk  Thu Jan 20 20:24:06 2005
From: martin.gautier at myrnham.co.uk (martin.gautier@myrnham.co.uk)
Date: Thu, 20 Jan 2005 20:24:06 +0000
Subject: [docbook-css] New Mod: varlistentry>term
Message-ID: <OF345AB766.98802E71-ON80256F8F.006FDC7B-80256F8F.006CE678@myrnham.co.uk>

I couldn't find <term> handled anywhere so I've added this to my 
customisation layer.

NB: It's the same as glossentry>glossterm.

varlistentry>term {
        font-weight: bolder;
        font-style: italic;
}


From martin.gautier at myrnham.co.uk  Thu Jan 20 21:15:09 2005
From: martin.gautier at myrnham.co.uk (martin.gautier@myrnham.co.uk)
Date: Thu, 20 Jan 2005 21:15:09 +0000
Subject: [docbook-css] New Mod: <function>
Message-ID: <OFE543DDAB.3B70376D-ON80256F8F.00749F77-80256F8F.0071930F@myrnham.co.uk>

I didn't find <function> support so I've added this to my customisation 
layer:

function {
        font-family: monospace;
}




From martin.gautier at myrnham.co.uk  Thu Jan 20 21:19:11 2005
From: martin.gautier at myrnham.co.uk (martin.gautier@myrnham.co.uk)
Date: Thu, 20 Jan 2005 21:19:11 +0000
Subject: [docbook-css] Callouts
Message-ID: <OF8B473A61.E7BFF0DB-ON80256F8F.0074CEC6-80256F8F.0071F17F@myrnham.co.uk>

Hmm.

Tricky one.

Any plans afoot? I'd hazzard a guess that CSS is going to have trouble. I 
don't grok Gecko/XUL so can't say whether it could cope...

Here's an example:

<example id="odbchelper.dict.del">
<title>Deleting Items from a Dictionary</title>
<screen><prompt>&gt;&gt;&gt; </prompt><userinput>d</userinput>
<computeroutput>{'server': 'mpilgrim', 'uid': 'sa', 'database': 'master',
42: 'douglas', 'retrycount': 3}</computeroutput>
<prompt>&gt;&gt;&gt; </prompt><userinput>del d[42]</userinput> <co 
id="odbchelper.dict.4.1"/>
<prompt>&gt;&gt;&gt; </prompt><userinput>d</userinput>
<computeroutput>{'server': 'mpilgrim', 'uid': 'sa', 'database': 'master', 
'retrycount': 3}</computeroutput>
<prompt>&gt;&gt;&gt; </prompt><userinput>d.clear()</userinput> <co 
id="odbchelper.dict.4.2"/>
<prompt>&gt;&gt;&gt; </prompt><userinput>d</userinput>
<computeroutput>{}</computeroutput></screen>
</example>
<calloutlist>
<callout arearefs="odbchelper.dict.4.1">
<para><function>del</function> lets you delete individual items from a 
dictionary by key.</para>
</callout>
<callout arearefs="odbchelper.dict.4.2">
<para><function>clear</function> deletes all items from a dictionary. Note 
that the set of empty curly braces signifies a dictionary without any 
items.</para>
</callout>
</calloutlist>


From dave at badgers-in-foil.co.uk  Thu Jan 20 23:14:28 2005
From: dave at badgers-in-foil.co.uk (David Holroyd)
Date: Thu, 20 Jan 2005 23:14:28 +0000
Subject: [docbook-css] Callouts
In-Reply-To: <OF8B473A61.E7BFF0DB-ON80256F8F.0074CEC6-80256F8F.0071F17F@myrnham.co.uk>
References: <OF8B473A61.E7BFF0DB-ON80256F8F.0074CEC6-80256F8F.0071F17F@myrnham.co.uk>
Message-ID: <20050120231427.GD27811@vhost.badgers-in-foil.co.uk>

On Thu, Jan 20, 2005 at 09:19:11PM +0000, martin.gautier@myrnham.co.uk wrote:
> Hmm.
> 
> Tricky one.
> 
> Any plans afoot? I'd hazzard a guess that CSS is going to have trouble. I 
> don't grok Gecko/XUL so can't say whether it could cope...

Yeah, you're right, CSS isn't going to be able to cope with callouts.

XBL is almost able to generate the crossreferences for these kind of
callouts, but the general unavailability of getElementById() for
Mozilla's XML DOM makes it tricky.

[ Maybe I could have a go at substituting an (almost) equivalent XPath
function.  Hmmm... ]

I also seem to recall some other kind of DB callout system using x/y
coordinates, though maybe that was a caffeine-induced hallucination?


Oh, FYI, I've just started trying to improve thee XBL for image handling.
I'm in the process of replacing the naive binding on <imageobject> with
something more complex bound to the parent <[inline]mediaobject>.


dave

-- 
http://david.holroyd.me.uk/


From dave at badgers-in-foil.co.uk  Fri Jan 21 00:31:58 2005
From: dave at badgers-in-foil.co.uk (David Holroyd)
Date: Fri, 21 Jan 2005 00:31:58 +0000
Subject: [docbook-css] Another New Mod - titleabbrev
In-Reply-To: <OFBFFDCD69.86237DFA-ON80256F8F.0064DFE7-80256F8F.00620D88@myrnham.co.uk>
References: <OFBFFDCD69.86237DFA-ON80256F8F.0064DFE7-80256F8F.00620D88@myrnham.co.uk>
Message-ID: <20050121003157.GF27811@vhost.badgers-in-foil.co.uk>

On Thu, Jan 20, 2005 at 06:25:34PM +0000, martin.gautier@myrnham.co.uk wrote:
> >From DB:TDG
> 
> <titleabbrev>
> [Processing Expectations]...Abbreviated titles are usually used only in 
> specific contexts, such as headers and footers, and suppressed everywhere 
> else. 
> 
> On this basis, I'm suppressing css processing this in my customisation 
> layer.

Cool.  I've added that to core.css in CVS.

-- 
http://david.holroyd.me.uk/


From dave at badgers-in-foil.co.uk  Fri Jan 21 00:39:10 2005
From: dave at badgers-in-foil.co.uk (David Holroyd)
Date: Fri, 21 Jan 2005 00:39:10 +0000
Subject: [docbook-css] New Mod: varlistentry>term
In-Reply-To: <OF345AB766.98802E71-ON80256F8F.006FDC7B-80256F8F.006CE678@myrnham.co.uk>
References: <OF345AB766.98802E71-ON80256F8F.006FDC7B-80256F8F.006CE678@myrnham.co.uk>
Message-ID: <20050121003909.GG27811@vhost.badgers-in-foil.co.uk>

On Thu, Jan 20, 2005 at 08:24:06PM +0000, martin.gautier@myrnham.co.uk wrote:
> I couldn't find <term> handled anywhere so I've added this to my 
> customisation layer.
> 
> NB: It's the same as glossentry>glossterm.
> 
> varlistentry>term {
>         font-weight: bolder;
>         font-style: italic;
> }

I've expanded the glossterm rule in 'styles.css' with...

 glossentry>glossterm, term {
     font-weight: bolder;
     font-style: italic;
 }

(<term> is only allowed in <varlistentry>, so we don't need to match
against that.)


dave

-- 
http://david.holroyd.me.uk/


From dave at badgers-in-foil.co.uk  Fri Jan 21 00:42:17 2005
From: dave at badgers-in-foil.co.uk (David Holroyd)
Date: Fri, 21 Jan 2005 00:42:17 +0000
Subject: [docbook-css] New Mod: <function>
In-Reply-To: <OFE543DDAB.3B70376D-ON80256F8F.00749F77-80256F8F.0071930F@myrnham.co.uk>
References: <OFE543DDAB.3B70376D-ON80256F8F.00749F77-80256F8F.0071930F@myrnham.co.uk>
Message-ID: <20050121004217.GH27811@vhost.badgers-in-foil.co.uk>

On Thu, Jan 20, 2005 at 09:15:09PM +0000, martin.gautier@myrnham.co.uk wrote:
> I didn't find <function> support so I've added this to my customisation 
> layer:
> 
> function {
>         font-family: monospace;
> }

Ok, I've added <function> to the list of monospaced elements is
'styles.css'.


Thanks for all these nice tweaks!

dave

-- 
http://david.holroyd.me.uk/


From dave at badgers-in-foil.co.uk  Sat Jan 22 01:11:24 2005
From: dave at badgers-in-foil.co.uk (David Holroyd)
Date: Sat, 22 Jan 2005 01:11:24 +0000
Subject: [docbook-css] Different image resources for HTML & FO output
In-Reply-To: <20041019200800.GB20944@vhost.badgers-in-foil.co.uk>
References: <OFAACED8D3.B0FF6C53-ON80256F31.006F3A32-80256F31.006C4F99@myrnham.co.uk> <20041019200800.GB20944@vhost.badgers-in-foil.co.uk>
Message-ID: <20050122011123.GA20514@vhost.badgers-in-foil.co.uk>

--BXVAT5kNtrzKuDFl
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Tue, Oct 19, 2004 at 08:08:00PM +0000, David Holroyd wrote:
> ...
> 
> I was thinking about changing the XBL such that, rather than simply
> binding to all the <imageobject> elements, a binding is made to the
> containing <mediaobject>.  That binding would then, somehow, make a
> reasonable selection from the <imageobject> children.

I went ahead and implemented something along these lines.  The attached
patch causes the XBL to use the following image selection process for
<mediaobject> and <inlinemediaobject>:

1) Look through all the <imageobject> children for one with an
   acceptable 'role' attribute.  We will accept the values 'html', 'HTML',
   'xhtml' or 'XHTML'.

2) If step 1 doesn't select and image, look though all the <imagedata>
   descendants for on with an acceptable 'format' attribute.  We will
   accept the values 'PNG', 'GIF', 'GIF87a', 'GIF89a', 'JPG' or 'JPEG'.

3) If either step above has now selected an <imagedata> element with a
   non-empty 'fileref' attribute, use that attribute's value as the
   image path, otherwise, use the Gecko built-in broken image
   "resource://gre/res/broken-image.gif".


This should prevent multiple images from appearing, and also gives a
visual indication that 'some' image should be appearing, even if the
stylesheet considers none of the options suitable.


dave

-- 
http://david.holroyd.me.uk/

--BXVAT5kNtrzKuDFl
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="improved_image_selection-patch1.diff"

Index: db-bindings.xml
===================================================================
RCS file: /var/lib/cvs/docbook-css/db-bindings.xml,v
retrieving revision 1.6
diff -u -r1.6 db-bindings.xml
--- db-bindings.xml	3 Jan 2005 01:30:22 -0000	1.6
+++ db-bindings.xml	22 Jan 2005 00:49:51 -0000
@@ -81,20 +81,58 @@
     </implementation>
   </binding>
 
-  <binding id="image">
+  <binding id="mediaobj" inheritstyle="false">
+    <!--
+      We must have <children/> here, because Moz will reject this binding if
+      any of the bound node's children aren't matched.
+      Because of this, the stylesheet hides most of [inline]mediaobject's
+      children with display:none;
+    -->
     <content>
-      <html:img xbl:inherits="src=fileref"/>
+      <html:img/>
+      <children/>
     </content>
 
     <implementation>
       <constructor>
 	var img = document.getAnonymousNodes(this)[0];
-	var file = this.getAttribute("fileref");
+	var file = this.selectImage();
 	// HACK: using img.src=file 'inline' doesn't seem to work
 	//       but it does when called from a setTimeout()
 	var f = function() { img.src = file; }
 	setTimeout(f, 0);
       </constructor>
+
+      <method name="selectImage">
+	<body><![CDATA[
+	  var src = this.selectImageByRole();
+	  if (src == null) {
+	    src = this.selectImageByFormat()
+	  }
+	  if (src == null) {
+	    src = "resource://gre/res/broken-image.gif";
+	  }
+	  return src;
+	]]></body>
+      </method>
+      <method name="selectImageByRole">
+	<body><![CDATA[
+	  var fileref = document.evaluate("imageobject[@role='html' or @role='HTML' or @role='xhtml' or @role='XHTML']/imagedata/@fileref", this, null, XPathResult.STRING_TYPE, null).stringValue;
+	  if (fileref != "") {
+	    return fileref;
+	  }
+	  return null;
+	]]></body>
+      </method>
+      <method name="selectImageByFormat">
+	<body><![CDATA[
+	  var fileref = document.evaluate("imageobject/imagedata[@format='PNG' or @format='GIF' or @format='GIF87a' or @format='GIF89a' or @format='JPG' or @format='JPEG']/@fileref", this, null, XPathResult.STRING_TYPE, null).stringValue;
+	  if (fileref != "") {
+	    return fileref;
+	  }
+	  return null;
+	]]></body>
+      </method>
     </implementation>
   </binding>
 </bindings>
Index: mozilla.css
===================================================================
RCS file: /var/lib/cvs/docbook-css/mozilla.css,v
retrieving revision 1.7
diff -u -r1.7 mozilla.css
--- mozilla.css	3 Jan 2005 01:30:22 -0000	1.7
+++ mozilla.css	22 Jan 2005 00:49:51 -0000
@@ -34,10 +34,9 @@
 	-moz-outline: 1px dotted invert;
 }
 
-imagedata {
-	-moz-binding:url('db-bindings.xml#image');
+mediaobject, inlinemediaobject {
+	-moz-binding:url('db-bindings.xml#mediaobj');
 }
-
 
 guimenu, guimenuitem, guisubmenu {
 	font: menu;
Index: styles.css
===================================================================
RCS file: /var/lib/cvs/docbook-css/styles.css,v
retrieving revision 1.15
diff -u -r1.15 styles.css
--- styles.css	22 Jan 2005 00:43:59 -0000	1.15
+++ styles.css	22 Jan 2005 00:49:51 -0000
@@ -657,6 +657,16 @@
 	text-align: center;
 }
 
-mediaobject>textobject {
-	font-size: smaller;
+/* hide content; we will use XML in mozilla to display it */
+mediaobject>*, inlinemediaobject>* {
+	display: none;
+}
+mediaobject>caption {
+	display: block;
+}
+mediaobject {
+	text-align: center;
+}
+caption>para {
+	text-align: inherit;  /* to override 'justify' and inherit 'centre' */
 }

--BXVAT5kNtrzKuDFl--