[gnome-doc-utils/mallard] [mallard] Rename pages to .page, XSLT fixed for Yelp

From: Shaun McCance <shaunm src gnome org>
To: svn-commits-list gnome org
Subject: [gnome-doc-utils/mallard] [mallard] Rename pages to .page, XSLT fixed for Yelp
Date: Tue, 9 Jun 2009 20:33:28 -0400 (EDT)
commit d0e0103028d9d3d32b44e7f0f2b2997da828496a
Author: Shaun McCance <shaunm shaunmlxlap localdomain>
Date:   Mon Jun 8 15:19:16 2009 -0500

    [mallard] Rename pages to .page, XSLT fixed for Yelp
---
 doc/mallard/C/{details.xml => details.page}        |    0
 doc/mallard/C/{explore.xml => explore.page}        |    0
 doc/mallard/C/{i18n.xml => i18n.page}              |    0
 doc/mallard/C/{index.xml => index.page}            |    0
 doc/mallard/C/{its.xml => its.page}                |    0
 doc/mallard/C/{l10n.xml => l10n.page}              |    0
 doc/mallard/C/{links.xml => links.page}            |    0
 doc/mallard/C/{mal_TODO.xml => mal_TODO.page}      |    0
 .../C/{mal_attr_link.xml => mal_attr_link.page}    |    0
 doc/mallard/C/{mal_block.xml => mal_block.page}    |    0
 .../C/{mal_block_cite.xml => mal_block_cite.page}  |    0
 .../C/{mal_block_code.xml => mal_block_code.page}  |    0
 ...al_block_comment.xml => mal_block_comment.page} |    0
 .../C/{mal_block_desc.xml => mal_block_desc.page}  |    0
 ...al_block_example.xml => mal_block_example.page} |    0
 ...{mal_block_figure.xml => mal_block_figure.page} |    0
 .../C/{mal_block_list.xml => mal_block_list.page}  |    0
 ...al_block_listing.xml => mal_block_listing.page} |    0
 .../{mal_block_media.xml => mal_block_media.page}  |    0
 .../C/{mal_block_note.xml => mal_block_note.page}  |    0
 .../C/{mal_block_p.xml => mal_block_p.page}        |    0
 .../{mal_block_quote.xml => mal_block_quote.page}  |    0
 ...{mal_block_screen.xml => mal_block_screen.page} |    0
 .../{mal_block_steps.xml => mal_block_steps.page}  |    0
 ..._block_subtitle.xml => mal_block_subtitle.page} |    0
 ..._block_synopsis.xml => mal_block_synopsis.page} |    0
 .../{mal_block_terms.xml => mal_block_terms.page}  |    0
 .../{mal_block_title.xml => mal_block_title.page}  |    0
 .../C/{mal_block_tree.xml => mal_block_tree.page}  |    0
 .../C/{mal_external.xml => mal_external.page}      |    0
 doc/mallard/C/{mal_info.xml => mal_info.page}      |    0
 ..._info_copyright.xml => mal_info_copyright.page} |    0
 .../{mal_info_credit.xml => mal_info_credit.page}  |    0
 .../C/{mal_info_desc.xml => mal_info_desc.page}    |    0
 ...{mal_info_license.xml => mal_info_license.page} |    0
 .../C/{mal_info_link.xml => mal_info_link.page}    |    0
 ...al_info_revision.xml => mal_info_revision.page} |    0
 .../C/{mal_info_title.xml => mal_info_title.page}  |    0
 doc/mallard/C/{mal_inline.xml => mal_inline.page}  |    0
 .../C/{mal_inline_app.xml => mal_inline_app.page}  |    0
 .../C/{mal_inline_cmd.xml => mal_inline_cmd.page}  |    0
 .../{mal_inline_code.xml => mal_inline_code.page}  |    0
 .../C/{mal_inline_em.xml => mal_inline_em.page}    |    0
 .../{mal_inline_file.xml => mal_inline_file.page}  |    0
 .../C/{mal_inline_gui.xml => mal_inline_gui.page}  |    0
 ...al_inline_guiseq.xml => mal_inline_guiseq.page} |    0
 ...{mal_inline_input.xml => mal_inline_input.page} |    0
 .../C/{mal_inline_key.xml => mal_inline_key.page}  |    0
 ...al_inline_keyseq.xml => mal_inline_keyseq.page} |    0
 .../{mal_inline_link.xml => mal_inline_link.page}  |    0
 ...{mal_inline_media.xml => mal_inline_media.page} |    0
 ...al_inline_output.xml => mal_inline_output.page} |    0
 .../{mal_inline_span.xml => mal_inline_span.page}  |    0
 .../C/{mal_inline_sys.xml => mal_inline_sys.page}  |    0
 .../C/{mal_inline_var.xml => mal_inline_var.page}  |    0
 doc/mallard/C/{mal_page.xml => mal_page.page}      |    0
 .../C/{mal_section.xml => mal_section.page}        |    0
 doc/mallard/C/{mal_table.xml => mal_table.page}    |    0
 .../C/{mal_table_col.xml => mal_table_col.page}    |    0
 .../C/{mal_table_td.xml => mal_table_td.page}      |    0
 .../C/{mal_table_tr.xml => mal_table_tr.page}      |    0
 .../{principle-guide.xml => principle-guide.page}  |    0
 ...le-justenough.xml => principle-justenough.page} |    0
 ...le-redundancy.xml => principle-redundancy.page} |    0
 doc/mallard/C/{principles.xml => principles.page}  |    0
 doc/mallard/C/{spec.xml => spec.page}              |    0
 doc/mallard/C/{tenminutes.xml => tenminutes.page}  |    0
 sandbox/mallard/html/Makefile                      |   10 +-
 tools/Makefile.am                                  |    2 +-
 xslt/Makefile.am                                   |    2 +-
 xslt/common/Makefile.am                            |    2 +-
 xslt/{mallard/html/util.xsl => common/utils.xsl}   |    6 +-
 xslt/mallard/html/Makefile.am                      |    3 +-
 xslt/mallard/html/mal2html-block.xsl               |    4 +-
 xslt/mallard/html/mal2html.xsl                     |    2 +-
 xslt/mallard/html/mal2xhtml.xsl                    |    2 +-
 xslt/mallard/html/theme.xml                        |   43 -----------
 xslt/mallard/html/theme.xsl                        |   78 --------------------
 78 files changed, 17 insertions(+), 137 deletions(-)

diff --git a/doc/mallard/C/details.xml b/doc/mallard/C/details.page
similarity index 100%
rename from doc/mallard/C/details.xml
rename to doc/mallard/C/details.page
diff --git a/doc/mallard/C/explore.xml b/doc/mallard/C/explore.page
similarity index 100%
rename from doc/mallard/C/explore.xml
rename to doc/mallard/C/explore.page
diff --git a/doc/mallard/C/i18n.xml b/doc/mallard/C/i18n.page
similarity index 100%
rename from doc/mallard/C/i18n.xml
rename to doc/mallard/C/i18n.page
diff --git a/doc/mallard/C/index.xml b/doc/mallard/C/index.page
similarity index 100%
rename from doc/mallard/C/index.xml
rename to doc/mallard/C/index.page
diff --git a/doc/mallard/C/its.xml b/doc/mallard/C/its.page
similarity index 100%
rename from doc/mallard/C/its.xml
rename to doc/mallard/C/its.page
diff --git a/doc/mallard/C/l10n.xml b/doc/mallard/C/l10n.page
similarity index 100%
rename from doc/mallard/C/l10n.xml
rename to doc/mallard/C/l10n.page
diff --git a/doc/mallard/C/links.xml b/doc/mallard/C/links.page
similarity index 100%
rename from doc/mallard/C/links.xml
rename to doc/mallard/C/links.page
diff --git a/doc/mallard/C/mal_TODO.xml b/doc/mallard/C/mal_TODO.page
similarity index 100%
rename from doc/mallard/C/mal_TODO.xml
rename to doc/mallard/C/mal_TODO.page
diff --git a/doc/mallard/C/mal_attr_link.xml b/doc/mallard/C/mal_attr_link.page
similarity index 100%
rename from doc/mallard/C/mal_attr_link.xml
rename to doc/mallard/C/mal_attr_link.page
diff --git a/doc/mallard/C/mal_block.xml b/doc/mallard/C/mal_block.page
similarity index 100%
rename from doc/mallard/C/mal_block.xml
rename to doc/mallard/C/mal_block.page
diff --git a/doc/mallard/C/mal_block_cite.xml b/doc/mallard/C/mal_block_cite.page
similarity index 100%
rename from doc/mallard/C/mal_block_cite.xml
rename to doc/mallard/C/mal_block_cite.page
diff --git a/doc/mallard/C/mal_block_code.xml b/doc/mallard/C/mal_block_code.page
similarity index 100%
rename from doc/mallard/C/mal_block_code.xml
rename to doc/mallard/C/mal_block_code.page
diff --git a/doc/mallard/C/mal_block_comment.xml b/doc/mallard/C/mal_block_comment.page
similarity index 100%
rename from doc/mallard/C/mal_block_comment.xml
rename to doc/mallard/C/mal_block_comment.page
diff --git a/doc/mallard/C/mal_block_desc.xml b/doc/mallard/C/mal_block_desc.page
similarity index 100%
rename from doc/mallard/C/mal_block_desc.xml
rename to doc/mallard/C/mal_block_desc.page
diff --git a/doc/mallard/C/mal_block_example.xml b/doc/mallard/C/mal_block_example.page
similarity index 100%
rename from doc/mallard/C/mal_block_example.xml
rename to doc/mallard/C/mal_block_example.page
diff --git a/doc/mallard/C/mal_block_figure.xml b/doc/mallard/C/mal_block_figure.page
similarity index 100%
rename from doc/mallard/C/mal_block_figure.xml
rename to doc/mallard/C/mal_block_figure.page
diff --git a/doc/mallard/C/mal_block_list.xml b/doc/mallard/C/mal_block_list.page
similarity index 100%
rename from doc/mallard/C/mal_block_list.xml
rename to doc/mallard/C/mal_block_list.page
diff --git a/doc/mallard/C/mal_block_listing.xml b/doc/mallard/C/mal_block_listing.page
similarity index 100%
rename from doc/mallard/C/mal_block_listing.xml
rename to doc/mallard/C/mal_block_listing.page
diff --git a/doc/mallard/C/mal_block_media.xml b/doc/mallard/C/mal_block_media.page
similarity index 100%
rename from doc/mallard/C/mal_block_media.xml
rename to doc/mallard/C/mal_block_media.page
diff --git a/doc/mallard/C/mal_block_note.xml b/doc/mallard/C/mal_block_note.page
similarity index 100%
rename from doc/mallard/C/mal_block_note.xml
rename to doc/mallard/C/mal_block_note.page
diff --git a/doc/mallard/C/mal_block_p.xml b/doc/mallard/C/mal_block_p.page
similarity index 100%
rename from doc/mallard/C/mal_block_p.xml
rename to doc/mallard/C/mal_block_p.page
diff --git a/doc/mallard/C/mal_block_quote.xml b/doc/mallard/C/mal_block_quote.page
similarity index 100%
rename from doc/mallard/C/mal_block_quote.xml
rename to doc/mallard/C/mal_block_quote.page
diff --git a/doc/mallard/C/mal_block_screen.xml b/doc/mallard/C/mal_block_screen.page
similarity index 100%
rename from doc/mallard/C/mal_block_screen.xml
rename to doc/mallard/C/mal_block_screen.page
diff --git a/doc/mallard/C/mal_block_steps.xml b/doc/mallard/C/mal_block_steps.page
similarity index 100%
rename from doc/mallard/C/mal_block_steps.xml
rename to doc/mallard/C/mal_block_steps.page
diff --git a/doc/mallard/C/mal_block_subtitle.xml b/doc/mallard/C/mal_block_subtitle.page
similarity index 100%
rename from doc/mallard/C/mal_block_subtitle.xml
rename to doc/mallard/C/mal_block_subtitle.page
diff --git a/doc/mallard/C/mal_block_synopsis.xml b/doc/mallard/C/mal_block_synopsis.page
similarity index 100%
rename from doc/mallard/C/mal_block_synopsis.xml
rename to doc/mallard/C/mal_block_synopsis.page
diff --git a/doc/mallard/C/mal_block_terms.xml b/doc/mallard/C/mal_block_terms.page
similarity index 100%
rename from doc/mallard/C/mal_block_terms.xml
rename to doc/mallard/C/mal_block_terms.page
diff --git a/doc/mallard/C/mal_block_title.xml b/doc/mallard/C/mal_block_title.page
similarity index 100%
rename from doc/mallard/C/mal_block_title.xml
rename to doc/mallard/C/mal_block_title.page
diff --git a/doc/mallard/C/mal_block_tree.xml b/doc/mallard/C/mal_block_tree.page
similarity index 100%
rename from doc/mallard/C/mal_block_tree.xml
rename to doc/mallard/C/mal_block_tree.page
diff --git a/doc/mallard/C/mal_external.xml b/doc/mallard/C/mal_external.page
similarity index 100%
rename from doc/mallard/C/mal_external.xml
rename to doc/mallard/C/mal_external.page
diff --git a/doc/mallard/C/mal_info.xml b/doc/mallard/C/mal_info.page
similarity index 100%
rename from doc/mallard/C/mal_info.xml
rename to doc/mallard/C/mal_info.page
diff --git a/doc/mallard/C/mal_info_copyright.xml b/doc/mallard/C/mal_info_copyright.page
similarity index 100%
rename from doc/mallard/C/mal_info_copyright.xml
rename to doc/mallard/C/mal_info_copyright.page
diff --git a/doc/mallard/C/mal_info_credit.xml b/doc/mallard/C/mal_info_credit.page
similarity index 100%
rename from doc/mallard/C/mal_info_credit.xml
rename to doc/mallard/C/mal_info_credit.page
diff --git a/doc/mallard/C/mal_info_desc.xml b/doc/mallard/C/mal_info_desc.page
similarity index 100%
rename from doc/mallard/C/mal_info_desc.xml
rename to doc/mallard/C/mal_info_desc.page
diff --git a/doc/mallard/C/mal_info_license.xml b/doc/mallard/C/mal_info_license.page
similarity index 100%
rename from doc/mallard/C/mal_info_license.xml
rename to doc/mallard/C/mal_info_license.page
diff --git a/doc/mallard/C/mal_info_link.xml b/doc/mallard/C/mal_info_link.page
similarity index 100%
rename from doc/mallard/C/mal_info_link.xml
rename to doc/mallard/C/mal_info_link.page
diff --git a/doc/mallard/C/mal_info_revision.xml b/doc/mallard/C/mal_info_revision.page
similarity index 100%
rename from doc/mallard/C/mal_info_revision.xml
rename to doc/mallard/C/mal_info_revision.page
diff --git a/doc/mallard/C/mal_info_title.xml b/doc/mallard/C/mal_info_title.page
similarity index 100%
rename from doc/mallard/C/mal_info_title.xml
rename to doc/mallard/C/mal_info_title.page
diff --git a/doc/mallard/C/mal_inline.xml b/doc/mallard/C/mal_inline.page
similarity index 100%
rename from doc/mallard/C/mal_inline.xml
rename to doc/mallard/C/mal_inline.page
diff --git a/doc/mallard/C/mal_inline_app.xml b/doc/mallard/C/mal_inline_app.page
similarity index 100%
rename from doc/mallard/C/mal_inline_app.xml
rename to doc/mallard/C/mal_inline_app.page
diff --git a/doc/mallard/C/mal_inline_cmd.xml b/doc/mallard/C/mal_inline_cmd.page
similarity index 100%
rename from doc/mallard/C/mal_inline_cmd.xml
rename to doc/mallard/C/mal_inline_cmd.page
diff --git a/doc/mallard/C/mal_inline_code.xml b/doc/mallard/C/mal_inline_code.page
similarity index 100%
rename from doc/mallard/C/mal_inline_code.xml
rename to doc/mallard/C/mal_inline_code.page
diff --git a/doc/mallard/C/mal_inline_em.xml b/doc/mallard/C/mal_inline_em.page
similarity index 100%
rename from doc/mallard/C/mal_inline_em.xml
rename to doc/mallard/C/mal_inline_em.page
diff --git a/doc/mallard/C/mal_inline_file.xml b/doc/mallard/C/mal_inline_file.page
similarity index 100%
rename from doc/mallard/C/mal_inline_file.xml
rename to doc/mallard/C/mal_inline_file.page
diff --git a/doc/mallard/C/mal_inline_gui.xml b/doc/mallard/C/mal_inline_gui.page
similarity index 100%
rename from doc/mallard/C/mal_inline_gui.xml
rename to doc/mallard/C/mal_inline_gui.page
diff --git a/doc/mallard/C/mal_inline_guiseq.xml b/doc/mallard/C/mal_inline_guiseq.page
similarity index 100%
rename from doc/mallard/C/mal_inline_guiseq.xml
rename to doc/mallard/C/mal_inline_guiseq.page
diff --git a/doc/mallard/C/mal_inline_input.xml b/doc/mallard/C/mal_inline_input.page
similarity index 100%
rename from doc/mallard/C/mal_inline_input.xml
rename to doc/mallard/C/mal_inline_input.page
diff --git a/doc/mallard/C/mal_inline_key.xml b/doc/mallard/C/mal_inline_key.page
similarity index 100%
rename from doc/mallard/C/mal_inline_key.xml
rename to doc/mallard/C/mal_inline_key.page
diff --git a/doc/mallard/C/mal_inline_keyseq.xml b/doc/mallard/C/mal_inline_keyseq.page
similarity index 100%
rename from doc/mallard/C/mal_inline_keyseq.xml
rename to doc/mallard/C/mal_inline_keyseq.page
diff --git a/doc/mallard/C/mal_inline_link.xml b/doc/mallard/C/mal_inline_link.page
similarity index 100%
rename from doc/mallard/C/mal_inline_link.xml
rename to doc/mallard/C/mal_inline_link.page
diff --git a/doc/mallard/C/mal_inline_media.xml b/doc/mallard/C/mal_inline_media.page
similarity index 100%
rename from doc/mallard/C/mal_inline_media.xml
rename to doc/mallard/C/mal_inline_media.page
diff --git a/doc/mallard/C/mal_inline_output.xml b/doc/mallard/C/mal_inline_output.page
similarity index 100%
rename from doc/mallard/C/mal_inline_output.xml
rename to doc/mallard/C/mal_inline_output.page
diff --git a/doc/mallard/C/mal_inline_span.xml b/doc/mallard/C/mal_inline_span.page
similarity index 100%
rename from doc/mallard/C/mal_inline_span.xml
rename to doc/mallard/C/mal_inline_span.page
diff --git a/doc/mallard/C/mal_inline_sys.xml b/doc/mallard/C/mal_inline_sys.page
similarity index 100%
rename from doc/mallard/C/mal_inline_sys.xml
rename to doc/mallard/C/mal_inline_sys.page
diff --git a/doc/mallard/C/mal_inline_var.xml b/doc/mallard/C/mal_inline_var.page
similarity index 100%
rename from doc/mallard/C/mal_inline_var.xml
rename to doc/mallard/C/mal_inline_var.page
diff --git a/doc/mallard/C/mal_page.xml b/doc/mallard/C/mal_page.page
similarity index 100%
rename from doc/mallard/C/mal_page.xml
rename to doc/mallard/C/mal_page.page
diff --git a/doc/mallard/C/mal_section.xml b/doc/mallard/C/mal_section.page
similarity index 100%
rename from doc/mallard/C/mal_section.xml
rename to doc/mallard/C/mal_section.page
diff --git a/doc/mallard/C/mal_table.xml b/doc/mallard/C/mal_table.page
similarity index 100%
rename from doc/mallard/C/mal_table.xml
rename to doc/mallard/C/mal_table.page
diff --git a/doc/mallard/C/mal_table_col.xml b/doc/mallard/C/mal_table_col.page
similarity index 100%
rename from doc/mallard/C/mal_table_col.xml
rename to doc/mallard/C/mal_table_col.page
diff --git a/doc/mallard/C/mal_table_td.xml b/doc/mallard/C/mal_table_td.page
similarity index 100%
rename from doc/mallard/C/mal_table_td.xml
rename to doc/mallard/C/mal_table_td.page
diff --git a/doc/mallard/C/mal_table_tr.xml b/doc/mallard/C/mal_table_tr.page
similarity index 100%
rename from doc/mallard/C/mal_table_tr.xml
rename to doc/mallard/C/mal_table_tr.page
diff --git a/doc/mallard/C/principle-guide.xml b/doc/mallard/C/principle-guide.page
similarity index 100%
rename from doc/mallard/C/principle-guide.xml
rename to doc/mallard/C/principle-guide.page
diff --git a/doc/mallard/C/principle-justenough.xml b/doc/mallard/C/principle-justenough.page
similarity index 100%
rename from doc/mallard/C/principle-justenough.xml
rename to doc/mallard/C/principle-justenough.page
diff --git a/doc/mallard/C/principle-redundancy.xml b/doc/mallard/C/principle-redundancy.page
similarity index 100%
rename from doc/mallard/C/principle-redundancy.xml
rename to doc/mallard/C/principle-redundancy.page
diff --git a/doc/mallard/C/principles.xml b/doc/mallard/C/principles.page
similarity index 100%
rename from doc/mallard/C/principles.xml
rename to doc/mallard/C/principles.page
diff --git a/doc/mallard/C/spec.xml b/doc/mallard/C/spec.page
similarity index 100%
rename from doc/mallard/C/spec.xml
rename to doc/mallard/C/spec.page
diff --git a/doc/mallard/C/tenminutes.xml b/doc/mallard/C/tenminutes.page
similarity index 100%
rename from doc/mallard/C/tenminutes.xml
rename to doc/mallard/C/tenminutes.page
diff --git a/sandbox/mallard/html/Makefile b/sandbox/mallard/html/Makefile
index f5921c6..4aff311 100644
--- a/sandbox/mallard/html/Makefile
+++ b/sandbox/mallard/html/Makefile
@@ -1,7 +1,7 @@
 xslts=$(wildcard ../../../xslt/mallard/common/*.xsl) $(wildcard ../../../xslt/mallard/html/*.xsl)
-specs=$(filter-out ../../../doc/mallard/C/legal.xml, $(wildcard ../../../doc/mallard/C/*.xml))
-pages=$(patsubst %.xml,%.html, $(notdir $(specs)))
-xhtmls=$(patsubst %.xml,%.xhtml, $(notdir $(specs)))
+specs=$(wildcard ../../../doc/mallard/C/*.page)
+pages=$(patsubst %.page,%.html, $(notdir $(specs)))
+xhtmls=$(patsubst %.page,%.xhtml, $(notdir $(specs)))
 icons=admon-bug.png admon-caution.png admon-important.png admon-note.png admon-tip.png admon-warning.png
 marks=watermark-blockquote-201C.png watermark-code.png
 
@@ -23,7 +23,7 @@ $(marks):
 	ln -sf ../../../data/watermarks/$@ $@
 
 $(pages) : mallard.cache $(xslts)
-$(pages) : %.html : ../../../doc/mallard/C/%.xml
+$(pages) : %.html : ../../../doc/mallard/C/%.page
 	xsltproc \
 	  --stringparam mal.cache.file `pwd`/mallard.cache \
 	  --stringparam theme.icon.admon.path '' \
@@ -33,7 +33,7 @@ $(pages) : %.html : ../../../doc/mallard/C/%.xml
 	  ../../../xslt/mallard/html/mal2html.xsl $<
 
 $(xhtmls) : mallard.cache $(xslts)
-$(xhtmls) : %.xhtml : ../../../doc/mallard/C/%.xml
+$(xhtmls) : %.xhtml : ../../../doc/mallard/C/%.page
 	xsltproc \
 	  --stringparam mal.cache.file `pwd`/mallard.cache \
 	  --stringparam theme.icon.admon.path '' \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4053179..04ea4c3 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -10,7 +10,7 @@ bin_SCRIPTS = gnome-doc-prepare gnome-doc-tool
 
 endif
 
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(datadir)/pkgconfig
 pkgconfig_DATA = gnome-doc-utils.pc
 
 EXTRA_DIST =			\
diff --git a/xslt/Makefile.am b/xslt/Makefile.am
index 328783f..d9466fd 100644
--- a/xslt/Makefile.am
+++ b/xslt/Makefile.am
@@ -1 +1 @@
-SUBDIRS = gettext docbook common # gettext needs to be first
+SUBDIRS = gettext docbook mallard common # gettext needs to be first
diff --git a/xslt/common/Makefile.am b/xslt/common/Makefile.am
index cd17dd8..0414184 100644
--- a/xslt/common/Makefile.am
+++ b/xslt/common/Makefile.am
@@ -1,6 +1,6 @@
 xsldir=$(datadir)/xml/gnome/xslt/common
 
-xsl_DATA = theme.xsl
+xsl_DATA = theme.xsl utils.xsl
 
 EXTRA_DIST=$(xsl_DATA)
 
diff --git a/xslt/mallard/html/util.xsl b/xslt/common/utils.xsl
similarity index 95%
rename from xslt/mallard/html/util.xsl
rename to xslt/common/utils.xsl
index 2816d06..55315d5 100644
--- a/xslt/mallard/html/util.xsl
+++ b/xslt/common/utils.xsl
@@ -27,7 +27,7 @@ REMARK: Describe this module
 
 
 <!--**==========================================================================
-util.strip_newlines
+utils.strip_newlines
 Strips leading or trailing newlines from a string
 $string: The string to strip newlines from
 $leading: Whether to strip leading newlines
@@ -37,7 +37,7 @@ This template strips at most one leading and one trailing newline from
 ${string}.  This is useful for preformatted block elements where leading and
 trailing newlines are ignored to make source formatting easier for authors.
 -->
-<xsl:template name="util.strip_newlines">
+<xsl:template name="utils.strip_newlines">
   <xsl:param name="string"/>
   <xsl:param name="leading" select="false()"/>
   <xsl:param name="trailing" select="false()"/>
@@ -55,7 +55,7 @@ trailing newlines are ignored to make source formatting easier for authors.
       </xsl:variable>
       <xsl:choose>
         <xsl:when test="$trailing">
-          <xsl:call-template name="util.strip_newlines">
+          <xsl:call-template name="utils.strip_newlines">
             <xsl:with-param name="string" select="$new"/>
             <xsl:with-param name="leading" select="false()"/>
             <xsl:with-param name="trailing" select="true()"/>
diff --git a/xslt/mallard/html/Makefile.am b/xslt/mallard/html/Makefile.am
index 23b1346..2ac76a7 100644
--- a/xslt/mallard/html/Makefile.am
+++ b/xslt/mallard/html/Makefile.am
@@ -8,6 +8,7 @@ xsl_DATA =				\
 	mal2html-media.xsl		\
 	mal2html-page.xsl		\
 	mal2html-table.xsl		\
-	mal2html.xsl
+	mal2html.xsl			\
+	mal2xhtml.xsl
 
 EXTRA_DIST=$(xsl_DATA)
diff --git a/xslt/mallard/html/mal2html-block.xsl b/xslt/mallard/html/mal2html-block.xsl
index e64825f..49c39fe 100644
--- a/xslt/mallard/html/mal2html-block.xsl
+++ b/xslt/mallard/html/mal2html-block.xsl
@@ -181,7 +181,7 @@ FIXME
       </xsl:if>
     </xsl:attribute>
     <xsl:if test="$first">
-      <xsl:call-template name="util.strip_newlines">
+      <xsl:call-template name="utils.strip_newlines">
         <xsl:with-param name="string" select="$first"/>
         <xsl:with-param name="leading" select="true()"/>
         <xsl:with-param name="trailing" select="count(node()) = 1"/>
@@ -190,7 +190,7 @@ FIXME
     <xsl:apply-templates mode="mal2html.inline.mode"
                          select="node()[not(self::text() and (position() = 1 or position() = last()))]"/>
     <xsl:if test="$last and (count(node()) != 1)">
-      <xsl:call-template name="util.strip_newlines">
+      <xsl:call-template name="utils.strip_newlines">
         <xsl:with-param name="string" select="$last"/>
         <xsl:with-param name="leading" select="false()"/>
         <xsl:with-param name="trailing" select="true()"/>
diff --git a/xslt/mallard/html/mal2html.xsl b/xslt/mallard/html/mal2html.xsl
index 6a4e5de..7952520 100644
--- a/xslt/mallard/html/mal2html.xsl
+++ b/xslt/mallard/html/mal2html.xsl
@@ -59,7 +59,7 @@ REMARK: Describe this module
 <xsl:include href="mal2html-table.xsl"/>
 
 <xsl:include href="../../common/theme.xsl"/>
-<xsl:include href="util.xsl"/>
+<xsl:include href="../../common/utils.xsl"/>
 
 <!-- FIXME -->
 <xsl:template match="*">
diff --git a/xslt/mallard/html/mal2xhtml.xsl b/xslt/mallard/html/mal2xhtml.xsl
index 2f556e7..4cca1b7 100644
--- a/xslt/mallard/html/mal2xhtml.xsl
+++ b/xslt/mallard/html/mal2xhtml.xsl
@@ -58,7 +58,7 @@ REMARK: Describe this module
 <xsl:include href="mal2html-table.xsl"/>
 
 <xsl:include href="../../common/theme.xsl"/>
-<xsl:include href="util.xsl"/>
+<xsl:include href="../../common/utils.xsl"/>
 
 <!-- FIXME -->
 <xsl:template match="*">
diff --git a/xslt/mallard/html/theme.xml b/xslt/mallard/html/theme.xml
deleted file mode 100644
index 355857f..0000000
--- a/xslt/mallard/html/theme.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><!-- -*- indent-tabs-mode: nil -*- -->
-<theme xmlns="http://www.gnome.org/~shaunm/gnome-doc-utils/theme";>
-
-  <color id="background"    value="#ffffff"/>
-  <color id="link"          value="#1f609f"/>
-  <color id="link-visited"  value="#9f1f6f"/>
-  <color id="text"          value="#000000"/>
-  <color id="text-light"    value="#3f3f3f"/>
-
-  <color id="blue-background"   value="#f0f9ff"/>
-  <color id="blue-border"       value="#c0c9ff"/>
-  <color id="gray-background"   value="#f9f9f6"/>
-  <color id="gray-border"       value="#e0e0df"/>
-  <color id="red-background"    value="#fff0f0"/>
-  <color id="red-border"        value="#ffc0c0"/>
-  <color id="yellow-background" value="#fffff0"/>
-  <color id="yellow-border"     value="#ffffc0"/>
-
-
-  <!-- notes/admonitions -->
-  <icon id="bug"       width="48" height="48" src=""/>
-  <icon id="caution"   width="48" height="48" src=""/>
-  <icon id="important" width="48" height="48" src=""/>
-  <icon id="note"      width="48" height="48" src=""/>
-  <icon id="tip"       width="48" height="48" src=""/>
-  <icon id="warning"   width="48" height="48" src=""/>
-
-  <!-- status information -->
-  <icon id="status-stub"       width="16" height="16" src=""/>
-  <icon id="status-draft"      width="16" height="16" src=""/>
-  <icon id="status-incomplete" width="16" height="16" src=""/>
-  <icon id="status-review"     width="16" height="16" src=""/>
-
-  <!-- watermarks -->
-  <icon id="watermark-code"       src=""/>
-  <icon id="watermark-quote-00AB" src=""/>
-  <icon id="watermark-quote-00BB" src=""/>
-  <icon id="watermark-quote-201C" src=""/>
-  <icon id="watermark-quote-201D" src=""/>
-  <icon id="watermark-quote-201E" src=""/>
-  <icon id="waterkmark-screen"    src=""/>
-
-</theme>
diff --git a/xslt/mallard/html/theme.xsl b/xslt/mallard/html/theme.xsl
deleted file mode 100644
index 53adf26..0000000
--- a/xslt/mallard/html/theme.xsl
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><!-- -*- indent-tabs-mode: nil -*- -->
-<!--
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by the Free
-Software Foundation; either version 2 of the License, or (at your option) any
-later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
-details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program; see the file COPYING.LGPL.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
-                xmlns:theme="http://www.gnome.org/~shaunm/gnome-doc-utils/theme";
-                version="1.0">
-
-<!--!!==========================================================================
-Themes
-
-REMARK: Describe this module
--->
-
-
-<xsl:variable name="theme" select="document('theme.xml')"/>
-
-<xsl:key name="theme_key" match="*[ id]" use="@id"/>
-
-
-<!--**==========================================================================
-theme.get_color
--->
-<xsl:template name="theme.get_color">
-  <xsl:param name="id"/>
-  <xsl:for-each select="$theme">
-    <xsl:value-of select="key('theme_key', $id)/@value"/>
-  </xsl:for-each>
-</xsl:template>
-
-
-<!--**==========================================================================
-theme.get_icon_src
--->
-<xsl:template name="theme.get_icon_src">
-  <xsl:param name="id"/>
-  <xsl:for-each select="$theme">
-    <xsl:value-of select="key('theme_key', $id)/@src"/>
-  </xsl:for-each>
-</xsl:template>
-
-
-<!--**==========================================================================
-theme.get_icon_width
--->
-<xsl:template name="theme.get_icon_width">
-  <xsl:param name="id"/>
-  <xsl:for-each select="$theme">
-    <xsl:value-of select="key('theme_key', $id)/@width"/>
-  </xsl:for-each>
-</xsl:template>
-
-
-<!--**==========================================================================
-theme.get_icon_height
--->
-<xsl:template name="theme.get_height">
-  <xsl:param name="id"/>
-  <xsl:for-each select="$theme">
-    <xsl:value-of select="key('theme_key', $id)/@height"/>
-  </xsl:for-each>
-</xsl:template>
-
-</xsl:stylesheet>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]