Return-Path: 
 <svn-return-6101-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 61101 invoked from network); 25 Aug 2006 07:49:29 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 25 Aug 2006 07:49:29 -0000
Received: (qmail 88756 invoked by uid 500); 25 Aug 2006 07:49:29 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 88714 invoked by uid 500); 25 Aug 2006 07:49:29 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 88703 invoked by uid 99); 25 Aug 2006 07:49:29 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Aug 2006 00:49:29 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Aug 2006 00:49:28 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 217A81A981A; Fri, 25 Aug 2006 00:49:08 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r436700 - in /forrest/trunk:
 main/webapp/resources/stylesheets/html-to-document.xsl site-author/status.xml
Date: Fri, 25 Aug 2006 07:49:07 -0000
To: svn@forrest.apache.org
From: crossley@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060825074908.217A81A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: crossley
Date: Fri Aug 25 00:49:06 2006
New Revision: 436700

URL: http://svn.apache.org/viewvc?rev=436700&view=rev
Log:
When using html as source, the "a" elements were not rendered properly if both
@href and @name attributes. A side-effect of this fix is that now all other
attributes such as @title or @target are copied over.
Also removed the automated generation of @id attributes from @name attributes,
which can lead to invalid IDs and other confusion.
fixes-bug="FOR-448" due-to="Jim Dixon"

Modified:
    forrest/trunk/main/webapp/resources/stylesheets/html-to-document.xsl
    forrest/trunk/site-author/status.xml

Modified: forrest/trunk/main/webapp/resources/stylesheets/html-to-document.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/html-to-document.xsl?rev=436700&r1=436699&r2=436700&view=diff
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/html-to-document.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/html-to-document.xsl Fri Aug 25 00:49:06 2006
@@ -174,21 +174,14 @@
        </xsl:choose>
     </xsl:template>
 
-  
     <!-- convert a to link -->
     <xsl:template match="a">
-      <xsl:if test="@name">
-        <!-- Attach an id to the current node -->
-        <xsl:attribute name="id"><xsl:value-of select="translate(@name, ' $', '__')"/></xsl:attribute>
+      <link>
+        <xsl:copy-of select="@*"/>
         <xsl:apply-templates/>
-      </xsl:if>
-      <xsl:if test="@href">
-        <link href="{@href}">
-          <xsl:apply-templates/>
-        </link>
-      </xsl:if>
+      </link>
     </xsl:template>
-    
+
     <xsl:template match="@valign | @align"/>
         
     <xsl:template match="center">

Modified: forrest/trunk/site-author/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=436700&r1=436699&r2=436700&view=diff
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Fri Aug 25 00:49:06 2006
@@ -140,6 +140,13 @@
         <link href="site:v0.80//upgrading_08">upgrading to v0.8</link>
       </action>
 <!-- 2006-08 -->
+      <action context="code" type="fix" dev="DC" fixes-bug="FOR-448" due-to="Jim Dixon">
+        When using html as source, the "a" elements were not rendered properly if both
+        @href and @name attributes. A side-effect of this fix is that now all other
+        attributes such as @title or @target are copied over.
+        Also removed the automated generation of @id attributes from @name attributes,
+        which can lead to invalid IDs and other confusion.
+      </action>
       <action type="update" context="docs" dev="TS">
         <strong>FOR-920</strong> - Addings notes how to
         <link href="site:v0.80//upgrading_08">update</link> the different module calls in