Index: jrst2/src/java/org/codelutin/jrst/JRST.java diff -u jrst2/src/java/org/codelutin/jrst/JRST.java:1.15 jrst2/src/java/org/codelutin/jrst/JRST.java:1.16 --- jrst2/src/java/org/codelutin/jrst/JRST.java:1.15 Fri Nov 30 14:59:13 2007 +++ jrst2/src/java/org/codelutin/jrst/JRST.java Mon Mar 3 15:21:18 2008 @@ -23,10 +23,10 @@ * Created: 3 nov. 06 20:56:00 * * @author poussin - * @version $Revision: 1.15 $ + * @version $Revision: 1.16 $ * - * Last update: $Date: 2007-11-30 14:59:13 $ - * by : $Author: chatellier $ + * Last update: $Date: 2008-03-03 15:21:18 $ + * by : $Author: glandais $ */ package org.codelutin.jrst; @@ -348,6 +348,11 @@ line=""; return line; } + + public static void generate(String xslListOrOutType, File fileIn, File fileOut, Overwrite overwrite) throws Exception { + generate(xslListOrOutType, fileIn, "ISO-8859-15", fileOut, "ISO-8859-15", overwrite); + } + /** * * @param xslListOrOutType @@ -357,7 +362,7 @@ * @throws Exception */ - public static void generate(String xslListOrOutType, File fileIn, File fileOut, Overwrite overwrite) throws Exception { + public static void generate(String xslListOrOutType, File fileIn, String inputEncoding, File fileOut, String outputEncoding, Overwrite overwrite) throws Exception { if (fileOut != null && fileOut.exists() && (overwrite == Overwrite.NEVER || (overwrite == Overwrite.IFNEWER && FileUtil @@ -375,7 +380,7 @@ // parse rst file URL url = fileIn.toURL(); - Reader in = new InputStreamReader(url.openStream()); + Reader in = new InputStreamReader(url.openStream(), inputEncoding); JRSTReader jrst = new JRSTReader(); Document doc = jrst.read(in); @@ -443,11 +448,11 @@ XMLWriter out = null; if (fileOut != null) { fileOut.getAbsoluteFile().getParentFile().mkdirs(); - - out = new XMLWriter(new FileWriter(fileOut), new OutputFormat( - " ", true,"ISO-8859-1")); + + out = new XMLWriter(FileUtil.getWriter(fileOut, outputEncoding), new OutputFormat( + " ", true,outputEncoding)); } else { - out = new XMLWriter(System.out, new OutputFormat(" ", true, "ISO-8859-1")); + out = new XMLWriter(System.out, new OutputFormat(" ", true, outputEncoding)); } // write generated document out.write(doc);