PERFORCE change 82000 for review

[Murray Stokely]

http://perforce.freebsd.org/chv.cgi?CH=82000

Change 82000 by murray at murray_doc on 2005/08/15 01:42:51

	Add better XPath expression to select text and element nodes
	other than itemizedlists so we can indent properly for nested lists.
	
	Also add more robust <ulink> template to print href if there
	is no text in the body of the element.

Affected files ...

.. //depot/projects/docbook_slides/share/openoffice/BSDi.xsl#2 edit

Differences ...

==== //depot/projects/docbook_slides/share/openoffice/BSDi.xsl#2 (text+ko) ====

@@ -453,7 +453,7 @@
 <text:span text:style-name="T6">
 <!-- XXX want only text here, not additional lists -->
 <!-- <xsl:apply-templates select="text( )"/> -->
-<xsl:apply-templates select="text( ) or *[not(descendant::itemizedlist)]"/>
+<xsl:apply-templates select="node()[not(descendant::itemizedlist)]"/>
 </text:span>
 </text:p>
 <!-- <xsl:apply-templates select="*"/> -->
@@ -462,7 +462,16 @@
 </xsl:template>
 
 <xsl:template match="ulink">
-<text:span text:style-name="T11"><xsl:value-of select="."/></text:span>
+<text:span text:style-name="T11">
+<xsl:choose>
+ <xsl:when test="count(child::node())=0">
+   <xsl:value-of select="@url"/>
+ </xsl:when>
+ <xsl:otherwise>
+   <xsl:apply-templates/>
+ </xsl:otherwise>
+</xsl:choose>
+</text:span>
 </xsl:template>
 
 </xsl:stylesheet>