X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBibtex.cpp;h=c925bfe3cc9bd3c30c1366c4327a7cbf4837bc2d;hb=e15d3d35cba7266d8a1a22c7e4cd92d12599e103;hp=2544a493d39a686588557b44d291fae989c0d337;hpb=dfdcc56cbaf77b67048cfd7e2ad877b7687f4888;p=lyx.git

diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index 2544a493d3..c925bfe3cc 100644
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -23,7 +23,6 @@
 #include "Format.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "Language.h"
 #include "LaTeXFeatures.h"
 #include "output_xhtml.h"
 #include "OutputParams.h"
@@ -41,7 +40,7 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/os.h"
-#include "support/Path.h"
+#include "support/PathChanger.h"
 #include "support/textutils.h"
 
 #include <limits>
@@ -58,14 +57,17 @@ namespace os = support::os;
 InsetBibtex::InsetBibtex(Buffer * buf, InsetCommandParams const & p)
 	: InsetCommand(buf, p)
 {
-	buffer().invalidateBibinfoCache();
+	buffer().invalidateBibfileCache();
+	buffer().removeBiblioTempFiles();
 }
 
 
 InsetBibtex::~InsetBibtex()
 {
-	if (isBufferLoaded())
+	if (isBufferLoaded()) {
 		buffer().invalidateBibfileCache();
+		buffer().removeBiblioTempFiles();
+	}
 }
 
 
@@ -108,6 +110,7 @@ void InsetBibtex::doDispatch(Cursor & cur, FuncRequest & cmd)
 		cur.recordUndo();
 		setParams(p);
 		buffer().invalidateBibfileCache();
+		buffer().removeBiblioTempFiles();
 		cur.forceBufferUpdate();
 		break;
 	}
@@ -332,7 +335,10 @@ void InsetBibtex::latex(otexstream & os, OutputParams const & runparams) const
 			style = split(style, bibtotoc, ',');
 	}
 
-	if (!style.empty()) {
+	if (style == "default")
+		style = buffer().params().biblio_style;
+
+	if (!style.empty() && !buffer().params().use_bibtopic) {
 		string base = normalizeName(buffer(), runparams, style, ".bst");
 		FileName const try_in_file =
 			makeAbsPath(base + ".bst", buffer().filePath());
@@ -371,7 +377,10 @@ void InsetBibtex::latex(otexstream & os, OutputParams const & runparams) const
 	}
 
 	if (!db_out.empty() && buffer().params().use_bibtopic) {
-		os << "\\begin{btSect}{" << db_out << "}\n";
+		os << "\\begin{btSect}";
+		if (!style.empty())
+			os << "[" << style << "]";
+		os << "{" << db_out << "}\n";
 		docstring btprint = getParam("btprint");
 		if (btprint.empty())
 			// default
@@ -793,7 +802,7 @@ void InsetBibtex::parseBibTeXFiles() const
 				docstring key;
 
 				if (!readTypeOrKey(key, ifs, from_ascii(","), from_ascii("}"), keepCase)) {
-					lyxerr << "BibTeX Parser: Unable to read key for entry type:" << 
+					lyxerr << "BibTeX Parser: Unable to read key for entry type:" <<
 							entryType << "." << std::endl;
 					continue;
 				}
@@ -874,7 +883,7 @@ FileName InsetBibtex::getBibTeXPath(docstring const & filename, Buffer const & b
 		file = FileName(makeAbsPath(texfile, buf.filePath()));
 	return file;
 }
- 
+
 
 bool InsetBibtex::addDatabase(docstring const & db)
 {
@@ -916,11 +925,51 @@ void InsetBibtex::validate(LaTeXFeatures & features) const
 	// It'd be better to be able to get this from an InsetLayout, but at present
 	// InsetLayouts do not seem really to work for things that aren't InsetTexts.
 	if (features.runparams().flavor == OutputParams::HTML)
-		features.addPreambleSnippet("<style type=\"text/css\">\n"
-			"div.bibtexentry { margin-left: 2em; text-indent: -2em; }\n"
+		features.addCSSSnippet("div.bibtexentry { margin-left: 2em; text-indent: -2em; }\n"
 			"span.bibtexlabel:before{ content: \"[\"; }\n"
-			"span.bibtexlabel:after{ content: \"] \"; }\n"
-			"</style>");
+			"span.bibtexlabel:after{ content: \"] \"; }");
+}
+
+
+int InsetBibtex::plaintext(odocstringstream & os,
+       OutputParams const & op, size_t max_length) const
+{
+	docstring const reflabel = buffer().B_("References");
+
+	// We could output more information here, e.g., what databases are included
+	// and information about options. But I don't necessarily see any reason to
+	// do this right now.
+	if (op.for_tooltip || op.for_toc || op.for_search) {
+		os << '[' << reflabel << ']' << '\n';
+		return PLAINTEXT_NEWLINE;
+	}
+
+	BiblioInfo bibinfo = buffer().masterBibInfo();
+	bibinfo.makeCitationLabels(buffer());
+	vector<docstring> const & cites = bibinfo.citedEntries();
+
+	size_t start_size = os.str().size();
+	docstring refoutput;
+	refoutput += reflabel + "\n\n";
+
+	// Now we loop over the entries
+	vector<docstring>::const_iterator vit = cites.begin();
+	vector<docstring>::const_iterator const ven = cites.end();
+	for (; vit != ven; ++vit) {
+		if (start_size + refoutput.size() >= max_length)
+			break;
+		BiblioInfo::const_iterator const biit = bibinfo.find(*vit);
+		if (biit == bibinfo.end())
+			continue;
+		BibTeXInfo const & entry = biit->second;
+		refoutput += "[" + entry.label() + "] ";
+		// FIXME Right now, we are calling BibInfo::getInfo on the key,
+		// which will give us all the cross-referenced info. But for every
+		// entry, so there's a lot of repitition. This should be fixed.
+		refoutput += bibinfo.getInfo(entry.key(), buffer(), false) + "\n\n";
+	}
+	os << refoutput;
+	return refoutput.size();
 }
 
 
@@ -930,15 +979,11 @@ void InsetBibtex::validate(LaTeXFeatures & features) const
 docstring InsetBibtex::xhtml(XHTMLStream & xs, OutputParams const &) const
 {
 	BiblioInfo const & bibinfo = buffer().masterBibInfo();
-	vector<docstring> const & cites = bibinfo.citedEntries();
-	CiteEngine const engine = buffer().params().citeEngine();
-	bool const numbers =
-		(engine == ENGINE_BASIC || engine == ENGINE_NATBIB_NUMERICAL);
+	bool const all_entries = getParam("btprint") == "btPrintAll";
+	vector<docstring> const & cites = 
+	    all_entries ? bibinfo.getKeys() : bibinfo.citedEntries();
 
-	docstring reflabel = from_ascii("References");
-	Language const * l = buffer().params().language;
-	if (l)
-		reflabel = translateIfPossible(reflabel, l->code());
+	docstring const reflabel = buffer().B_("References");
 
 	xs << html::StartTag("h2", "class='bibtex'")
 		<< reflabel
@@ -952,31 +997,19 @@ docstring InsetBibtex::xhtml(XHTMLStream & xs, OutputParams const &) const
 		BiblioInfo::const_iterator const biit = bibinfo.find(*vit);
 		if (biit == bibinfo.end())
 			continue;
+
 		BibTeXInfo const & entry = biit->second;
-		xs << html::StartTag("div", "class='bibtexentry'");
-		// FIXME XHTML
-		// The same name/id problem we have elsewhere.
-		string const attr = "id='" + to_utf8(entry.key()) + "'";
-		xs << html::CompTag("a", attr);
-		docstring citekey;
-		if (numbers)
-			citekey = entry.citeNumber();
-		else {
-			docstring const auth = entry.getAbbreviatedAuthor();
-			// we do it this way so as to access the xref, if necessary
-			// note that this also gives us the modifier
-			docstring const year = bibinfo.getYear(*vit, true);
-			if (!auth.empty() && !year.empty())
-				citekey = auth + ' ' + year;
-		}
-		if (citekey.empty()) {
-			citekey = entry.label();
-			if (citekey.empty())
-				citekey = entry.key();
+		string const attr = "class='bibtexentry' id='LyXCite-" 
+		    + to_utf8(html::cleanAttr(entry.key())) + "'";
+		xs << html::StartTag("div", attr);
+		
+		// don't print labels if we're outputting all entries
+		if (!all_entries) {
+			xs << html::StartTag("span", "class='bibtexlabel'")
+				<< entry.label()
+				<< html::EndTag("span");
 		}
-		xs << html::StartTag("span", "class='bibtexlabel'")
-			<< citekey
-			<< html::EndTag("span");
+		
 		// FIXME Right now, we are calling BibInfo::getInfo on the key,
 		// which will give us all the cross-referenced info. But for every
 		// entry, so there's a lot of repitition. This should be fixed.