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

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index 32b0b64cfc..bb9b27f7fe 100644
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -19,12 +19,14 @@
 #include "Encoding.h"
 #include "InsetIterator.h"
 #include "Paragraph.h"
+#include "TocBackend.h"
 
 #include "insets/Inset.h"
 #include "insets/InsetBibitem.h"
 #include "insets/InsetBibtex.h"
 #include "insets/InsetInclude.h"
 
+#include "support/convert.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
@@ -33,6 +35,8 @@
 
 #include "boost/regex.hpp"
 
+#include <set>
+
 using namespace std;
 using namespace lyx::support;
 
@@ -129,10 +133,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 +178,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 +217,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 +226,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 +254,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();
 
@@ -597,6 +606,78 @@ void BiblioInfo::mergeBiblioInfo(BiblioInfo const & info)
 }
 
 
+namespace {
+	// used in xhtml to sort a list of BibTeXInfo objects
+	bool lSorter(BibTeXInfo const * lhs, BibTeXInfo const * rhs)
+	{
+		return lhs->getAbbreviatedAuthor() < rhs->getAbbreviatedAuthor();
+	}
+}
+
+
+void BiblioInfo::collectCitedEntries(Buffer const & buf)
+{
+	cited_entries_.clear();
+	// We are going to collect all the citation keys used in the document,
+	// getting them from the TOC.
+	// FIXME We may want to collect these differently, in the first case,
+	// so that we might have them in order of appearance.
+	set<docstring> citekeys;
+	Toc const & toc = buf.tocBackend().toc("citation");
+	Toc::const_iterator it = toc.begin();
+	Toc::const_iterator const en = toc.end();
+	for (; it != en; ++it) {
+		if (it->str().empty())
+			continue;
+		vector<docstring> const keys = getVectorFromString(it->str());
+		citekeys.insert(keys.begin(), keys.end());
+	}
+	if (citekeys.empty())
+		return;
+	
+	// We have a set of the keys used in this document.
+	// We will now convert it to a list of the BibTeXInfo objects used in 
+	// this document...
+	vector<BibTeXInfo const *> bi;
+	set<docstring>::const_iterator cit = citekeys.begin();
+	set<docstring>::const_iterator const cen = citekeys.end();
+	for (; cit != cen; ++cit) {
+		BiblioInfo::const_iterator const bt = find(*cit);
+		if (bt == end() || !bt->second.isBibTeX())
+			continue;
+		bi.push_back(&(bt->second));
+	}
+	// ...and sort it.
+	sort(bi.begin(), bi.end(), lSorter);
+	
+	// Now we can write the sorted keys
+	vector<BibTeXInfo const *>::const_iterator bit = bi.begin();
+	vector<BibTeXInfo const *>::const_iterator ben = bi.end();
+	for (; bit != ben; ++bit)
+		cited_entries_.push_back((*bit)->key());
+}
+
+
+void BiblioInfo::makeCitationLabels(Buffer const & buf)
+{
+	collectCitedEntries(buf);
+	// FIXME It'd be nice to do author-year as well as numerical
+	// and maybe even some other sorts of labels.
+	vector<docstring>::const_iterator it = cited_entries_.begin();
+	vector<docstring>::const_iterator const en = cited_entries_.end();
+	int keynumber = 0;
+	for (; it != en; ++it) {
+		map<docstring, BibTeXInfo>::iterator const biit = bimap_.find(*it);
+		// this shouldn't happen, but...
+		if (biit == bimap_.end())
+			continue;
+		BibTeXInfo & entry = biit->second;
+		docstring const key = convert<docstring>(++keynumber);
+		entry.setCiteKey(key);
+	}
+}
+
+
 //////////////////////////////////////////////////////////////////////
 //
 // CitationStyle
@@ -669,13 +750,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';
 	}