bjori Mon Jun 25 12:04:17 2007 UTC
Modified files:
/livedocs toc.xsl mkindex.php
Log:
Sync with phpdoc Docbook5 upgrade
http://cvs.php.net/viewvc.cgi/livedocs/toc.xsl?r1=1.5&r2=1.6&diff_format=u
Index: livedocs/toc.xsl
diff -u livedocs/toc.xsl:1.5 livedocs/toc.xsl:1.6
--- livedocs/toc.xsl:1.5 Thu Sep 2 14:33:49 2004
+++ livedocs/toc.xsl Mon Jun 25 12:04:16 2007
@@ -1,47 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:db="http://docbook.org/ns/docbook"; version="1.0">
+<xsl:template name="getTitle">
+ <xsl:param name="element" />
+ <xsl:choose>
+ <xsl:when test="db:title">
+ <xsl:value-of select="db:title"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="db:info/db:title" />
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
-<xsl:template match="book">
+<xsl:template match="db:book">
<toc>
- <xsl:attribute name="title"><xsl:value-of
select="title"/></xsl:attribute>
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
- <xsl:apply-templates select="bookinfo"/>
- <xsl:apply-templates select="preface"/>
- <xsl:apply-templates select="part"/>
+ <xsl:attribute name="title"><xsl:call-template name="getTitle"
select="."/></xsl:attribute>
+ <xsl:attribute name="id"><xsl:value-of
select="@xml:id"/></xsl:attribute>
+ <xsl:apply-templates select="/db:book/db:info"/>
+ <xsl:apply-templates select="db:preface"/>
+ <xsl:apply-templates select="db:part"/>
</toc>
</xsl:template>
-<xsl:template match="bookinfo|preface">
+<xsl:template match="/db:book/db:info|db:preface">
<dir>
- <xsl:attribute name="title"><xsl:value-of
select="title"/></xsl:attribute>
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+ <xsl:attribute name="title"><xsl:call-template name="getTitle"
select="." /></xsl:attribute>
+ <xsl:attribute name="id"><xsl:value-of
select="@xml:id"/></xsl:attribute>
</dir>
</xsl:template>
-<xsl:template match="part">
+<xsl:template match="db:part">
<part>
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
- <xsl:attribute name="title"><xsl:value-of
select="title"/></xsl:attribute>
- <xsl:apply-templates select="chapter"/>
- <xsl:apply-templates select="refgroup"/>
- <xsl:apply-templates select="reference"/>
- <xsl:apply-templates select="appendix"/>
+ <xsl:attribute name="id"><xsl:value-of
select="@xml:id"/></xsl:attribute>
+ <xsl:attribute name="title"><xsl:call-template name="getTitle"
select="."/></xsl:attribute>
+ <xsl:apply-templates select="db:chapter"/>
+ <xsl:apply-templates select="db:refgroup"/>
+ <xsl:apply-templates select="db:reference"/>
+ <xsl:apply-templates select="db:appendix"/>
</part>
</xsl:template>
-<xsl:template match="chapter">
+<xsl:template match="db:chapter">
<chapter>
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
- <xsl:attribute name="title"><xsl:value-of
select="title"/></xsl:attribute>
- <xsl:apply-templates select="sect1|section"/>
+ <xsl:attribute name="id"><xsl:value-of
select="@xml:id"/></xsl:attribute>
+ <xsl:attribute name="title"><xsl:call-template name="getTitle"
select="."/></xsl:attribute>
+ <xsl:apply-templates select="db:sect1|db:section"/>
</chapter>
</xsl:template>
-<xsl:template match="appendix">
+<xsl:template match="db:appendix">
<appendix>
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
- <xsl:attribute name="title"><xsl:value-of
select="title"/></xsl:attribute>
+ <xsl:attribute name="id"><xsl:value-of
select="@xml:id"/></xsl:attribute>
+ <xsl:attribute name="title"><xsl:call-template name="getTitle"
select="."/></xsl:attribute>
<xsl:apply-templates select="sect1|section"/>
</appendix>
</xsl:template>
@@ -55,57 +66,57 @@
</refgroup>
</xsl:template>
-<xsl:template match="reference">
+<xsl:template match="db:reference">
<reference>
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
- <xsl:attribute name="title"><xsl:value-of
select="title"/></xsl:attribute>
- <xsl:apply-templates select="section|refentry"/>
+ <xsl:attribute name="id"><xsl:value-of
select="@xml:id"/></xsl:attribute>
+ <xsl:attribute name="title"><xsl:value-of
select="db:title"/></xsl:attribute>
+ <xsl:apply-templates select="db:section|db:refentry"/>
</reference>
</xsl:template>
-<xsl:template match="section">
+<xsl:template match="db:section">
<sect1>
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
- <xsl:attribute name="title"><xsl:value-of
select="title"/></xsl:attribute>
+ <xsl:attribute name="id"><xsl:value-of
select="@xml:id"/></xsl:attribute>
+ <xsl:attribute name="title"><xsl:call-template name="getTitle"
select="."/></xsl:attribute>
<xsl:apply-templates select="section"/>
</sect1>
</xsl:template>
-<xsl:template match="sect1">
+<xsl:template match="db:sect1">
<sect1>
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
- <xsl:attribute name="title"><xsl:value-of
select="title"/></xsl:attribute>
- <xsl:apply-templates select="sect2"/>
+ <xsl:attribute name="id"><xsl:value-of
select="@xml:id"/></xsl:attribute>
+ <xsl:attribute name="title"><xsl:value-of
select="db:title"/></xsl:attribute>
+ <xsl:apply-templates select="db:sect2"/>
</sect1>
</xsl:template>
-<xsl:template match="sect2">
+<xsl:template match="db:sect2">
<sect2>
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
- <xsl:attribute name="title"><xsl:value-of
select="title"/></xsl:attribute>
- <xsl:apply-templates select="sect3"/>
+ <xsl:attribute name="id"><xsl:value-of
select="@xml:id"/></xsl:attribute>
+ <xsl:attribute name="title"><xsl:value-of
select="db:title"/></xsl:attribute>
+ <xsl:apply-templates select="db:sect3"/>
</sect2>
</xsl:template>
-<xsl:template match="sect3">
+<xsl:template match="db:sect3">
<sect3>
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
- <xsl:attribute name="title"><xsl:value-of
select="title"/></xsl:attribute>
- <xsl:apply-templates select="sect4"/>
+ <xsl:attribute name="id"><xsl:value-of
select="@xml:id"/></xsl:attribute>
+ <xsl:attribute name="title"><xsl:value-of
select="db:title"/></xsl:attribute>
+ <xsl:apply-templates select="db:sect4"/>
</sect3>
</xsl:template>
-<xsl:template match="sect4">
+<xsl:template match="db:sect4">
<sect4>
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
- <xsl:attribute name="title"><xsl:value-of
select="title"/></xsl:attribute>
+ <xsl:attribute name="id"><xsl:value-of
select="@xml:id"/></xsl:attribute>
+ <xsl:attribute name="title"><xsl:value-of
select="db:title"/></xsl:attribute>
</sect4>
</xsl:template>
-<xsl:template match="refentry">
+<xsl:template match="db:refentry">
<chapter>
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
- <xsl:attribute name="title"><xsl:value-of
select="refnamediv/refname"/></xsl:attribute>
+ <xsl:attribute name="id"><xsl:value-of
select="@xml:id"/></xsl:attribute>
+ <xsl:attribute name="title"><xsl:value-of
select="db:refnamediv/db:refname"/></xsl:attribute>
</chapter>
</xsl:template>
</xsl:stylesheet>
http://cvs.php.net/viewvc.cgi/livedocs/mkindex.php?r1=1.49&r2=1.50&diff_format=u
Index: livedocs/mkindex.php
diff -u livedocs/mkindex.php:1.49 livedocs/mkindex.php:1.50
--- livedocs/mkindex.php:1.49 Thu May 10 07:31:56 2007
+++ livedocs/mkindex.php Mon Jun 25 12:04:16 2007
@@ -19,7 +19,7 @@
// | construct an index |
// +----------------------------------------------------------------------+
//
-// $Id: mkindex.php,v 1.49 2007/05/10 07:31:56 philip Exp $
+// $Id: mkindex.php,v 1.50 2007/06/25 12:04:16 bjori Exp $
/* just to be on the safe side */
@@ -92,8 +92,8 @@
function start_elem($parser, $name, $attrs) {
// if there is an ID attribute, record it
- if (isset($attrs['ID'])) {
- $this->last_id = $attrs['ID'];
+ if (isset($attrs['XML:ID'])) {
+ $this->last_id = $attrs['XML:ID'];
}
if ($this->last_id !== false) {
if (isset($GLOBALS['titles'][$name])) {
