X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLabel.cpp;h=6f006a1288160d508d41bc0f50ed9b66dc68a33c;hb=142caff8336c54627606c09d3ce5bb7de7a8adb6;hp=0158361ab8b1774fc25fa5d5165456b91b601b7b;hpb=017ba3c4c7b7711431779dba931f50735ce32b71;p=lyx.git diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp index 0158361ab8..6f006a1288 100644 --- a/src/insets/InsetLabel.cpp +++ b/src/insets/InsetLabel.cpp @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * * Full author contact details are available in file CREDITS. */ @@ -16,21 +16,31 @@ #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 "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" -#include "support/lyxalgo.h" #include "support/gettext.h" #include "support/lstrings.h" +#include "support/lyxalgo.h" using namespace std; using namespace lyx::support; @@ -38,18 +48,18 @@ using namespace lyx::support; namespace lyx { -InsetLabel::InsetLabel(InsetCommandParams const & p) - : InsetCommand(p, "label") +InsetLabel::InsetLabel(Buffer * buf, InsetCommandParams const & p) + : InsetCommand(buf, p, "label") {} void InsetLabel::initView() { - update(getParam("name")); + updateCommand(getParam("name")); } -void InsetLabel::update(docstring const & new_label, bool updaterefs) +void InsetLabel::updateCommand(docstring const & new_label, bool updaterefs) { docstring const old_label = getParam("name"); docstring label = new_label; @@ -66,45 +76,51 @@ void InsetLabel::update(docstring const & new_label, bool updaterefs) "it will be changed to %2$s."), new_label, label)); } + buffer().undo().beginUndoGroup(); setParam("name", label); 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) - it->first->setParam("reference", label); + for (; it != end; ++it) { + buffer().undo().recordUndo(it->second); + if (it->first->lyxCode() == MATH_REF_CODE) { + InsetMathHull * mi = + static_cast(it->first); + mi->asRefInset()->changeTarget(label); + } else { + InsetCommand * ref = + static_cast(it->first); + ref->setParam("reference", label); + } + } } + buffer().undo().endUndoGroup(); // We need an update of the Buffer reference cache. This is achieved by - // updateLabel(). - lyx::updateLabels(buffer()); + // updateBuffer(). + buffer().updateBuffer(); } ParamInfo const & InsetLabel::findInfo(string const & /* cmdName */) { static ParamInfo param_info_; - if (param_info_.empty()) { - param_info_.add("name", ParamInfo::LATEX_REQUIRED); - } + if (param_info_.empty()) + param_info_.add("name", ParamInfo::LATEX_REQUIRED, + ParamInfo::HANDLING_ESCAPE); return param_info_; } -void InsetLabel::getLabelList(vector & list) const -{ - list.push_back(getParam("name")); -} - - docstring InsetLabel::screenLabel() const { return screen_label_; } -void InsetLabel::updateLabels(ParIterator const &) +void InsetLabel::updateBuffer(ParIterator const & par, UpdateType utype) { docstring const & label = getParam("name"); if (buffer().insetLabel(label)) { @@ -114,10 +130,25 @@ void InsetLabel::updateLabels(ParIterator const &) } buffer().setInsetLabel(label, this); screen_label_ = label; + + if (utype) { + // 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(ParConstIterator const & cpit) const +void InsetLabel::addToToc(DocIterator const & cpit) { docstring const & label = getParam("name"); Toc & toc = buffer().tocBackend().toc("label"); @@ -130,39 +161,73 @@ void InsetLabel::addToToc(ParConstIterator const & cpit) const Buffer::References::const_iterator it = refs.begin(); Buffer::References::const_iterator end = refs.end(); for (; it != end; ++it) { - ParConstIterator const ref_pit(it->second); - toc.push_back(TocItem(ref_pit, 1, it->first->screenLabel())); + DocIterator const ref_pit(it->second); + if (it->first->lyxCode() == MATH_REF_CODE) + toc.push_back(TocItem(ref_pit, 1, + static_cast(it->first)->asRefInset() + ->screenLabel())); + else + toc.push_back(TocItem(ref_pit, 1, + static_cast(it->first)->screenLabel())); } } +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: + enabled = true; + break; + default: + return InsetCommand::getStatus(cur, cmd, status); + } + + status.setEnabled(enabled); + return true; +} + + void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd) { - switch (cmd.action) { + switch (cmd.action()) { case LFUN_INSET_MODIFY: { InsetCommandParams p(LABEL_CODE); // FIXME UNICODE - InsetCommandMailer::string2params("label", to_utf8(cmd.argument()), p); + InsetCommand::string2params("label", to_utf8(cmd.argument()), p); if (p.getCmdName().empty()) { cur.noUpdate(); break; } - update(p["name"]); + if (p["name"] != params()["name"]) + updateCommand(p["name"]); break; } - default: - InsetCommand::doDispatch(cur, cmd); + case LFUN_LABEL_COPY_AS_REF: { + InsetCommandParams p(REF_CODE, "ref"); + p["reference"] = getParam("name"); + cap::clearSelection(); + cap::copyInset(cur, new InsetRef(buffer_, p), getParam("name")); break; } -} + case LFUN_LABEL_INSERT_AS_REF: { + InsetCommandParams p(REF_CODE, "ref"); + p["reference"] = getParam("name"); + string const data = InsetCommand::params2string("ref", p); + lyx::dispatch(FuncRequest(LFUN_INSET_INSERT, data)); + break; + } -int InsetLabel::latex(odocstream & os, OutputParams const &) const -{ - os << escape(getCommand()); - return 0; + default: + InsetCommand::doDispatch(cur, cmd); + break; + } } @@ -183,4 +248,17 @@ int InsetLabel::docbook(odocstream & os, OutputParams const & runparams) const } +docstring InsetLabel::xhtml(XHTMLStream & xs, OutputParams const &) const +{ + // FIXME XHTML + // Unfortunately, the name attribute has been deprecated, so we have to use + // 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); + return docstring(); +} + + } // namespace lyx