Index: jrst2/src/java/org/codelutin/jrst/JRSTLexer.java diff -u jrst2/src/java/org/codelutin/jrst/JRSTLexer.java:1.4 jrst2/src/java/org/codelutin/jrst/JRSTLexer.java:1.5 --- jrst2/src/java/org/codelutin/jrst/JRSTLexer.java:1.4 Fri Nov 10 14:21:11 2006 +++ jrst2/src/java/org/codelutin/jrst/JRSTLexer.java Mon Dec 18 15:57:28 2006 @@ -23,9 +23,9 @@ * Created: 28 oct. 06 00:44:20 * * @author poussin - * @version $Revision: 1.4 $ + * @version $Revision: 1.5 $ * - * Last update: $Date: 2006/11/10 14:21:11 $ + * Last update: $Date: 2006/12/18 15:57:28 $ * by : $Author: bpoussin $ */ @@ -449,8 +449,6 @@ } public Element peekTable() throws IOException { - // TODO now we take table as LITERAL_BLOCK, but in near - // futur we must parse correctly TABLE (show JRSTGenerator and JRSTReader too) beginPeek(); Element result = null; @@ -632,6 +630,10 @@ // // result.addText(line); } else if (line.matches("^\\s*(=+ +)+=+\\s*$")) { // simple table + // TODO now we take table as LITERAL_BLOCK, but in near + // futur we must parse correctly TABLE (show JRSTGenerator and JRSTReader too) + + // dans les tables simples il peut y avoir des lignes blanches au // milieu. Mais la premiere et la derniere lignes sont identiques // TODO cela ne parse pas la table, il faut le faire Index: jrst2/src/java/org/codelutin/jrst/JRSTReader.java diff -u jrst2/src/java/org/codelutin/jrst/JRSTReader.java:1.4 jrst2/src/java/org/codelutin/jrst/JRSTReader.java:1.5 --- jrst2/src/java/org/codelutin/jrst/JRSTReader.java:1.4 Fri Nov 10 14:21:11 2006 +++ jrst2/src/java/org/codelutin/jrst/JRSTReader.java Mon Dec 18 15:57:28 2006 @@ -23,9 +23,9 @@ * Created: 27 oct. 06 00:15:34 * * @author poussin - * @version $Revision: 1.4 $ + * @version $Revision: 1.5 $ * - * Last update: $Date: 2006/11/10 14:21:11 $ + * Last update: $Date: 2006/12/18 15:57:28 $ * by : $Author: bpoussin $ */ @@ -643,11 +643,10 @@ entry.addAttribute("morecols", String.valueOf(morecols)); } - // FIXME parse entry text in table + // parse entry text in table JRSTReader reader = new JRSTReader(); Document doc = reader.read(new StringReader(text)); entry.appendContent(doc.getRootElement()); -// entry.setText(text); } } if ("true".equals(rows.get(r).attributeValue(JRSTLexer.ROW_END_HEADER))) {