anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-26 14:15:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't write a \bibtex_command to the preferences file if not needed.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29871 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2009-05-28 00:25:40 +00:00
parent c0127e8ede
commit 6c7cbfa7a1
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/frontends/qt4/GuiDocument.cpp
View File

@ -1744,11 +1744,12 @@ void GuiDocument::applyView()
string const bibtex_command =
fromqstr(biblioModule->bibtexCO->itemData(
biblioModule->bibtexCO->currentIndex()).toString());
if (bibtex_command == "default")
string const bibtex_options =
fromqstr(biblioModule->bibtexOptionsED->text());
if (bibtex_command == "default" || bibtex_options.empty())
bp_.bibtex_command = bibtex_command;
else
bp_.bibtex_command = bibtex_command + " "
+ fromqstr(biblioModule->bibtexOptionsED->text());
bp_.bibtex_command = bibtex_command + " " + bibtex_options;
// Indices
indicesModule->apply(bp_);

6
src/frontends/qt4/GuiIndices.cpp
View File

@ -136,11 +136,11 @@ void GuiIndices::apply(BufferParams & params) const
string const index_command =
fromqstr(indexCO->itemData(
indexCO->currentIndex()).toString());
if (index_command == "default")
string const index_options = fromqstr(indexOptionsED->text());
if (index_command == "default" || index_options.empty())
params.index_command = index_command;
else
params.index_command = index_command + " "
+ fromqstr(indexOptionsED->text());
params.index_command = index_command + " " + index_options;
}

18
src/frontends/qt4/GuiPrefs.cpp
View File

@ -670,19 +670,29 @@ void PrefLatex::on_latexIndexCO_activated(int n)
void PrefLatex::apply(LyXRC & rc) const
{
// If bibtex is not empty, bibopt contains the options, otherwise
// it is a customized bibtex command with options.
QString const bibtex = latexBibtexCO->itemData(
latexBibtexCO->currentIndex()).toString();
QString const bibopt = latexBibtexED->text();
if (bibtex.isEmpty())
rc.bibtex_command = fromqstr(latexBibtexED->text());
rc.bibtex_command = fromqstr(bibopt);
else if (bibopt.isEmpty())
rc.bibtex_command = fromqstr(bibtex);
else
rc.bibtex_command = fromqstr(bibtex) + " " + fromqstr(latexBibtexED->text());
rc.bibtex_command = fromqstr(bibtex) + " " + fromqstr(bibopt);
// If index is not empty, idxopt contains the options, otherwise
// it is a customized index command with options.
QString const index = latexIndexCO->itemData(
latexIndexCO->currentIndex()).toString();
QString const idxopt = latexIndexED->text();
if (index.isEmpty())
rc.index_command = fromqstr(latexIndexED->text());
rc.index_command = fromqstr(idxopt);
else if (idxopt.isEmpty())
rc.index_command = fromqstr(index);
else
rc.index_command = fromqstr(index) + " " + fromqstr(latexIndexED->text());
rc.index_command = fromqstr(index) + " " + fromqstr(idxopt);
rc.fontenc = fromqstr(latexEncodingED->text());
rc.chktex_command = fromqstr(latexChecktexED->text());