From owner-p4-projects@FreeBSD.ORG  Mon Aug 15 01:58:51 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 529D016A421; Mon, 15 Aug 2005 01:58:49 +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 0DCC216A41F
	for <perforce@freebsd.org>; Mon, 15 Aug 2005 01:58:49 +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 CFE3943D46
	for <perforce@freebsd.org>; Mon, 15 Aug 2005 01:58:48 +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 j7F1wm0v005276
	for <perforce@freebsd.org>; Mon, 15 Aug 2005 01:58:48 GMT
	(envelope-from murray@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7F1wmtF005273
	for perforce@freebsd.org; Mon, 15 Aug 2005 01:58:48 GMT
	(envelope-from murray@freebsd.org)
Date: Mon, 15 Aug 2005 01:58:48 GMT
Message-Id: <200508150158.j7F1wmtF005273@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 82001 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:58:51 -0000

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

Change 82001 by murray@murray_doc on 2005/08/15 01:58:23

	Remove superfluous comments.  Add para template to properly
	setup paragraphs when used as top level elements in a <foil>.

Affected files ...

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

Differences ...

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

@@ -418,6 +418,8 @@
 <draw:text-box presentation:style-name="pr4" draw:text-style-name="P8" draw:layer="layout" svg:width="23.912cm" svg:height="13.231cm" svg:x="2.059cm" svg:y="5.805cm" presentation:class="outline" presentation:user-transformed="true">
 
 <xsl:apply-templates select="itemizedlist"/>
+<xsl:apply-templates select="para"/>
+<xsl:apply-templates select="screen"/>
 
 </draw:text-box>
 
@@ -451,12 +453,9 @@
 <text:p>
   <xsl:attribute name="text:style-name"><xsl:value-of select="$mystyle"/></xsl:attribute>
 <text:span text:style-name="T6">
-<!-- XXX want only text here, not additional lists -->
-<!-- <xsl:apply-templates select="text( )"/> -->
 <xsl:apply-templates select="node()[not(descendant::itemizedlist)]"/>
 </text:span>
 </text:p>
-<!-- <xsl:apply-templates select="*"/> -->
 <xsl:apply-templates select="itemizedlist"/>
 </text:list-item>
 </xsl:template>
@@ -474,6 +473,19 @@
 </text:span>
 </xsl:template>
 
+
+<xsl:template match="para">
+<xsl:choose>
+<xsl:when test="parent::foil">
+<!-- special treatment if this is toplevel, inside foil. -->
+<text:p text:style-name="P5"><xsl:apply-templates/></text:p>
+</xsl:when>
+<xsl:otherwise>
+<xsl:apply-templates/>
+</xsl:otherwise>
+</xsl:choose>
+</xsl:template>
+
 </xsl:stylesheet>
 
 <!--