* \author Angus Leeming
* \author Herbert Voß
* \author Richard Heck
+ * \author Julien Rioux
*
* Full author contact details are available in file CREDITS.
*/
return ret;
}
+
+// Escape '<' and '>' and remove richtext markers (e.g. {!this is richtext!}) from a string.
+docstring processRichtext(docstring const & str, bool richtext)
+{
+ docstring val = str;
+ docstring ret;
+
+ bool scanning_rich = false;
+ while (!val.empty()) {
+ char_type const ch = val[0];
+ if (ch == '{' && val.size() > 1 && val[1] == '!') {
+ // beginning of rich text
+ scanning_rich = true;
+ val = val.substr(2);
+ continue;
+ }
+ if (scanning_rich && ch == '!' && val.size() > 1 && val[1] == '}') {
+ // end of rich text
+ scanning_rich = false;
+ val = val.substr(2);
+ continue;
+ }
+ if (richtext) {
+ if (scanning_rich)
+ ret += ch;
+ else {
+ // we need to escape '<' and '>'
+ if (ch == '<')
+ ret += "<";
+ else if (ch == '>')
+ ret += ">";
+ else
+ ret += ch;
+ }
+ } else if (!scanning_rich /* && !richtext */)
+ ret += ch;
+ // else the character is discarded, which will happen only if
+ // richtext == false and we are scanning rich text
+ val = val.substr(1);
+ }
+ return ret;
+}
+
} // anon namespace
return shortauthor;
}
- if (authors.size() == 2)
- return bformat(_("%1$s and %2$s"),
+ if (authors.size() == 2 && authors[1] != "others")
+ return bformat(from_ascii("%1$s and %2$s"),
familyName(authors[0]), familyName(authors[1]));
- if (authors.size() > 2)
- return bformat(_("%1$s et al."), familyName(authors[0]));
+ if (authors.size() >= 2)
+ return bformat(from_ascii("%1$s et al."),
+ familyName(authors[0]));
return familyName(authors[0]);
}
+docstring const BibTeXInfo::getAbbreviatedAuthor(Buffer const & buf, bool jurabib_style) const
+{
+ docstring const author = getAbbreviatedAuthor(jurabib_style);
+ if (!is_bibtex_)
+ return author;
+ vector<docstring> const authors = getVectorFromString(author, from_ascii(" and "));
+ if (authors.size() == 2)
+ return bformat(buf.B_("%1$s and %2$s"), authors[0], authors[1]);
+ docstring::size_type const idx = author.rfind(from_ascii(" et al."));
+ if (idx != docstring::npos)
+ return bformat(buf.B_("%1$s et al."), author.substr(0, idx));
+ return author;
+}
+
+
docstring const BibTeXInfo::getYear() const
{
if (is_bibtex_)
docstring BibTeXInfo::expandFormat(string const & format,
BibTeXInfo const * const xref, int & counter, Buffer const & buf,
- bool richtext, docstring before, docstring after, docstring dialog, bool next) const
+ docstring before, docstring after, docstring dialog, bool next) const
{
// incorrect use of macros could put us in an infinite loop
static int max_passes = 5000;
// so we replace the key with its value, which may be empty
if (key[0] == '!') {
// macro
- // FIXME: instead of passing the buf, just past the macros
- // FIXME: and the language code
string const val =
buf.params().documentClass().getCiteMacro(engine_type, key);
fmt = val + fmt.substr(1);
translateIfPossible(from_utf8(val), buf.params().language->code());
ret += trans;
} else {
- docstring const val = getValueForKey(key, before, after, dialog, xref);
+ docstring const val =
+ getValueForKey(key, buf, before, after, dialog, xref);
+ if (!scanning_rich)
+ ret += from_ascii("{!<span class=\"bib-" + key + "\">!}");
ret += val;
+ if (!scanning_rich)
+ ret += from_ascii("{!</span>!}");
}
} else {
// beginning of key
if (newfmt == fmt) // parse error
return _("ERROR!");
fmt = newfmt;
- docstring const val = getValueForKey(optkey, before, after, dialog, xref);
+ docstring const val =
+ getValueForKey(optkey, buf, before, after, dialog, xref);
if (optkey == "next" && next)
ret += from_utf8(ifpart); // without expansion
else if (!val.empty())
ret += expandFormat(ifpart, xref, counter, buf,
- richtext, before, after, dialog, next);
+ before, after, dialog, next);
else if (!elsepart.empty())
ret += expandFormat(elsepart, xref, counter, buf,
- richtext, before, after, dialog, next);
+ before, after, dialog, next);
// fmt will have been shortened for us already
continue;
}
// beginning of rich text
scanning_rich = true;
fmt = fmt.substr(2);
+ ret += from_ascii("{!");
continue;
}
}
// end of rich text
scanning_rich = false;
fmt = fmt.substr(2);
+ ret += from_ascii("!}");
continue;
}
else if (scanning_key)
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 */)
+ else
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) {
docstring const & BibTeXInfo::getInfo(BibTeXInfo const * const xref,
Buffer const & buf, bool richtext) const
{
- if (!info_.empty())
+ if (!richtext && !info_.empty())
return info_;
+ if (richtext && !info_richtext_.empty())
+ return info_richtext_;
if (!is_bibtex_) {
BibTeXInfo::const_iterator it = find(from_ascii("ref"));
DocumentClass const & dc = buf.params().documentClass();
string const & format = dc.getCiteFormat(engine_type, to_utf8(entry_type_));
int counter = 0;
- info_ = expandFormat(format, xref, counter, buf, richtext);
-
- if (!info_.empty())
- info_ = convertLaTeXCommands(info_);
+ info_ = expandFormat(format, xref, counter, buf,
+ docstring(), docstring(), docstring(), false);
+
+ if (!info_.empty()) {
+ info_richtext_ = convertLaTeXCommands(processRichtext(info_, true));
+ info_ = convertLaTeXCommands(processRichtext(info_, false));
+ if (richtext)
+ return info_richtext_;
+ }
return info_;
}
*/
int counter = 0;
- loclabel = expandFormat(format, xref, counter, buf, richtext,
+ loclabel = expandFormat(format, xref, counter, buf,
before, after, dialog, next);
- if (!loclabel.empty())
+ if (!loclabel.empty() && !next) {
+ loclabel = processRichtext(loclabel, richtext);
loclabel = convertLaTeXCommands(loclabel);
+ }
return loclabel;
}
}
-docstring BibTeXInfo::getValueForKey(string const & key,
+docstring BibTeXInfo::getValueForKey(string const & key, Buffer const & buf,
docstring const & before, docstring const & after, docstring const & dialog,
BibTeXInfo const * const xref) const
{
return label_;
else if (key == "abbrvauthor")
// Special key to provide abbreviated author names.
- return getAbbreviatedAuthor();
+ return getAbbreviatedAuthor(buf, false);
else if (key == "shortauthor")
// When shortauthor is not defined, jurabib automatically
// provides jurabib-style abbreviated author names. We do
// this as well.
- return getAbbreviatedAuthor(true);
+ return getAbbreviatedAuthor(buf, true);
else if (key == "shorttitle") {
// When shorttitle is not defined, jurabib uses for `article'
// and `periodical' entries the form `journal volume [year]'
}
-docstring const BiblioInfo::getAbbreviatedAuthor(docstring const & key) const
+docstring const BiblioInfo::getAbbreviatedAuthor(docstring const & key, Buffer const & buf) const
{
BiblioInfo::const_iterator it = find(key);
if (it == end())
return docstring();
BibTeXInfo const & data = it->second;
- return data.getAbbreviatedAuthor();
+ return data.getAbbreviatedAuthor(buf, false);
}
// let's try the crossref
docstring const xref = data.getXRef();
if (xref.empty())
- return _("No year"); // no luck
+ // no luck
+ return docstring();
BiblioInfo::const_iterator const xrefit = find(xref);
if (xrefit == end())
- return _("No year"); // no luck again
+ // no luck again
+ return docstring();
BibTeXInfo const & xref_data = xrefit->second;
year = xref_data.getYear();
}
}
+docstring const BiblioInfo::getYear(docstring const & key, Buffer const & buf, bool use_modifier) const
+{
+ docstring const year = getYear(key, use_modifier);
+ if (year.empty())
+ return buf.B_("No year");
+ return year;
+}
+
+
docstring const BiblioInfo::getInfo(docstring const & key,
Buffer const & buf, bool richtext) const
{
}
} // namespace lyx
-
projects / lyx.git / blobdiff