Index: jrst/src/java/org/codelutin/jrst/HtmlGenerator.java
diff -u jrst/src/java/org/codelutin/jrst/HtmlGenerator.java:1.10 jrst/src/java/org/codelutin/jrst/HtmlGenerator.java:1.11
--- jrst/src/java/org/codelutin/jrst/HtmlGenerator.java:1.10 Fri Jul 30 17:23:15 2004
+++ jrst/src/java/org/codelutin/jrst/HtmlGenerator.java Tue Aug 3 16:10:59 2004
@@ -23,10 +23,10 @@
*
* @author Benjamin Poussin
* Copyright Code Lutin
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*
- * Mise a jour: $Date: 2004/07/30 17:23:15 $
- * par : $Author: bucas $
+ * Mise a jour: $Date: 2004/08/03 16:10:59 $
+ * par : $Author: bpoussin $
*/
package org.codelutin.jrst;
@@ -127,7 +127,7 @@
public void generate(FieldList e){
- String classTerm = null;
+ String classTerm = "";
if (e == doc.getBibliographic()) {
os.println(getIndent()+"");
os.println(getIndent()+"");
@@ -281,7 +281,7 @@
}
}
- os.println(img+">");
+ os.println(img+"/>");
if (comment != null) {
os.println(getIndent()+""+comment+"
");
}
@@ -392,7 +392,7 @@
inHead = false;
}
}
- os.println(getIndent()+"
");
+ os.println(getIndent()+"");
}
@@ -478,6 +478,7 @@
* Permet de convertir les caratere speciaux HTML du texte
*/
protected String encode(String s){
+ s = s.replaceAll("&", "&"); // first all the time
s = s.replaceAll("<", "<");
s = s.replaceAll(">", ">");
return s;
Index: jrst/src/java/org/codelutin/jrst/XdocGenerator.java
diff -u jrst/src/java/org/codelutin/jrst/XdocGenerator.java:1.5 jrst/src/java/org/codelutin/jrst/XdocGenerator.java:1.6
--- jrst/src/java/org/codelutin/jrst/XdocGenerator.java:1.5 Fri Jul 30 12:58:00 2004
+++ jrst/src/java/org/codelutin/jrst/XdocGenerator.java Tue Aug 3 16:10:59 2004
@@ -33,13 +33,20 @@
public void generate(Document e){
doc = e;
+ String title = "NoTitle";
+ if (e.getTitle() != null){
+ title = e.getTitle().getText();
+ if(title != null){
+ title = title.trim();
+ }
+ }
+
os.println("");
os.println("\n");
- if (e.getTitle() != null)
- os.println(""+encode(e.getTitle().getText())+"");
+ os.println(""+encode(title)+"");
os.println("\n");
- os.println("");
+ os.println("");
for(Iterator i=e.getChilds().iterator(); i.hasNext();){
visit((Element)i.next());