remove annoying debug message

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

diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp
index b315608498b858b20eff3e62bd456e021285c195..829e15a52a22d642cc05dac70249dfa209adb3e4 100644 (file)
--- a/src/insets/InsetBibitem.cpp
+++ b/src/insets/InsetBibitem.cpp
@@ -12,11 +12,15 @@
 
 #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 "Lexer.h"
 #include "Paragraph.h"
 #include "ParagraphList.h"
@@ -39,7 +43,7 @@ int InsetBibitem::key_counter = 0;
 docstring const key_prefix = from_ascii("key-");
 
 InsetBibitem::InsetBibitem(InsetCommandParams const & p)
-       : InsetCommand(p, "bibitem"), counter(1)
+       : InsetCommand(p, "bibitem")
 {
        if (getParam("key").empty())
                setParam("key", key_prefix + convert<docstring>(++key_counter));
@@ -49,7 +53,7 @@ InsetBibitem::InsetBibitem(InsetCommandParams const & p)
 auto_ptr<Inset> InsetBibitem::doClone() const
 {
        auto_ptr<InsetBibitem> b(new InsetBibitem(params()));
-       b->setCounter(counter);
+       b->autolabel_ = autolabel_;
        return auto_ptr<Inset>(b);
 }
 
@@ -78,12 +82,6 @@ void InsetBibitem::doDispatch(Cursor & cur, FuncRequest & cmd)
 }
 
 
-void InsetBibitem::setCounter(int c)
-{
-       counter = c;
-}
-
-
 void InsetBibitem::read(Buffer const & buf, Lexer & lex)
 {
        InsetCommand::read(buf, lex);
@@ -98,7 +96,7 @@ void InsetBibitem::read(Buffer const & buf, Lexer & lex)
 docstring const InsetBibitem::getBibLabel() const
 {
        docstring const & label = getParam("label");
-       return label.empty() ? convert<docstring>(counter) : label;
+       return label.empty() ? autolabel_ : label;
 }
 
 
@@ -112,7 +110,7 @@ int InsetBibitem::plaintext(Buffer const &, odocstream & os,
                            OutputParams const &) const
 {
        odocstringstream oss;
-       oss << '[' << getCounter() << "] ";
+       oss << '[' << getBibLabel() << "] ";
 
        docstring const str = oss.str();
        os << str;
@@ -184,4 +182,32 @@ docstring const bibitemWidest(Buffer const & buffer)
 }
 
 
+void InsetBibitem::fillWithBibKeys(Buffer const & buf,
+       biblio::BibKeyList & keys, InsetIterator const & it) const
+{
+       string const key = to_utf8(getParam("key"));
+       biblio::BibTeXInfo keyvalmap;
+       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;
+}
+
+
+/// Update the counters of this inset and of its contents
+void InsetBibitem::updateLabels(Buffer const &buf, ParIterator const &) 
+{
+       Counters & counters = buf.params().getTextClass().counters();
+       docstring const bibitem = from_ascii("bibitem");
+       if (counters.hasCounter(bibitem) && getParam("label").empty()) {
+               counters.step(bibitem);
+               autolabel_ = counters.theCounter(bibitem);
+       } else
+               autolabel_ = from_ascii("??");
+       refresh();
+}
+
+
 } // namespace lyx