[mallard] Rename pages to .page, XSLT fixed for Yelp

9 files changed, 11 insertions, 131 deletions

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
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>