You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by je...@apache.org on 2002/03/18 21:42:58 UTC
cvs commit: xml-cocoon2/src/scratchpad/webapp/mount/editor/editor/stylesheets editor-bravo-components.xsl generation-utils.xsl
jeremy 02/03/18 12:42:58
Modified: src/scratchpad/webapp/mount/editor/editor/stylesheets
editor-bravo-components.xsl generation-utils.xsl
Log:
experimental addition to 'bravo' editor, you can now write b|i|em|strong|ul|li in the body. NB. no well-formed check are done before writing, so it is possible to write mal-formed XML
Revision Changes Path
1.6 +3 -3 xml-cocoon2/src/scratchpad/webapp/mount/editor/editor/stylesheets/editor-bravo-components.xsl
Index: editor-bravo-components.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/scratchpad/webapp/mount/editor/editor/stylesheets/editor-bravo-components.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- editor-bravo-components.xsl 18 Mar 2002 18:27:51 -0000 1.5
+++ editor-bravo-components.xsl 18 Mar 2002 20:42:58 -0000 1.6
@@ -69,15 +69,15 @@
<br/>
</xsl:template>
- <!--<xsl:template match="b|i|a|strong|em|ul|ol|li" mode="bravo"><xsl:copy><xsl:apply-templates select="@*|*|text()"/></xsl:copy></xsl:template>
+ <xsl:template match="b|i|a|strong|em|ul|ol|li" mode="bravo"><xsl:copy><xsl:apply-templates select="@*|*|text()"/></xsl:copy></xsl:template>
<xsl:template match="br" mode="bravo">
<xsl:text>
</xsl:text>
- </xsl:template>-->
+ </xsl:template><!---->
<xsl:template match="para" mode="bravo"><!-- strips 'br' tags, so they need a CR after them to survive! -->
- <xsl:value-of select="."/>
+ <xsl:apply-templates mode="bravo"/>
<xsl:text>
</xsl:text>
1.2 +2 -2 xml-cocoon2/src/scratchpad/webapp/mount/editor/editor/stylesheets/generation-utils.xsl
Index: generation-utils.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/scratchpad/webapp/mount/editor/editor/stylesheets/generation-utils.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- generation-utils.xsl 17 Mar 2002 21:26:55 -0000 1.1
+++ generation-utils.xsl 18 Mar 2002 20:42:58 -0000 1.2
@@ -59,14 +59,14 @@
<xsl:param name="text"/>
<xsl:choose>
<xsl:when test="normalize-space(substring-before($text,'
')) != ''">
-<xsl:value-of select="normalize-space(substring-before($text,'
'))"/><br/>
+<xsl:value-of disable-output-escaping="yes" select="normalize-space(substring-before($text,'
'))"/><br/>
<xsl:text>
</xsl:text>
<xsl:call-template name="cr2br">
<xsl:with-param name="text"><xsl:value-of select="substring-after($text,'
')"/></xsl:with-param>
</xsl:call-template>
</xsl:when>
- <xsl:when test="normalize-space($text) != ''"><xsl:value-of select="$text"/></xsl:when>
+ <xsl:when test="normalize-space($text) != ''"><xsl:value-of disable-output-escaping="yes" select="$text"/></xsl:when>
</xsl:choose>
</xsl:template>
----------------------------------------------------------------------
In case of troubles, e-mail: webmaster@xml.apache.org
To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org