git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'subtree'
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
fanfix
/
output
/
Text.java
diff --git
a/src/be/nikiroo/fanfix/output/Text.java
b/src/be/nikiroo/fanfix/output/Text.java
index ee72385b32220c479e1e03ad2d8a378f59539e49..f0516dc629ebca9bf65b7bf86fa559028004f622 100644
(file)
--- a/
src/be/nikiroo/fanfix/output/Text.java
+++ b/
src/be/nikiroo/fanfix/output/Text.java
@@
-17,6
+17,7
@@
import be.nikiroo.fanfix.data.Story;
class Text extends BasicOutput {
protected BufferedWriter writer;
protected File targetDir;
class Text extends BasicOutput {
protected BufferedWriter writer;
protected File targetDir;
+ private boolean nextParaIsCover = true;
@Override
public File process(Story story, File targetDir, String targetName)
@Override
public File process(Story story, File targetDir, String targetName)
@@
-61,8
+62,7
@@
class Text extends BasicOutput {
writer.write(title);
writer.write("\n");
if (author != null && !author.isEmpty()) {
writer.write(title);
writer.write("\n");
if (author != null && !author.isEmpty()) {
- writer.write(Instance.getTrans().getString(StringId.BY) + " "
- + author);
+ writer.write(Instance.getInstance().getTrans().getString(StringId.BY) + " " + author);
}
if (date != null && !date.isEmpty()) {
writer.write(" (");
}
if (date != null && !date.isEmpty()) {
writer.write(" (");
@@
-81,11
+81,9
@@
class Text extends BasicOutput {
protected void writeChapterHeader(Chapter chap) throws IOException {
String txt;
if (chap.getName() != null && !chap.getName().isEmpty()) {
protected void writeChapterHeader(Chapter chap) throws IOException {
String txt;
if (chap.getName() != null && !chap.getName().isEmpty()) {
- txt = Instance.getTrans().getString(StringId.CHAPTER_NAMED,
- chap.getNumber(), chap.getName());
+ txt = Instance.getInstance().getTrans().getString(StringId.CHAPTER_NAMED, chap.getNumber(), chap.getName());
} else {
} else {
- txt = Instance.getTrans().getString(StringId.CHAPTER_UNNAMED,
- chap.getNumber());
+ txt = Instance.getInstance().getTrans().getString(StringId.CHAPTER_UNNAMED, chap.getNumber());
}
writer.write("\n" + txt + "\n");
}
writer.write("\n" + txt + "\n");
@@
-104,8
+102,14
@@
class Text extends BasicOutput {
protected void writeParagraphHeader(Paragraph para) throws IOException {
if (para.getType() == ParagraphType.IMAGE) {
File file = new File(targetDir, getCurrentImageBestName(true));
protected void writeParagraphHeader(Paragraph para) throws IOException {
if (para.getType() == ParagraphType.IMAGE) {
File file = new File(targetDir, getCurrentImageBestName(true));
- Instance.getCache().saveAsImage(para.getContentImage(), file);
+ try {
+ Instance.getInstance().getCache().saveAsImage(para.getContentImage(), file, nextParaIsCover);
+ } catch (IOException e) {
+ Instance.getInstance().getTraceHandler().error(new IOException("Cannot save an image", e));
+ }
}
}
+
+ nextParaIsCover = false;
}
@Override
}
@Override