anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* src/lyxfind.C:

Browse Source 
* 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:
Michael Schmitt 2006-10-23 16:25:29 +00:00
parent 3ede781c53
commit dcc3f7f151
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lyxfind.C
View File

@ -126,8 +126,7 @@ bool findBackwards(DocIterator & cur, MatchString const & match)
bool findChange(DocIterator & cur) bool findChange(DocIterator & cur)
{ {
for (; cur; cur.forwardPos()) for (; cur; cur.forwardPos())
if (cur.inTexted() && if (cur.inTexted() && !cur.paragraph().isUnchanged(cur.pos()))
cur.paragraph().lookupChange(cur.pos()).type != Change::UNCHANGED)
return true; return true;
return false; return false;
} }

16
src/paragraph.C
View File

@ -921,7 +921,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf,
// Do we have an open font change? // Do we have an open font change?
bool open_font = false; bool open_font = false;
Change::Type running_change = Change::UNCHANGED; Change::Type runningChangeType = Change::UNCHANGED;
texrow.start(id(), 0); texrow.start(id(), 0);
@ -1009,15 +1009,15 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf,
open_font = true; open_font = true;
} }
Change::Type change = pimpl_->lookupChange(i).type; Change::Type changeType = pimpl_->lookupChange(i).type;
column += Changes::latexMarkChange(os, running_change, column += Changes::latexMarkChange(os, runningChangeType,
change, output); changeType, output);
running_change = change; runningChangeType = changeType;
// do not output text which is marked deleted // do not output text which is marked deleted
// if change tracking output is not desired // if change tracking output is not desired
if (output || running_change != Change::DELETED) { if (output || runningChangeType != Change::DELETED) {
OutputParams rp = runparams; OutputParams rp = runparams;
rp.free_spacing = style->free_spacing; rp.free_spacing = style->free_spacing;
rp.local_font = &font; rp.local_font = &font;
@ -1026,13 +1026,13 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf,
os, texrow, rp, os, texrow, rp,
font, running_font, font, running_font,
basefont, outerfont, open_font, basefont, outerfont, open_font,
running_change, runningChangeType,
*style, i, column, c); *style, i, column, c);
} }
} }
column += Changes::latexMarkChange(os, 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 we have an open font definition, we have to close it
if (open_font) { if (open_font) {