X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBibtex.cpp;h=c925bfe3cc9bd3c30c1366c4327a7cbf4837bc2d;hb=fd5d47d182a70de532225715a04b77fe4155aa18;hp=1abafd60b3189679a6c57d3a41ba4d47770d3406;hpb=3f748c79c3a3cdeb1493cf6d2b76d21051a6d12b;p=lyx.git

diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index 1abafd60b3..c925bfe3cc 100644
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -338,7 +338,7 @@ void InsetBibtex::latex(otexstream & os, OutputParams const & runparams) const
 	if (style == "default")
 		style = buffer().params().biblio_style;
 
-	if (!style.empty()) {
+	if (!style.empty() && !buffer().params().use_bibtopic) {
 		string base = normalizeName(buffer(), runparams, style, ".bst");
 		FileName const try_in_file =
 			makeAbsPath(base + ".bst", buffer().filePath());
@@ -377,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
@@ -976,7 +979,9 @@ int InsetBibtex::plaintext(odocstringstream & os,
 docstring InsetBibtex::xhtml(XHTMLStream & xs, OutputParams const &) const
 {
 	BiblioInfo const & bibinfo = buffer().masterBibInfo();
-	vector<docstring> const & cites = bibinfo.citedEntries();
+	bool const all_entries = getParam("btprint") == "btPrintAll";
+	vector<docstring> const & cites = 
+	    all_entries ? bibinfo.getKeys() : bibinfo.citedEntries();
 
 	docstring const reflabel = buffer().B_("References");
 
@@ -992,16 +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='LyXCite-" + to_utf8(html::cleanAttr(entry.key())) + "'";
-		xs << html::CompTag("a", attr);
-		xs << html::StartTag("span", "class='bibtexlabel'")
-			<< entry.label()
-			<< html::EndTag("span");
+		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");
+		}
+		
 		// 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.