Shortcut for LyX HTML output. (Makes my life easier!)

[lyx.git] / src / BiblioInfo.cpp

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index 32b0b64cfcfecbb035be94f1f15a6c2f2484b129..2b9911ea8930e0805dfe181b9ac0f169005685d4 100644 (file)
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -170,7 +170,8 @@ docstring convertLaTeXCommands(docstring const & str)
                        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;
@@ -208,7 +209,7 @@ bool BibTeXInfo::hasField(docstring const & field) const
 docstring const BibTeXInfo::getAbbreviatedAuthor() const
 {
        if (!is_bibtex_) {
-               docstring const opt = trim(operator[]("label"));
+               docstring const opt = label();
                if (opt.empty())
                        return docstring();
 
@@ -217,9 +218,9 @@ docstring const BibTeXInfo::getAbbreviatedAuthor() const
                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_;
        }
@@ -245,7 +246,7 @@ docstring const BibTeXInfo::getYear() const
        if (is_bibtex_) 
                return operator[]("year");
 
-       docstring const opt = trim(operator[]("label"));
+       docstring const opt = label();
        if (opt.empty())
                return docstring();
 
@@ -669,13 +670,13 @@ string citationStyleToString(const CitationStyle & s)
        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';
        }