#include "Cursor.h"
#include "CutAndPaste.h"
#include "DispatchResult.h"
+#include "Encoding.h"
#include "ErrorList.h"
#include "FuncRequest.h"
#include "factory.h"
tmp.setInsetOwner(&par.inInset());
tmp.makeSameLayout(par);
- LASSERT(pos <= par.size(), /**/);
+ LASSERT(pos <= par.size(), return);
if (pos < par.size()) {
// move everything behind the break position to the new paragraph
}
// Move over the end-of-par change information
tmp.setChange(tmp.size(), par.lookupChange(par.size()));
- par.setChange(par.size(), Change(bparams.trackChanges ?
+ par.setChange(par.size(), Change(bparams.track_changes ?
Change::INSERTED : Change::UNCHANGED));
}
}
// in this case only the empty layout is allowed
layoutname = tclass.plainLayoutName();
} else if (par.usePlainLayout()) {
- // in this case, default layout maps to empty layout
+ // in this case, default layout maps to empty layout
if (layoutname == tclass.defaultLayoutName())
layoutname = tclass.plainLayoutName();
- } else {
+ } else {
// otherwise, the empty layout maps to the default
if (layoutname == tclass.plainLayoutName())
layoutname = tclass.defaultLayoutName();
// Initialize begin_of_body_ on load; redoParagraph maintains
par.setBeginOfBody();
-
+
// mark paragraph for spell checking on load
// par.requestSpellCheck();
}
public:
///
TextCompletionList(Cursor const & cur, WordList const * list)
- : buffer_(cur.buffer()), pos_(0), list_(list)
+ : buffer_(cur.buffer()), list_(list)
{}
///
virtual ~TextCompletionList() {}
-
+
///
virtual bool sorted() const { return true; }
///
{
return list_->word(idx);
}
-
+
private:
///
Buffer const * buffer_;
///
- size_t pos_;
- ///
WordList const * list_;
};
bool Text::empty() const
{
return pars_.empty() || (pars_.size() == 1 && pars_[0].empty()
- // FIXME: Should we consider the labeled type as empty too?
+ // FIXME: Should we consider the labeled type as empty too?
&& pars_[0].layout().labeltype == LABEL_NO_LABEL);
}
* This breaks a paragraph at the specified position.
* The new paragraph will:
* - Decrease depth by one (or change layout to default layout) when
- * keep_layout == false
+ * keep_layout == false
* - keep current depth and layout when keep_layout == true
*/
-static void breakParagraph(Text & text, pit_type par_offset, pos_type pos,
+static void breakParagraph(Text & text, pit_type par_offset, pos_type pos,
bool keep_layout)
{
BufferParams const & bparams = text.inset().buffer().params();
// Move over the end-of-par change information
tmp->setChange(tmp->size(), par.lookupChange(par.size()));
- par.setChange(par.size(), Change(bparams.trackChanges ?
+ par.setChange(par.size(), Change(bparams.track_changes ?
Change::INSERTED : Change::UNCHANGED));
if (pos) {
void Text::breakParagraph(Cursor & cur, bool inverse_logic)
{
- LASSERT(this == cur.text(), /**/);
+ LBUFERR(this == cur.text());
Paragraph & cpar = cur.paragraph();
pit_type cpit = cur.pit();
if (cur.lastpos() == 0 && !cpar.allowEmpty()) {
if (changeDepthAllowed(cur, DEC_DEPTH))
changeDepth(cur, DEC_DEPTH);
- else
- setLayout(cur, tclass.defaultLayoutName());
+ else {
+ docstring const & lay = cur.paragraph().usePlainLayout()
+ ? tclass.plainLayoutName() : tclass.defaultLayoutName();
+ setLayout(cur, lay);
+ }
return;
}
// Always break behind a space
// It is better to erase the space (Dekel)
if (cur.pos() != cur.lastpos() && cpar.isLineSeparator(cur.pos()))
- cpar.eraseChar(cur.pos(), cur.buffer()->params().trackChanges);
+ cpar.eraseChar(cur.pos(), cur.buffer()->params().track_changes);
// What should the layout for the new paragraph be?
- bool keep_layout = layout.isEnvironment()
+ bool keep_layout = layout.isEnvironment()
|| (layout.isParagraph() && layout.parbreak_is_newline);
if (inverse_logic)
keep_layout = !keep_layout;
}
while (!pars_[next_par].empty() && pars_[next_par].isNewline(0)) {
- if (!pars_[next_par].eraseChar(0, cur.buffer()->params().trackChanges))
+ if (!pars_[next_par].eraseChar(0, cur.buffer()->params().track_changes))
break; // the character couldn't be deleted physically due to change tracking
}
} else if (*cit == '\t') {
if (!par.isFreeSpacing()) {
// tabs are like spaces here
- par.insertChar(pos, ' ', font, bparams.trackChanges);
+ par.insertChar(pos, ' ', font, bparams.track_changes);
++pos;
space_inserted = true;
} else {
- par.insertChar(pos, *cit, font, bparams.trackChanges);
+ par.insertChar(pos, *cit, font, bparams.track_changes);
++pos;
space_inserted = true;
}
continue;
} else {
// just insert the character
- par.insertChar(pos, *cit, font, bparams.trackChanges);
+ par.insertChar(pos, *cit, font, bparams.track_changes);
++pos;
space_inserted = (*cit == ' ');
}
// same Paragraph one to the right and make a rebreak
void Text::insertChar(Cursor & cur, char_type c)
{
- LASSERT(this == cur.text(), /**/);
+ LBUFERR(this == cur.text());
cur.recordUndo(INSERT_UNDO);
if (contains(number_unary_operators, c) &&
(cur.pos() == 1
|| par.isSeparator(cur.pos() - 2)
+ || par.isEnvSeparator(cur.pos() - 2)
|| par.isNewline(cur.pos() - 2))
) {
setCharFont(pit, cur.pos() - 1, cur.current_font,
}
// In Bidi text, we want spaces to be treated in a special way: spaces
- // which are between words in different languages should get the
- // paragraph's language; otherwise, spaces should keep the language
+ // which are between words in different languages should get the
+ // paragraph's language; otherwise, spaces should keep the language
// they were originally typed in. This is only in effect while typing;
// after the text is already typed in, the user can always go back and
// explicitly set the language of a space as desired. But 99.9% of the
// time, what we're doing here is what the user actually meant.
- //
+ //
// The following cases are the ones in which the language of the space
// should be changed to match that of the containing paragraph. In the
- // depictions, lowercase is LTR, uppercase is RTL, underscore (_)
+ // depictions, lowercase is LTR, uppercase is RTL, underscore (_)
// represents a space, pipe (|) represents the cursor position (so the
// character before it is the one just typed in). The different cases
// are depicted logically (not visually), from left to right:
- //
+ //
// 1. A_a|
// 2. a_A|
//
// Theoretically, there are other situations that we should, perhaps, deal
- // with (e.g.: a|_A, A|_a). In practice, though, there really isn't any
+ // with (e.g.: a|_A, A|_a). In practice, though, there really isn't any
// point (to understand why, just try to create this situation...).
if ((cur.pos() >= 2) && (par.isLineSeparator(cur.pos() - 1))) {
- // get font in front and behind the space in question. But do NOT
+ // get font in front and behind the space in question. But do NOT
// use getFont(cur.pos()) because the character c is not inserted yet
Font const pre_space_font = tm.displayFont(cur.pit(), cur.pos() - 2);
Font const & post_space_font = cur.real_current_font;
bool pre_space_rtl = pre_space_font.isVisibleRightToLeft();
bool post_space_rtl = post_space_font.isVisibleRightToLeft();
-
+
if (pre_space_rtl != post_space_rtl) {
- // Set the space's language to match the language of the
+ // Set the space's language to match the language of the
// adjacent character whose direction is the paragraph's
// direction; don't touch other properties of the font
- Language const * lang =
+ Language const * lang =
(pre_space_rtl == par.isRTL(buffer.params())) ?
pre_space_font.language() : post_space_font.language();
par.setFont(cur.pos() - 1, space_font);
}
}
-
+
// Next check, if there will be two blanks together or a blank at
// the beginning of a paragraph.
// I decided to handle blanks like normal characters, the main
"beginning of a paragraph. Please read the Tutorial."));
return;
}
+ // LASSERT: Is it safe to continue here?
LASSERT(cur.pos() > 0, /**/);
if ((par.isLineSeparator(cur.pos() - 1) || par.isNewline(cur.pos() - 1))
&& !par.isDeleted(cur.pos() - 1)) {
}
}
+ // Prevent to insert uncodable characters in verbatim and ERT
+ // (workaround for bug 9012)
+ // Don't do it for listings inset, since InsetListings::latex() tries
+ // to switch to a usable encoding which works in many cases (bug 9102).
+ if (cur.paragraph().isPassThru() && owner_->lyxCode() != LISTINGS_CODE &&
+ cur.current_font.language()) {
+ Encoding const * e = cur.current_font.language()->encoding();
+ if (!e->encodable(c)) {
+ cur.message(_("Character is uncodable in verbatim paragraphs."));
+ return;
+ }
+ }
+
par.insertChar(cur.pos(), c, cur.current_font,
- cur.buffer()->params().trackChanges);
+ cur.buffer()->params().track_changes);
cur.checkBufferStructure();
// cur.screenUpdateFlags(Update::Force);
&& !par.isWordSeparator(cur.pos() - 2)
&& par.isWordSeparator(cur.pos() - 1)) {
// get the word in front of cursor
- LASSERT(this == cur.text(), /**/);
+ LBUFERR(this == cur.text());
cur.paragraph().updateWords();
}
}
bool Text::cursorForwardOneWord(Cursor & cur)
{
- LASSERT(this == cur.text(), /**/);
+ LBUFERR(this == cur.text());
pos_type const lastpos = cur.lastpos();
pit_type pit = cur.pit();
return false;
}
- if (lyxrc.mac_like_word_movement) {
+ if (lyxrc.mac_like_cursor_movement) {
// Skip through trailing punctuation and spaces.
while (pos != lastpos && (par.isChar(pos) || par.isSpace(pos)))
++pos;
else while (pos != lastpos && !par.isWordSeparator(pos))
++pos;
} else {
- LASSERT(pos < lastpos, /**/); // see above
+ LASSERT(pos < lastpos, return false); // see above
if (!par.isWordSeparator(pos))
while (pos != lastpos && !par.isWordSeparator(pos))
++pos;
// Skip over white space
while (pos != lastpos && par.isSpace(pos))
- ++pos;
+ ++pos;
}
return setCursor(cur, pit, pos);
bool Text::cursorBackwardOneWord(Cursor & cur)
{
- LASSERT(this == cur.text(), /**/);
+ LBUFERR(this == cur.text());
pit_type pit = cur.pit();
pos_type pos = cur.pos();
if (pos == 0 && pit != 0)
return setCursor(cur, pit - 1, getPar(pit - 1).size());
- if (lyxrc.mac_like_word_movement) {
+ if (lyxrc.mac_like_cursor_movement) {
// Skip through punctuation and spaces.
while (pos != 0 && (par.isChar(pos - 1) || par.isSpace(pos - 1)))
--pos;
bool Text::cursorVisLeftOneWord(Cursor & cur)
{
- LASSERT(this == cur.text(), /**/);
+ LBUFERR(this == cur.text());
pos_type left_pos, right_pos;
bool left_is_letter, right_is_letter;
// collect some information about current cursor position
temp_cur.getSurroundingPos(left_pos, right_pos);
- left_is_letter =
+ left_is_letter =
(left_pos > -1 ? !temp_cur.paragraph().isWordSeparator(left_pos) : false);
- right_is_letter =
+ right_is_letter =
(right_pos > -1 ? !temp_cur.paragraph().isWordSeparator(right_pos) : false);
// if we're not at a letter/non-letter boundary, continue moving
break;
}
- return setCursor(cur, temp_cur.pit(), temp_cur.pos(),
+ return setCursor(cur, temp_cur.pit(), temp_cur.pos(),
true, temp_cur.boundary());
}
bool Text::cursorVisRightOneWord(Cursor & cur)
{
- LASSERT(this == cur.text(), /**/);
+ LBUFERR(this == cur.text());
pos_type left_pos, right_pos;
bool left_is_letter, right_is_letter;
// collect some information about current cursor position
temp_cur.getSurroundingPos(left_pos, right_pos);
- left_is_letter =
+ left_is_letter =
(left_pos > -1 ? !temp_cur.paragraph().isWordSeparator(left_pos) : false);
- right_is_letter =
+ right_is_letter =
(right_pos > -1 ? !temp_cur.paragraph().isWordSeparator(right_pos) : false);
// if we're not at a letter/non-letter boundary, continue moving
// we should stop when we have an LTR word on our right or an RTL word
// on our left
if ((left_is_letter && temp_cur.paragraph().getFontSettings(
- temp_cur.buffer()->params(),
+ temp_cur.buffer()->params(),
left_pos).isRightToLeft())
|| (right_is_letter && !temp_cur.paragraph().getFontSettings(
- temp_cur.buffer()->params(),
+ temp_cur.buffer()->params(),
right_pos).isRightToLeft()))
break;
}
- return setCursor(cur, temp_cur.pit(), temp_cur.pos(),
+ return setCursor(cur, temp_cur.pit(), temp_cur.pos(),
true, temp_cur.boundary());
}
void Text::selectWord(Cursor & cur, word_location loc)
{
- LASSERT(this == cur.text(), /**/);
+ LBUFERR(this == cur.text());
CursorSlice from = cur.top();
CursorSlice to = cur.top();
getWord(from, to, loc);
void Text::selectAll(Cursor & cur)
{
- LASSERT(this == cur.text(), /**/);
+ LBUFERR(this == cur.text());
if (cur.lastpos() == 0 && cur.lastpit() == 0)
return;
// If the cursor is at the beginning, make sure the cursor ends there
if (cur.pit() == 0 && cur.pos() == 0) {
setCursor(cur, cur.lastpit(), getPar(cur.lastpit()).size());
cur.resetAnchor();
- setCursor(cur, 0, 0);
+ setCursor(cur, 0, 0);
} else {
setCursor(cur, 0, 0);
cur.resetAnchor();
// selection is currently set
bool Text::selectWordWhenUnderCursor(Cursor & cur, word_location loc)
{
- LASSERT(this == cur.text(), /**/);
+ LBUFERR(this == cur.text());
if (cur.selection())
return false;
selectWord(cur, loc);
void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op)
{
- LASSERT(this == cur.text(), /**/);
+ LBUFERR(this == cur.text());
if (!cur.selection()) {
- bool const changed = cur.paragraph().isChanged(cur.pos());
- if (!(changed && findNextChange(&cur.bv())))
+ if (!selectChange(cur))
return;
}
bool endsBeforeEndOfPar = (endPos < pars_[endPit].size());
// first, accept/reject changes within each individual paragraph (do not consider end-of-par)
-
for (pit_type pit = begPit; pit <= endPit; ++pit) {
pos_type parSize = pars_[pit].size();
pos_type left = (pit == begPit ? begPos : 0);
pos_type right = (pit == endPit ? endPos : parSize);
-
+
if (left == right)
// there is no change here
continue;
-
+
if (op == ACCEPT) {
pars_[pit].acceptChanges(left, right);
} else {
}
// finally, invoke the DEPM
-
- deleteEmptyParagraphMechanism(begPit, endPit, cur.buffer()->params().trackChanges);
-
- //
+ deleteEmptyParagraphMechanism(begPit, endPit, cur.buffer()->params().track_changes);
cur.finishUndo();
cur.clearSelection();
{
BufferParams const & bparams = owner_->buffer().params();
lyx::acceptChanges(pars_, bparams);
- deleteEmptyParagraphMechanism(0, pars_.size() - 1, bparams.trackChanges);
+ deleteEmptyParagraphMechanism(0, pars_.size() - 1, bparams.track_changes);
}
}
// finally, invoke the DEPM
- deleteEmptyParagraphMechanism(0, pars_size - 1, bparams.trackChanges);
+ deleteEmptyParagraphMechanism(0, pars_size - 1, bparams.track_changes);
}
void Text::deleteWordForward(Cursor & cur)
{
- LASSERT(this == cur.text(), /**/);
+ LBUFERR(this == cur.text());
if (cur.lastpos() == 0)
cursorForward(cur);
else {
void Text::deleteWordBackward(Cursor & cur)
{
- LASSERT(this == cur.text(), /**/);
+ LBUFERR(this == cur.text());
if (cur.lastpos() == 0)
cursorBackward(cur);
else {
// Kill to end of line.
void Text::changeCase(Cursor & cur, TextCase action)
{
- LASSERT(this == cur.text(), /**/);
+ LBUFERR(this == cur.text());
CursorSlice from;
CursorSlice to;
setCursorIntern(cur, prevcur.pit(), prevcur.pos());
cur.screenUpdateFlags(Update::Force);
return true;
- }
+ }
// otherwise reset to default
cur.paragraph().setPlainOrDefaultLayout(bufparams.documentClass());
// any paragraphs
cur.recordUndo(DELETE_UNDO);
bool const was_inset = cur.paragraph().isInset(cur.pos());
- if(!par.eraseChar(cur.pos(), cur.buffer()->params().trackChanges))
+ if(!par.eraseChar(cur.pos(), cur.buffer()->params().track_changes))
// the character has been logically deleted only => skip it
cur.top().forwardPos();
if (cur.pit() == cur.lastpit())
return dissolveInset(cur);
- if (!par.isMergedOnEndOfParDeletion(cur.buffer()->params().trackChanges)) {
+ if (!par.isMergedOnEndOfParDeletion(cur.buffer()->params().track_changes)) {
par.setChange(cur.pos(), Change(Change::DELETED));
cur.forwardPos();
needsUpdate = true;
bool Text::backspacePos0(Cursor & cur)
{
- LASSERT(this == cur.text(), /**/);
+ LBUFERR(this == cur.text());
if (cur.pit() == 0)
return false;
bool Text::backspace(Cursor & cur)
{
- LASSERT(this == cur.text(), /**/);
+ LBUFERR(this == cur.text());
bool needsUpdate = false;
if (cur.pos() == 0) {
if (cur.pit() == 0)
return dissolveInset(cur);
- Paragraph & prev_par = pars_[cur.pit() - 1];
+ Cursor prev_cur = cur;
+ --prev_cur.pit();
- if (!prev_par.isMergedOnEndOfParDeletion(cur.buffer()->params().trackChanges)) {
- prev_par.setChange(prev_par.size(), Change(Change::DELETED));
- setCursorIntern(cur, cur.pit() - 1, prev_par.size());
+ if (!prev_cur.paragraph().isMergedOnEndOfParDeletion(cur.buffer()->params().track_changes)) {
+ cur.recordUndo(ATOMIC_UNDO, prev_cur.pit(), prev_cur.pit());
+ prev_cur.paragraph().setChange(prev_cur.lastpos(), Change(Change::DELETED));
+ setCursorIntern(cur, prev_cur.pit(), prev_cur.lastpos());
return true;
}
// The cursor is at the beginning of a paragraph, so
setCursorIntern(cur, cur.pit(), cur.pos() - 1,
false, cur.boundary());
bool const was_inset = cur.paragraph().isInset(cur.pos());
- cur.paragraph().eraseChar(cur.pos(), cur.buffer()->params().trackChanges);
+ cur.paragraph().eraseChar(cur.pos(), cur.buffer()->params().track_changes);
if (was_inset)
cur.forceBufferUpdate();
else
spos += cur.pos();
spit += cur.pit();
Buffer & b = *cur.buffer();
- cur.paragraph().eraseChar(cur.pos(), b.params().trackChanges);
+ cur.paragraph().eraseChar(cur.pos(), b.params().track_changes);
if (!plist.empty()) {
// see bug 7319
}
-bool Text::read(Lexer & lex,
+bool Text::read(Lexer & lex,
ErrorList & errorList, InsetText * insetPtr)
{
Buffer const & buf = owner_->buffer();
Paragraph par;
par.setInsetOwner(insetPtr);
par.params().depth(depth);
- par.setFont(0, Font(inherit_font,
+ par.setFont(0, Font(inherit_font,
buf.params().language));
par.setPlainOrDefaultLayout(buf.params().documentClass());
pars_.push_back(par);
}
-
+
return res;
}
// Returns the current font and depth as a message.
docstring Text::currentState(Cursor const & cur) const
{
- LASSERT(this == cur.text(), /**/);
+ LBUFERR(this == cur.text());
Buffer & buf = *cur.buffer();
Paragraph const & par = cur.paragraph();
odocstringstream os;
- if (buf.params().trackChanges)
+ if (buf.params().track_changes)
os << _("[Change Tracking] ");
Change change = par.lookupChange(cur.pos());
text += '-';
text += head;
}
-
+
// Make sure it isn't too long
unsigned int const max_label_length = 32;
if (text.size() > max_label_length)
// For captions, we just take the caption type
Inset * caption_inset = cur.innerInsetOfType(CAPTION_CODE);
if (caption_inset) {
- string const & ftype = static_cast<InsetCaption *>(caption_inset)->type();
+ string const & ftype = static_cast<InsetCaption *>(caption_inset)->floattype();
FloatList const & fl = cur.buffer()->params().documentClass().floats();
if (fl.typeExist(ftype)) {
Floating const & flt = fl.getType(ftype);
}
-void Text::forToc(docstring & os, size_t maxlen, bool shorten) const
+void Text::forOutliner(docstring & os, size_t maxlen, bool shorten) const
{
if (maxlen == 0)
maxlen = std::numeric_limits<std::size_t>::max();
else
LASSERT(maxlen >= 8, maxlen = TOC_ENTRY_LENGTH);
for (size_t i = 0; i != pars_.size() && os.length() < maxlen; ++i)
- pars_[i].forToc(os, maxlen);
+ pars_[i].forOutliner(os, maxlen);
if (shorten && os.length() >= maxlen)
os = os.substr(0, maxlen - 3) + from_ascii("...");
}
void Text::charsTranspose(Cursor & cur)
{
- LASSERT(this == cur.text(), /**/);
+ LBUFERR(this == cur.text());
pos_type pos = cur.pos();
// And finally, we are ready to perform the transposition.
// Track the changes if Change Tracking is enabled.
- bool const trackChanges = cur.buffer()->params().trackChanges;
+ bool const trackChanges = cur.buffer()->params().track_changes;
cur.recordUndo();
getWord(from, to, PREVIOUS_WORD);
if (sl == from || to == from)
return docstring();
-
+
Paragraph const & par = sl.paragraph();
return par.asString(from.pos(), to.pos());
}
CompletionList const * Text::createCompletionList(Cursor const & cur) const
{
- WordList const * list = theWordList(*cur.getFont().language());
+ WordList const * list = theWordList(cur.getFont().language()->lang());
return new TextCompletionList(cur, list);
}
bool Text::insertCompletion(Cursor & cur, docstring const & s, bool /*finished*/)
-{
- LASSERT(cur.bv().cursor() == cur, /**/);
+{
+ LBUFERR(cur.bv().cursor() == cur);
cur.insert(s);
cur.bv().cursor() = cur;
if (!(cur.result().screenUpdate() & Update::Force))
cur.screenUpdateFlags(cur.result().screenUpdate() | Update::SinglePar);
return true;
}
-
-
+
+
docstring Text::completionPrefix(Cursor const & cur) const
{
return previousWord(cur.top());
projects / lyx.git / blobdiff