From owner-p4-projects@FreeBSD.ORG  Mon Aug 29 01:53:29 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 64B0B16A421; Mon, 29 Aug 2005 01:53:29 +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 3F1C316A41F
	for <perforce@freebsd.org>; Mon, 29 Aug 2005 01:53:29 +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 E2D6143D45
	for <perforce@freebsd.org>; Mon, 29 Aug 2005 01:53:28 +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 j7T1rSIE097595
	for <perforce@freebsd.org>; Mon, 29 Aug 2005 01:53:28 GMT
	(envelope-from murray@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7T1rSR1097592
	for perforce@freebsd.org; Mon, 29 Aug 2005 01:53:28 GMT
	(envelope-from murray@freebsd.org)
Date: Mon, 29 Aug 2005 01:53:28 GMT
Message-Id: <200508290153.j7T1rSR1097592@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 82735 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, 29 Aug 2005 01:53:30 -0000

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

Change 82735 by murray@murray_doc on 2005/08/29 01:53:23

	Get email field from slidesinfo/author/email and be more
	intelligent about numbering the slides.

Affected files ...

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

Differences ...

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

@@ -11,7 +11,6 @@
 
   <xsl:variable name="base" select="'.'"/>
   <xsl:variable name="date" select="'$Id$'"/>
-  <xsl:variable name="title" select="'Murray Stokely Resume'"/>
 
   <xsl:output type="xml" encoding="iso-8859-1" indent="yes" />
   <xsl:include href="include.xsl"/>
@@ -394,7 +393,10 @@
 <text:p text:style-name="P3">
 <text:span text:style-name="T4">&lt;</text:span>
 <text:span text:style-name="T5">
-<text:a xlink:href="mailto:murray@freebsd.org">murray@freebsd.org</text:a>
+
+<xsl:variable name="slidesinfo-email" select="author/email"/>
+
+<text:a xlink:href="mailto:{$slidesinfo-email}"><xsl:value-of select="$slidesinfo-email"/></text:a>
 </text:span>
 <text:span text:style-name="T4">&gt;</text:span>
 </text:p>
@@ -412,8 +414,17 @@
 
 </xsl:template>
 
+<xsl:template match="author">
+<xsl:apply-templates select="firstname"/>
+<xsl:text> </xsl:text>
+<xsl:apply-templates select="surname"/>
+</xsl:template>
+
 <xsl:template match="foil">
-<draw:page draw:name="page2" draw:style-name="dp1" draw:id="2" draw:master-page-name="BSDi - Template" presentation:presentation-page-layout-name="AL2T19" xlink:href="./BSDi%20-%20WellsFargo.sdd#" xlink:type="simple" xlink:show="replace" xlink:actuate="onRequest">
+<xsl:variable name="pagenum"><xsl:number value="position()" format="1"/></xsl:variable>
+<draw:page draw:style-name="dp1" draw:master-page-name="BSDi - Template" presentation:presentation-page-layout-name="AL2T19" xlink:href="./BSDi%20-%20WellsFargo.sdd#" xlink:type="simple" xlink:show="replace" xlink:actuate="onRequest">
+  <xsl:attribute name="draw:name">page<xsl:value-of select="$pagenum"/></xsl:attribute>
+  <xsl:attribute name="draw:id"><xsl:value-of select="$pagenum"/></xsl:attribute>
 
 <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">