val.insert(2, from_ascii("{"));
}
docstring rem;
- docstring const cnvtd = Encodings::fromLaTeXCommand(val, rem);
+ docstring const cnvtd = Encodings::fromLaTeXCommand(val, rem,
+ Encodings::TEXT_CMD);
if (!cnvtd.empty()) {
// it did, so we'll take that bit and proceed with what's left
ret += cnvtd;
docstring const BibTeXInfo::getAbbreviatedAuthor() const
{
if (!is_bibtex_) {
- docstring const opt = trim(operator[]("label"));
+ docstring const opt = label();
if (opt.empty())
return docstring();
return authors;
}
- docstring author = operator[]("author");
+ docstring author = convertLaTeXCommands(operator[]("author"));
if (author.empty()) {
- author = operator[]("editor");
+ author = convertLaTeXCommands(operator[]("editor"));
if (author.empty())
return bib_key_;
}
if (is_bibtex_)
return operator[]("year");
- docstring const opt = trim(operator[]("label"));
+ docstring const opt = label();
if (opt.empty())
return docstring();
string cite = citeCommands[s.style];
if (s.full) {
CiteStyle const * last = citeStylesFull + nCiteStylesFull;
- if (find(citeStylesFull, last, s.style) != last)
+ if (std::find(citeStylesFull, last, s.style) != last)
cite += '*';
}
if (s.forceUpperCase) {
CiteStyle const * last = citeStylesUCase + nCiteStylesUCase;
- if (find(citeStylesUCase, last, s.style) != last)
+ if (std::find(citeStylesUCase, last, s.style) != last)
cite[0] = 'C';
}