Update a bibitem label also when it is emptied.

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

diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp
index 434bd4c8b748c7721218ec362a2f7c455d40d6ca..39076b9d997fdc8b0c8bba7043508894043a9f82 100644 (file)
--- a/src/insets/InsetBibitem.cpp
+++ b/src/insets/InsetBibitem.cpp
@@ -15,6 +15,7 @@
 
 #include "BiblioInfo.h"
 #include "Buffer.h"
+#include "Cursor.h"
 #include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "BufferView.h"
@@ -24,7 +25,7 @@
 #include "FuncRequest.h"
 #include "InsetIterator.h"
 #include "InsetList.h"
-#include "Language.h" 
+#include "Language.h"
 #include "Lexer.h"
 #include "output_xhtml.h"
 #include "OutputParams.h"
@@ -52,9 +53,9 @@ docstring const key_prefix = from_ascii("key-");
 
 
 InsetBibitem::InsetBibitem(Buffer * buf, InsetCommandParams const & p)
-       : InsetCommand(buf, p, "bibitem")
+       : InsetCommand(buf, p)
 {
-       buffer_->invalidateBibinfoCache();
+       buffer().invalidateBibinfoCache();
        if (getParam("key").empty())
                setParam("key", key_prefix + convert<docstring>(++key_counter));
 }
@@ -63,7 +64,7 @@ InsetBibitem::InsetBibitem(Buffer * buf, InsetCommandParams const & p)
 InsetBibitem::~InsetBibitem()
 {
        if (isBufferLoaded())
-               buffer_->invalidateBibinfoCache();
+               buffer().invalidateBibinfoCache();
 }
 
 
@@ -93,8 +94,7 @@ void InsetBibitem::updateCommand(docstring const & new_key, bool)
                        "it will be changed to %2$s."), new_key, key));
        }
        setParam("key", key);
-
-       buffer().updateBuffer();
+       buffer().invalidateBibinfoCache();
 }
 
 
@@ -113,23 +113,75 @@ ParamInfo const & InsetBibitem::findInfo(string const & /* cmdName */)
 
 void InsetBibitem::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-       switch (cmd.action) {
+       switch (cmd.action()) {
 
        case LFUN_INSET_MODIFY: {
                InsetCommandParams p(BIBITEM_CODE);
-               InsetCommand::string2params("bibitem", to_utf8(cmd.argument()), p);
+               InsetCommand::string2params(to_utf8(cmd.argument()), p);
                if (p.getCmdName().empty()) {
-                       cur.noUpdate();
+                       cur.noScreenUpdate();
                        break;
                }
+
+               cur.recordUndo();
+
                docstring const & old_key = params()["key"];
+               docstring const & old_label = params()["label"];
+               docstring label = p["label"];
+
+               // definitions for escaping
+               int previous;
+               static docstring const backslash = from_ascii("\\");
+               static docstring const lbrace = from_ascii("{");
+               static docstring const rbrace = from_ascii("}");
+               static char_type const chars_escape[6] = {
+                       '&', '_', '$', '%', '#', '^'};
+               static char_type const brackets_escape[2] = {'[', ']'};
+
+               if (!label.empty()) {
+                       // The characters in chars_name[] need to be changed to a command when
+                       // they are in the name field.
+                       for (int k = 0; k < 6; k++)
+                               for (size_t i = 0, pos;
+                                       (pos = label.find(chars_escape[k], i)) != string::npos;
+                                       i = pos + 2) {
+                                               if (pos == 0)
+                                                       previous = 0;
+                                               else
+                                                       previous = pos - 1;
+                                               // only if not already escaped
+                                               if (label[previous] != '\\')
+                                                       label.replace(pos, 1, backslash + chars_escape[k] + lbrace + rbrace);
+                               }
+                       // The characters '[' and ']' need to be put into braces
+                       for (int k = 0; k < 2; k++)
+                               for (size_t i = 0, pos;
+                                       (pos = label.find(brackets_escape[k], i)) != string::npos;
+                                       i = pos + 2) {
+                                               if (pos == 0)
+                                                       previous = 0;
+                                               else
+                                                       previous = pos - 1;
+                                               // only if not already escaped
+                                               if (label[previous] != '{')
+                                                       label.replace(pos, 1, lbrace + brackets_escape[k] + rbrace);
+                               }
+               }
+
+               if (old_label != label) {
+                       p["label"] = label;
+                       cur.forceBufferUpdate();
+                       buffer().invalidateBibinfoCache();
+               }
+
                setParam("label", p["label"]);
                if (p["key"] != old_key) {
                        updateCommand(p["key"]);
                        cur.bv().buffer().changeRefsIfUnique(old_key,
                                params()["key"], CITE_CODE);
+                       cur.forceBufferUpdate();
+                       buffer().invalidateBibinfoCache();
                }
-               buffer_->invalidateBibinfoCache();
                break;
        }
 
@@ -259,15 +311,15 @@ docstring bibitemWidest(Buffer const & buffer, OutputParams const & runparams)
 }
 
 
-void InsetBibitem::fillWithBibKeys(BiblioInfo & keys, InsetIterator const & it) const
+void InsetBibitem::collectBibKeys(InsetIterator const & it) const
 {
        docstring const key = getParam("key");
        BibTeXInfo keyvalmap(false);
        keyvalmap.label(bibLabel());
-       DocIterator doc_it(it); 
+       DocIterator doc_it(it);
        doc_it.forwardPos();
        keyvalmap[from_ascii("ref")] = doc_it.paragraph().asString();
-       keys[key] = keyvalmap;
+       buffer().addBibTeXInfo(key, keyvalmap);
 }
 
 
@@ -277,8 +329,9 @@ void InsetBibitem::updateBuffer(ParIterator const & it, UpdateType utype)
        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, utype);
+       if (getParam("label").empty()) {
+               if (counters.hasCounter(bibitem))
+                       counters.step(bibitem, utype);
                string const & lang = it.paragraph().getParLanguage(bp)->code();
                autolabel_ = counters.theCounter(bibitem, lang);
        } else {
@@ -295,7 +348,7 @@ docstring InsetBibitem::xhtml(XHTMLStream & xs, OutputParams const &) const
        // need to use "name" anyway, eventually, because some browsers do not
        // handle jumping to ids. If we don't do that, though, we can just put the
        // id into the span tag.
-       string const attrs = "id='" + to_utf8(getParam("key")) + "'";
+       string const attrs = "id='" + to_utf8(getParam("label")) + "'";
        xs << html::CompTag("a", attrs);
        xs << html::StartTag("span", "class='bibitemlabel'");
        xs << bibLabel();