On Tue, Jun 28, 2005 at 05:33:25PM -0400, Mark Johnson wrote:
> I'm not sure I understand what you're proposing. I looked at
> xhtml/graphics.xsl (V1.68.1) and couldn't figure out what you mean exactly.
> Can you elaborate?
Possibly wrong file: I meant docbook-slides 3.3.1.0-1.1:
/usr/share/xml/docbook/custom/slides/3.3.1/xsl/xhtml/graphics.xsl
You meant docbook-xsl 1.68.1-0.1:
/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/graphics.xsl
> FWIW, this point has been argued a number of times. I'm of the opinion that
> the packages should be configured so that they "just work" for the largest
> subset of users - people who don't use xml catalogs, in this case. However,
> there are those who feel quite strongly the other way, e.g. that the
> sourceforge url should get mapped to a local file via the xml catalog
> system. (this assumes that one is using a catalog-aware parser/processor.)
Confusion again, sorry! There are two things:
1. Use of http URIs for DTDs and XSL files, that are translated
to file locations using XML catalogs. This is OK. I am
under the impression, that most of the XSLT processors we
deliver are XML catalog aware. xsltproc is, of course.
Saxon and Xalan AFAIK, too. Sablotron seems not. We can
live with that, can't we?
2. The generated (X)HTML (by docbook-slides) contains http URIs
for CSS, JavaScript, and graphics files by default. This is
not so good (not a big deal!), but we should change the
default values to point to the Debian installation paths of
the respective files instead of sf.net.
> But back to the main point: could you give me a specific example of what
> your suggesting?
A patch says more than thousand words. Attached. We than just
need to create a symlink from the version directory to "current"
and we need to add the logo
http://docbook.sourceforge.net/release/buttons/slides-1.png in
the graphics directory.
Cheers, WB
diff -uraN docbook-slides-3.3.1.0.orig/xsl/html/css.xsl
docbook-slides-3.3.1.0/xsl/html/css.xsl
--- docbook-slides-3.3.1.0.orig/xsl/html/css.xsl 2005-06-28
22:54:20.589509392 +0000
+++ docbook-slides-3.3.1.0/xsl/html/css.xsl 2005-06-28 22:56:41.505626656
+0000
@@ -24,7 +24,7 @@
<xsl:text>/</xsl:text>
</xsl:when>
<xsl:otherwise>
-
<xsl:text>http://docbook.sourceforge.net/release/slides/browser/</xsl:text>
+
<xsl:text>/usr/share/xml/docbook/custom/slides/current/browser/</xsl:text>
</xsl:otherwise>
</xsl:choose>
<xsl:value-of select="$css"/>
diff -uraN docbook-slides-3.3.1.0.orig/xsl/html/graphics.xsl
docbook-slides-3.3.1.0/xsl/html/graphics.xsl
--- docbook-slides-3.3.1.0.orig/xsl/html/graphics.xsl 2005-06-28
22:54:20.590509240 +0000
+++ docbook-slides-3.3.1.0/xsl/html/graphics.xsl 2005-06-28
22:58:33.934534864 +0000
@@ -24,7 +24,7 @@
<xsl:text>/</xsl:text>
</xsl:when>
<xsl:otherwise>
-
<xsl:text>http://docbook.sourceforge.net/release/slides/graphics/</xsl:text>
+
<xsl:text>/usr/share/xml/docbook/custom/slides/current/graphics/</xsl:text>
</xsl:otherwise>
</xsl:choose>
<xsl:value-of select="$image"/>
diff -uraN docbook-slides-3.3.1.0.orig/xsl/html/jscript.xsl
docbook-slides-3.3.1.0/xsl/html/jscript.xsl
--- docbook-slides-3.3.1.0.orig/xsl/html/jscript.xsl 2005-06-28
22:54:20.590509240 +0000
+++ docbook-slides-3.3.1.0/xsl/html/jscript.xsl 2005-06-28 22:57:21.578534648
+0000
@@ -22,7 +22,7 @@
<xsl:text>/</xsl:text>
</xsl:when>
<xsl:otherwise>
-
<xsl:text>http://docbook.sourceforge.net/release/slides/browser/</xsl:text>
+
<xsl:text>/usr/share/xml/docbook/custom/slides/current/browser/</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
diff -uraN docbook-slides-3.3.1.0.orig/xsl/html/param.xsl
docbook-slides-3.3.1.0/xsl/html/param.xsl
--- docbook-slides-3.3.1.0.orig/xsl/html/param.xsl 2005-06-28
22:54:20.591509088 +0000
+++ docbook-slides-3.3.1.0/xsl/html/param.xsl 2005-06-28 23:01:54.974417216
+0000
@@ -39,7 +39,7 @@
<xsl:param name="output.indent" select="'no'"/>
<xsl:param name="overlay" select="0"/>
<xsl:param name="overlay.js" select="'overlay.js'"/>
-<xsl:param name="overlay.logo"
select="'http://docbook.sourceforge.net/release/buttons/slides-1.png'"/>
+<xsl:param name="overlay.logo"
select="'/usr/share/xml/docbook/custom/slides/current/graphics/slides-1.png'"/>
<xsl:param name="plus.image" select="'toc/closed.png'"/>
<xsl:param name="prev.image" select="'active/nav-prev.png'"/>
<xsl:param name="script.dir" select="''"/>
diff -uraN docbook-slides-3.3.1.0.orig/xsl/xhtml/css.xsl
docbook-slides-3.3.1.0/xsl/xhtml/css.xsl
--- docbook-slides-3.3.1.0.orig/xsl/xhtml/css.xsl 2005-06-28
22:54:20.594508632 +0000
+++ docbook-slides-3.3.1.0/xsl/xhtml/css.xsl 2005-06-28 22:56:54.142705528
+0000
@@ -25,7 +25,7 @@
<xsl:text>/</xsl:text>
</xsl:when>
<xsl:otherwise>
-
<xsl:text>http://docbook.sourceforge.net/release/slides/browser/</xsl:text>
+
<xsl:text>/usr/share/xml/docbook/custom/slides/current/browser/</xsl:text>
</xsl:otherwise>
</xsl:choose>
<xsl:value-of select="$css"/>
diff -uraN docbook-slides-3.3.1.0.orig/xsl/xhtml/graphics.xsl
docbook-slides-3.3.1.0/xsl/xhtml/graphics.xsl
--- docbook-slides-3.3.1.0.orig/xsl/xhtml/graphics.xsl 2005-06-28
22:54:20.595508480 +0000
+++ docbook-slides-3.3.1.0/xsl/xhtml/graphics.xsl 2005-06-28
22:58:54.427419472 +0000
@@ -25,7 +25,7 @@
<xsl:text>/</xsl:text>
</xsl:when>
<xsl:otherwise>
-
<xsl:text>http://docbook.sourceforge.net/release/slides/graphics/</xsl:text>
+
<xsl:text>/usr/share/xml/docbook/custom/slides/current/graphics/</xsl:text>
</xsl:otherwise>
</xsl:choose>
<xsl:value-of select="$image"/>
diff -uraN docbook-slides-3.3.1.0.orig/xsl/xhtml/jscript.xsl
docbook-slides-3.3.1.0/xsl/xhtml/jscript.xsl
--- docbook-slides-3.3.1.0.orig/xsl/xhtml/jscript.xsl 2005-06-28
22:54:20.595508480 +0000
+++ docbook-slides-3.3.1.0/xsl/xhtml/jscript.xsl 2005-06-28
22:57:32.648851704 +0000
@@ -23,7 +23,7 @@
<xsl:text>/</xsl:text>
</xsl:when>
<xsl:otherwise>
-
<xsl:text>http://docbook.sourceforge.net/release/slides/browser/</xsl:text>
+
<xsl:text>/usr/share/xml/docbook/custom/slides/current/browser/</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
diff -uraN docbook-slides-3.3.1.0.orig/xsl/xhtml/param.xsl
docbook-slides-3.3.1.0/xsl/xhtml/param.xsl
--- docbook-slides-3.3.1.0.orig/xsl/xhtml/param.xsl 2005-06-28
22:54:20.595508480 +0000
+++ docbook-slides-3.3.1.0/xsl/xhtml/param.xsl 2005-06-28 23:02:05.468821824
+0000
@@ -39,7 +39,7 @@
<xsl:param name="output.indent" select="'no'"/>
<xsl:param name="overlay" select="0"/>
<xsl:param name="overlay.js" select="'overlay.js'"/>
-<xsl:param name="overlay.logo"
select="'http://docbook.sourceforge.net/release/buttons/slides-1.png'"/>
+<xsl:param name="overlay.logo"
select="'/usr/share/xml/docbook/custom/slides/current/graphics/slides-1.png'"/>
<xsl:param name="plus.image" select="'toc/closed.png'"/>
<xsl:param name="prev.image" select="'active/nav-prev.png'"/>
<xsl:param name="script.dir" select="''"/>
