#include "buffer_funcs.h"
#include "Encoding.h"
#include "InsetIterator.h"
+#include "Language.h"
#include "Paragraph.h"
#include "TextClass.h"
#include "TocBackend.h"
#include "support/lstrings.h"
#include "support/textutils.h"
-#include "boost/regex.hpp"
+#include "support/regex.h"
#include <set>
// unicodesymbols has things in the form: \"{u},
// whereas we may see things like: \"u. So we'll
// look for that and change it, if necessary.
- static boost::regex const reg("^\\\\\\W\\w");
- if (boost::regex_search(to_utf8(val), reg)) {
+ static lyx::regex const reg("^\\\\\\W\\w");
+ if (lyx::regex_search(to_utf8(val), reg)) {
val.insert(3, from_ascii("}"));
val.insert(2, from_ascii("{"));
}
docstring BibTeXInfo::expandFormat(string const & format,
- BibTeXInfo const * const xref, Buffer const & buf,
+ BibTeXInfo const * const xref, int & counter, Buffer const & buf,
bool richtext) const
{
// incorrect use of macros could put us in an infinite loop
- static int max_passes = 1000;
+ static int max_passes = 5000;
docstring ret; // return value
string key;
bool scanning_key = false;
bool scanning_rich = false;
- int passes = 0;
string fmt = format;
// we'll remove characters from the front of fmt as we
// deal with them
while (fmt.size()) {
- if (passes++ > max_passes) {
+ if (counter++ > max_passes) {
LYXERR0("Recursion limit reached while parsing `"
<< format << "'.");
return _("ERROR!");
// a translatable bit
string const val =
buf.params().documentClass().getCiteMacro(key);
- ret += _(val);
+ docstring const trans =
+ translateIfPossible(from_utf8(val), buf.params().language->code());
+ ret += trans;
} else {
docstring const val = getValueForKey(key, xref);
ret += val;
fmt = newfmt;
docstring const val = getValueForKey(optkey, xref);
if (!val.empty())
- ret += expandFormat(ifpart, xref, buf, richtext);
+ ret += expandFormat(ifpart, xref, counter, buf, richtext);
else if (!elsepart.empty())
- ret += expandFormat(elsepart, xref, buf, richtext);
+ ret += expandFormat(elsepart, xref, counter, buf, richtext);
// fmt will have been shortened for us already
continue;
}
}
else if (scanning_key)
key += char(thischar);
- else if (richtext || !scanning_rich)
+ else if (richtext) {
+ if (scanning_rich)
+ ret += thischar;
+ else {
+ // we need to escape '<' and '>'
+ if (thischar == '<')
+ ret += "<";
+ else if (thischar == '>')
+ ret += ">";
+ else
+ ret += thischar;
+ }
+ } else if (!scanning_rich /* && !richtext */)
ret += thischar;
// else the character is discarded, which will happen only if
// richtext == false and we are scanning rich text
DocumentClass const & dc = buf.params().documentClass();
string const & format = dc.getCiteFormat(to_utf8(entry_type_));
- info_ = expandFormat(format, xref, buf, richtext);
+ int counter = 0;
+ info_ = expandFormat(format, xref, counter, buf, richtext);
if (!info_.empty())
info_ = convertLaTeXCommands(info_);
void BiblioInfo::mergeBiblioInfo(BiblioInfo const & info)
{
bimap_.insert(info.begin(), info.end());
+ field_names_.insert(info.field_names_.begin(), info.field_names_.end());
+ entry_types_.insert(info.entry_types_.begin(), info.entry_types_.end());
}