mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
* src/lyxfind.C:
* src/paragraph.C: more change tracking cosmetics git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15513 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
3ede781c53
commit
dcc3f7f151
@ -126,8 +126,7 @@ bool findBackwards(DocIterator & cur, MatchString const & match)
|
||||
bool findChange(DocIterator & cur)
|
||||
{
|
||||
for (; cur; cur.forwardPos())
|
||||
if (cur.inTexted() &&
|
||||
cur.paragraph().lookupChange(cur.pos()).type != Change::UNCHANGED)
|
||||
if (cur.inTexted() && !cur.paragraph().isUnchanged(cur.pos()))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
@ -921,7 +921,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf,
|
||||
// Do we have an open font change?
|
||||
bool open_font = false;
|
||||
|
||||
Change::Type running_change = Change::UNCHANGED;
|
||||
Change::Type runningChangeType = Change::UNCHANGED;
|
||||
|
||||
texrow.start(id(), 0);
|
||||
|
||||
@ -1009,15 +1009,15 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf,
|
||||
open_font = true;
|
||||
}
|
||||
|
||||
Change::Type change = pimpl_->lookupChange(i).type;
|
||||
Change::Type changeType = pimpl_->lookupChange(i).type;
|
||||
|
||||
column += Changes::latexMarkChange(os, running_change,
|
||||
change, output);
|
||||
running_change = change;
|
||||
column += Changes::latexMarkChange(os, runningChangeType,
|
||||
changeType, output);
|
||||
runningChangeType = changeType;
|
||||
|
||||
// do not output text which is marked deleted
|
||||
// if change tracking output is not desired
|
||||
if (output || running_change != Change::DELETED) {
|
||||
if (output || runningChangeType != Change::DELETED) {
|
||||
OutputParams rp = runparams;
|
||||
rp.free_spacing = style->free_spacing;
|
||||
rp.local_font = &font;
|
||||
@ -1026,13 +1026,13 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf,
|
||||
os, texrow, rp,
|
||||
font, running_font,
|
||||
basefont, outerfont, open_font,
|
||||
running_change,
|
||||
runningChangeType,
|
||||
*style, i, column, c);
|
||||
}
|
||||
}
|
||||
|
||||
column += Changes::latexMarkChange(os,
|
||||
running_change, Change::UNCHANGED, output);
|
||||
runningChangeType, Change::UNCHANGED, output);
|
||||
|
||||
// If we have an open font definition, we have to close it
|
||||
if (open_font) {
|
||||
|
Loading…
Reference in New Issue
Block a user