Replace the hardcoded TEXT_TO_INSET_OFFSET by tunable values

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index bd3d63e1c470c644888cb0e29bb67f91c6551cee..0dcd81ab5ebed7c6cc4b0c8a27caaa08a4bc5a68 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1028,20 +1028,13 @@ bool Buffer::readDocument(Lexer & lex)
        readHeader(lex);
 
        if (params().output_changes) {
-               bool dvipost    = LaTeXFeatures::isAvailable("dvipost");
                bool xcolorulem = LaTeXFeatures::isAvailable("ulem") &&
                                  LaTeXFeatures::isAvailable("xcolor");
 
-               if (!dvipost && !xcolorulem) {
+               if (!xcolorulem) {
                        Alert::warning(_("Changes not shown in LaTeX output"),
                                       _("Changes will not be highlighted in LaTeX output, "
-                                        "because neither dvipost nor xcolor/ulem are installed.\n"
-                                        "Please install these packages or redefine "
-                                        "\\lyxadded and \\lyxdeleted in the LaTeX preamble."));
-               } else if (!xcolorulem) {
-                       Alert::warning(_("Changes not shown in LaTeX output"),
-                                      _("Changes will not be highlighted in LaTeX output "
-                                        "when using pdflatex, because xcolor and ulem are not installed.\n"
+                                        "because xcolor and ulem are not installed.\n"
                                         "Please install both packages or redefine "
                                         "\\lyxadded and \\lyxdeleted in the LaTeX preamble."));
                }
@@ -3035,20 +3028,13 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
                        undo().recordUndoBufferParams(CursorData());
                params().output_changes = !params().output_changes;
                if (params().output_changes) {
-                       bool dvipost    = LaTeXFeatures::isAvailable("dvipost");
                        bool xcolorulem = LaTeXFeatures::isAvailable("ulem") &&
                                          LaTeXFeatures::isAvailable("xcolor");
 
-                       if (!dvipost && !xcolorulem) {
+                       if (!xcolorulem) {
                                Alert::warning(_("Changes not shown in LaTeX output"),
                                               _("Changes will not be highlighted in LaTeX output, "
-                                                "because neither dvipost nor xcolor/ulem are installed.\n"
-                                                "Please install these packages or redefine "
-                                                "\\lyxadded and \\lyxdeleted in the LaTeX preamble."));
-                       } else if (!xcolorulem) {
-                               Alert::warning(_("Changes not shown in LaTeX output"),
-                                              _("Changes will not be highlighted in LaTeX output "
-                                                "when using pdflatex, because xcolor and ulem are not installed.\n"
+                                                "because xcolor and ulem are not installed.\n"
                                                 "Please install both packages or redefine "
                                                 "\\lyxadded and \\lyxdeleted in the LaTeX preamble."));
                        }
@@ -4039,14 +4025,17 @@ void Buffer::changeRefsIfUnique(docstring const & from, docstring const & to)
                return;
 
        string const paramName = "key";
+       UndoGroupHelper ugh(this);
        InsetIterator it = inset_iterator_begin(inset());
        for (; it; ++it) {
                if (it->lyxCode() != CITE_CODE)
                        continue;
                InsetCommand * inset = it->asInsetCommand();
                docstring const oldValue = inset->getParam(paramName);
-               if (oldValue == from)
+               if (oldValue == from) {
+                       undo().recordUndo(CursorData(it));
                        inset->setParam(paramName, to);
+               }
        }
 }
 
@@ -5358,8 +5347,9 @@ void Buffer::updateBuffer(ParIterator & parit, UpdateType utype) const
                changed |= parit->isChanged();
        }
 
-       // set change indicator for the inset
-       parit.inset().asInsetText()->isChanged(changed);
+       // set change indicator for the inset (or the cell that the iterator
+       // points to, if applicable).
+       parit.text()->inset().isChanged(changed);
 }