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

diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp
index 55806f1781..3a6f083cb0 100644
--- a/src/insets/InsetBibitem.cpp
+++ b/src/insets/InsetBibitem.cpp
@@ -18,16 +18,21 @@
 #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>
+
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
@@ -46,6 +51,15 @@ InsetBibitem::InsetBibitem(InsetCommandParams const & p)
 }
 
 
+CommandInfo const * InsetBibitem::findInfo(string const & /* cmdName */)
+{
+	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());
@@ -59,7 +73,7 @@ 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();
@@ -82,9 +96,9 @@ void InsetBibitem::read(Buffer const & buf, Lexer & lex)
 {
 	InsetCommand::read(buf, lex);
 
-	if (support::prefixIs(getParam("key"), key_prefix)) {
+	if (prefixIs(getParam("key"), key_prefix)) {
 		int const key = convert<int>(getParam("key").substr(key_prefix.length()));
-		key_counter = std::max(key_counter, key);
+		key_counter = max(key_counter, key);
 	}
 }
 
@@ -139,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())
@@ -182,12 +198,11 @@ void InsetBibitem::fillWithBibKeys(Buffer const & buf,
 	BiblioInfo & keys, InsetIterator const & it) const
 {
 	docstring const key = getParam("key");
-	BibTeXInfo keyvalmap;
+	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;
 	keys[key] = keyvalmap;
 }