[Boost-commit] svn:boost r47876 - in branches/release: . tools/boostbook/xsl/doxygen

From: eric_at_[hidden]
Date: 2008-07-29 22:13:59

Author: eric_niebler
Date: 2008-07-29 22:13:58 EDT (Tue, 29 Jul 2008)
New Revision: 47876
URL: http://svn.boost.org/trac/boost/changeset/47876

Log:
Merged revisions 47872 via svnmerge from 
https://svn.boost.org/svn/boost/trunk

........
  r47872 | eric_niebler | 2008-07-29 14:48:11 -0700 (Tue, 29 Jul 2008) | 1 line
  
  use relative paths when loading external xml entities to make win32 xsltproc happy
........

Properties modified: 
   branches/release/   (props changed)
Text files modified: 
   branches/release/tools/boostbook/xsl/doxygen/collect.xsl |     8 ++------                                
   1 files changed, 2 insertions(+), 6 deletions(-)

Modified: branches/release/tools/boostbook/xsl/doxygen/collect.xsl
==============================================================================
--- branches/release/tools/boostbook/xsl/doxygen/collect.xsl	(original)
+++ branches/release/tools/boostbook/xsl/doxygen/collect.xsl	2008-07-29 22:13:58 EDT (Tue, 29 Jul 2008)
@@ -9,8 +9,6 @@
 <xsl:stylesheet        xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:output method="xml" version="1.0" indent="yes" standalone="yes" />
  
-  <xsl:param name="doxygen.xml.path">./</xsl:param>
- 
   <xsl:template match="/">
     <doxygen>
       <xsl:attribute name="version">
@@ -37,8 +35,7 @@
           </xsl:choose>
         </xsl:variable>
         <xsl:if test="$id">
-          <xsl:copy-of select="document( concat($doxygen.xml.path, '/',
-                               $id, '.xml' ) )/doxygen/*" />
+          <xsl:copy-of select="document( concat( $id, '.xml' ), / )/doxygen/*" />
         </xsl:if>
       </xsl:for-each>
       <xsl:for-each select="doxygenindex/compound">
@@ -53,8 +50,7 @@
           </xsl:choose>
         </xsl:variable>
         <xsl:if test="$id">
-          <xsl:copy-of select="document( concat($doxygen.xml.path, '/',
-                               $id, '.xml' ) )/doxygen/*" />
+          <xsl:copy-of select="document( concat($id, '.xml'), /)/doxygen/*" />
         </xsl:if>
       </xsl:for-each>
     </doxygen>