anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 08:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix from herbert to biblio parsing

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3422 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2002-01-19 21:51:54 +00:00
parent 34e27f8c26
commit 58a522ef71
2 changed files with 67 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontends/controllers/ChangeLog
View File

@ -1,3 +1,8 @@
2002-01-19 Herbert Voss <voss@perce.de>
* biblio.C (parseBibTeX): change the parsing, so that
'#'-characters in a bibtex entry are no more a problem.
2002-01-19 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* ControlDialog_impl.h (ControlConnectBI>): make ControlDialogBI

147
src/frontends/controllers/biblio.C
View File

@ -319,101 +319,74 @@ searchKeys(InfoMap const & theMap,
string const parseBibTeX(string data, string const & findkey)
{
string keyvalue;
for (string::iterator it=data.begin(); it<data.end(); ++it) {
for (string::iterator it = data.begin(); it < data.end(); ++it) {
if ((*it) == '\n' || (*it) == '\t')
(*it)= ' ';
(*it)= ' ';
}
data = frontStrip(data);
while (!data.empty() && data[0] != '=' &&
(data.find(' ') != string::npos || data.find('=') != string::npos)) {
string::size_type keypos = min(data.find(' '), data.find('='));
string key = lowercase(data.substr(0, keypos));
// now get only the important line of the bibtex entry.
// all entries are devided by ',' except the last one.
data += ','; // now we have same behaviour for all entries
// because the last one is "blah ... }"
int Entries = 0;
string dummy = token(data, ',', Entries);
while (!contains(lowercase(dummy), findkey) && !dummy.empty())
dummy = token(data, ',', ++Entries);
if (dummy.empty())
return string(); // no such keyword
// we are not sure, if we get all, because "key= "blah, blah" is allowed.
// therefore we read all until the next "=" character, which follows a
// new keyword
keyvalue = dummy;
dummy = token(data, ',', ++Entries);
while (!contains(dummy, '=') && !dummy.empty()) {
keyvalue += (',' + dummy);
dummy = token(data, ',', ++Entries);
}
data = keyvalue; // now we have the important line
data = strip(data, ' '); // all spaces
if (!contains(data, '{')) // no opening '{'
data = strip(data, '}');// maybe there is a main closing '}'
// happens, when last keyword
string key = lowercase(data.substr(0, data.find('=')));
data = data.substr(data.find('='), data.length() - 1);
data = frontStrip(strip(data));
if (data.length() < 2 || data[0] != '=') { // a valid entry?
return string();
} else {
data = frontStrip(data.substr(1, data.length() - 1));
if (data.length() < 2) {
return data; // not long enough to find delimiters
} else {
string::size_type keypos = 1;
char enclosing;
if (data[0] == '{') {
enclosing = '}';
} else if (data[0] == '"') {
enclosing = '"';
} else {
return data; // no {} and no "", pure data
}
string tmp = data.substr(keypos, data.length()-1);
while (tmp.find('{') != string::npos &&
tmp.find('}') != string::npos &&
tmp.find('{') < tmp.find('}') &&
tmp.find('{') < tmp.find(enclosing)) {
data = data.substr(keypos, data.length()-1);
data = frontStrip(strip(data));
if (data.length() > 1 && data[0]=='=') {
data = frontStrip(data.substr(1, data.length()-1));
if (!data.empty()) {
keypos = 1;
string value;
char enclosing;
if (data[0]=='{') {
enclosing = '}';
} else if (data[0]=='"') {
enclosing = '"';
} else {
keypos=0;
enclosing=' ';
}
if (keypos &&
data.find(enclosing)!=string::npos &&
data.length()>1) {
string tmp = data.substr(keypos,
data.length()-1);
while (tmp.find('{') != string::npos &&
tmp.find('}') != string::npos &&
tmp.find('{') < tmp.find('}') &&
tmp.find('{') < tmp.find(enclosing)) {
keypos += tmp.find('{')+1;
tmp = data.substr(keypos,
data.length()-1);
keypos += tmp.find('}')+1;
tmp = data.substr(keypos,
data.length()-1);
}
if (tmp.find(enclosing)==string::npos)
return keyvalue;
else {
keypos += tmp.find(enclosing);
tmp = data.substr(keypos,
data.length()-1);
}
value = data.substr(1, keypos-1);
if (keypos+1<data.length()-1)
data = frontStrip(data.substr(keypos+1, data.length()-1));
else
data = "";
} else if (!keypos &&
(data.find(' ') ||
data.find(','))) {
keypos = data.length()-1;
if (data.find(' ') != string::npos)
keypos = data.find(' ');
if (data.find(',') != string::npos &&
keypos > data.find(','))
keypos = data.find(',');
value = data.substr(0, keypos);
if (keypos+1<data.length()-1)
data = frontStrip(data.substr(keypos+1, data.length()-1));
else
data = "";
}
else
return keyvalue;
if (findkey == key) {
keyvalue = value;
return keyvalue;
}
data = frontStrip(frontStrip(data,','));
keypos += tmp.find('{') + 1;
tmp = data.substr(keypos, data.length() - 1);
keypos += tmp.find('}') + 1;
tmp = data.substr(keypos, data.length() - 1);
}
if (tmp.find(enclosing) == string::npos)
return data;
else {
keypos += tmp.find(enclosing);
return data.substr(1, keypos - 1);
}
}
else return keyvalue;
}
return keyvalue;
}