mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-23 02:14:50 +00:00
Corrections, thanks to Bernhard.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24570 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
9ea014431e
commit
4a22588963
@ -694,13 +694,13 @@ void InsetBibtex::fillWithBibKeys(BiblioInfo & keylist,
|
|||||||
|
|
||||||
docstring entryType;
|
docstring entryType;
|
||||||
|
|
||||||
if (!ifs) {
|
if (!readTypeOrKey(entryType, ifs, from_ascii("{("), docstring(), makeLowerCase)) {
|
||||||
lyxerr << "InsetBibtex::fillWithBibKeys: Unexpected end of file." << std::endl;
|
lyxerr << "InsetBibtex::fillWithBibKeys: Error reading entry type." << std::endl;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!readTypeOrKey(entryType, ifs, from_ascii("{("), docstring(), makeLowerCase)) {
|
if (!ifs) {
|
||||||
lyxerr << "InsetBibtex::fillWithBibKeys: Error reading entry type." << std::endl;
|
lyxerr << "InsetBibtex::fillWithBibKeys: Unexpected end of file." << std::endl;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -729,13 +729,13 @@ void InsetBibtex::fillWithBibKeys(BiblioInfo & keylist,
|
|||||||
docstring name;
|
docstring name;
|
||||||
docstring value;
|
docstring value;
|
||||||
|
|
||||||
if (!ifs) {
|
if (!readTypeOrKey(name, ifs, from_ascii("="), from_ascii("#{}(),"), makeLowerCase)) {
|
||||||
lyxerr << "InsetBibtex::fillWithBibKeys: Unexpected end of file." << std::endl;
|
lyxerr << "InsetBibtex::fillWithBibKeys: Error reading string name." << std::endl;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!readTypeOrKey(name, ifs, from_ascii("="), from_ascii("#{}(),"), makeLowerCase)) {
|
if (!ifs) {
|
||||||
lyxerr << "InsetBibtex::fillWithBibKeys: Error reading string name." << std::endl;
|
lyxerr << "InsetBibtex::fillWithBibKeys: Unexpected end of file." << std::endl;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -771,17 +771,17 @@ void InsetBibtex::fillWithBibKeys(BiblioInfo & keylist,
|
|||||||
// Citation entry. Try to read the key.
|
// Citation entry. Try to read the key.
|
||||||
docstring key;
|
docstring key;
|
||||||
|
|
||||||
if (!ifs) {
|
|
||||||
lyxerr << "InsetBibtex::fillWithBibKeys: Unexpected end of file." << std::endl;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!readTypeOrKey(key, ifs, from_ascii(","), from_ascii("}"), keepCase)) {
|
if (!readTypeOrKey(key, ifs, from_ascii(","), from_ascii("}"), keepCase)) {
|
||||||
lyxerr << "InsetBibtex::fillWithBibKeys: Unable to read key for entry type:" <<
|
lyxerr << "InsetBibtex::fillWithBibKeys: Unable to read key for entry type:" <<
|
||||||
entryType << "." << std::endl;
|
entryType << "." << std::endl;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!ifs) {
|
||||||
|
lyxerr << "InsetBibtex::fillWithBibKeys: Unexpected end of file." << std::endl;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
/////////////////////////////////////////////
|
/////////////////////////////////////////////
|
||||||
// now we have a key, so we will add an entry
|
// now we have a key, so we will add an entry
|
||||||
// (even if it's empty, as bibtex does)
|
// (even if it's empty, as bibtex does)
|
||||||
|
Loading…
Reference in New Issue
Block a user