Track change of label name

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 8fa3c1d0a335f633f1177c91080643363f90ac47..389b43699e6365812c44abae2ec30d92ac3fe8ef 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -2477,9 +2477,14 @@ void Paragraph::latex(BufferParams const & bparams,
                Change const & change = runparams.inDeletedInset
                        ? runparams.changeOfDeletedInset : lookupChange(i);
 
+               char_type const c = d->text_[i];
+
                // Check whether a display math inset follows
-               if (d->text_[i] == META_INSET
+               if (c == META_INSET
                    && i >= start_pos && (end_pos == -1 || i < end_pos)) {
+                       if (isDeleted(i))
+                               runparams.ctObject = getInset(i)->CtObject(runparams);
+       
                        InsetMath const * im = getInset(i)->asInsetMath();
                        if (im && im->asHullInset()
                            && im->asHullInset()->outerDisplay()) {
@@ -2593,8 +2598,6 @@ void Paragraph::latex(BufferParams const & bparams,
                        }
                }
 
-               char_type const c = d->text_[i];
-
                // A display math inset inside an ulem command will be output
                // as a box of width \linewidth, so we have to either disable
                // indentation if the inset starts a paragraph, or start a new
@@ -2613,6 +2616,21 @@ void Paragraph::latex(BufferParams const & bparams,
                     current_font.language() != running_font.language()) &&
                        i != body_pos - 1)
                {
+                       bool const in_ct_deletion = (bparams.output_changes
+                                                    && runningChange == change
+                                                    && change.type == Change::DELETED
+                                                    && !os.afterParbreak());
+                       if (in_ct_deletion) {
+                               // We have to close and then reopen \lyxdeleted,
+                               // as strikeout needs to be on lowest level.
+                               bool needPar = false;
+                               OutputParams rp = runparams;
+                               column += running_font.latexWriteEndChanges(
+                                       os, bparams, rp, basefont,
+                                       basefont, needPar);
+                               os << '}';
+                               column += 1;
+                       }
                        odocstringstream ods;
                        column += current_font.latexWriteStartChanges(ods, bparams,
                                                              runparams, basefont,
@@ -2641,6 +2659,13 @@ void Paragraph::latex(BufferParams const & bparams,
                                   << from_ascii("{}");
                        else
                                os << fontchange;
+                       if (in_ct_deletion) {
+                               // We have to close and then reopen \lyxdeleted,
+                               // as strikeout needs to be on lowest level.
+                               OutputParams rp = runparams;
+                               column += Changes::latexMarkChange(os, bparams,
+                                       Change(Change::UNCHANGED), change, rp);
+                       }
                }
 
                // FIXME: think about end_pos implementation...