#include "TextClass.h"
#include "TocBackend.h"
-#include "insets/Inset.h"
-#include "insets/InsetBibitem.h"
-#include "insets/InsetBibtex.h"
-#include "insets/InsetInclude.h"
-
#include "support/convert.h"
#include "support/debug.h"
#include "support/docstream.h"
#include "support/gettext.h"
#include "support/lassert.h"
#include "support/lstrings.h"
-#include "support/textutils.h"
-
#include "support/regex.h"
+#include "support/textutils.h"
#include <set>
for (; it != en; ++it) {
if (!first)
retval += " ";
- else
+ else
first = false;
retval += *it;
}
escaped = false;
else if (ch == '\\')
escaped = true;
- else if (ch == '$')
+ else if (ch == '$')
scanning_math = false;
ret += ch;
val = val.substr(1);
val.insert(2, from_ascii("{"));
}
docstring rem;
- docstring const cnvtd = Encodings::fromLaTeXCommand(val, rem,
- Encodings::TEXT_CMD);
+ docstring const cnvtd = Encodings::fromLaTeXCommand(val,
+ Encodings::TEXT_CMD, rem);
if (!cnvtd.empty()) {
// it did, so we'll take that bit and proceed with what's left
ret += cnvtd;
docstring authors;
docstring const remainder = trim(split(opt, authors, '('));
if (remainder.empty())
- // in this case, we didn't find a "(",
+ // in this case, we didn't find a "(",
// so we don't have author (year)
return docstring();
return authors;
// FIXME Move this to a separate routine that can
// be called from elsewhere.
- //
+ //
// OK, we've got some names. Let's format them.
// Try to split the author list on " and "
vector<docstring> const authors =
docstring const BibTeXInfo::getYear() const
{
- if (is_bibtex_)
+ if (is_bibtex_)
return operator[]("year");
docstring const opt = label();
docstring authors;
docstring tmp = split(opt, authors, '(');
- if (tmp.empty())
+ if (tmp.empty())
// we don't have author (year)
return docstring();
docstring year;
namespace {
- string parseOptions(string const & format, string & optkey,
+ string parseOptions(string const & format, string & optkey,
string & ifpart, string & elsepart);
// Calls parseOptions to deal with an embedded option, such as:
ifelsepart = format.substr(0, format.size() - rest.size());
return rest;
}
-
-
- // Gets a "clause" from a format string, where the clause is
+
+
+ // Gets a "clause" from a format string, where the clause is
// delimited by '[[' and ']]'. Returns what is left after the
// clause is removed, and returns format if there is an error.
string getClause(string const & format, string & clause)
string fmt = format;
// remove '[['
fmt = fmt.substr(2);
- // we'll remove characters from the front of fmt as we
+ // we'll remove characters from the front of fmt as we
// deal with them
- while (fmt.size()) {
+ while (fmt.size()) {
if (fmt[0] == ']' && fmt.size() > 1 && fmt[1] == ']') {
// that's the end
fmt = fmt.substr(2);
// format parameter. puts the parsed bits in optkey, ifpart, and
// elsepart and returns what's left after the option is removed.
// if there's an error, it returns format itself.
- string parseOptions(string const & format, string & optkey,
- string & ifpart, string & elsepart)
+ string parseOptions(string const & format, string & optkey,
+ string & ifpart, string & elsepart)
{
LASSERT(format[0] == '{' && format[1] == '%', return format);
// strip '{%'
if (fmt[0] == '}') // we're done, no else clause
return fmt.substr(1);
-
+
// else part should follow
if (fmt[0] != '[' || fmt[1] != '[') {
LYXERR0("Error parsing `" << format <<"'. Can't find else clause.");
return format;
}
-
+
curfmt = fmt;
fmt = getClause(curfmt, elsepart);
// we should be done
} // anon namespace
-docstring BibTeXInfo::expandFormat(string const & format,
- BibTeXInfo const * const xref, int & counter, Buffer const & buf,
+docstring BibTeXInfo::expandFormat(string const & format,
+ BibTeXInfo const * const xref, int & counter, Buffer const & buf,
bool richtext) const
{
// incorrect use of macros could put us in an infinite loop
bool scanning_rich = false;
string fmt = format;
- // we'll remove characters from the front of fmt as we
+ // we'll remove characters from the front of fmt as we
// deal with them
while (fmt.size()) {
if (counter++ > max_passes) {
- LYXERR0("Recursion limit reached while parsing `"
+ LYXERR0("Recursion limit reached while parsing `"
<< format << "'.");
return _("ERROR!");
}
-
+
char_type thischar = fmt[0];
- if (thischar == '%') {
+ if (thischar == '%') {
// beginning or end of key
- if (scanning_key) {
+ if (scanning_key) {
// end of key
scanning_key = false;
// so we replace the key with its value, which may be empty
if (key[0] == '!') {
// macro
- string const val =
+ string const val =
buf.params().documentClass().getCiteMacro(key);
fmt = val + fmt.substr(1);
continue;
} else if (key[0] == '_') {
// a translatable bit
- string const val =
+ string const val =
buf.params().documentClass().getCiteMacro(key);
- docstring const trans =
+ docstring const trans =
translateIfPossible(from_utf8(val), buf.params().language->code());
ret += trans;
} else {
scanning_key = true;
}
}
- else if (thischar == '{') {
+ else if (thischar == '{') {
// beginning of option?
if (scanning_key) {
LYXERR0("ERROR: Found `{' when scanning key in `" << format << "'.");
string optkey;
string ifpart;
string elsepart;
- string const newfmt =
+ string const newfmt =
parseOptions(fmt, optkey, ifpart, elsepart);
if (newfmt == fmt) // parse error
return _("ERROR!");
else if (!elsepart.empty())
ret += expandFormat(elsepart, xref, counter, buf, richtext);
// fmt will have been shortened for us already
- continue;
+ continue;
}
if (fmt[1] == '!') {
// beginning of rich text
continue;
}
}
- // we are here if '{' was not followed by % or !.
+ // we are here if '{' was not followed by % or !.
// So it's just a character.
ret += thischar;
}
- else if (scanning_rich && thischar == '!'
+ else if (scanning_rich && thischar == '!'
&& fmt.size() > 1 && fmt[1] == '}') {
// end of rich text
scanning_rich = false;
ret += "<";
else if (thischar == '>')
ret += ">";
- else
+ else
ret += thischar;
- }
+ }
} else if (!scanning_rich /* && !richtext */)
ret += thischar;
// else the character is discarded, which will happen only if
static docstring const empty_value = docstring();
return empty_value;
}
-
-
+
+
docstring const & BibTeXInfo::operator[](string const & field) const
{
return operator[](from_ascii(field));
}
-docstring BibTeXInfo::getValueForKey(string const & key,
+docstring BibTeXInfo::getValueForKey(string const & key,
BibTeXInfo const * const xref) const
{
docstring const ret = operator[](key);
}
-docstring const BiblioInfo::getInfo(docstring const & key,
+docstring const BiblioInfo::getInfo(docstring const & key,
Buffer const & buf, bool richtext) const
{
BiblioInfo::const_iterator it = find(key);
if (it == end())
- return docstring();
+ return docstring(_("Bibliography entry not found!"));
BibTeXInfo const & data = it->second;
BibTeXInfo const * xrefptr = 0;
docstring const xref = data.getXRef();
return vector<docstring>();
vector<CiteStyle> const & styles = citeStyles(buf.params().citeEngine());
-
+
vector<docstring> vec(styles.size());
for (size_t i = 0; i != vec.size(); ++i) {
docstring str;
return vector<docstring>();
vector<CiteStyle> const & styles = citeStyles(buf.params().citeEngine());
-
+
vector<docstring> vec(styles.size());
for (size_t i = 0; i != vec.size(); ++i) {
docstring str;
}
if (citekeys.empty())
return;
-
+
// We have a set of the keys used in this document.
- // We will now convert it to a list of the BibTeXInfo objects used in
+ // We will now convert it to a list of the BibTeXInfo objects used in
// this document...
vector<BibTeXInfo const *> bi;
set<docstring>::const_iterator cit = citekeys.begin();
}
// ...and sort it.
sort(bi.begin(), bi.end(), lSorter);
-
+
// Now we can write the sorted keys
vector<BibTeXInfo const *>::const_iterator bit = bi.begin();
vector<BibTeXInfo const *>::const_iterator ben = bi.end();
{
collectCitedEntries(buf);
CiteEngine const engine = buf.params().citeEngine();
- bool const numbers =
+ bool const numbers =
(engine == ENGINE_BASIC || engine == ENGINE_NATBIB_NUMERICAL);
int keynumber = 0;
} else {
modifier = 0;
}
- entry.setModifier(modifier);
+ entry.setModifier(modifier);
// remember the last one
last = biit;
}
projects / lyx.git / blobdiff