#include "LyX.h"
#include "output_xhtml.h"
#include "ParIterator.h"
-#include "sgml.h"
+#include "xml.h"
#include "texstream.h"
#include "Text.h"
#include "TextClass.h"
UndoGroupHelper ugh(&buffer());
if (cursor)
cursor->recordUndo();
- setParam("name", label);
+ if (buffer().masterParams().track_changes) {
+ // With change tracking, we insert a new label and
+ // delete the old one
+ InsetCommandParams p(LABEL_CODE, "label");
+ p["name"] = label;
+ string const data = InsetCommand::params2string(p);
+ lyx::dispatch(FuncRequest(LFUN_INSET_INSERT, data));
+ lyx::dispatch(FuncRequest(LFUN_CHAR_DELETE_FORWARD));
+ } else
+ setParam("name", label);
updateReferences(old_label, label);
}
docstring const & new_label)
{
UndoGroupHelper ugh;
- for (auto const & p: buffer().references(old_label)) {
- ugh.resetBuffer(p.second.buffer());
- CursorData(p.second).recordUndo();
- if (p.first->lyxCode() == MATH_REF_CODE) {
- InsetMathRef * mi = p.first->asInsetMath()->asRefInset();
- mi->changeTarget(new_label);
- } else {
- InsetCommand * ref = p.first->asInsetCommand();
- ref->setParam("reference", new_label);
+ if (buffer().masterParams().track_changes) {
+ // With change tracking, we insert a new ref and
+ // delete the old one
+ lyx::dispatch(FuncRequest(LFUN_MASTER_BUFFER_FORALL,
+ "inset-forall Ref inset-modify ref changetarget "
+ + old_label + " " + new_label));
+ } else {
+ for (auto const & p: buffer().references(old_label)) {
+ ugh.resetBuffer(p.second.buffer());
+ CursorData(p.second).recordUndo();
+ if (p.first->lyxCode() == MATH_REF_CODE) {
+ InsetMathRef * mi = p.first->asInsetMath()->asRefInset();
+ mi->changeTarget(new_label);
+ } else {
+ InsetCommand * ref = p.first->asInsetCommand();
+ ref->setParam("reference", new_label);
+ }
}
}
}
}
-void InsetLabel::updateBuffer(ParIterator const & par, UpdateType utype)
+void InsetLabel::updateBuffer(ParIterator const & par, UpdateType utype, bool const /*deleted*/)
{
docstring const & label = getParam("name");
else
toc->push_back(TocItem(ref_pit, 1,
static_cast<InsetRef *>(p.first)->getTOCString(),
- output_active));
+ static_cast<InsetRef *>(p.first)->outputActive()));
}
}
}
{
OutputParams runparams = runparams_in;
docstring command = getCommand(runparams);
+ docstring const label = getParam("name");
+ if (buffer().params().output_changes
+ && buffer().activeLabel(label)
+ && buffer().insetLabel(label, true) != this) {
+ // this is a deleted label and we have a non-deleted with the same id
+ // rename it for output to prevent wrong references
+ docstring newlabel = label;
+ int i = 1;
+ while (buffer().insetLabel(newlabel)) {
+ newlabel = label + "-DELETED-" + convert<docstring>(i);
+ ++i;
+ }
+ command = subst(command, label, newlabel);
+ }
// In macros with moving arguments, such as \section,
// we store the label and output it after the macro (#2154)
if (runparams_in.postpone_fragile_stuff)
}
-int InsetLabel::docbook(odocstream & os, OutputParams const & runparams) const
+int InsetLabel::docbook(odocstream & os, OutputParams const &) const
{
os << "<!-- anchor id=\""
- << sgml::cleanID(buffer(), runparams, getParam("name"))
+ << xml::cleanID(getParam("name"))
<< "\" -->";
return 0;
}
-docstring InsetLabel::xhtml(XHTMLStream & xs, OutputParams const &) const
+docstring InsetLabel::xhtml(XMLStream & 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.
- docstring const attr = "id=\"" + html::cleanAttr(getParam("name")) + '"';
- xs << html::CompTag("a", to_utf8(attr));
+ docstring const attr = "id=\"" + xml::cleanAttr(getParam("name")) + '"';
+ xs << xml::CompTag("a", to_utf8(attr));
return docstring();
}