Remove all BufferParam arguments in InsetXXX methods (since insets know about their...

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

diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp
index ed9e859641352748ffe0657fc0b3c9a615710376..008bf9aebeede8f3e787929ddec5d676f728ace8 100644 (file)
--- a/src/insets/InsetBibitem.cpp
+++ b/src/insets/InsetBibitem.cpp
@@ -9,6 +9,7 @@
  */
 
 #include <config.h>
+#include <algorithm>
 
 #include "InsetBibitem.h"
 
@@ -22,19 +23,20 @@
 #include "FuncRequest.h"
 #include "InsetIterator.h"
 #include "InsetList.h"
+#include "Language.h" 
 #include "Lexer.h"
+#include "output_xhtml.h"
 #include "Paragraph.h"
 #include "ParagraphList.h"
+#include "ParIterator.h"
 #include "TextClass.h"
 
 #include "frontends/alert.h"
 
-#include "support/lstrings.h"
+#include "support/convert.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
-#include "support/convert.h"
-
-#include <ostream>
+#include "support/lstrings.h"
 
 using namespace std;
 using namespace lyx::support;
@@ -46,14 +48,23 @@ int InsetBibitem::key_counter = 0;
 docstring const key_prefix = from_ascii("key-");
 
 
-InsetBibitem::InsetBibitem(InsetCommandParams const & p)
+InsetBibitem::InsetBibitem(Buffer const & buf, InsetCommandParams const & p)
        : InsetCommand(p, "bibitem")
 {
+       Inset::setBuffer(const_cast<Buffer &>(buf));
+       buffer_->invalidateBibinfoCache();
        if (getParam("key").empty())
                setParam("key", key_prefix + convert<docstring>(++key_counter));
 }
 
 
+InsetBibitem::~InsetBibitem()
+{
+       if (isBufferValid())
+               buffer_->invalidateBibinfoCache();
+}
+
+
 void InsetBibitem::initView()
 {
        updateCommand(getParam("key"));
@@ -65,9 +76,7 @@ void InsetBibitem::updateCommand(docstring const & new_key, bool)
        docstring const old_key = getParam("key");
        docstring key = new_key;
 
-       BiblioInfo keys;
-       keys.fillWithBibKeys(&buffer());
-       vector<docstring> bibkeys = keys.getKeys();
+       vector<docstring> bibkeys = buffer().masterBibInfo().getKeys();
 
        int i = 1;
 
@@ -84,7 +93,7 @@ void InsetBibitem::updateCommand(docstring const & new_key, bool)
        }
        setParam("key", key);
 
-       lyx::updateLabels(buffer());
+       buffer().updateLabels();
 }
 
 
@@ -105,17 +114,19 @@ void InsetBibitem::doDispatch(Cursor & cur, FuncRequest & cmd)
 
        case LFUN_INSET_MODIFY: {
                InsetCommandParams p(BIBITEM_CODE);
-               InsetCommandMailer::string2params("bibitem", to_utf8(cmd.argument()), p);
+               InsetCommand::string2params("bibitem", to_utf8(cmd.argument()), p);
                if (p.getCmdName().empty()) {
                        cur.noUpdate();
                        break;
                }
-               docstring old_key = params()["key"];
+               docstring const & old_key = params()["key"];
                setParam("label", p["label"]);
-               updateCommand(p["key"]);
-               if (params()["key"] != old_key)
+               if (p["key"] != old_key) {
+                       updateCommand(p["key"]);
                        cur.bv().buffer().changeRefsIfUnique(old_key,
                                params()["key"], CITE_CODE);
+               }
+               buffer_->invalidateBibinfoCache();
                break;
        }
 
@@ -163,7 +174,7 @@ int InsetBibitem::plaintext(odocstream & os, OutputParams const &) const
 
 
 // ale070405
-docstring const bibitemWidest(Buffer const & buffer)
+docstring bibitemWidest(Buffer const & buffer)
 {
        int w = 0;
 
@@ -174,7 +185,7 @@ docstring const bibitemWidest(Buffer const & buffer)
        /*
        bibitemWidest() is supposed to find the bibitem with the widest label in the
        output, because that is needed as an argument of the bibliography
-       environment to dtermine the correct indentation. To be 100% correct we
+       environment to determine the correct indentation. To be 100% correct we
        would need the metrics of the font that is used in the output, but usually
        we don't have access to these.
        In practice, any proportional font is probably good enough, since we don't
@@ -191,6 +202,8 @@ docstring const bibitemWidest(Buffer const & buffer)
        font.
        */
 
+       docstring lbl;
+
        ParagraphList::const_iterator it = buffer.paragraphs().begin();
        ParagraphList::const_iterator end = buffer.paragraphs().end();
 
@@ -216,12 +229,14 @@ docstring const bibitemWidest(Buffer const & buffer)
                // potentially the wrong one.
                int const wx = label.size();
 
-               if (wx > w)
+               if (wx > w) {
                        w = wx;
+                       lbl = label;
+               }
        }
 
-       if (bitem && !bitem->bibLabel().empty())
-               return bitem->bibLabel();
+       if (!lbl.empty())
+               return lbl;
 
        return from_ascii("99");
 }
@@ -231,26 +246,36 @@ void InsetBibitem::fillWithBibKeys(BiblioInfo & keys, InsetIterator const & it)
 {
        docstring const key = getParam("key");
        BibTeXInfo keyvalmap(false);
-       keyvalmap[from_ascii("label")] = getParam("label");
+       keyvalmap.label(bibLabel());
        DocIterator doc_it(it); 
        doc_it.forwardPos();
-       keyvalmap[from_ascii("ref")] = doc_it.paragraph().asString(false);
+       keyvalmap[from_ascii("ref")] = doc_it.paragraph().asString();
        keys[key] = keyvalmap;
 }
 
 
-/// Update the counters of this inset and of its contents
-void InsetBibitem::updateLabels(ParIterator const &) 
+// Update the counters of this inset and of its contents
+void InsetBibitem::updateLabels(ParIterator const & it) 
 {
-       Counters & counters = buffer().params().documentClass().counters();
+       BufferParams const & bp = buffer().masterBuffer()->params();
+       Counters & counters = bp.documentClass().counters();
        docstring const bibitem = from_ascii("bibitem");
        if (counters.hasCounter(bibitem) && getParam("label").empty()) {
                counters.step(bibitem);
-               autolabel_ = counters.theCounter(bibitem);
+               string const & lang = it.paragraph().getParLanguage(bp)->code();
+               autolabel_ = counters.theCounter(bibitem, lang);
        } else {
                autolabel_ = from_ascii("??");
        }
 }
 
 
+docstring InsetBibitem::xhtml(odocstream & os, OutputParams const &) const
+{
+       os << "<a name='" << html::htmlize(getParam("key")) << "'></a>";
+       os << "<span class='biblabel'>" << bibLabel() << "</span> "; 
+       return docstring();
+}
+
+
 } // namespace lyx