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
/
Html.java
diff --git
a/src/be/nikiroo/fanfix/output/Html.java
b/src/be/nikiroo/fanfix/output/Html.java
index ca802a50b60770c73d1ceef3388037a2222c1482..f81ea1dc5f643d20de832dcd96b48ec4070172ab 100644
(file)
--- a/
src/be/nikiroo/fanfix/output/Html.java
+++ b/
src/be/nikiroo/fanfix/output/Html.java
@@
-50,8
+50,7
@@
class Html extends BasicOutput {
.process(story, dir, targetNameOrig);
if (story.getMeta().getCover() != null) {
.process(story, dir, targetNameOrig);
if (story.getMeta().getCover() != null) {
- Instance.getCache().saveAsImage(story.getMeta().getCover(),
- new File(dir, "cover"), true);
+ Instance.getInstance().getCache().saveAsImage(story.getMeta().getCover(), new File(dir, "cover"), true);
}
return target;
}
return target;
@@
-91,7
+90,7
@@
class Html extends BasicOutput {
author = meta.getAuthor();
}
author = meta.getAuthor();
}
- String format = Instance.getConfig()
+ String format = Instance.get
Instance().get
Config()
.getString(Config.FILE_FORMAT_IMAGE_FORMAT_COVER).toLowerCase();
InputStream inStyle = getClass().getResourceAsStream("html.style.css");
.getString(Config.FILE_FORMAT_IMAGE_FORMAT_COVER).toLowerCase();
InputStream inStyle = getClass().getResourceAsStream("html.style.css");
@@
-217,7
+216,7
@@
class Html extends BasicOutput {
writer.write(" <div class='dialogue'>— ");
break;
case IMAGE:
writer.write(" <div class='dialogue'>— ");
break;
case IMAGE:
- // TODO
+ // TODO
check if images work OK
writer.write("<a href='"
+ StringUtils.xmlEscapeQuote(para.getContent()) + "'>"
+ StringUtils.xmlEscape(para.getContent()) + "</a>");
writer.write("<a href='"
+ StringUtils.xmlEscapeQuote(para.getContent()) + "'>"
+ StringUtils.xmlEscape(para.getContent()) + "</a>");