Author: rgardler
Date: Fri Jun 23 04:57:43 2006
New Revision: 416688
URL: http://svn.apache.org/viewvc?rev=416688&view=rev
Log:
fix list rendering (thanks to Sjur N. Moshagen, FOR-680)
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl
forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl?rev=416688&r1=416687&r2=416688&view=diff
==============================================================================
---
forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl
(original)
+++
forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl
Fri Jun 23 04:57:43 2006
@@ -136,7 +136,7 @@
</xsl:template>
<xsl:template match="st:line" mode="paragraph">
-
<p>--------------------------------------------------------------------------------</p>
+ <hr/>
</xsl:template>
<xsl:template match="st:table" mode="paragraph">
@@ -275,25 +275,25 @@
<xsl:template match="st:bulletedlist1" mode="paragraph">
<ul>
- <xsl:apply-templates select="st:bulletedlistitem1|st:bulletedlist2"/>
+ <xsl:apply-templates select="st:bulletedlistitem1"/>
</ul>
</xsl:template>
<xsl:template match="st:bulletedlistitem1" >
<li>
- <xsl:apply-templates select="st:textsequence/st:textblock/*"/>
+ <xsl:apply-templates
select="st:textsequence/st:textblock/*|following-sibling::st:*[1][name() !=
'bulletedlistitem1']"/>
</li>
</xsl:template>
<xsl:template match="st:bulletedlist2" >
<ul>
- <xsl:apply-templates select="st:bulletedlistitem2|st:bulletedlist3"/>
+ <xsl:apply-templates select="st:bulletedlistitem2"/>
</ul>
</xsl:template>
<xsl:template match="st:bulletedlistitem2" >
<li>
- <xsl:apply-templates select="st:textsequence/st:textblock/*"/>
+ <xsl:apply-templates
select="st:textsequence/st:textblock/*|following-sibling::st:*[1][name() !=
'bulletedlistitem2']"/>
</li>
</xsl:template>
@@ -312,25 +312,25 @@
<xsl:template match="st:numberedlist1" mode="paragraph">
<ol>
- <xsl:apply-templates select="st:numberedlistitem1|st:numberedlist2"/>
+ <xsl:apply-templates select="st:numberedlistitem1"/>
</ol>
</xsl:template>
<xsl:template match="st:numberedlistitem1" >
<li>
- <xsl:apply-templates select="st:textsequence/st:textblock/*"/>
+ <xsl:apply-templates
select="st:textsequence/st:textblock/*|following-sibling::st:*[1][name() !=
'numberedlistitem1']"/>
</li>
</xsl:template>
<xsl:template match="st:numberedlist2" >
<ol>
- <xsl:apply-templates select="st:numberedlistitem2|st:numberedlist3"/>
+ <xsl:apply-templates select="st:numberedlistitem2"/>
</ol>
</xsl:template>
<xsl:template match="st:numberedlistitem2" >
<li>
- <xsl:apply-templates select="st:textsequence/st:textblock/*"/>
+ <xsl:apply-templates
select="st:textsequence/st:textblock/*|following-sibling::st:*[1][name() !=
'numberedlistitem2']"/>
</li>
</xsl:template>
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml?rev=416688&r1=416687&r2=416688&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml
(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Fri
Jun 23 04:57:43 2006
@@ -24,6 +24,12 @@
<changes>
<release version="0.2-dev" date="not-released">
+ <action type="fix" context="code" dev="RDG" fixes-bug="680"
+ due-to="Sjur N. Moshagen, Gavin">
+ Corrected processing of nested lists so that sub-lists are properly
+ nested within the LI of the outer list, thus bringing the output in
+ accordance with the HTML DTD.
+ </action>
<action type="add" context="code" dev="RDG" importance="high">
Use locationmap for resolution of resources and files. Resources are
exposed via
{lm:wiki.*}
