Author: echatellier Date: 2011-03-10 15:21:35 +0100 (Thu, 10 Mar 2011) New Revision: 559 Url: http://nuiton.org/repositories/revision/jrst/559 Log: Fix #1291: Multiline table cell generation as d?\195?\169finition Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-03-10 14:17:00 UTC (rev 558) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-03-10 14:21:35 UTC (rev 559) @@ -1833,7 +1833,7 @@ if (lines.length == 2) { int level = level(lines[0]); int levelDef = level(lines[1]); - if (level < levelDef) { + if ((levelDef != lines[1].length()) && (level < levelDef)) { in.unread(lines[1], true); Pattern pattern = Pattern.compile("^\\s*([^:]+)(?: : (.*))?"); Matcher matcher = pattern.matcher(lines[0]); Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java 2011-03-10 14:17:00 UTC (rev 558) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java 2011-03-10 14:21:35 UTC (rev 559) @@ -58,8 +58,9 @@ JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); + System.out.println(content); Assert.assertTrue(content.indexOf("Annee|Trait|Espece") > 0); - Assert.assertTrue(content.indexOf("Fatal") > 0); + Assert.assertTrue(content.indexOf("<p>Fatal</p>") > 0); } /**