Merge branch 'master' into subtree

[nikiroo-utils.git] / output / Html.java

diff --git a/output/Html.java b/output/Html.java
index ca802a50b60770c73d1ceef3388037a2222c1482..f81ea1dc5f643d20de832dcd96b48ec4070172ab 100644 (file)
--- a/output/Html.java
+++ b/output/Html.java
@@ -50,8 +50,7 @@ class Html extends BasicOutput {
                                .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;
@@ -91,7 +90,7 @@ class Html extends BasicOutput {
                        author = meta.getAuthor();
                }
 
-               String format = Instance.getConfig()
+               String format = Instance.getInstance().getConfig()
                                .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'>&mdash; ");
                        break;
                case IMAGE:
-                       // TODO
+                       // TODO check if images work OK
                        writer.write("<a href='"
                                        + StringUtils.xmlEscapeQuote(para.getContent()) + "'>"
                                        + StringUtils.xmlEscape(para.getContent()) + "</a>");