X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FEpub.java;h=1ff6888ac42e13a185b2e1bda96b3ab9c552aa3d;hb=5083ef84efb7e001c0b5de235d3424e1b59c62f4;hp=3e875aa11a036f6a0c72edf87b8ead77cc4db209;hpb=3d247bc3bb955a9b85686f0db431157cb9dc4a10;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/output/Epub.java b/src/be/nikiroo/fanfix/output/Epub.java
index 3e875aa..1ff6888 100644
--- a/src/be/nikiroo/fanfix/output/Epub.java
+++ b/src/be/nikiroo/fanfix/output/Epub.java
@@ -6,7 +6,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStreamWriter;
-import java.net.URL;
 
 import javax.imageio.ImageIO;
 
@@ -32,7 +31,7 @@ class Epub extends BasicOutput {
 	public File process(Story story, File targetDir, String targetName)
 			throws IOException {
 		String targetNameOrig = targetName;
-		targetName += getDefaultExtension();
+		targetName += getDefaultExtension(false);
 
 		tmpDir = File.createTempFile("fanfic-reader-epub_", ".wip");
 		tmpDir.delete();
@@ -45,7 +44,9 @@ class Epub extends BasicOutput {
 		// "Originals"
 		File data = new File(tmpDir, "DATA");
 		data.mkdir();
-		new InfoText().process(story, data, targetNameOrig);
+		BasicOutput.getOutput(OutputType.TEXT, isWriteInfo()).process(story,
+				data, targetNameOrig);
+		InfoCover.writeInfo(data, targetNameOrig, story.getMeta());
 		IOUtils.writeSmallFile(data, "version", "3.0");
 
 		super.process(story, targetDir, targetNameOrig);
@@ -60,7 +61,7 @@ class Epub extends BasicOutput {
 	}
 
 	@Override
-	public String getDefaultExtension() {
+	public String getDefaultExtension(boolean readerTarget) {
 		return ".epub";
 	}
 
@@ -198,7 +199,7 @@ class Epub 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'>");
@@ -208,7 +209,7 @@ class Epub extends BasicOutput {
 			break;
 		case IMAGE:
 			File file = new File(images, getCurrentImageBestName(false));
-			Instance.getCache().saveAsImage(new URL(para.getContent()), file);
+			Instance.getCache().saveAsImage(para.getContentImage(), file);
 			writer.write("			<img class='page-image' src='images/"
 					+ getCurrentImageBestName(false) + "'/>");
 			break;