BibTeXInfo const * const xref) const
{
docstring const ret = operator[](key);
- if (!ret.empty() or !xref)
+ if (!ret.empty() || !xref)
return ret;
return (*xref)[key];
}
} // anon namespace
-docstring const BibTeXInfo::getInfo(BibTeXInfo const * const xref) const
+docstring const & BibTeXInfo::getInfo(BibTeXInfo const * const xref) const
{
if (!info_.empty())
return info_;
}
// FIXME
- // This could be made a lot better using the entryType
+ // This could be made a lot better using the entry_type_
// field to customize the output based upon entry type.
// Search for all possible "required" fields
if (docLoc.empty()) {
docLoc = getValueForKey("chapter", xref);
if (!docLoc.empty())
- docLoc = from_ascii("Ch. ") + docLoc;
+ docLoc = _("Ch. ") + docLoc;
} else {
- docLoc = from_ascii("pp. ") + docLoc;
+ docLoc = _("pp. ") + docLoc;
}
docstring media = getValueForKey("journal", xref);
}
// This should never happen (or at least be very unusual!)
- return docstring();
+ static docstring e = docstring();
+ return e;
}