From d2acacedf915b825674079f5ef38abb215188d54 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Tue, 1 May 2012 12:54:17 -0400 Subject: [PATCH] We don't need to rescan everything from the BibTeX dialog, just the bib and bst files. --- src/frontends/qt4/GuiBibtex.cpp | 2 +- src/frontends/qt4/qt_helpers.cpp | 13 +++++++------ src/frontends/qt4/qt_helpers.h | 4 +++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/frontends/qt4/GuiBibtex.cpp b/src/frontends/qt4/GuiBibtex.cpp index 6dd8d8f650..8a2a27d7f3 100644 --- a/src/frontends/qt4/GuiBibtex.cpp +++ b/src/frontends/qt4/GuiBibtex.cpp @@ -484,7 +484,7 @@ QStringList GuiBibtex::bibFiles() const void GuiBibtex::rescanBibStyles() const { - rescanTexStyles(); + rescanTexStyles("bst bib"); } diff --git a/src/frontends/qt4/qt_helpers.cpp b/src/frontends/qt4/qt_helpers.cpp index 59a3d67fd2..dcbd2e9cb1 100644 --- a/src/frontends/qt4/qt_helpers.cpp +++ b/src/frontends/qt4/qt_helpers.cpp @@ -210,20 +210,21 @@ QString const qt_(string const & str) } -void rescanTexStyles() +void rescanTexStyles(string const & arg) { // Run rescan in user lyx directory PathChanger p(package().user_support()); - FileName const command = support::libFileSearch("scripts", "TeXFiles.py"); + FileName const prog = support::libFileSearch("scripts", "TeXFiles.py"); Systemcall one; - int const status = one.startscript(Systemcall::Wait, - os::python() + ' ' + - quoteName(command.toFilesystemEncoding())); + string const command = os::python() + ' ' + + quoteName(prog.toFilesystemEncoding()) + ' ' + + arg; + int const status = one.startscript(Systemcall::Wait, command); if (status == 0) return; // FIXME UNICODE frontend::Alert::error(_("Could not update TeX information"), - bformat(_("The script `%1$s' failed."), from_utf8(command.absFileName()))); + bformat(_("The script `%1$s' failed."), from_utf8(prog.absFileName()))); } diff --git a/src/frontends/qt4/qt_helpers.h b/src/frontends/qt4/qt_helpers.h index d7a471ca06..4a3855d5c3 100644 --- a/src/frontends/qt4/qt_helpers.h +++ b/src/frontends/qt4/qt_helpers.h @@ -127,8 +127,10 @@ QString browseRelToSub(QString const & filename, /** Build filelists of all availabe bst/cls/sty-files. Done through * kpsewhich and an external script, saved in *Files.lst. +* \param arg: cls, sty, bst, or bib, as required by TeXFiles.py. +* Can be a list of these, too. */ -void rescanTexStyles(); +void rescanTexStyles(std::string const & arg = empty_string()); /** Fill \c contents from one of the three texfiles. * Each entry in the file list is returned as a name_with_path -- 2.39.2