From owner-svn-doc-user@FreeBSD.ORG  Tue Jul  2 10:08:57 2013
Return-Path: <owner-svn-doc-user@FreeBSD.ORG>
Delivered-To: svn-doc-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id EAC7311B;
 Tue,  2 Jul 2013 10:08:57 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C69C61222;
 Tue,  2 Jul 2013 10:08:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r62A8vSQ086803;
 Tue, 2 Jul 2013 10:08:57 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r62A8vJm086802;
 Tue, 2 Jul 2013 10:08:57 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201307021008.r62A8vJm086802@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 2 Jul 2013 10:08:57 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-user@freebsd.org
Subject: svn commit: r42109 - user/gabor/db5
X-SVN-Group: doc-user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc experimental trees
 <svn-doc-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-user>,
 <mailto:svn-doc-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-user>
List-Post: <mailto:svn-doc-user@freebsd.org>
List-Help: <mailto:svn-doc-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-user>,
 <mailto:svn-doc-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Jul 2013 10:08:58 -0000

Author: gabor
Date: Tue Jul  2 10:08:57 2013
New Revision: 42109
URL: http://svnweb.freebsd.org/changeset/doc/42109

Log:
  - Convert titles properly (move into info if not there)

Modified:
  user/gabor/db5/db5-upgrade.xsl

Modified: user/gabor/db5/db5-upgrade.xsl
==============================================================================
--- user/gabor/db5/db5-upgrade.xsl	Tue Jul  2 09:55:51 2013	(r42108)
+++ user/gabor/db5/db5-upgrade.xsl	Tue Jul  2 10:08:57 2013	(r42109)
@@ -201,7 +201,12 @@
 <xsl:template match="title|titleabbrev|subtitle" mode="info"/>
 
 <xsl:template match="title|titleabbrev|subtitle">
-  <xsl:if test="not(preceding-sibling::sect1info or preceding-sibling::sect2info or preceding-sibling::sect3info or preceding-sibling::sect4info or preceding-sibling::chapterinfo)">
+  <xsl:if test="not(preceding-sibling::sect1info or preceding-sibling::sect2info or preceding-sibling::sect3info or
+           preceding-sibling::sect4info or preceding-sibling::chapterinfo or preceding-sibling::bookinfo or
+           preceding-sibling::articleinfo or
+           following-sibling::sect1info or following-sibling::sect2info or following-sibling::sect3info or
+           following-sibling::sect4info or following-sibling::chapterinfo or following-sibling::bookinfo or
+           following-sibling::articleinfo)">
     <xsl:copy>
       <xsl:call-template name="copy.attributes"/>
       <xsl:apply-templates/>
@@ -229,16 +234,10 @@
 		     |screeninfo|sidebarinfo"
               priority="200">
   <info>
-    <xsl:if test="../title">
-      <xsl:apply-templates select="../title"/>
-    </xsl:if>
-    <xsl:if test="../titleabbrev">
-      <xsl:apply-templates select="../titleabbrev"/>
-    </xsl:if>
-    <xsl:if test="../subtitle">
-      <xsl:apply-templates select="../subtitle"/>
-    </xsl:if>
     <xsl:call-template name="copy.attributes"/>
+    <xsl:apply-templates select="(../title|title)[1]" mode="copy"/>
+    <xsl:apply-templates select="(../subtitle|subtitle)[1]" mode="copy"/>
+    <xsl:apply-templates select="(../titleabbrev|titleabbrev)[1]" mode="copy"/>
     <xsl:apply-templates mode="info"/>
   </info>
 </xsl:template>