X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLabel.cpp;h=553c6d7b969bac5cb09fcf1f26862c4a99509328;hb=1f0305509b99681885958c03f8d8f04c1564c84c;hp=1177d2db5b0ae92f70a85ff24e3c63ec9fe56160;hpb=3e654186d22b2a4f3b7b8429d6fcb3952a04fe4d;p=lyx.git diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp index 1177d2db5b..553c6d7b96 100644 --- a/src/insets/InsetLabel.cpp +++ b/src/insets/InsetLabel.cpp @@ -16,19 +16,25 @@ #include "buffer_funcs.h" #include "Buffer.h" +#include "BufferParams.h" #include "BufferView.h" #include "CutAndPaste.h" #include "DispatchResult.h" #include "FuncRequest.h" #include "FuncStatus.h" #include "InsetIterator.h" -#include "LyXFunc.h" +#include "Language.h" +#include "LyX.h" #include "output_xhtml.h" #include "ParIterator.h" #include "sgml.h" #include "Text.h" +#include "TextClass.h" #include "TocBackend.h" +#include "mathed/InsetMathHull.h" +#include "mathed/InsetMathRef.h" + #include "frontends/alert.h" #include "support/convert.h" @@ -43,50 +49,79 @@ namespace lyx { InsetLabel::InsetLabel(Buffer * buf, InsetCommandParams const & p) - : InsetCommand(buf, p, "label") + : InsetCommand(buf, p) {} void InsetLabel::initView() { - updateCommand(getParam("name")); + // This seems to be used only for inset creation. + // Therefore we do not update refs here, since this would + // erroneously change refs from existing duplicate labels + // (#8141). + updateLabel(getParam("name")); } -void InsetLabel::updateCommand(docstring const & new_label, bool updaterefs) +void InsetLabel::uniqueLabel(docstring & label) const { - docstring const old_label = getParam("name"); - docstring label = new_label; + docstring const new_label = label; int i = 1; while (buffer().insetLabel(label)) { label = new_label + '-' + convert(i); ++i; } - if (label != new_label) { // Warn the user that the label has been changed to something else. frontend::Alert::warning(_("Label names must be unique!"), bformat(_("The label %1$s already exists,\n" "it will be changed to %2$s."), new_label, label)); } +} + + +void InsetLabel::updateLabel(docstring const & new_label) +{ + docstring label = new_label; + uniqueLabel(label); + setParam("name", label); +} + + +void InsetLabel::updateLabelAndRefs(docstring const & new_label, + Cursor * cursor) +{ + docstring const old_label = getParam("name"); + docstring label = new_label; + uniqueLabel(label); + if (label == old_label) + return; buffer().undo().beginUndoGroup(); + if (cursor) + cursor->recordUndo(); setParam("name", label); + updateReferences(old_label, label); + buffer().undo().endUndoGroup(); +} - if (updaterefs) { - Buffer::References & refs = buffer().references(old_label); - Buffer::References::iterator it = refs.begin(); - Buffer::References::iterator end = refs.end(); - for (; it != end; ++it) { - buffer().undo().recordUndo(it->second); - it->first->setParam("reference", label); + +void InsetLabel::updateReferences(docstring const & old_label, + docstring const & new_label) +{ + Buffer::References const & refs = buffer().references(old_label); + Buffer::References::const_iterator it = refs.begin(); + Buffer::References::const_iterator end = refs.end(); + for (; it != end; ++it) { + buffer().undo().recordUndo(CursorData(it->second)); + if (it->first->lyxCode() == MATH_REF_CODE) { + InsetMathRef * mi = it->first->asInsetMath()->asRefInset(); + mi->changeTarget(new_label); + } else { + InsetCommand * ref = it->first->asInsetCommand(); + ref->setParam("reference", new_label); } } - buffer().undo().endUndoGroup(); - - // We need an update of the Buffer reference cache. This is achieved by - // updateLabels(). - buffer().updateLabels(); } @@ -94,7 +129,8 @@ ParamInfo const & InsetLabel::findInfo(string const & /* cmdName */) { static ParamInfo param_info_; if (param_info_.empty()) - param_info_.add("name", ParamInfo::LATEX_REQUIRED); + param_info_.add("name", ParamInfo::LATEX_REQUIRED, + ParamInfo::HANDLING_ESCAPE); return param_info_; } @@ -105,7 +141,7 @@ docstring InsetLabel::screenLabel() const } -void InsetLabel::updateLabels(ParIterator const &, bool) +void InsetLabel::updateBuffer(ParIterator const & par, UpdateType utype) { docstring const & label = getParam("name"); if (buffer().insetLabel(label)) { @@ -115,24 +151,47 @@ void InsetLabel::updateLabels(ParIterator const &, bool) } buffer().setInsetLabel(label, this); screen_label_ = label; + + if (utype == OutputUpdate) { + // save info on the active counter + Counters const & cnts = + buffer().masterBuffer()->params().documentClass().counters(); + active_counter_ = cnts.currentCounter(); + Language const * lang = par->getParLanguage(buffer().params()); + if (lang && !active_counter_.empty()) { + counter_value_ = cnts.theCounter(active_counter_, lang->code()); + pretty_counter_ = cnts.prettyCounter(active_counter_, lang->code()); + } else { + counter_value_ = from_ascii("#"); + pretty_counter_ = from_ascii("#"); + } + } } -void InsetLabel::addToToc(DocIterator const & cpit) +void InsetLabel::addToToc(DocIterator const & cpit, bool output_active, + UpdateType) const { docstring const & label = getParam("name"); - Toc & toc = buffer().tocBackend().toc("label"); + shared_ptr toc = buffer().tocBackend().toc("label"); if (buffer().insetLabel(label) != this) { - toc.push_back(TocItem(cpit, 0, screen_label_)); - return; - } - toc.push_back(TocItem(cpit, 0, screen_label_)); - Buffer::References const & refs = buffer().references(label); - Buffer::References::const_iterator it = refs.begin(); - Buffer::References::const_iterator end = refs.end(); - for (; it != end; ++it) { - DocIterator const ref_pit(it->second); - toc.push_back(TocItem(ref_pit, 1, it->first->screenLabel())); + toc->push_back(TocItem(cpit, 0, screen_label_, output_active)); + } else { + toc->push_back(TocItem(cpit, 0, screen_label_, output_active)); + Buffer::References const & refs = buffer().references(label); + Buffer::References::const_iterator it = refs.begin(); + Buffer::References::const_iterator end = refs.end(); + for (; it != end; ++it) { + DocIterator const ref_pit(it->second); + if (it->first->lyxCode() == MATH_REF_CODE) + toc->push_back(TocItem(ref_pit, 1, + it->first->asInsetMath()->asRefInset()->screenLabel(), + output_active)); + else + toc->push_back(TocItem(ref_pit, 1, + static_cast(it->first)->getTOCString(), + output_active)); + } } } @@ -141,11 +200,18 @@ bool InsetLabel::getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus & status) const { bool enabled; - switch (cmd.action) { - case LFUN_LABEL_INSERT_AS_REF: - case LFUN_LABEL_COPY_AS_REF: + switch (cmd.action()) { + case LFUN_LABEL_INSERT_AS_REFERENCE: + case LFUN_LABEL_COPY_AS_REFERENCE: enabled = true; break; + case LFUN_INSET_MODIFY: + if (cmd.getArg(0) == "changetype") { + // this is handled by InsetCommand, + // but not by InsetLabel. + enabled = false; + break; + } default: return InsetCommand::getStatus(cur, cmd, status); } @@ -157,22 +223,31 @@ bool InsetLabel::getStatus(Cursor & cur, FuncRequest const & cmd, void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd) { - switch (cmd.action) { + switch (cmd.action()) { case LFUN_INSET_MODIFY: { + // the only other option here is "changetype", and we + // do not have different types. + if (cmd.getArg(0) != "label") { + cur.undispatched(); + return; + } InsetCommandParams p(LABEL_CODE); // FIXME UNICODE - InsetCommand::string2params("label", to_utf8(cmd.argument()), p); + InsetCommand::string2params(to_utf8(cmd.argument()), p); if (p.getCmdName().empty()) { - cur.noUpdate(); + cur.noScreenUpdate(); break; } - if (p["name"] != params()["name"]) - updateCommand(p["name"]); + if (p["name"] != params()["name"]) { + // undo is handled in updateLabelAndRefs + updateLabelAndRefs(p["name"], &cur); + } + cur.forceBufferUpdate(); break; } - case LFUN_LABEL_COPY_AS_REF: { + case LFUN_LABEL_COPY_AS_REFERENCE: { InsetCommandParams p(REF_CODE, "ref"); p["reference"] = getParam("name"); cap::clearSelection(); @@ -180,10 +255,10 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd) break; } - case LFUN_LABEL_INSERT_AS_REF: { + case LFUN_LABEL_INSERT_AS_REFERENCE: { InsetCommandParams p(REF_CODE, "ref"); p["reference"] = getParam("name"); - string const data = InsetCommand::params2string("ref", p); + string const data = InsetCommand::params2string(p); lyx::dispatch(FuncRequest(LFUN_INSET_INSERT, data)); break; } @@ -195,14 +270,8 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd) } -int InsetLabel::latex(odocstream & os, OutputParams const &) const -{ - os << escape(getCommand()); - return 0; -} - - -int InsetLabel::plaintext(odocstream & os, OutputParams const &) const +int InsetLabel::plaintext(odocstringstream & os, + OutputParams const &, size_t) const { docstring const str = getParam("name"); os << '<' << str << '>'; @@ -226,8 +295,8 @@ docstring InsetLabel::xhtml(XHTMLStream & xs, OutputParams const &) const // id here to get the document to validate as XHTML 1.1. This will cause a // problem with some browsers, though, I'm sure. (Guess which!) So we will // have to figure out what to do about this later. - string const attr = "id=\"" + html::cleanAttr(to_utf8(getParam("name"))) + "\""; - xs << html::CompTag("a", attr); + docstring const attr = "id=\"" + html::cleanAttr(getParam("name")) + '"'; + xs << html::CompTag("a", to_utf8(attr)); return docstring(); }