From 6bd0bfe20605cd4637d2626afbed2f2e44d25b94 Mon Sep 17 00:00:00 2001
From: pookey <pookey@625475ce-881a-0410-a577-b389adb331d8>
Date: Thu, 31 May 2007 19:18:25 +0000
Subject: [PATCH] docbook docs are now able to do syntax highlighting.

---
 manual/docbook/Makefile             | 4 ++--
 manual/docbook/doctrine-chunked.xsl | 4 +++-
 manual/docbook/doctrine.css         | 5 +++++
 manual/docbook/doctrine.xml         | 2 +-
 manual/docbook/doctrine.xsl         | 2 ++
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/manual/docbook/Makefile b/manual/docbook/Makefile
index 88a751bb6..493976c7b 100644
--- a/manual/docbook/Makefile
+++ b/manual/docbook/Makefile
@@ -1,7 +1,7 @@
 XSLSTYLE=doctrine.xsl
 XSLSTYLE_CHUNKED=doctrine-chunked.xsl
 %.html:  %.xml
-	xsltproc  --output $@ $(XSLSTYLE)  $<
-	xsltproc  --stringparam base.dir html/ $(XSLSTYLE_CHUNKED)  $<
+	xsieve -xinclude --output $@ $(XSLSTYLE)  $<
+	xsieve -xinclude --stringparam base.dir html/ $(XSLSTYLE_CHUNKED)  $<
 
 html:  doctrine.html
diff --git a/manual/docbook/doctrine-chunked.xsl b/manual/docbook/doctrine-chunked.xsl
index d16615daf..18cba525b 100644
--- a/manual/docbook/doctrine-chunked.xsl
+++ b/manual/docbook/doctrine-chunked.xsl
@@ -1,5 +1,7 @@
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 <xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets-1.70.1/xhtml/chunk.xsl"/>
-<xsl:param name="html.stylesheet" select="'doctrine.css'"/>
+<xsl:import href="/root/src/xsieve/experiments/programlisting/colorer.xsl"/>
+<xsl:import href="/root/src/xsieve/experiments/programlisting/colorer-html.xsl"/>
+<xsl:param name="html.stylesheet" select="'../doctrine.css'"/>
 </xsl:stylesheet>
diff --git a/manual/docbook/doctrine.css b/manual/docbook/doctrine.css
index 09bf80d70..ad36c545a 100644
--- a/manual/docbook/doctrine.css
+++ b/manual/docbook/doctrine.css
@@ -2,3 +2,8 @@ body, p, td
 {
   font-family: arial, "lucida console", sans-serif
 }
+.programlisting
+{
+    margin: 10px;
+    background-color: #eeeeee;
+}
diff --git a/manual/docbook/doctrine.xml b/manual/docbook/doctrine.xml
index 0a72cb0b2..3348588ba 100644
--- a/manual/docbook/doctrine.xml
+++ b/manual/docbook/doctrine.xml
@@ -171,7 +171,7 @@
       If the power of DQL isn't enough, you should consider using the rawSql API for object population.
     </para>
 
-    <programlisting><![CDATA[
+    <programlisting role="php"><![CDATA[
     <?php 
     // DO NOT USE THE FOLLOWING CODE 
     // (using many sql queries for object population):
diff --git a/manual/docbook/doctrine.xsl b/manual/docbook/doctrine.xsl
index d3129be8d..0986328bb 100644
--- a/manual/docbook/doctrine.xsl
+++ b/manual/docbook/doctrine.xsl
@@ -1,5 +1,7 @@
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 <xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets-1.70.1/xhtml/docbook.xsl"/>
+<xsl:import href="/root/src/xsieve/experiments/programlisting/colorer.xsl"/>
+<xsl:import href="/root/src/xsieve/experiments/programlisting/colorer-html.xsl"/>
 <xsl:param name="html.stylesheet" select="'doctrine.css'"/>
 </xsl:stylesheet>