Author: sjur Date: Fri Jan 18 22:36:06 2013 New Revision: 1435381 URL: http://svn.apache.org/viewvc?rev=1435381&view=rev Log: The recent changes introduced one regression - linebreaks triggered new paragraphs where they shouldn't. Now newlines in the middle of a paragraph doesn't introduce a new paragaph anymore, and everything else seems to be the same.
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm?rev=1435381&r1=1435380&r2=1435381&view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm Fri Jan 18 22:36:06 2013 @@ -133,18 +133,18 @@ subsubsection ; title - : titleitem textsequence - | titleitem textsequence hardbreak + : titleitem limitedtextsequence + | titleitem limitedtextsequence hardbreak ; subtitle - : subtitleitem textsequence - | subtitleitem textsequence hardbreak + : subtitleitem limitedtextsequence + | subtitleitem limitedtextsequence hardbreak ; subsubtitle - : subsubtitleitem textsequence - | subsubtitleitem textsequence hardbreak + : subsubtitleitem limitedtextsequence + | subsubtitleitem limitedtextsequence hardbreak ; paragraphs @@ -259,15 +259,23 @@ tablecolumn ; limitedtextsequence - : textblock break limitedtextsequence - | textblock limitedtextsequence - | textblock + : limitedtextblock limitedtextsequence + | limitedtextblock ; +limitedtextblock + : link + | anchor + | strongblock + | emblock + | text + | codeblock + | deftermdefstart + | break + ; + textsequence - : textblock textsequence softbreak - | textblock textsequence - | textblock softbreak + : textblock textsequence | textblock ; @@ -280,6 +288,7 @@ textblock | codeblock | deftermdefstart | break + | softbreak ; termtextsequence 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=1435381&r1=1435380&r2=1435381&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 Jan 18 22:36:06 2013 @@ -134,19 +134,19 @@ <!-- Sections: --> <xsl:template match="st:section"> <section> - <title><xsl:value-of select="st:title/st:textsequence"/></title> + <title><xsl:value-of select="st:title/st:limitedtextsequence"/></title> <xsl:apply-templates select="st:paragraphs/st:paragraph/*|st:subsections/st:subsection" mode="paragraph"/> </section> </xsl:template> <xsl:template match="st:subsection" mode="paragraph"> <section> - <title><xsl:value-of select="st:subtitle/st:textsequence"/></title> + <title><xsl:value-of select="st:subtitle/st:limitedtextsequence"/></title> <xsl:apply-templates select="st:paragraphs/st:paragraph/*|st:subsubsections/st:subsubsection" mode="paragraph"/> </section> </xsl:template> <xsl:template match="st:subsubsection" mode="paragraph"> <section> - <title><xsl:value-of select="st:subsubtitle/st:textsequence"/></title> + <title><xsl:value-of select="st:subsubtitle/st:limitedtextsequence"/></title> <xsl:apply-templates select="st:paragraphs/st:paragraph/*" mode="paragraph"/> </section> </xsl:template> @@ -191,7 +191,7 @@ <xsl:template match="st:tablecolumn"> <td> - <xsl:apply-templates select="st:limitedtextsequence/st:textblock/* + <xsl:apply-templates select="st:limitedtextsequence/st:limitedtextblock/* | st:limitedtextsequence/st:break"/> </td> </xsl:template>