svn commit: r42109 - user/gabor/db5

[Gabor Kovesdan]

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>