Buffer: Rename function names:

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index d8d1dd1ca87a512388f024ad87506127ace1d9ab..4128129fc76bcab9f7008bd0487dd4a6bb040887 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -12,10 +12,11 @@
 
 #include "Converter.h"
 
-#include "ConverterCache.h"
 #include "Buffer.h"
 #include "buffer_funcs.h"
 #include "BufferParams.h"
+#include "ConverterCache.h"
+#include "Encoding.h"
 #include "ErrorList.h"
 #include "Format.h"
 #include "Language.h"
@@ -49,7 +50,7 @@ string const token_base("$$b");
 string const token_to("$$o");
 string const token_path("$$p");
 string const token_orig_path("$$r");
-
+string const token_encoding("$$e");
 
 
 string const add_options(string const & command, string const & options)
@@ -284,7 +285,7 @@ bool Converters::convert(Buffer const * buffer,
                        // if no special converter defined, then we take the
                        // default one from ImageMagic.
                        string const from_ext = from_format.empty() ?
-                               getExtension(from_file.absFilename()) :
+                               getExtension(from_file.absFileName()) :
                                formats.extension(from_format);
                        string const to_ext = formats.extension(to_format);
                        string const command =
@@ -325,7 +326,7 @@ bool Converters::convert(Buffer const * buffer,
        // used anyway.
        OutputParams runparams(buffer ? &buffer->params().encoding() : 0);
        runparams.flavor = getFlavor(edgepath);
-       
+
        if (buffer) {
                runparams.use_japanese = buffer->bufferFormat() == "platex";
                runparams.use_indices = buffer->params().use_indices;
@@ -340,7 +341,7 @@ bool Converters::convert(Buffer const * buffer,
        // This has the added benefit that all other files that may be
        // generated by the converter are deleted when LyX closes and do not
        // clutter the real working directory.
-       string const path(onlyPath(from_file.absFilename()));
+       string const path(onlyPath(from_file.absFileName()));
        // Prevent the compiler from optimizing away p
        FileName pp(path);
        PathChanger p(pp);
@@ -349,8 +350,8 @@ bool Converters::convert(Buffer const * buffer,
        errorList.clear();
 
        bool run_latex = false;
-       string from_base = changeExtension(from_file.absFilename(), "");
-       string to_base = changeExtension(to_file.absFilename(), "");
+       string from_base = changeExtension(from_file.absFileName(), "");
+       string to_base = changeExtension(to_file.absFileName(), "");
        FileName infile;
        FileName outfile = from_file;
        for (Graph::EdgePath::const_iterator cit = edgepath.begin();
@@ -363,11 +364,11 @@ bool Converters::convert(Buffer const * buffer,
                }
                infile = outfile;
                outfile = FileName(conv.result_dir.empty()
-                       ? changeExtension(from_file.absFilename(), conv.To->extension())
+                       ? changeExtension(from_file.absFileName(), conv.To->extension())
                        : addName(subst(conv.result_dir,
                                        token_base, from_base),
                                  subst(conv.result_file,
-                                       token_base, onlyFilename(from_base))));
+                                       token_base, onlyFileName(from_base))));
 
                // if input and output files are equal, we use a
                // temporary file as intermediary (JMarc)
@@ -378,7 +379,7 @@ bool Converters::convert(Buffer const * buffer,
                        if (buffer)
                                outfile = FileName(addName(buffer->temppath(), "tmpfile.out"));
                        else
-                               outfile = FileName(addName(package().temp_dir().absFilename(),
+                               outfile = FileName(addName(package().temp_dir().absFileName(),
                                                   "tmpfile.out"));
                }
 
@@ -397,17 +398,18 @@ bool Converters::convert(Buffer const * buffer,
                        }
 
                        // FIXME UNICODE
-                       string const infile2 = 
-                               to_utf8(makeRelPath(from_utf8(infile.absFilename()), from_utf8(path)));
-                       string const outfile2 = 
-                               to_utf8(makeRelPath(from_utf8(outfile.absFilename()), from_utf8(path)));
+                       string const infile2 =
+                               to_utf8(makeRelPath(from_utf8(infile.absFileName()), from_utf8(path)));
+                       string const outfile2 =
+                               to_utf8(makeRelPath(from_utf8(outfile.absFileName()), from_utf8(path)));
 
                        string command = conv.command;
                        command = subst(command, token_from, quoteName(infile2));
                        command = subst(command, token_base, quoteName(from_base));
                        command = subst(command, token_to, quoteName(outfile2));
-                       command = subst(command, token_path, quoteName(infile.onlyPath().absFilename()));
-                       command = subst(command, token_orig_path, quoteName(orig_from.onlyPath().absFilename()));
+                       command = subst(command, token_path, quoteName(infile.onlyPath().absFileName()));
+                       command = subst(command, token_orig_path, quoteName(orig_from.onlyPath().absFileName()));
+                       command = subst(command, token_encoding, buffer ? buffer->params().encoding().iconvName() : string());
                        command = libScriptSearch(command);
 
                        if (!conv.parselog.empty())
@@ -512,16 +514,16 @@ bool Converters::move(string const & fmt,
                return true;
 
        bool no_errors = true;
-       string const path = onlyPath(from.absFilename());
-       string const base = onlyFilename(removeExtension(from.absFilename()));
-       string const to_base = removeExtension(to.absFilename());
-       string const to_extension = getExtension(to.absFilename());
+       string const path = onlyPath(from.absFileName());
+       string const base = onlyFileName(removeExtension(from.absFileName()));
+       string const to_base = removeExtension(to.absFileName());
+       string const to_extension = getExtension(to.absFileName());
 
-       support::FileNameList const files = FileName(path).dirList(getExtension(from.absFilename()));
+       support::FileNameList const files = FileName(path).dirList(getExtension(from.absFileName()));
        for (support::FileNameList::const_iterator it = files.begin();
             it != files.end(); ++it) {
-               string const from2 = it->absFilename();
-               string const file2 = onlyFilename(from2);
+               string const from2 = it->absFileName();
+               string const file2 = onlyFileName(from2);
                if (prefixIs(file2, base)) {
                        string const to2 = changeExtension(
                                to_base + file2.substr(base.length()),