#include "MetricsInfo.h"
#include "OutputParams.h"
#include "Paragraph.h"
+#include "texstream.h"
#include "TocBackend.h"
#include "support/debug.h"
// close \lyxadded or \lyxdeleted
os << '}';
column++;
- if (oldChange.type == Change::DELETED)
+ if (oldChange.type == Change::DELETED && !runparams.wasDisplayMath)
--runparams.inulemcmd;
}
docstring macro_beg;
if (change.type == Change::DELETED) {
macro_beg = from_ascii("\\lyxdeleted{");
- ++runparams.inulemcmd;
+ if (!runparams.inDisplayMath)
+ ++runparams.inulemcmd;
}
else if (change.type == Change::INSERTED)
macro_beg = from_ascii("\\lyxadded{");
bparams.authors().get(change.author).name(),
chgTime, runparams);
+ // signature needed by \lyxsout to correctly strike out display math
+ if (change.type == Change::DELETED && runparams.inDisplayMath
+ && (!LaTeXFeatures::isAvailable("dvipost")
+ || (runparams.flavor != OutputParams::LATEX
+ && runparams.flavor != OutputParams::DVILUATEX))) {
+ if (os.afterParbreak())
+ str += from_ascii("\\\\\\noindent\n");
+ else
+ str += from_ascii("\\\\\\\\\n");
+ }
+
os << str;
column += str.size();
Toc::iterator it = TocBackend::findItem(*change_list, 0, author);
if (it == change_list->end()) {
change_list->push_back(TocItem(dit, 0, author, true));
- change_list->push_back(TocItem(dit, 1, str, output_active,
- support::wrapParas(str, 4)));
+ change_list->push_back(TocItem(dit, 1, str, output_active));
continue;
}
for (++it; it != change_list->end(); ++it) {
if (it->depth() == 0 && it->str() != author)
break;
}
- change_list->insert(it, TocItem(dit, 1, str, output_active,
- support::wrapParas(str, 4)));
+ change_list->insert(it, TocItem(dit, 1, str, output_active));
}
}
return;
// Calculate 1/3 height of font
FontMetrics const & fm = theFontMetrics(font);
- int const y_bar = int(deleted() ? y - fm.maxAscent() / 3
- : y + 2 * pi.base.solidLineOffset() + pi.base.solidLineThickness());
- pi.pain.line(int(x1), y_bar, int(x2), y_bar, color(),
+ double const y_bar = deleted() ? y - fm.maxAscent() / 3
+ : y + 2 * pi.base.solidLineOffset() + pi.base.solidLineThickness();
+ pi.pain.line(int(x1), int(y_bar), int(x2), int(y_bar), color(),
Painter::line_solid, pi.base.solidLineThickness());
}
* y2 /_____
* x1 x2
*/
- double y = 0;
switch(type) {
case UNCHANGED:
return;
case INSERTED:
- y = y2;
- break;
+ pi.pain.line(int(x1), int(y2) + 1, int(x2), int(y2) + 1,
+ color(), Painter::line_solid,
+ pi.base.solidLineThickness());
+ return;
case DELETED:
- y = y1;
- break;
+ // FIXME: we cannot use antialias since we keep drawing on the same
+ // background with the current painting mechanism.
+ pi.pain.line(int(x1), int(y2), int(x2), int(y1),
+ color(), Painter::line_solid_aliased,
+ pi.base.solidLineThickness());
+ return;
}
- pi.pain.line(int(x1), int(y2), int(x2), int(y),
- color(), Painter::line_solid,
- pi.base.solidLineThickness());
}