anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix writing of \bibtex_alternatives and \index_alternatives to the

Browse Source 
preferences file. Now the alternatives are only written if they have
actually been changed, and not always as it was before. Existing
preferences files will be automatically trimmed on next save.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29869 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2009-05-27 22:21:33 +00:00
parent 4daeb64685
commit 852dfe3869
1 changed files with 48 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/LyXRC.cpp
View File

@ -1370,15 +1370,33 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
}
if (tag != RC_LAST)
break;
case RC_BIBTEX_ALTERNATIVES:
if (ignore_system_lyxrc ||
bibtex_alternatives != system_lyxrc.bibtex_alternatives) {
for (vector<string>::const_iterator it = bibtex_alternatives.begin();
it != bibtex_alternatives.end(); ++it)
os << "\\bibtex_alternatives \"" << *it << "\"\n";
case RC_BIBTEX_ALTERNATIVES: {
vector<string>::const_iterator it = bibtex_alternatives.begin();
vector<string>::const_iterator end = bibtex_alternatives.end();
if (ignore_system_lyxrc) {
for ( ; it != end; ++it)
os << "\\bibtex_alternatives \""
<< *it << "\"\n";
} else {
vector<string>::const_iterator sbeg =
system_lyxrc.bibtex_alternatives.begin();
vector<string>::const_iterator send =
system_lyxrc.bibtex_alternatives.end();
for ( ; it != end; ++it) {
bool found = false;
for (vector<string>::const_iterator sit = sbeg;
sit != send; ++sit) {
if (*it == *sit)
found = true;
}
if (!found)
os << "\\bibtex_alternatives \""
<< *it << "\"\n";
}
}
if (tag != RC_LAST)
break;
}
case RC_BIBTEX_COMMAND:
if (ignore_system_lyxrc ||
bibtex_command != system_lyxrc.bibtex_command) {
@ -1393,15 +1411,33 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
}
if (tag != RC_LAST)
break;
case RC_INDEX_ALTERNATIVES:
if (ignore_system_lyxrc ||
index_alternatives != system_lyxrc.index_alternatives) {
for (vector<string>::const_iterator it = index_alternatives.begin();
it != index_alternatives.end(); ++it)
os << "\\index_alternatives \"" << *it << "\"\n";
case RC_INDEX_ALTERNATIVES: {
vector<string>::const_iterator it = index_alternatives.begin();
vector<string>::const_iterator end = index_alternatives.end();
if (ignore_system_lyxrc) {
for ( ; it != end; ++it)
os << "\\index_alternatives \""
<< *it << "\"\n";
} else {
vector<string>::const_iterator sbeg =
system_lyxrc.index_alternatives.begin();
vector<string>::const_iterator send =
system_lyxrc.index_alternatives.end();
for ( ; it != end; ++it) {
bool found = false;
for (vector<string>::const_iterator sit = sbeg;
sit != send; ++sit) {
if (*it == *sit)
found = true;
}
if (!found)
os << "\\index_alternatives \""
<< *it << "\"\n";
}
}
if (tag != RC_LAST)
break;
}
case RC_INDEX_COMMAND:
if (ignore_system_lyxrc ||
index_command != system_lyxrc.index_command) {