From owner-p4-projects@FreeBSD.ORG  Mon Aug 15 01:43:31 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7A6D816A421; Mon, 15 Aug 2005 01:43:30 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2D41816A41F
	for <perforce@freebsd.org>; Mon, 15 Aug 2005 01:43:30 +0000 (GMT)
	(envelope-from murray@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EFD4343D45
	for <perforce@freebsd.org>; Mon, 15 Aug 2005 01:43:29 +0000 (GMT)
	(envelope-from murray@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7F1hT9m004766
	for <perforce@freebsd.org>; Mon, 15 Aug 2005 01:43:29 GMT
	(envelope-from murray@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7F1hTxm004763
	for perforce@freebsd.org; Mon, 15 Aug 2005 01:43:29 GMT
	(envelope-from murray@freebsd.org)
Date: Mon, 15 Aug 2005 01:43:29 GMT
Message-Id: <200508150143.j7F1hTxm004763@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	murray@freebsd.org using -f
From: Murray Stokely <murray@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 82000 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Aug 2005 01:43:31 -0000

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

Change 82000 by murray@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>