X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBiblioInfo.cpp;h=420eaa2177c87f9d1d05f92d939565fd60313136;hb=edc94a578f3e43c036842f91f25cf2eea42eb6cf;hp=99e3bd91acbdc80fccbf240b7fa2dd2b4251a858;hpb=206ca457517a7d6a2c92c23cf59f9e59241fb698;p=lyx.git diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp index 99e3bd91ac..420eaa2177 100644 --- a/src/BiblioInfo.cpp +++ b/src/BiblioInfo.cpp @@ -18,7 +18,9 @@ #include "buffer_funcs.h" #include "Encoding.h" #include "InsetIterator.h" +#include "Language.h" #include "Paragraph.h" +#include "TextClass.h" #include "TocBackend.h" #include "insets/Inset.h" @@ -34,7 +36,7 @@ #include "support/lstrings.h" #include "support/textutils.h" -#include "boost/regex.hpp" +#include "support/regex.h" #include @@ -173,8 +175,8 @@ docstring convertLaTeXCommands(docstring const & str) // 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("{")); } @@ -281,22 +283,21 @@ docstring const BibTeXInfo::getXRef() const namespace { - docstring parseOptions(docstring const & format, docstring & optkey, - docstring & ifpart, docstring & elsepart); - - /// Calls parseOptions to deal with an embedded option, such as: - /// {%number%[[, no.~%number%]]} - /// which must appear at the start of format. ifelsepart gets the - /// whole of the option, and we return what's left after the option. - /// we return format if there is an error. - docstring parseEmbeddedOption(docstring const & format, - docstring & ifelsepart) + string parseOptions(string const & format, string & optkey, + string & ifpart, string & elsepart); + + // Calls parseOptions to deal with an embedded option, such as: + // {%number%[[, no.~%number%]]} + // which must appear at the start of format. ifelsepart gets the + // whole of the option, and we return what's left after the option. + // we return format if there is an error. + string parseEmbeddedOption(string const & format, string & ifelsepart) { LASSERT(format[0] == '{' && format[1] == '%', return format); - docstring optkey; - docstring ifpart; - docstring elsepart; - docstring const rest = parseOptions(format, optkey, ifpart, elsepart); + string optkey; + string ifpart; + string elsepart; + string const rest = parseOptions(format, optkey, ifpart, elsepart); if (format == rest) { // parse error LYXERR0("ERROR! Couldn't parse `" << format <<"'."); return format; @@ -310,25 +311,25 @@ namespace { // 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. - docstring getClause(docstring const & format, docstring & clause) + string getClause(string const & format, string & clause) { - docstring fmt = format; + string fmt = format; // remove '[[' fmt = fmt.substr(2); // we'll remove characters from the front of fmt as we // deal with them while (fmt.size()) { if (fmt[0] == ']' && fmt.size() > 1 && fmt[1] == ']') { - // that's the end + // that's the end fmt = fmt.substr(2); break; } // check for an embedded option if (fmt[0] == '{' && fmt.size() > 1 && fmt[1] == '%') { - docstring part; - docstring const rest = parseEmbeddedOption(fmt, part); + string part; + string const rest = parseEmbeddedOption(fmt, part); if (fmt == rest) { - LYXERR0("ERROR! Couldn't parse `" << format <<"'."); + LYXERR0("ERROR! Couldn't parse embedded option in `" << format <<"'."); return format; } clause += part; @@ -342,16 +343,16 @@ namespace { } - /// parse an options string, which must appear at the start of the - /// 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. - docstring parseOptions(docstring const & format, docstring & optkey, - docstring & ifpart, docstring & elsepart) + // parse an options string, which must appear at the start of the + // 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) { LASSERT(format[0] == '{' && format[1] == '%', return format); // strip '{%' - docstring fmt = format.substr(2); + string fmt = format.substr(2); size_t pos = fmt.find('%'); // end of key if (pos == string::npos) { LYXERR0("Error parsing `" << format <<"'. Can't find end of key."); @@ -365,7 +366,7 @@ namespace { return format; } - docstring curfmt = fmt; + string curfmt = fmt; fmt = getClause(curfmt, ifpart); if (fmt == curfmt) { LYXERR0("Error parsing `" << format <<"'. Couldn't get if clause."); @@ -394,18 +395,27 @@ namespace { } // anon namespace -docstring BibTeXInfo::expandFormat(docstring const & format, - BibTeXInfo const * const xref) const +docstring BibTeXInfo::expandFormat(string const & format, + BibTeXInfo const * const xref, int & counter, Buffer const & buf, + bool richtext) const { - // return value - docstring ret; - docstring key; + // incorrect use of macros could put us in an infinite loop + static int max_passes = 5000; + docstring ret; // return value + string key; bool scanning_key = false; + bool scanning_rich = false; - docstring fmt = format; + string fmt = format; // 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 `" + << format << "'."); + return _("ERROR!"); + } + char_type thischar = fmt[0]; if (thischar == '%') { // beginning or end of key @@ -413,72 +423,106 @@ docstring BibTeXInfo::expandFormat(docstring const & format, // end of key scanning_key = false; // so we replace the key with its value, which may be empty - docstring const val = getValueForKey(to_utf8(key), xref); - key.clear(); - ret += val; + if (key[0] == '!') { + // macro + string const val = + buf.params().documentClass().getCiteMacro(key); + fmt = val + fmt.substr(1); + continue; + } else if (key[0] == '_') { + // a translatable bit + string const val = + buf.params().documentClass().getCiteMacro(key); + docstring const trans = + translateIfPossible(from_utf8(val), buf.params().language->code()); + ret += trans; + } else { + docstring const val = getValueForKey(key, xref); + ret += val; + } } else { // beginning of key + key.clear(); scanning_key = true; } - } + } else if (thischar == '{') { // beginning of option? if (scanning_key) { LYXERR0("ERROR: Found `{' when scanning key in `" << format << "'."); return _("ERROR!"); } - if (fmt.size() > 1 && fmt[1] == '%') { - // it is the beginning of an optional format - docstring optkey; - docstring ifpart; - docstring elsepart; - docstring const newfmt = + if (fmt.size() > 1) { + if (fmt[1] == '%') { + // it is the beginning of an optional format + string optkey; + string ifpart; + string elsepart; + string const newfmt = parseOptions(fmt, optkey, ifpart, elsepart); - if (newfmt == fmt) // parse error - return _("ERROR!"); - fmt = newfmt; - docstring const val = getValueForKey(to_utf8(optkey), xref); - if (!val.empty()) - ret += expandFormat(ifpart, xref); - else if (!elsepart.empty()) - ret += expandFormat(elsepart, xref); - // fmt will have been shortened for us already - continue; - } + if (newfmt == fmt) // parse error + return _("ERROR!"); + fmt = newfmt; + docstring const val = getValueForKey(optkey, xref); + if (!val.empty()) + ret += expandFormat(ifpart, xref, counter, buf, richtext); + else if (!elsepart.empty()) + ret += expandFormat(elsepart, xref, counter, buf, richtext); + // fmt will have been shortened for us already + continue; + } + if (fmt[1] == '!') { + // beginning of rich text + scanning_rich = true; + fmt = fmt.substr(2); + continue; + } + } + // we are here if '{' was not followed by % or !. + // So it's just a character. ret += thischar; - } + } + else if (scanning_rich && thischar == '!' + && fmt.size() > 1 && fmt[1] == '}') { + // end of rich text + scanning_rich = false; + fmt = fmt.substr(2); + continue; + } else if (scanning_key) - key += thischar; - else + key += char(thischar); + 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 fmt = fmt.substr(1); } // for loop if (scanning_key) { LYXERR0("Never found end of key in `" << format << "'!"); return _("ERROR!"); } + if (scanning_rich) { + LYXERR0("Never found end of rich text in `" << format << "'!"); + return _("ERROR!"); + } return ret; } -namespace { - -// FIXME These would be better read from a file, so that they -// could be customized. - - static docstring articleFormat = from_ascii("%author%, \"%title%\", %journal% {%volume%[[ %volume%{%number%[[, %number%]]}]]} (%year%){%pages%[[, pp. %pages%]]}.{%note%[[ %note%]]}"); - -static docstring bookFormat = from_ascii("{%author%[[%author%]][[%editor%, ed.]]}, %title%{%volume%[[ vol. %volume%]][[{%number%[[no. %number%]]}]]}{%edition%[[%edition%]]} ({%address%[[%address%: ]]}%publisher%, %year%).{%note%[[ %note%]]}"); - -static docstring inSomething = from_ascii("%author%, \"%title%\", in{%editor%[[ %editor%, ed.,]]} %booktitle%{%volume%[[ vol. %volume%]][[{%number%[[no. %number%]]}]]}{%edition%[[%edition%]]} ({%address%[[%address%: ]]}%publisher%, %year%){%pages%[[, pp. %pages%]]}.{%note%[[ %note%]]}"); - -static docstring thesis = from_ascii("%author%, %title% ({%address%[[%address%: ]]}%school%, %year%).{%note%[[ %note%]]}"); - -static docstring defaultFormat = from_ascii("{%author%[[%author%, ]][[{%editor%[[%editor%, ed., ]]}]]}%title%{%journal%[[, %journal%]][[{%publisher%[[, %publisher%]][[{%institution%[[, %institution%]]}]]}]]}{%year%[[ (%year%)]]}{%pages%[[, %pages%]]}."); - -} - -docstring const & BibTeXInfo::getInfo(BibTeXInfo const * const xref) const +docstring const & BibTeXInfo::getInfo(BibTeXInfo const * const xref, + Buffer const & buf, bool richtext) const { if (!info_.empty()) return info_; @@ -489,16 +533,10 @@ docstring const & BibTeXInfo::getInfo(BibTeXInfo const * const xref) const return info_; } - if (entry_type_ == "article") - info_ = expandFormat(articleFormat, xref); - else if (entry_type_ == "book") - info_ = expandFormat(bookFormat, xref); - else if (entry_type_.substr(0,2) == "in") - info_ = expandFormat(inSomething, xref); - else if (entry_type_ == "phdthesis" || entry_type_ == "mastersthesis") - info_ = expandFormat(thesis, xref); - else - info_ = expandFormat(defaultFormat, xref); + DocumentClass const & dc = buf.params().documentClass(); + string const & format = dc.getCiteFormat(to_utf8(entry_type_)); + int counter = 0; + info_ = expandFormat(format, xref, counter, buf, richtext); if (!info_.empty()) info_ = convertLaTeXCommands(info_); @@ -629,7 +667,8 @@ docstring const BiblioInfo::getYear(docstring const & key, bool use_modifier) co } -docstring const BiblioInfo::getInfo(docstring const & key) const +docstring const BiblioInfo::getInfo(docstring const & key, + Buffer const & buf, bool richtext) const { BiblioInfo::const_iterator it = find(key); if (it == end()) @@ -642,7 +681,7 @@ docstring const BiblioInfo::getInfo(docstring const & key) const if (xrefit != end()) xrefptr = &(xrefit->second); } - return data.getInfo(xrefptr); + return data.getInfo(xrefptr, buf, richtext); }