Index: tests/com/ecyrd/jspwiki/htmltowiki/HtmlStringToWikiTranslatorTest.java =================================================================== --- tests/com/ecyrd/jspwiki/htmltowiki/HtmlStringToWikiTranslatorTest.java (revision 749505) +++ tests/com/ecyrd/jspwiki/htmltowiki/HtmlStringToWikiTranslatorTest.java (working copy) @@ -163,14 +163,14 @@ public void testPre() throws Exception { - assertEquals( "\n{{{\nhallo\n}}}\n", html2wiki.translate( "
hallo" ) ); + assertEquals( "\n{{{hallo}}}\n", html2wiki.translate( "
hallo" ) ); - assertEquals( "\n{{{\nHallo\nWelt!\n\n\n}}}\n", html2wiki.translate( "
Hallo" ) ); + assertEquals( "\n{{{Hallo\nWelt!\n\n}}}\n", html2wiki.translate( "
Welt!
Hallo" ) ); - assertEquals( "\n{{{\n\n\n\n\nHallo\n\n\n\nWelt!\n\n\n\n\n}}}\n", html2wiki + assertEquals( "\n{{{\n\n\n\nHallo\n\n\n\nWelt!\n\n\n\n}}}\n", html2wiki .translate( "\n\n\n\n
Welt!
\n\n\n\nHallo\n\n\n\nWelt!\n\n\n\n\n\n\n\n" ) ); - assertEquals( "\n{{{\n\n\n* Baltramon \n lasdjfh\n\n\n}}}\n", html2wiki.translate( "
\n\n* Baltramon \n lasdjfh\n\n" ) ); + assertEquals( "\n{{{\n\n* Baltramon \n lasdjfh\n\n}}}\n", html2wiki.translate( "
\n\n* Baltramon \n lasdjfh\n\n" ) ); /* // The style "font-family: courier new" is no longer translated as monospace text, so this test case is no longer needed. Index: src/com/ecyrd/jspwiki/htmltowiki/XHtmlElementToWikiTranslator.java =================================================================== --- src/com/ecyrd/jspwiki/htmltowiki/XHtmlElementToWikiTranslator.java (revision 749505) +++ src/com/ecyrd/jspwiki/htmltowiki/XHtmlElementToWikiTranslator.java (working copy) @@ -518,14 +518,14 @@ } else if( n.equals( "pre" ) ) { - m_out.print( "\n{{{\n" ); // start JSPWiki "code blocks" on its own line + m_out.print( "\n{{{" ); // start JSPWiki "code blocks" on its own line m_preStack.push(); print( e ); m_preStack.pop(); - // print a newline before the closing braces for aesthetics and a newline after it + // print a newline after the closing braces // to avoid breaking any subsequent wiki markup that follows. - m_out.print( "\n}}}\n" ); + m_out.print( "}}}\n" ); } else if( n.equals( "code" ) || n.equals( "tt" ) ) {