[gnome-doc-utils/mallard: 4/4] Merge commit 'origin/mallard' into mallard

[Shaun McCance <shaunm src gnome org>]

commit 29c9e29879525c7c1b937c0396d8875927d2fa11
Merge: a7c323b... 32fd28c...
Author: Shaun McCance <shaunm gnome org>
Date:   Mon May 11 21:32:24 2009 -0500

    Merge commit 'origin/mallard' into mallard

 doc/mallard/C/mal_block.xml                        |  109 +++-
 doc/mallard/C/mal_block_cite.xml                   |   30 +-
 doc/mallard/C/mal_block_code.xml                   |    3 +-
 doc/mallard/C/mal_block_comment.xml                |  150 ++++-
 doc/mallard/C/mal_block_desc.xml                   |    2 -
 ...mal_list_definition.xml => mal_block_dlist.xml} |   14 +-
 doc/mallard/C/mal_block_example.xml                |  100 +++-
 doc/mallard/C/mal_block_figure.xml                 |    1 -
 doc/mallard/C/mal_block_listing.xml                |    1 -
 doc/mallard/C/mal_block_media.xml                  |    3 +-
 doc/mallard/C/mal_block_note.xml                   |    1 -
 .../{mal_list_numbered.xml => mal_block_olist.xml} |   14 +-
 doc/mallard/C/mal_block_p.xml                      |    1 -
 doc/mallard/C/mal_block_quote.xml                  |    1 -
 doc/mallard/C/mal_block_screen.xml                 |    3 +-
 doc/mallard/C/mal_block_synopsis.xml               |    4 +-
 .../C/{mal_list_bullet.xml => mal_block_ulist.xml} |   14 +-
 doc/mallard/C/mal_list.xml                         |   29 -
 doc/mallard/C/mal_subtitle.xml                     |    1 -
 doc/mallard/C/mal_table.xml                        |  675 +++++---------------
 doc/mallard/C/mal_table_col.xml                    |   24 +
 doc/mallard/C/mal_table_td.xml                     |   20 +
 doc/mallard/C/mal_table_tr.xml                     |   38 ++
 doc/mallard/C/mal_title.xml                        |    1 -
 sandbox/mallard/html/Makefile                      |    7 +-
 xslt/mallard/html/mal2html-block.xsl               |   68 ++-
 xslt/mallard/html/mal2html-css.xsl                 |   19 +-
 xslt/mallard/html/mal2html-page.xsl                |   47 +-
 xslt/mallard/html/mal2html.xsl                     |   16 +-
 xslt/mallard/html/mal2xhtml.xsl                    |   67 ++
 30 files changed, 790 insertions(+), 673 deletions(-)