X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FHtml.java;h=dca0fc4a7d1bb48f45a8bd4b502ad5bdfb35b580;hb=a9eb3f46dd83115e7a549e96e800b932162b68ad;hp=fcffec67a2a5403c300b19a5d712f487d2817f6d;hpb=5ced20e4bd8a7d175e044fe5cdbf02e1bd8e1d26;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/output/Html.java b/src/be/nikiroo/fanfix/output/Html.java
index fcffec6..dca0fc4 100644
--- a/src/be/nikiroo/fanfix/output/Html.java
+++ b/src/be/nikiroo/fanfix/output/Html.java
@@ -1,9 +1,11 @@
 package be.nikiroo.fanfix.output;
 
+import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStreamWriter;
 
 import javax.imageio.ImageIO;
 
@@ -19,7 +21,7 @@ import be.nikiroo.utils.StringUtils;
 
 class Html extends BasicOutput {
 	private File dir;
-	protected FileWriter writer;
+	protected BufferedWriter writer;
 	private boolean inDialogue = false;
 	private boolean inNormal = false;
 
@@ -32,12 +34,15 @@ class Html extends BasicOutput {
 		target.mkdir();
 		dir = target;
 
-		targetName = new File(targetName, "index").getPath();
-		targetName += getDefaultExtension();
+		// write a copy of the originals inside
+		InfoCover.writeInfo(dir, targetName, story.getMeta());
+		InfoCover.writeCover(dir, targetName, story.getMeta());
+		new InfoText().process(story, dir, targetNameOrig);
 
-		target = new File(targetDir, targetName);
+		target = new File(targetDir, targetName + getDefaultExtension(true));
 
-		writer = new FileWriter(target);
+		writer = new BufferedWriter(new OutputStreamWriter(
+				new FileOutputStream(target), "UTF-8"));
 		try {
 			super.process(story, targetDir, targetNameOrig);
 		} finally {
@@ -56,8 +61,12 @@ class Html extends BasicOutput {
 	}
 
 	@Override
-	public String getDefaultExtension() {
-		return File.separator + "index.html";
+	public String getDefaultExtension(boolean readerTarget) {
+		if (readerTarget) {
+			return File.separator + "index.html";
+		} else {
+			return "";
+		}
 	}
 
 	@Override
@@ -202,7 +211,7 @@ class Html extends BasicOutput {
 			writer.write("		<div class='blank'></div>");
 			break;
 		case BREAK:
-			writer.write("		<hr/>");
+			writer.write("		<hr class='break'/>");
 			break;
 		case NORMAL:
 			writer.write("		<span class='normal'>");