Return-Path: Delivered-To: apmail-forrest-dev-archive@www.apache.org Received: (qmail 2599 invoked from network); 13 Oct 2005 08:26:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 13 Oct 2005 08:26:07 -0000 Received: (qmail 78227 invoked by uid 500); 13 Oct 2005 08:26:06 -0000 Delivered-To: apmail-forrest-dev-archive@forrest.apache.org Received: (qmail 78171 invoked by uid 500); 13 Oct 2005 08:26:05 -0000 Mailing-List: contact dev-help@forrest.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@forrest.apache.org List-Id: Delivered-To: mailing list dev@forrest.apache.org Received: (qmail 78160 invoked by uid 99); 13 Oct 2005 08:26:05 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Oct 2005 01:26:05 -0700 Received-SPF: neutral (asf.osuosl.org: local policy) Received: from [65.77.211.84] (HELO www2.kc.aoindustries.com) (65.77.211.84) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Oct 2005 01:26:07 -0700 Received: from fo2.kc.aoindustries.com (www2.kc.aoindustries.com [65.77.211.84]) by www2.kc.aoindustries.com (8.13.1/8.13.1) with ESMTP id j9D8PePU027345 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 13 Oct 2005 03:25:40 -0500 Received: from localhost (localhost [[UNIX: localhost]]) by fo2.kc.aoindustries.com (8.13.1/8.13.1/Submit) id j9D8Pegh027286 for dev@forrest.apache.org; Thu, 13 Oct 2005 03:25:40 -0500 X-Authentication-Warning: fo2.kc.aoindustries.com: indexgeo set sender to crossley@apache.org using -f Date: Thu, 13 Oct 2005 18:25:33 +1000 From: David Crossley To: Forrest Developers List Subject: Re: svn commit: r306554 - in /forrest/branches/forrest_07_branch/main/webapp: resources/stylesheets/html2document.xsl skins/common/xslt/html/document2html.xsl skins/pelt/xslt/html/document2html.xsl Message-ID: <20051013082533.GA12353@igg.indexgeo.com.au> References: <20051006084600.33641.qmail@minotaur.apache.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20051006084600.33641.qmail@minotaur.apache.org> User-Agent: Mutt/1.4i X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N There is something wrong here. The Apache XML project uses forrest_07_branch and they are reporting that the "Note" elements are not rendered anymore. I confirmed that by going back to just before this revision. Also everything is okay using 0.8-dev to build their site. So i presume that something was missed during r306554. I have no idea what sorry, becuase i don't understand these changes. -David > Author: ferdinand > Date: Thu Oct 6 01:45:42 2005 > New Revision: 306554 > > URL: http://svn.apache.org/viewcvs?rev=306554&view=rev > Log: > Applied all fixes to these files in 0.8dev to 0.7 (mainly improving class and id handling) > > Modified: > forrest/branches/forrest_07_branch/main/webapp/resources/stylesheets/html2document.xsl > forrest/branches/forrest_07_branch/main/webapp/skins/common/xslt/html/document2html.xsl > forrest/branches/forrest_07_branch/main/webapp/skins/pelt/xslt/html/document2html.xsl > > Modified: forrest/branches/forrest_07_branch/main/webapp/resources/stylesheets/html2document.xsl > URL: http://svn.apache.org/viewcvs/forrest/branches/forrest_07_branch/main/webapp/resources/stylesheets/html2document.xsl?rev=306554&r1=306553&r2=306554&view=diff > ============================================================================== > --- forrest/branches/forrest_07_branch/main/webapp/resources/stylesheets/html2document.xsl (original) > +++ forrest/branches/forrest_07_branch/main/webapp/resources/stylesheets/html2document.xsl Thu Oct 6 01:45:42 2005 > @@ -1,6 +1,6 @@ > > ]]> > > > > > > - > - > - > - > - > -
> - > - > - > - > - <xsl:apply-templates/> > - <xsl:call-template name="process_h1"/> > - </section> > - </xsl:otherwise> > - </xsl:choose> > + <xsl:apply-templates select="*[1]" mode="next"/> > + <xsl:call-template name="process_h1"/> > </body> > </xsl:template> > > @@ -128,7 +113,7 @@ > </section> > </xsl:for-each> > </xsl:template> > - > + > <!--process each sibling in order until the next heading level--> > > <xsl:template match="*" mode="next"> > @@ -258,9 +243,10 @@ > </xsl:template> > > <xsl:template match="table"> > - <table> > - <xsl:apply-templates select="node()"/> > - </table> > + <xsl:copy> > + <xsl:copy-of select="@*"/> > + <xsl:apply-templates/> > + </xsl:copy> > </xsl:template> > > > > Modified: forrest/branches/forrest_07_branch/main/webapp/skins/common/xslt/html/document2html.xsl > URL: http://svn.apache.org/viewcvs/forrest/branches/forrest_07_branch/main/webapp/skins/common/xslt/html/document2html.xsl?rev=306554&r1=306553&r2=306554&view=diff > ============================================================================== > --- forrest/branches/forrest_07_branch/main/webapp/skins/common/xslt/html/document2html.xsl (original) > +++ forrest/branches/forrest_07_branch/main/webapp/skins/common/xslt/html/document2html.xsl Thu Oct 6 01:45:42 2005 > @@ -1,6 +1,6 @@ > <?xml version="1.0"?> > <!-- > - Copyright 2002-2004 The Apache Software Foundation or its licensors, > + Copyright 2002-2005 The Apache Software Foundation or its licensors, > as applicable. > > Licensed under the Apache License, Version 2.0 (the "License"); > @@ -137,7 +137,7 @@ > > <xsl:template match="note | warning | fixme"> > <xsl:apply-templates select="@id"/> > - <div class="frame {local-name()}"> > + <div class="{local-name()}"> > <div class="label"> > <xsl:choose> > <!-- FIXME: i18n Transformer here --> > @@ -192,6 +192,7 @@ > <xsl:template match="p[@xml:space='preserve']"> > <xsl:apply-templates select="@id"/> > <div class="pre"> > + <xsl:copy-of select="@id"/> > <xsl:apply-templates/> > </div> > </xsl:template> > @@ -200,6 +201,7 @@ > <xsl:apply-templates select="@id"/> > <pre class="code"> > <!-- Temporarily removed long-line-splitter ... gives out-of-memory problems --> > + <xsl:copy-of select="@id"/> > <xsl:apply-templates/> > <!-- > <xsl:call-template name="format"> > @@ -211,36 +213,59 @@ > </xsl:template> > > <xsl:template match="anchor"> > - <a name="{@id}"/> > + <a name="{@id}"> > + <xsl:copy-of select="@id"/> > + </a> > </xsl:template> > > <xsl:template match="icon"> > <xsl:apply-templates select="@id"/> > <img class="icon"> > - <xsl:copy-of select="@height | @width | @src | @alt"/> > + <xsl:copy-of select="@height | @width | @src | @alt | @id"/> > </img> > </xsl:template> > > <xsl:template match="code"> > <xsl:apply-templates select="@id"/> > - <span class="codefrag"><xsl:value-of select="."/></span> > + <span class="codefrag"> > + <xsl:copy-of select="@id"/> > + <xsl:value-of select="."/> > + </span> > </xsl:template> > > <xsl:template match="figure"> > <xsl:apply-templates select="@id"/> > + > <div align="center"> > + <xsl:copy-of select="@id"/> > <img class="figure"> > - <xsl:copy-of select="@height | @width | @src | @alt"/> > + <xsl:copy-of select="@height | @width | @src | @alt | @id"/> > </img> > </div> > </xsl:template> > > <xsl:template match="table"> > <xsl:apply-templates select="@id"/> > - <table cellpadding="4" cellspacing="1" class="ForrestTable"> > - <xsl:copy-of select="@cellspacing | @cellpadding | @border | @class | @bgcolor"/> > - <xsl:apply-templates/> > - </table> > + <xsl:choose> > + <!-- Limit Forrest specific processing to tables without class --> > + <xsl:when test="not(@class) or @class=''"> > + <table cellpadding="4" cellspacing="1" class="ForrestTable"> > + <xsl:copy-of select="@cellspacing | @cellpadding | @border | @class | @bgcolor |@id"/> > + <xsl:apply-templates/> > + </table> > + </xsl:when> > + <xsl:otherwise> > + <!-- Tables with class are passed without change --> > + <xsl:copy> > + <xsl:copy-of select="@*"/> > + <xsl:apply-templates/> > + </xsl:copy> > + > + </xsl:otherwise> > + </xsl:choose> > + <xsl:if test="@class = ''"> > + > + </xsl:if> > </xsl:template> > > <xsl:template match="acronym/@title"> > @@ -359,8 +384,13 @@ > <!-- End of "toc" mode templates --> > > <xsl:template match="node()|@*" priority="-1"> > + <!-- id processing will create its own a-element so processing has to > + happen outside the copied element > + --> > + <xsl:apply-templates select="@id"/> > <xsl:copy> > - <xsl:apply-templates select="@*"/> > + <xsl:apply-templates select="@*[name(.) != 'id']"/> > + <xsl:copy-of select="@id"/> > <xsl:apply-templates/> > </xsl:copy> > </xsl:template> > > Modified: forrest/branches/forrest_07_branch/main/webapp/skins/pelt/xslt/html/document2html.xsl > URL: http://svn.apache.org/viewcvs/forrest/branches/forrest_07_branch/main/webapp/skins/pelt/xslt/html/document2html.xsl?rev=306554&r1=306553&r2=306554&view=diff > ============================================================================== > --- forrest/branches/forrest_07_branch/main/webapp/skins/pelt/xslt/html/document2html.xsl (original) > +++ forrest/branches/forrest_07_branch/main/webapp/skins/pelt/xslt/html/document2html.xsl Thu Oct 6 01:45:42 2005 > @@ -1,6 +1,6 @@ > <?xml version="1.0"?> > <!-- > - Copyright 2002-2004 The Apache Software Foundation or its licensors, > + Copyright 2002-2005 The Apache Software Foundation or its licensors, > as applicable. > > Licensed under the Apache License, Version 2.0 (the "License"); > @@ -136,8 +136,8 @@ > > <xsl:template match="figure"> > <xsl:apply-templates select="@id"/> > - <div style="text-align: center;"> > - <img src="{@src}" alt="{@alt}" class="figure"> > + <div style="text-align: center;" id="{@id}"> > + <img src="{@src}" alt="{@alt}" class="figure" id="{@id}"> > <xsl:if test="@height"> > <xsl:attribute name="height"><xsl:value-of select="@height"/></xsl:attribute> > </xsl:if> >