more cleanup:

[lyx.git] / src / insets / insetbibtex.C

diff --git a/src/insets/insetbibtex.C b/src/insets/insetbibtex.C
index c0fe99bcdee483295d792483f493a8d019bc3c76..09ba80701a377147ee54dc8e4e6c19ff1294067d 100644 (file)
--- a/src/insets/insetbibtex.C
+++ b/src/insets/insetbibtex.C
@@ -24,7 +24,6 @@
 
 #include "frontends/Alert.h"
 
-#include "support/filename.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
@@ -44,6 +43,7 @@ using support::ascii_lowercase;
 using support::changeExtension;
 using support::contains;
 using support::copy;
+using support::DocFileName;
 using support::FileName;
 using support::findtexfile;
 using support::isFileReadable;
@@ -117,7 +117,7 @@ string normalize_name(Buffer const & buffer, OutputParams const & runparams,
                      string const & name, string const & ext)
 {
        string const fname = makeAbsPath(name, buffer.filePath());
-       if (absolutePath(name) || !isFileReadable(fname + ext))
+       if (absolutePath(name) || !isFileReadable(FileName(fname + ext)))
                return name;
        else if (!runparams.nice)
                return fname;
@@ -155,6 +155,9 @@ int InsetBibtex::latex(Buffer const & buffer, odocstream & os,
        typedef boost::tokenizer<Separator, docstring::const_iterator, docstring> Tokenizer;
 
        Separator const separator(from_ascii(",").c_str());
+       // The tokenizer must not be called with temporary strings, since
+       // it does not make a copy and uses iterators of the string further
+       // down. getParam returns a reference, so this is OK.
        Tokenizer const tokens(getParam("bibfiles"), separator);
        Tokenizer::const_iterator const begin = tokens.begin();
        Tokenizer::const_iterator const end = tokens.end();
@@ -166,15 +169,17 @@ int InsetBibtex::latex(Buffer const & buffer, odocstream & os,
                string utf8input(to_utf8(input));
                string database =
                        normalize_name(buffer, runparams, utf8input, ".bib");
-               string const in_file = database + ".bib";
+               string const try_in_file = makeAbsPath(database + ".bib", buffer.filePath());
+               bool const not_from_texmf = isFileReadable(FileName(try_in_file));
 
                if (!runparams.inComment && !runparams.dryrun && !runparams.nice &&
-                   isFileReadable(in_file)) {
+                   not_from_texmf) {
 
                        // mangledFilename() needs the extension
-                       database = removeExtension(FileName(in_file).mangledFilename());
-                       string const out_file = makeAbsPath(database + ".bib",
-                                       buffer.getMasterBuffer()->temppath());
+                       DocFileName const in_file = DocFileName(try_in_file);
+                       database = removeExtension(in_file.mangledFilename());
+                       FileName const out_file = FileName(makeAbsPath(database + ".bib",
+                                       buffer.getMasterBuffer()->temppath()));
 
                        bool const success = copy(in_file, out_file);
                        if (!success) {
@@ -219,18 +224,19 @@ int InsetBibtex::latex(Buffer const & buffer, odocstream & os,
        if (!style.empty()) {
                string base =
                        normalize_name(buffer, runparams, style, ".bst");
-               string const in_file = base + ".bst";
+               string const try_in_file = makeAbsPath(base + ".bst", buffer.filePath());
+               bool const not_from_texmf = isFileReadable(FileName(try_in_file));
                // If this style does not come from texmf and we are not
                // exporting to .tex copy it to the tmp directory.
                // This prevents problems with spaces and 8bit charcaters
                // in the file name.
                if (!runparams.inComment && !runparams.dryrun && !runparams.nice &&
-                   isFileReadable(in_file)) {
+                   not_from_texmf) {
                        // use new style name
-                       base = removeExtension(
-                                       FileName(in_file).mangledFilename());
-                       string const out_file = makeAbsPath(base + ".bst",
-                                       buffer.getMasterBuffer()->temppath());
+                       DocFileName const in_file = DocFileName(try_in_file);
+                       base = removeExtension(in_file.mangledFilename());
+                       FileName const out_file = FileName(makeAbsPath(base + ".bst",
+                                       buffer.getMasterBuffer()->temppath()));
                        bool const success = copy(in_file, out_file);
                        if (!success) {
                                lyxerr << "Failed to copy '" << in_file
@@ -299,18 +305,18 @@ int InsetBibtex::latex(Buffer const & buffer, odocstream & os,
 }
 
 
-vector<string> const InsetBibtex::getFiles(Buffer const & buffer) const
+vector<FileName> const InsetBibtex::getFiles(Buffer const & buffer) const
 {
        Path p(buffer.filePath());
 
-       vector<string> vec;
+       vector<FileName> vec;
 
        string tmp;
        // FIXME UNICODE
        string bibfiles = to_utf8(getParam("bibfiles"));
        bibfiles = split(bibfiles, tmp, ',');
        while (!tmp.empty()) {
-               string file = findtexfile(changeExtension(tmp, "bib"), "bib");
+               FileName const file = findtexfile(changeExtension(tmp, "bib"), "bib");
                lyxerr[Debug::LATEX] << "Bibfile: " << file << endl;
 
                // If we didn't find a matching file name just fail silently
@@ -329,14 +335,14 @@ vector<string> const InsetBibtex::getFiles(Buffer const & buffer) const
 void InsetBibtex::fillWithBibKeys(Buffer const & buffer,
                                  std::vector<std::pair<string, string> > & keys) const
 {
-       vector<string> const files = getFiles(buffer);
-       for (vector<string>::const_iterator it = files.begin();
+       vector<FileName> const files = getFiles(buffer);
+       for (vector<FileName>::const_iterator it = files.begin();
             it != files.end(); ++ it) {
                // This is a _very_ simple parser for Bibtex database
                // files. All it does is to look for lines starting
                // in @ and not being @preamble and @string entries.
                // It does NOT do any syntax checking!
-               ifstream ifs(it->c_str());
+               ifstream ifs(it->toFilesystemEncoding().c_str());
                string linebuf0;
                while (getline(ifs, linebuf0)) {
                        string linebuf = trim(linebuf0);