]> git.lyx.org Git - lyx.git/blobdiff - src/insets/insetbibtex.C
The speed patch: redraw only rows that have changed
[lyx.git] / src / insets / insetbibtex.C
index 22c3886751c26fd60fcbcb94aa7b47573346528d..3bc29d0566a09e2c1d67a04325523ad072ea6a6e 100644 (file)
 #include "dispatchresult.h"
 #include "debug.h"
 #include "funcrequest.h"
-#include "LaTeXFeatures.h"
 #include "gettext.h"
+#include "LaTeXFeatures.h"
 #include "metricsinfo.h"
 #include "outputparams.h"
 
+#include "frontends/Alert.h"
+
+#include "support/filename.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
+#include "support/lyxlib.h"
 #include "support/os.h"
 #include "support/path.h"
 
+#include <boost/tokenizer.hpp>
+
 #include <fstream>
+#include <sstream>
 
 using lyx::support::AbsolutePath;
 using lyx::support::ascii_lowercase;
 using lyx::support::ChangeExtension;
 using lyx::support::contains;
+using lyx::support::copy;
+using lyx::support::FileName;
 using lyx::support::findtexfile;
 using lyx::support::IsFileReadable;
+using lyx::support::latex_path;
 using lyx::support::ltrim;
 using lyx::support::MakeAbsPath;
 using lyx::support::MakeRelPath;
@@ -68,7 +78,7 @@ std::auto_ptr<InsetBase> InsetBibtex::doClone() const
 }
 
 
-void InsetBibtex::priv_dispatch(LCursor & cur, FuncRequest & cmd)
+void InsetBibtex::doDispatch(LCursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action) {
 
@@ -77,11 +87,13 @@ void InsetBibtex::priv_dispatch(LCursor & cur, FuncRequest & cmd)
                InsetCommandMailer::string2params("bibtex", cmd.argument, p);
                if (!p.getCmdName().empty())
                        setParams(p);
+               else
+                       cur.noUpdate();
                break;
        }
 
        default:
-               InsetCommand::priv_dispatch(cur, cmd);
+               InsetCommand::doDispatch(cur, cmd);
                break;
        }
 }
@@ -89,7 +101,7 @@ void InsetBibtex::priv_dispatch(LCursor & cur, FuncRequest & cmd)
 
 string const InsetBibtex::getScreenLabel(Buffer const &) const
 {
-       return _("BibTeX Generated References");
+       return _("BibTeX Generated Bibliography");
 }
 
 
@@ -123,21 +135,62 @@ int InsetBibtex::latex(Buffer const & buffer, ostream & os,
        // 3. \btPrint{Cited|NotCited|All}
        // 4. \end{btSect}
 
-       // the database string
-       string adb;
-       string db_in = getContents();
-       db_in = split(db_in, adb, ',');
-       // If we generate in a temp dir, we might need to give an
-       // absolute path there. This is a bit complicated since we can
-       // have a comma-separated list of bibliographies
-       string db_out;
-       while (!adb.empty()) {
-               db_out += os::external_path(normalize_name(buffer, runparams,
-                                                          adb, ".bib"));
-               db_out += ',';
-               db_in = split(db_in, adb,',');
+       // Database(s)
+       // If we are processing the LaTeX file in a temp directory then
+       // copy the .bib databases to this temp directory, mangling their
+       // names in the process. Store this mangled name in the list of
+       // all databases.
+       // (We need to do all this because BibTeX *really*, *really*
+       // can't handle "files with spaces" and Windows users tend to
+       // use such filenames.)
+       // Otherwise, store the (maybe absolute) path to the original,
+       // unmangled database name.
+       typedef boost::char_separator<char> Separator;
+       typedef boost::tokenizer<Separator> Tokenizer;
+
+       Separator const separator(",");
+       Tokenizer const tokens(getContents(), separator);
+       Tokenizer::const_iterator const begin = tokens.begin();
+       Tokenizer::const_iterator const end = tokens.end();
+
+       std::ostringstream dbs;
+       for (Tokenizer::const_iterator it = begin; it != end; ++it) {
+               string const input = trim(*it);
+               string database =
+                       normalize_name(buffer, runparams, input, ".bib");
+               string const in_file = database + ".bib";
+
+               if (!runparams.nice && IsFileReadable(in_file)) {
+
+                       database = FileName(database).mangledFilename();
+                       string const out_file = MakeAbsPath(database + ".bib",
+                                       buffer.getMasterBuffer()->temppath());
+
+                       bool const success = copy(in_file, out_file);
+                       if (!success) {
+                               lyxerr << "Failed to copy '" << in_file
+                                      << "' to '" << out_file << "'"
+                                      << endl;
+                       }
+               }
+
+               if (it != begin)
+                       dbs << ',';
+               dbs << latex_path(database);
+       }
+       string const db_out = dbs.str();
+
+       // Post this warning only once.
+       static bool warned_about_spaces = false;
+       if (!warned_about_spaces &&
+           runparams.nice && db_out.find(' ') != string::npos) {
+               warned_about_spaces = true;
+
+               Alert::warning(_("Export Warning!"),
+                              _("There are spaces in the paths to your BibTeX databases.\n"
+                                "BibTeX will be unable to find them."));
+
        }
-       db_out = rtrim(db_out, ",");
 
        // Style-Options
        string style = getOptions(); // maybe empty! and with bibtotoc
@@ -150,17 +203,16 @@ int InsetBibtex::latex(Buffer const & buffer, ostream & os,
        }
 
        // line count
-       int i = 0;
+       int nlines = 0;
 
        if (!style.empty()) {
                os << "\\bibliographystyle{"
-                  << os::external_path(normalize_name(buffer, runparams,
-                                                      style, ".bst"))
+                  << latex_path(normalize_name(buffer, runparams, style, ".bst"))
                   << "}\n";
-               i += 1;
+               nlines += 1;
        }
 
-       if (buffer.params().use_bibtopic){
+       if (!db_out.empty() && buffer.params().use_bibtopic){
                os << "\\begin{btSect}{" << db_out << "}\n";
                string btprint = getSecOptions();
                if (btprint.empty())
@@ -168,7 +220,7 @@ int InsetBibtex::latex(Buffer const & buffer, ostream & os,
                        btprint = "btPrintCited";
                os << "\\" << btprint << "\n"
                   << "\\end{btSect}\n";
-               i += 3;
+               nlines += 3;
        }
 
        // bibtotoc-Option
@@ -196,12 +248,12 @@ int InsetBibtex::latex(Buffer const & buffer, ostream & os,
                }
        }
 
-       if (!buffer.params().use_bibtopic){
+       if (!db_out.empty() && !buffer.params().use_bibtopic){
                os << "\\bibliography{" << db_out << "}\n";
-               i += 1;
+               nlines += 1;
        }
 
-       return i;
+       return nlines;
 }
 
 
@@ -270,7 +322,7 @@ void InsetBibtex::fillWithBibKeys(Buffer const & buffer,
 bool InsetBibtex::addDatabase(string const & db)
 {
        string contents(getContents());
-       if (!contains(contents, db)) {
+       if (tokenPos(contents, ',', db) == -1) {
                if (!contents.empty())
                        contents += ',';
                setContents(contents + db);
@@ -282,16 +334,17 @@ bool InsetBibtex::addDatabase(string const & db)
 
 bool InsetBibtex::delDatabase(string const & db)
 {
-       if (contains(getContents(), db)) {
+       string contents(getContents());
+       if (contains(contents, db)) {
+               int const n = tokenPos(contents, ',', db);
                string bd = db;
-               int const n = tokenPos(getContents(), ',', bd);
                if (n > 0) {
-                       // Weird code, would someone care to explain this?(Lgb)
-                       string tmp(", ");
-                       tmp += bd;
-                       setContents(subst(getContents(), tmp, ", "));
+                       // this is not the first database
+                       string tmp = ',' + bd;
+                       setContents(subst(contents, tmp, ""));
                } else if (n == 0)
-                       setContents(split(getContents(), bd, ','));
+                       // this is the first (or only) database
+                       setContents(split(contents, bd, ','));
                else
                        return false;
        }