X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetbibitem.C;h=89346660f835a460c6f43fd67d8cc08e06bbaa38;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=ceff5365db1d49ec197ebf52367202d3926daa2f;hpb=a41282a1d62b00d4189c492dbdf0dbf6e453cdf7;p=lyx.git

diff --git a/src/insets/insetbibitem.C b/src/insets/insetbibitem.C
index ceff5365db..89346660f8 100644
--- a/src/insets/insetbibitem.C
+++ b/src/insets/insetbibitem.C
@@ -21,14 +21,14 @@
 #include "paragraph.h"
 #include "ParagraphList.h"
 
-#include "frontends/FontMetrics.h"
-
 #include "support/lstrings.h"
 #include "support/std_ostream.h"
 #include "support/convert.h"
 
-using lyx::docstring;
-using lyx::support::prefixIs;
+
+namespace lyx {
+
+using support::prefixIs;
 
 using std::max;
 using std::string;
@@ -36,17 +36,13 @@ using std::auto_ptr;
 using std::ostream;
 
 int InsetBibitem::key_counter = 0;
-string const key_prefix = "key-";
-
-namespace lyx {
-extern bool use_gui;
-}
+docstring const key_prefix = from_ascii("key-");
 
 InsetBibitem::InsetBibitem(InsetCommandParams const & p)
 	: InsetCommand(p, "bibitem"), counter(1)
 {
-	if (getContents().empty())
-		setContents(key_prefix + convert<string>(++key_counter));
+	if (getParam("key").empty())
+		setParam("key", key_prefix + convert<docstring>(++key_counter));
 }
 
 
@@ -63,15 +59,15 @@ void InsetBibitem::doDispatch(LCursor & cur, FuncRequest & cmd)
 	switch (cmd.action) {
 
 	case LFUN_INSET_MODIFY: {
-		InsetCommandParams p;
-		InsetCommandMailer::string2params("bibitem", lyx::to_utf8(cmd.argument()), p);
+		InsetCommandParams p("bibitem");
+		InsetCommandMailer::string2params("bibitem", to_utf8(cmd.argument()), p);
 		if (p.getCmdName().empty()) {
  			cur.noUpdate();
 			break;
 		}
-		if (p.getContents() != params().getContents()) 
-			cur.bv().buffer()->changeRefsIfUnique(params().getContents(),
-						       p.getContents(), InsetBase::CITE_CODE);
+		if (p["key"] != params()["key"])
+			cur.bv().buffer()->changeRefsIfUnique(params()["key"],
+						       p["key"], InsetBase::CITE_CODE);
 		setParams(p);
 	}
 
@@ -88,30 +84,12 @@ void InsetBibitem::setCounter(int c)
 }
 
 
-// I'm sorry but this is still necessary because \bibitem is used also
-// as a LyX 2.x command, and lyxlex is not enough smart to understand
-// real LaTeX commands. Yes, that could be fixed, but would be a waste
-// of time cause LyX3 won't use lyxlex anyway.  (ale)
-void InsetBibitem::write(Buffer const &, std::ostream & os) const
+void InsetBibitem::read(Buffer const & buf, LyXLex & lex)
 {
-	os << "\n\\bibitem ";
-	if (!getOptions().empty())
-		os << '[' << getOptions() << ']';
-	os << '{' << getContents() << "}\n";
-}
-
-
-// This is necessary here because this is written without begin_inset
-// This should be changed!!! (Jug)
-void InsetBibitem::read(Buffer const &, LyXLex & lex)
-{
-	if (lex.eatLine())
-		scanCommand(lex.getString());
-	else
-		lex.printError("InsetCommand: Parse error: `$$Token'");
+	InsetCommand::read(buf, lex);
 
-	if (prefixIs(getContents(), key_prefix)) {
-		int const key = convert<int>(getContents().substr(key_prefix.length()));
+	if (prefixIs(getParam("key"), key_prefix)) {
+		int const key = convert<int>(getParam("key").substr(key_prefix.length()));
 		key_counter = max(key_counter, key);
 	}
 }
@@ -119,21 +97,18 @@ void InsetBibitem::read(Buffer const &, LyXLex & lex)
 
 docstring const InsetBibitem::getBibLabel() const
 {
-	// FIXME UNICODE
-	return getOptions().empty() ?
-		convert<docstring>(counter) :
-		lyx::from_utf8(getOptions());
+	docstring const & label = getParam("label");
+	return label.empty() ? convert<docstring>(counter) : label;
 }
 
 
 docstring const InsetBibitem::getScreenLabel(Buffer const &) const
 {
-	// FIXME UNICODE
-	return lyx::from_utf8(getContents()) + " [" + getBibLabel() + ']';
+	return getParam("key") + " [" + getBibLabel() + ']';
 }
 
 
-int InsetBibitem::plaintext(Buffer const &, lyx::odocstream & os,
+int InsetBibitem::plaintext(Buffer const &, odocstream & os,
 			    OutputParams const &) const
 {
 	os << '[' << getCounter() << "] ";
@@ -145,11 +120,11 @@ int InsetBibitem::plaintext(Buffer const &, lyx::odocstream & os,
 docstring const bibitemWidest(Buffer const & buffer)
 {
 	int w = 0;
-	// Does look like a hack? It is! (but will change at 0.13)
 
 	InsetBibitem const * bitem = 0;
+
 	// FIXME: this font is used unitialized for now but should  be set to
-	// a proportional font. Here is what Georg has to say about it:
+	// a proportional font. Here is what Georg Baum has to say about it:
 	/*
 	bibitemWidest() is supposed to find the bibitem with the widest label in the 
 	output, because that is needed as an argument of the bibliography 
@@ -178,12 +153,17 @@ docstring const bibitemWidest(Buffer const & buffer)
 		if (it->bibitem()) {
 			docstring const label = it->bibitem()->getBibLabel();
             
-			// FIXME 1: we can't be sure using the following that the GUI
+			// FIXME: we can't be sure using the following that the GUI
 			// version and the command-line version will give the same 
 			// result.
-			// FIXME 2: this use_gui test should be transfered to the frontend.
-			int const wx = lyx::use_gui?
-				theFontMetrics(font).width(label): label.size();
+			//
+			//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;
@@ -195,5 +175,8 @@ docstring const bibitemWidest(Buffer const & buffer)
 	if (bitem && !bitem->getBibLabel().empty())
 		return bitem->getBibLabel();
 
-	return lyx::from_ascii("99");
+	return from_ascii("99");
 }
+
+
+} // namespace lyx