Index: jrst/src/java/org/codelutin/jrst/HtmlGenerator.java
diff -u jrst/src/java/org/codelutin/jrst/HtmlGenerator.java:1.11 jrst/src/java/org/codelutin/jrst/HtmlGenerator.java:1.12
--- jrst/src/java/org/codelutin/jrst/HtmlGenerator.java:1.11	Tue Aug  3 16:10:59 2004
+++ jrst/src/java/org/codelutin/jrst/HtmlGenerator.java	Thu Aug 12 20:02:00 2004
@@ -23,10 +23,10 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
  *
- * Mise a jour: $Date: 2004/08/03 16:10:59 $
- * par : $Author: bpoussin $
+ * Mise a jour: $Date: 2004/08/12 20:02:00 $
+ * par : $Author: bucas $
  */
 
 package org.codelutin.jrst;
@@ -467,6 +467,24 @@
        return text.toLowerCase().trim().replace(' ','-');
    }
 
+<<<<<<< HtmlGenerator.java
+   /**
+    * Encode pour les expressions régulières
+    */
+   public String encodeSpecChar(String text) {
+       return text.replaceAll("\\(", "\\\\(").replaceAll("\\)","\\\\)").replaceAll("\\[","\\\\[").replaceAll("\\]","\\\\]");
+   }
+
+   /**
+   * Permet de convertir les caratere speciaux HTML du texte
+   */
+   protected String encode(String s){
+       s = s.replaceAll("<", "&lt;");
+       s = s.replaceAll(">", "&gt;");
+       return s;
+   }
+
+=======
    /**
     * Encode pour les expressions régulières
     */
@@ -484,6 +502,7 @@
        return s;
    }
 
+>>>>>>> 1.11
    public String inlineMarkup(String text) {
        String before = "(^|[ '\"(\\[<])";
        String after = "([ '\".,:\\;!?)\\]}/\\>]|$)";