* Licence details can be found in the file COPYING.
*
* \author Alejandro Aguilar Sierra
+ * \author Richard Heck (BibTeX parser improvements)
*
* Full author contact details are available in file CREDITS.
*/
using support::FileName;
using support::findtexfile;
using support::isFileReadable;
+using support::isValidLaTeXFilename;
using support::latex_path;
using support::ltrim;
using support::makeAbsPath;
{}
-std::auto_ptr<Inset> InsetBibtex::doClone() const
+Inset * InsetBibtex::clone() const
{
- return std::auto_ptr<Inset>(new InsetBibtex(*this));
+ return new InsetBibtex(*this);
}
<< "' to '" << out_file << "'"
<< endl;
}
+ } else if (!runparams.inComment && runparams.nice && not_from_texmf &&
+ !isValidLaTeXFilename(database)) {
+ frontend::Alert::warning(_("Invalid filename"),
+ _("The following filename is likely to cause trouble "
+ "when running the exported file through LaTeX: ") +
+ from_utf8(database));
}
if (it != begin)
/// @return true if a string of length > 0 could be read.
///
bool readTypeOrKey(docstring & val, idocfstream & ifs,
- docstring const & delimChars, charCase chCase) {
+ docstring const & delimChars, docstring const &illegalChars,
+ charCase chCase) {
char_type ch;
return false;
// read value
- while (ifs && !isSpace(ch) && delimChars.find(ch) == docstring::npos) {
- if (chCase == makeLowerCase) {
+ bool legalChar = true;
+ while (ifs && !isSpace(ch) &&
+ delimChars.find(ch) == docstring::npos &&
+ (legalChar = (illegalChars.find(ch) == docstring::npos))
+ )
+ {
+ if (chCase == makeLowerCase)
val += lowercase(ch);
- } else {
+ else
val += ch;
- }
ifs.get(ch);
}
+
+ if (!legalChar) {
+ ifs.putback(ch);
+ return false;
+ }
// skip whitespace
while (ifs && isSpace(ch)) {
return false;
} else if (ch == '"' || ch == '{') {
+ // set end delimiter
+ char_type delim = ch == '"' ? '"': '}';
- // read delimited text - set end delimiter
- char_type delim = ch == '"'? '"': '}';
-
- // inside this delimited text braces must match.
- // Thus we can have a closing delimiter only
- // when nestLevel == 0
+ //Skip whitespace
+ do {
+ ifs.get(ch);
+ } while (ifs && isSpace(ch));
+
+ if (!ifs)
+ return false;
+
+ //We now have the first non-whitespace character
+ //We'll collapse adjacent whitespace.
+ bool lastWasWhiteSpace = false;
+
+ // inside this delimited text braces must match.
+ // Thus we can have a closing delimiter only
+ // when nestLevel == 0
int nestLevel = 0;
-
- ifs.get(ch);
+
while (ifs && (nestLevel > 0 || ch != delim)) {
+ if (isSpace(ch)) {
+ lastWasWhiteSpace = true;
+ ifs.get(ch);
+ continue;
+ }
+ //We output the space only after we stop getting
+ //whitespace so as not to output any whitespace
+ //at the end of the value.
+ if (lastWasWhiteSpace) {
+ lastWasWhiteSpace = false;
+ val += ' ';
+ }
+
val += ch;
// update nesting level
// This method returns a comma separated list of Bibtex entries
void InsetBibtex::fillWithBibKeys(Buffer const & buffer,
- std::vector<std::pair<string, docstring> > & keys) const
+ BiblioInfo & keylist, InsetIterator const & /*di*/) const
{
vector<FileName> const files = getFiles(buffer);
for (vector<FileName>::const_iterator it = files.begin();
// - it accepts more characters in keys or value names than
// bibtex does.
//
- // TODOS:
- // - the entries are split into name = value pairs by the
- // parser. These have to be merged again because of the
- // way lyx treats the entries ( pair<...>(...) ). The citation
- // mechanism in lyx should be changed such that it can use
- // the split entries.
- // - messages on parsing errors can be generated.
- //
-
// Officially bibtex does only support ASCII, but in practice
// you can use the encoding of the main document as long as
// some elements like keys and names are pure ASCII. Therefore
// We don't restrict keys to ASCII in LyX, since our own
// InsetBibitem can generate non-ASCII keys, and nonstandard
// 8bit clean bibtex forks exist.
+
idocfstream ifs(it->toFilesystemEncoding().c_str(),
- std::ios_base::in,
- buffer.params().encoding().iconvName());
+ std::ios_base::in,
+ buffer.params().encoding().iconvName());
char_type ch;
VarMap strings;
docstring entryType;
- if (!readTypeOrKey(entryType, ifs, from_ascii("{("), makeLowerCase) || !ifs)
+ if (!readTypeOrKey(entryType, ifs, from_ascii("{("),
+ docstring(), makeLowerCase) || !ifs)
continue;
if (entryType == from_ascii("comment")) {
docstring name;
docstring value;
- if (!readTypeOrKey(name, ifs, from_ascii("#=}),"), makeLowerCase) || !ifs)
+ if (!readTypeOrKey(name, ifs, from_ascii("="),
+ from_ascii("#{}(),"), makeLowerCase) || !ifs)
continue;
+ // next char must be an equal sign
ifs.get(ch);
if (!ifs || ch != '=')
continue;
} else {
- // Citation entry. Read the key and all name = value pairs
+ // Citation entry. Try to read the key.
docstring key;
- docstring fields;
- docstring name;
- docstring value;
- docstring commaNewline;
- if (!readTypeOrKey(key, ifs, from_ascii(",})"), keepCase) || !ifs)
+ if (!readTypeOrKey(key, ifs, from_ascii(","),
+ from_ascii("}"), keepCase) || !ifs)
continue;
- // now we have a key, so we will add an entry
- // (even if it's empty, as bibtex does)
+ /////////////////////////////////////////////
+ // now we have a key, so we will add an entry
+ // (even if it's empty, as bibtex does)
//
- // all items must be separated by a comma. If
- // it is missing the scanning of this entry is
- // stopped and the next is searched.
+ // we now read the field = value pairs.
+ // all items must be separated by a comma. If
+ // it is missing the scanning of this entry is
+ // stopped and the next is searched.
+ docstring fields;
+ docstring name;
+ docstring value;
+ docstring commaNewline;
+ docstring data;
+ BibTeXInfo keyvalmap;
+ keyvalmap.entryType = entryType;
+
bool readNext = removeWSAndComma(ifs);
-
+
while (ifs && readNext) {
// read field name
- if (!readTypeOrKey(name, ifs, from_ascii("=}),"), makeLowerCase) || !ifs)
+ if (!readTypeOrKey(name, ifs, from_ascii("="),
+ from_ascii("{}(),"), makeLowerCase) || !ifs)
break;
// next char must be an equal sign
if (!readValue(value, ifs, strings))
break;
- // append field to the total entry string.
- //
- // TODO: Here is where the fields can be put in
- // a more intelligent structure that preserves
- // the already known parts.
- fields += commaNewline;
- fields += name + from_ascii(" = {") + value + '}';
-
- if (!commaNewline.length())
- commaNewline = from_ascii(",\n");
-
+ keyvalmap[name] = value;
+ data += "\n\n" + value;
+ keylist.fieldNames.insert(name);
readNext = removeWSAndComma(ifs);
}
// add the new entry
- keys.push_back(pair<string, docstring>(
- to_utf8(key), fields));
+ keylist.entryTypes.insert(entryType);
+ keyvalmap.allData = data;
+ keyvalmap.isBibTeX = true;
+ keyvalmap.bibKey = key;
+ keylist[key] = keyvalmap;
}
-
} //< searching '@'
-
} //< for loop over files
}
projects / lyx.git / blobdiff