X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetbibtex.C;h=fa604fddd381159f9b1e90203dcfaab0bbae44ed;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=4ab1d097dcf15c8dc254d4a63cc1f7c2266d811d;hpb=6c300f72a217722652dc27db9108e1050028979c;p=lyx.git diff --git a/src/insets/insetbibtex.C b/src/insets/insetbibtex.C index 4ab1d097dc..fa604fddd3 100644 --- a/src/insets/insetbibtex.C +++ b/src/insets/insetbibtex.C @@ -16,6 +16,7 @@ #include "bufferparams.h" #include "dispatchresult.h" #include "debug.h" +#include "encoding.h" #include "funcrequest.h" #include "gettext.h" #include "LaTeXFeatures.h" @@ -24,7 +25,6 @@ #include "frontends/Alert.h" -#include "support/filename.h" #include "support/filetools.h" #include "support/lstrings.h" #include "support/lyxlib.h" @@ -33,9 +33,6 @@ #include -#include -#include - namespace lyx { @@ -44,6 +41,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; @@ -66,7 +64,6 @@ namespace os = support::os; using std::endl; using std::getline; using std::string; -using std::ifstream; using std::ostream; using std::pair; using std::vector; @@ -116,8 +113,8 @@ namespace { 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)) + string const fname = makeAbsPath(name, buffer.filePath()).absFilename(); + if (absolutePath(name) || !isFileReadable(FileName(fname + ext))) return name; else if (!runparams.nice) return fname; @@ -151,28 +148,35 @@ int InsetBibtex::latex(Buffer const & buffer, odocstream & os, // use such filenames.) // Otherwise, store the (maybe absolute) path to the original, // unmangled database name. - typedef boost::char_separator Separator; - typedef boost::tokenizer Tokenizer; - - Separator const separator(","); - Tokenizer const tokens(to_utf8(getParam("bibfiles")), separator); + typedef boost::char_separator Separator; + typedef boost::tokenizer 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(); - std::ostringstream dbs; + odocstringstream dbs; for (Tokenizer::const_iterator it = begin; it != end; ++it) { - string const input = trim(*it); + docstring const input = trim(*it); + // FIXME UNICODE + string utf8input(to_utf8(input)); string database = - normalize_name(buffer, runparams, input, ".bib"); - string const in_file = database + ".bib"; + normalize_name(buffer, runparams, utf8input, ".bib"); + FileName const try_in_file(makeAbsPath(database + ".bib", buffer.filePath())); + bool const not_from_texmf = isFileReadable(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(makeAbsPath(database + ".bib", + buffer.getMasterBuffer()->temppath())); bool const success = copy(in_file, out_file); if (!success) { @@ -184,10 +188,10 @@ int InsetBibtex::latex(Buffer const & buffer, odocstream & os, if (it != begin) dbs << ','; - dbs << latex_path(database); + // FIXME UNICODE + dbs << from_utf8(latex_path(database)); } - // FIXME UNICODE - docstring const db_out = from_utf8(dbs.str()); + docstring const db_out = dbs.str(); // Post this warning only once. static bool warned_about_spaces = false; @@ -217,18 +221,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"; + FileName const try_in_file(makeAbsPath(base + ".bst", buffer.filePath())); + bool const not_from_texmf = isFileReadable(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(makeAbsPath(base + ".bst", + buffer.getMasterBuffer()->temppath())); bool const success = copy(in_file, out_file); if (!success) { lyxerr << "Failed to copy '" << in_file @@ -297,18 +302,18 @@ int InsetBibtex::latex(Buffer const & buffer, odocstream & os, } -vector const InsetBibtex::getFiles(Buffer const & buffer) const +vector const InsetBibtex::getFiles(Buffer const & buffer) const { Path p(buffer.filePath()); - vector vec; + vector 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 @@ -325,36 +330,48 @@ vector const InsetBibtex::getFiles(Buffer const & buffer) const // This method returns a comma separated list of Bibtex entries void InsetBibtex::fillWithBibKeys(Buffer const & buffer, - std::vector > & keys) const + std::vector > & keys) const { - vector const files = getFiles(buffer); - for (vector::const_iterator it = files.begin(); + vector const files = getFiles(buffer); + for (vector::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()); - string linebuf0; + + // Officially bibtex does only support ASCII, but in practice + // you can use the encoding of the main document as long as + // some elements like keys and names are pure ASCII. Therefore + // we convert the file from the buffer encoding. + // We don't restrict keys to ASCII in LyX, since our own + // InsetBibitem can generate non-ASCII keys, and nonstandard + // 8bit clean bibtex forks exist. + idocfstream ifs(it->toFilesystemEncoding().c_str(), + std::ios_base::in, + buffer.params().encoding().iconvName()); + docstring linebuf0; while (getline(ifs, linebuf0)) { - string linebuf = trim(linebuf0); - if (linebuf.empty()) continue; - if (prefixIs(linebuf, "@")) { + docstring linebuf = trim(linebuf0); + if (linebuf.empty()) + continue; + if (prefixIs(linebuf, '@')) { linebuf = subst(linebuf, '{', '('); - string tmp; + docstring tmp; linebuf = split(linebuf, tmp, '('); tmp = ascii_lowercase(tmp); - if (!prefixIs(tmp, "@string") - && !prefixIs(tmp, "@preamble")) { + if (!prefixIs(tmp, from_ascii("@string")) && + !prefixIs(tmp, from_ascii("@preamble"))) { linebuf = split(linebuf, tmp, ','); tmp = ltrim(tmp, " \t"); if (!tmp.empty()) { - keys.push_back(pair(tmp,string())); + // FIXME UNICODE + keys.push_back(pair( + to_utf8(tmp), docstring())); } } - } else if (!keys.empty()) { - keys.back().second += linebuf + "\n"; - } + } else if (!keys.empty()) + keys.back().second += linebuf + '\n'; } } }