lyx_mirror/src/changes.h
Jürgen Spitzmüller 3f2c546936 The big change tracking paragraph patch (bug 880)
from Martin Vermeer  <martin.vermeer@hut.fi>:

	* text.C (backspace): Fix changebar non-update
	* CutAndPaste.C (pasteSelectionHelper): comments
	* paragraph_funcs.C (mergeParagraph): fix Juergen's cut&paste bug
	* changes.h: comments
	* paragraph.C (stripLeadingSpaces): remove unnecessary setChange
	* text.C (backspace): allow deletion of inserted para break
	Change tracking -related bug fixes (reported by Juergen) and
	some documentation work
	* rowpainter.C (paintChangeBar): fix painting of change bar with
	only paragraph break changed
	* paragraph.[Ch] (write, lookupChange, lookupChangeFull;
	added setChangeFull):
	* paragraph_pimpl.[Ch] (trackChanges, cleanChanges, acceptChange,
	rejectChange, erase; added setChangeFull):
	* CutAndPaste.C (eraseSelectionHelper):
	* lyxtext.h:
	* text.C (readParToken, readParagraph, breakParagraph,
	acceptChange, rejectChange, backspace, currentState;
	added backspacePos0):
	* paragraph_funcs.C (breakParagraphConservative, mergeParagraph):
	* lyxfind.C (findChange, findNextChange): fix bug 880: Change
	tracked paragraphs should still allow a paragraph split (and related
	things, i.e., multi-paragraph change tracking)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@13486 a592a061-630c-0410-9148-cb99ea01b6c8
2006-03-24 16:38:30 +00:00

160 lines
3.9 KiB
C++

// -*- C++ -*-
/**
* \file changes.h
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author John Levon
*
* Full author contact details are available in file CREDITS.
*
* Record changes in a paragraph.
*/
#ifndef CHANGES_H
#define CHANGES_H
#include "support/types.h"
#include "support/lyxtime.h"
#include <vector>
#include <iosfwd>
class Change {
public:
/// the type of change
enum Type {
UNCHANGED, // no change
INSERTED, // new text
DELETED // deleted text
};
Change(Type t = UNCHANGED, int a = 0, lyx::time_type ct = 0)
: type(t), author(a), changetime(ct) {}
Type type;
int author;
lyx::time_type changetime;
};
bool operator==(Change const & l, Change const & r);
bool operator!=(Change const & l, Change const & r);
class Changes {
public:
Changes(Change::Type type);
~Changes();
Changes(Changes const &);
/// reset "default" change type (for empty pars)
void reset(Change::Type type) {
empty_type_ = type;
}
/// set the position to the given change
void set(Change change, lyx::pos_type pos);
/// set the position to the given change
void set(Change::Type, lyx::pos_type pos);
/// set the range to the given change
void set(Change::Type, lyx::pos_type start, lyx::pos_type end);
/// set the range to the given change
void set(Change, lyx::pos_type start, lyx::pos_type end);
/// mark the given change and adjust
void record(Change, lyx::pos_type pos);
/// return the change type at the given position
Change::Type lookup(lyx::pos_type pos) const;
/// return the change at the given position
Change const lookupFull(lyx::pos_type pos) const;
/// return true if there is a change in the given range
bool isChange(lyx::pos_type start, lyx::pos_type end) const;
/// return true if there is a deleted or unchanged range contained
bool isChangeEdited(lyx::pos_type start, lyx::pos_type end) const;
/// remove the given entry. This implies that a character was
/// deleted at pos, and will adjust all range bounds past it
void erase(lyx::pos_type pos);
/// output latex to mark a transition between two changetypes
/// returns length of text outputted
static int latexMarkChange(std::ostream & os, Change::Type old,
Change::Type change, bool const & output);
/// output .lyx file format for transitions between changes
static void lyxMarkChange(std::ostream & os, int & column,
lyx::time_type curtime, Change const & old, Change const & change);
private:
class Range {
public:
Range(lyx::pos_type s, lyx::pos_type e)
: start(s), end(e) {}
// does this range contain r ?
bool contains(Range const & r) const;
// does this range contain pos ?
bool contains(lyx::pos_type pos) const;
// does this range contain pos, or can it be appended ?
bool loose_contains(lyx::pos_type pos) const;
// is this range contained within r ?
bool contained(Range const & r) const;
// do the ranges intersect ?
bool intersects(Range const & r) const;
lyx::pos_type start;
lyx::pos_type end;
};
friend bool operator==(Range const & r1, Range const & r2);
friend bool operator!=(Range const & r1, Range const & r2);
class ChangeRange {
public:
ChangeRange(lyx::pos_type s, lyx::pos_type e, Change c)
: range(Range(s, e)), change(c) {}
Range range;
Change change;
};
typedef std::vector<ChangeRange> ChangeTable;
/// our table of changes, every row a range and change descriptor
ChangeTable table_;
/// change type for an empty paragraph
Change::Type empty_type_;
/// handle a delete, either logical or physical (see erase)
void del(Change change, ChangeTable::size_type pos);
/// handle an add, adjusting range bounds past it
void add(Change change, ChangeTable::size_type pos);
/// merge neighbouring ranges, assuming that they are abutting
/// (as done by set())
void merge();
/// consistency check, needed before merge()
void check() const;
};
#endif // CHANGES_H