Author: tmortagne Date: 2009-09-09 12:53:09 +0200 (Wed, 09 Sep 2009) New Revision: 23372 Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ java/org/xwiki/rendering/internal/renderer/printer/ XWikiSyntaxEscapeWikiPrinter.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ java/org/xwiki/rendering/internal/renderer/xwiki/ XWikiSyntaxChainingRenderer.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ java/org/xwiki/rendering/internal/renderer/xwiki/ XWikiSyntaxEscapeHandler.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ java/org/xwiki/rendering/internal/renderer/xwiki/ XWikiSyntaxLinkRenderer.java platform/core/trunk/xwiki-rendering/xwiki-rendering-parsers/xwiki- rendering-parser-wikimodel/src/main/java/org/xwiki/rendering/ internal/parser/wikimodel/xhtml/XWikiCommentHandler.java platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/ java/org/xwiki/rendering/SimpleRenderingTests.java platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/ resources/link/links14.test platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/ resources/link/links6.test Log: XWIKI-4294: xhtml renderer wrong escape reference in the startlink html comment XWIKI-4194: Inconsistent behavior when escaping "-" symbols * improve a little escaping in links labels (less useless escaping)

Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/ src/test/java/org/xwiki/rendering/SimpleRenderingTests.java =================================================================== --- platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/ test/java/org/xwiki/rendering/SimpleRenderingTests.java 2009-09-09 10:43:50 UTC (rev 23371) +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/ test/java/org/xwiki/rendering/SimpleRenderingTests.java 2009-09-09 10:53:09 UTC (rev 23372) @@ -204,6 +204,26 @@ suite.addTestsFromResource("misc/misc7", false); suite.addTestsFromResource("encoding/encoding1", false); + suite.addTestsFromResource("escape/escape1", false); + suite.addTestsFromResource("escape/escape2", false); + suite.addTestsFromResource("escape/escape3", false); + suite.addTestsFromResource("escape/escape4", false); + suite.addTestsFromResource("escape/escape5", false); + suite.addTestsFromResource("escape/escape6", false); + suite.addTestsFromResource("escape/escape7", false); + suite.addTestsFromResource("escape/escape8", false); + suite.addTestsFromResource("escape/escape9", false); + suite.addTestsFromResource("escape/escape10", false); + suite.addTestsFromResource("escape/escape11", false); + suite.addTestsFromResource("escape/escape12", false); + suite.addTestsFromResource("escape/escape13", false); + suite.addTestsFromResource("escape/escape14", false); + suite.addTestsFromResource("escape/escape15", false); + suite.addTestsFromResource("escape/escape16", false); + suite.addTestsFromResource("escape/escape17", false); + suite.addTestsFromResource("escape/escape18", false); + suite.addTestsFromResource("escape/escape19", false);

return new ComponentManagerTestSetup(suite); } } Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/ src/test/resources/link/links14.test =================================================================== --- platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/ test/resources/link/links14.test 2009-09-09 10:43:50 UTC (rev 23371) +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/ test/resources/link/links14.test 2009-09-09 10:53:09 UTC (rev 23372) @@ -24,7 +24,7 @@ .#----------------------------------------------------- .expect|xwiki/2.0 .#----------------------------------------------------- -[[[[image:attach.png~|~|height="100" width="100"~]~]>>http://xwiki.org ||param="value"]] +[[[[image:attach.png||height="100" width="100"]]>>http://xwiki.org|| param="value"]]

.#----------------------------------------------------- .input|xhtml/1.0 .#----------------------------------------------------- Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/ src/test/resources/link/links6.test =================================================================== --- platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/ test/resources/link/links6.test 2009-09-09 10:43:50 UTC (rev 23371) +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/ test/resources/link/links6.test 2009-09-09 10:53:09 UTC (rev 23372) @@ -55,7 +55,7 @@ [[Label>Reference]] [[Reference|Param=Value]] [[[[no link]]>>Reference]] -[[~~[~~[image:whatever>>Reference]] +[[~[~[image:whatever>>Reference]]