X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBibitem.cpp;h=3a6f083cb065489a3ed1a488c2698c02fa2ab0c7;hb=2c357c1d23b7b83839a9beb8225d4f1ae4f793b4;hp=829e15a52a22d642cc05dac70249dfa209adb3e4;hpb=7fe51efeb8add4bed09207674fd538e4f0288ac2;p=lyx.git

diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp
index 829e15a52a..3a6f083cb0 100644
--- a/src/insets/InsetBibitem.cpp
+++ b/src/insets/InsetBibitem.cpp
@@ -12,36 +12,37 @@
 
 #include "InsetBibitem.h"
 
-#include "Biblio.h"
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Counters.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
-#include "Font.h"
 #include "InsetIterator.h"
+#include "InsetList.h"
 #include "Lexer.h"
 #include "Paragraph.h"
 #include "ParagraphList.h"
+#include "TextClass.h"
 
 #include "support/lstrings.h"
-#include "support/std_ostream.h"
+#include "support/docstream.h"
 #include "support/convert.h"
 
+#include <ostream>
 
-namespace lyx {
+using namespace std;
+using namespace lyx::support;
 
-using support::prefixIs;
+namespace lyx {
 
-using std::max;
-using std::string;
-using std::auto_ptr;
-using std::ostream;
 
 int InsetBibitem::key_counter = 0;
+
+
 docstring const key_prefix = from_ascii("key-");
 
+
 InsetBibitem::InsetBibitem(InsetCommandParams const & p)
 	: InsetCommand(p, "bibitem")
 {
@@ -50,11 +51,20 @@ InsetBibitem::InsetBibitem(InsetCommandParams const & p)
 }
 
 
-auto_ptr<Inset> InsetBibitem::doClone() const
+CommandInfo const * InsetBibitem::findInfo(string const & /* cmdName */)
 {
-	auto_ptr<InsetBibitem> b(new InsetBibitem(params()));
+	static const char * const paramnames[] = {"label", "key", ""};
+	static const bool isoptional[] = {true, false};
+	static const CommandInfo info = {2, paramnames, isoptional};
+	return &info;
+}
+
+
+Inset * InsetBibitem::clone() const
+{
+	InsetBibitem * b = new InsetBibitem(params());
 	b->autolabel_ = autolabel_;
-	return auto_ptr<Inset>(b);
+	return b;
 }
 
 
@@ -63,15 +73,15 @@ void InsetBibitem::doDispatch(Cursor & cur, FuncRequest & cmd)
 	switch (cmd.action) {
 
 	case LFUN_INSET_MODIFY: {
-		InsetCommandParams p("bibitem");
+		InsetCommandParams p(BIBITEM_CODE);
 		InsetCommandMailer::string2params("bibitem", to_utf8(cmd.argument()), p);
 		if (p.getCmdName().empty()) {
 			cur.noUpdate();
 			break;
 		}
 		if (p["key"] != params()["key"])
-			cur.bv().buffer()->changeRefsIfUnique(params()["key"],
-						       p["key"], Inset::CITE_CODE);
+			cur.bv().buffer().changeRefsIfUnique(params()["key"],
+						       p["key"], CITE_CODE);
 		setParams(p);
 	}
 
@@ -143,36 +153,38 @@ docstring const bibitemWidest(Buffer const & buffer)
 	It is very important that the result of this function is the same both with
 	and without GUI. After thinking about this it is clear that no Font
 	metrics should be used here, since these come from the gui. If we can't
-	easily get the LaTeX font metrics we should make our own poor mans front
+	easily get the LaTeX font metrics we should make our own poor mans font
 	metrics replacement, e.g. by hardcoding the metrics of the standard TeX
 	font.
 	*/
-	Font font;
 
 	ParagraphList::const_iterator it = buffer.paragraphs().begin();
 	ParagraphList::const_iterator end = buffer.paragraphs().end();
 
 	for (; it != end; ++it) {
-		if (it->bibitem()) {
-			docstring const label = it->bibitem()->getBibLabel();
-
-			// FIXME: we can't be sure using the following that the GUI
-			// version and the command-line version will give the same
-			// result.
-			//
-			//int const wx = use_gui?
-			//	theFontMetrics(font).width(label): label.size();
-			//
-			// So for now we just use the label size in order to be sure
-			// that GUI and no-GUI gives the same bibitem (even if that is
-			// potentially the wrong one.
-			int const wx = label.size();
-
-			if (wx > w) {
-				w = wx;
-				bitem = it->bibitem();
-			}
-		}
+		if (it->insetList().empty())
+			continue;
+		Inset * inset = it->insetList().begin()->inset;
+		if (inset->lyxCode() != BIBITEM_CODE)
+			continue;
+
+		bitem = static_cast<InsetBibitem const *>(inset);
+		docstring const label = bitem->getBibLabel();
+
+		// FIXME: we can't be sure using the following that the GUI
+		// version and the command-line version will give the same
+		// result.
+		//
+		//int const wx = use_gui?
+		//	theFontMetrics(font).width(label): label.size();
+		//
+		// So for now we just use the label size in order to be sure
+		// that GUI and no-GUI gives the same bibitem (even if that is
+		// potentially the wrong one.
+		int const wx = label.size();
+
+		if (wx > w)
+			w = wx;
 	}
 
 	if (bitem && !bitem->getBibLabel().empty())
@@ -183,15 +195,14 @@ docstring const bibitemWidest(Buffer const & buffer)
 
 
 void InsetBibitem::fillWithBibKeys(Buffer const & buf,
-	biblio::BibKeyList & keys, InsetIterator const & it) const
+	BiblioInfo & keys, InsetIterator const & it) const
 {
-	string const key = to_utf8(getParam("key"));
-	biblio::BibTeXInfo keyvalmap;
+	docstring const key = getParam("key");
+	BibTeXInfo keyvalmap(false);
 	keyvalmap[from_ascii("label")] = getParam("label");
 	DocIterator doc_it(it); 
 	doc_it.forwardPos();
-	keyvalmap [from_ascii("ref")] = doc_it.paragraph().asString(buf, false);
-	keyvalmap.isBibTeX = false;
+	keyvalmap[from_ascii("ref")] = doc_it.paragraph().asString(buf, false);
 	keys[key] = keyvalmap;
 }