Embedding: merge lyx::EmbeddedFiles to lyx::support::EmbeddedFileList

[lyx.git] / src / insets / InsetBibitem.cpp

diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp
index 924b931d82825a9794cf2cc9d0a7cf591fc5fb8f..db5bc53e4ec9ec8d454f9db54390529e92d56a0e 100644 (file)
--- 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();
@@ -67,7 +81,7 @@ void InsetBibitem::doDispatch(Cursor & cur, FuncRequest & cmd)
                }
                if (p["key"] != params()["key"])
                        cur.bv().buffer().changeRefsIfUnique(params()["key"],
-                                                      p["key"], Inset::CITE_CODE);
+                                                      p["key"], CITE_CODE);
                setParams(p);
        }
 
@@ -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())