X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FLaTeX.java;h=a406fc35fd425635baad02e6335de0cbaf0a9f61;hp=d322e4a7f3e67fd99ac71b6cf8fa6724fa86f6f6;hb=HEAD;hpb=3d247bc3bb955a9b85686f0db431157cb9dc4a10

diff --git a/src/be/nikiroo/fanfix/output/LaTeX.java b/src/be/nikiroo/fanfix/output/LaTeX.java
index d322e4a..a406fc3 100644
--- a/src/be/nikiroo/fanfix/output/LaTeX.java
+++ b/src/be/nikiroo/fanfix/output/LaTeX.java
@@ -19,20 +19,16 @@ class LaTeX extends BasicOutput {
 	private boolean lastWasQuote = false;
 
 	// quote chars
-	private char openQuote = Instance.getTrans().getChar(
-			StringId.OPEN_SINGLE_QUOTE);
-	private char closeQuote = Instance.getTrans().getChar(
-			StringId.CLOSE_SINGLE_QUOTE);
-	private char openDoubleQuote = Instance.getTrans().getChar(
-			StringId.OPEN_DOUBLE_QUOTE);
-	private char closeDoubleQuote = Instance.getTrans().getChar(
-			StringId.CLOSE_DOUBLE_QUOTE);
+	private char openQuote = Instance.getInstance().getTrans().getCharacter(StringId.OPEN_SINGLE_QUOTE);
+	private char closeQuote = Instance.getInstance().getTrans().getCharacter(StringId.CLOSE_SINGLE_QUOTE);
+	private char openDoubleQuote = Instance.getInstance().getTrans().getCharacter(StringId.OPEN_DOUBLE_QUOTE);
+	private char closeDoubleQuote = Instance.getInstance().getTrans().getCharacter(StringId.CLOSE_DOUBLE_QUOTE);
 
 	@Override
 	public File process(Story story, File targetDir, String targetName)
 			throws IOException {
 		String targetNameOrig = targetName;
-		targetName += getDefaultExtension();
+		targetName += getDefaultExtension(false);
 
 		File target = new File(targetDir, targetName);
 
@@ -49,7 +45,7 @@ class LaTeX extends BasicOutput {
 	}
 
 	@Override
-	public String getDefaultExtension() {
+	public String getDefaultExtension(boolean readerTarget) {
 		return ".tex";
 	}
 
@@ -66,10 +62,9 @@ class LaTeX extends BasicOutput {
 			author = "\\author{" + latexEncode(meta.getAuthor()) + "}";
 			lang = meta.getLang().toLowerCase();
 			if (lang != null && !lang.isEmpty()) {
-				lang = Instance.getConfig().getStringX(Config.LATEX_LANG, lang);
+				lang = Instance.getInstance().getConfig().getStringX(Config.CONF_LATEX_LANG, lang);
 				if (lang == null) {
-					System.err.println(Instance.getTrans().getString(
-							StringId.LATEX_LANG_UNKNOWN, lang));
+					System.err.println(Instance.getInstance().getTrans().getString(StringId.LATEX_LANG_UNKNOWN, lang));
 				}
 			}
 		}
@@ -154,7 +149,7 @@ class LaTeX extends BasicOutput {
 			lastWasQuote = true;
 			break;
 		case IMAGE:
-			// TODO
+			// TODO what about images in LaTeX?
 			break;
 		}
 	}