X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBiblioInfo.cpp;h=66fcd39fe1bb1952a1fd62ee241662f1451fbea5;hb=bb80bd78f981c888efcc030168bd4e366b0ca6cd;hp=32b0b64cfcfecbb035be94f1f15a6c2f2484b129;hpb=1b160bd82dbebdd2d993a2aa854633d3f5f20848;p=lyx.git

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index 32b0b64cfc..66fcd39fe1 100644
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -129,10 +129,14 @@ docstring convertLaTeXCommands(docstring const & str)
 			scanning_cmd = false;
 		}
 
-		// was the last character a \? If so, then this is something like: \\,
-		// or \$, so we'll just output it. That's probably not always right...
+		// was the last character a \? If so, then this is something like:
+		// \\ or \$, so we'll just output it. That's probably not always right...
 		if (escaped) {
-			ret += ch;
+			// exception: output \, as THIN SPACE
+			if (ch == ',')
+				ret.push_back(0x2009);
+			else
+				ret += ch;
 			val = val.substr(1);
 			escaped = false;
 			continue;
@@ -170,7 +174,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 +213,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 +222,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 +250,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 +674,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';
 	}