* Licence details can be found in the file COPYING.
*
* \author Asger Alstrup
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
* \author Dov Feldstern
* \author Jean-Marc Lasgouttes
* \author John Levon
- * \author André Pönitz
+ * \author André Pönitz
* \author Stefan Schimanski
* \author Dekel Tsur
- * \author Jürgen Vigna
+ * \author Jürgen Vigna
*
* Full author contact details are available in file CREDITS.
*/
#include "Language.h"
#include "Length.h"
#include "Lexer.h"
+#include "lyxfind.h"
#include "LyXRC.h"
#include "Paragraph.h"
#include "paragraph_funcs.h"
#include "insets/InsetSpecialChar.h"
#include "insets/InsetTabular.h"
-#include "support/lassert.h"
-#include "support/convert.h"
#include "support/debug.h"
#include "support/docstream.h"
#include "support/gettext.h"
+#include "support/lassert.h"
#include "support/lstrings.h"
#include "support/textutils.h"
else
lex.printError("Unknown bar font flag "
"`$$Token'");
+ } else if (token == "\\strikeout") {
+ lex.next();
+ font.fontInfo().setStrikeout(font.setLyXMisc(lex.getString()));
+ } else if (token == "\\uuline") {
+ lex.next();
+ font.fontInfo().setUuline(font.setLyXMisc(lex.getString()));
+ } else if (token == "\\uwave") {
+ lex.next();
+ font.fontInfo().setUwave(font.setLyXMisc(lex.getString()));
} else if (token == "\\noun") {
lex.next();
font.fontInfo().setNoun(font.setLyXMisc(lex.getString()));
public:
///
TextCompletionList(Cursor const & cur)
- : buf_(cur.buffer()), pos_(0) {}
+ : buffer_(cur.buffer()), pos_(0)
+ {}
///
virtual ~TextCompletionList() {}
private:
///
- Buffer const & buf_;
+ Buffer const * buffer_;
///
size_t pos_;
};
Paragraph & cpar = cur.paragraph();
pit_type cpit = cur.pit();
- DocumentClass const & tclass = cur.buffer().params().documentClass();
+ DocumentClass const & tclass = cur.buffer()->params().documentClass();
Layout const & layout = cpar.layout();
// this is only allowed, if the current paragraph is not empty
// 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().trackChanges);
// What should the layout for the new paragraph be?
bool keep_layout = inverse_logic ?
// we need to set this before we insert the paragraph.
bool const isempty = cpar.allowEmpty() && cpar.empty();
- lyx::breakParagraph(cur.buffer().params(), paragraphs(), cpit,
+ lyx::breakParagraph(cur.buffer()->params(), paragraphs(), cpit,
cur.pos(), keep_layout);
// After this, neither paragraph contains any rows!
}
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().trackChanges))
break; // the character couldn't be deleted physically due to change tracking
}
- updateLabels(cur.buffer());
+ cur.buffer()->updateLabels();
// A singlePar update is not enough in this case.
cur.updateFlags(Update::Force);
cur.recordUndo(INSERT_UNDO);
TextMetrics const & tm = cur.bv().textMetrics(this);
- Buffer const & buffer = cur.buffer();
+ Buffer const & buffer = *cur.buffer();
Paragraph & par = cur.paragraph();
// try to remove this
pit_type const pit = cur.pit();
}
}
- par.insertChar(cur.pos(), c, cur.current_font, cur.buffer().params().trackChanges);
+ par.insertChar(cur.pos(), c, cur.current_font,
+ cur.buffer()->params().trackChanges);
cur.checkBufferStructure();
// cur.updateFlags(Update::Force);
&& !par.isLetter(cur.pos() - 1)) {
// get the word in front of cursor
LASSERT(this == cur.text(), /**/);
- cur.paragraph().updateWords(cur.top());
+ cur.paragraph().updateWords();
}
}
// 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.bv().buffer().params(),
- left_pos).isRightToLeft())
+ temp_cur.buffer()->params(), left_pos).isRightToLeft())
|| (right_is_letter && !temp_cur.paragraph().getFontSettings(
- temp_cur.bv().buffer().params(),
- right_pos).isRightToLeft()))
+ temp_cur.buffer()->params(), right_pos).isRightToLeft()))
break;
}
// 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.bv().buffer().params(),
+ temp_cur.buffer()->params(),
left_pos).isRightToLeft())
|| (right_is_letter && !temp_cur.paragraph().getFontSettings(
- temp_cur.bv().buffer().params(),
+ temp_cur.buffer()->params(),
right_pos).isRightToLeft()))
break;
}
}
+void Text::selectAll(Cursor & cur)
+{
+ LASSERT(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);
+ } else {
+ setCursor(cur, 0, 0);
+ cur.resetAnchor();
+ setCursor(cur, cur.lastpit(), getPar(cur.lastpit()).size());
+ }
+ cur.setSelection();
+}
+
+
// Select the word currently under the cursor when no
// selection is currently set
bool Text::selectWordWhenUnderCursor(Cursor & cur, word_location loc)
{
LASSERT(this == cur.text(), /**/);
- if (!cur.selection())
- return;
+ if (!cur.selection()) {
+ Change const & change = cur.paragraph().lookupChange(cur.pos());
+ if (!(change.changed() && findNextChange(&cur.bv())))
+ return;
+ }
cur.recordUndoSelection();
pos_type right = (pit == endPit ? endPos : parSize);
if (op == ACCEPT) {
- pars_[pit].acceptChanges(cur.buffer().params(), left, right);
+ pars_[pit].acceptChanges(cur.buffer()->params(), left, right);
} else {
- pars_[pit].rejectChanges(cur.buffer().params(), left, right);
+ pars_[pit].rejectChanges(cur.buffer()->params(), left, right);
}
}
// instead, we mark it unchanged
pars_[pit].setChange(pos, Change(Change::UNCHANGED));
} else {
- mergeParagraph(cur.buffer().params(), pars_, pit);
+ mergeParagraph(cur.buffer()->params(), pars_, pit);
--endPit;
--pit;
}
// we mark the par break at the end of the last paragraph unchanged
pars_[pit].setChange(pos, Change(Change::UNCHANGED));
} else {
- mergeParagraph(cur.buffer().params(), pars_, pit);
+ mergeParagraph(cur.buffer()->params(), pars_, pit);
--endPit;
--pit;
}
// finally, invoke the DEPM
- deleteEmptyParagraphMechanism(begPit, endPit, cur.buffer().params().trackChanges);
+ deleteEmptyParagraphMechanism(begPit, endPit, cur.buffer()->params().trackChanges);
//
cur.clearSelection();
setCursorIntern(cur, begPit, begPos);
cur.updateFlags(Update::Force);
- updateLabels(cur.buffer());
+ cur.buffer()->updateLabels();
}
Paragraph & par = pars_[pit];
pos_type const pos = (pit == begPit ? begPos : 0);
right = (pit == endPit ? endPos : par.size());
- par.changeCase(cur.buffer().params(), pos, right, action);
+ par.changeCase(cur.buffer()->params(), pos, right, action);
}
// the selection may have changed due to logically-only deleted chars
if (cur.pos() != 0)
return false;
- BufferParams const & bufparams = cur.buffer().params();
+ BufferParams const & bufparams = cur.buffer()->params();
Paragraph const & par = cur.paragraph();
Cursor prevcur = cur;
if (cur.pit() > 0) {
cur.recordUndo(ATOMIC_UNDO, prevcur.pit());
mergeParagraph(bufparams, cur.text()->paragraphs(),
prevcur.pit());
- updateLabels(cur.buffer());
+ cur.buffer()->updateLabels();
setCursorIntern(cur, prevcur.pit(), prevcur.pos());
cur.updateFlags(Update::Force);
return true;
bool Text::erase(Cursor & cur)
{
- LASSERT(this == cur.text(), /**/);
+ LASSERT(this == cur.text(), return false);
bool needsUpdate = false;
Paragraph & par = cur.paragraph();
// 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().trackChanges))
// the character has been logically deleted only => skip it
cur.top().forwardPos();
if (was_inset)
- updateLabels(cur.buffer());
+ cur.buffer()->updateLabels();
else
cur.checkBufferStructure();
needsUpdate = true;
if (cur.pit() == cur.lastpit())
return dissolveInset(cur);
- if (!par.isMergedOnEndOfParDeletion(cur.buffer().params().trackChanges)) {
+ if (!par.isMergedOnEndOfParDeletion(cur.buffer()->params().trackChanges)) {
par.setChange(cur.pos(), Change(Change::DELETED));
cur.forwardPos();
needsUpdate = true;
bool needsUpdate = false;
- BufferParams const & bufparams = cur.buffer().params();
+ BufferParams const & bufparams = cur.buffer()->params();
DocumentClass const & tclass = bufparams.documentClass();
ParagraphList & plist = cur.text()->paragraphs();
Paragraph const & par = cur.paragraph();
}
if (needsUpdate) {
- updateLabels(cur.buffer());
+ cur.buffer()->updateLabels();
setCursorIntern(cur, prevcur.pit(), prevcur.pos());
}
Paragraph & prev_par = pars_[cur.pit() - 1];
- if (!prev_par.isMergedOnEndOfParDeletion(cur.buffer().params().trackChanges)) {
+ 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());
return true;
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().trackChanges);
if (was_inset)
- updateLabels(cur.buffer());
+ cur.buffer()->updateLabels();
else
cur.checkBufferStructure();
}
if (spit == 0)
spos += cur.pos();
spit += cur.pit();
- Buffer & b = cur.buffer();
+ Buffer & b = *cur.buffer();
cur.paragraph().eraseChar(cur.pos(), b.params().trackChanges);
if (!plist.empty()) {
// ERT paragraphs have the Language latex_language.
void Text::getWord(CursorSlice & from, CursorSlice & to,
word_location const loc) const
{
- Paragraph const & from_par = pars_[from.pit()];
- switch (loc) {
- case WHOLE_WORD_STRICT:
- if (from.pos() == 0 || from.pos() == from_par.size()
- || !from_par.isLetter(from.pos())
- || !from_par.isLetter(from.pos() - 1)) {
- to = from;
- return;
- }
- // no break here, we go to the next
-
- case WHOLE_WORD:
- // If we are already at the beginning of a word, do nothing
- if (!from.pos() || !from_par.isLetter(from.pos() - 1))
- break;
- // no break here, we go to the next
-
- case PREVIOUS_WORD:
- // always move the cursor to the beginning of previous word
- while (from.pos() && from_par.isLetter(from.pos() - 1))
- --from.pos();
- break;
- case NEXT_WORD:
- LYXERR0("Text::getWord: NEXT_WORD not implemented yet");
- break;
- case PARTIAL_WORD:
- // no need to move the 'from' cursor
- break;
- }
to = from;
- Paragraph const & to_par = pars_[to.pit()];
- while (to.pos() < to_par.size() && to_par.isLetter(to.pos()))
- ++to.pos();
+ pars_[to.pit()].locateWord(from.pos(), to.pos(), loc);
}
ErrorList & errorList, InsetText * insetPtr)
{
depth_type depth = 0;
+ bool res = true;
while (lex.isOK()) {
lex.nextToken();
if (token == "\\begin_body")
continue;
- if (token == "\\end_document")
- return false;
+ if (token == "\\end_document") {
+ res = false;
+ break;
+ }
if (token == "\\begin_layout") {
lex.pushToken(token);
// register the words in the global word list
CursorSlice sl = CursorSlice(*insetPtr);
sl.pit() = pars_.size() - 1;
- pars_.back().updateWords(sl);
+ pars_.back().updateWords();
} else if (token == "\\begin_deeper") {
++depth;
} else if (token == "\\end_deeper") {
LYXERR0("Handling unknown body token: `" << token << '\'');
}
}
- return true;
+
+ // avoid a crash on weird documents (bug 4859)
+ if (pars_.empty()) {
+ Paragraph par;
+ par.setInsetOwner(insetPtr);
+ par.params().depth(depth);
+ 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(), /**/);
- Buffer & buf = cur.buffer();
+ Buffer & buf = *cur.buffer();
Paragraph const & par = cur.paragraph();
odocstringstream os;
// Store the characters to be transposed (including font information).
char_type const char1 = par.getChar(pos1);
Font const font1 =
- par.getFontSettings(cur.buffer().params(), pos1);
+ par.getFontSettings(cur.buffer()->params(), pos1);
char_type const char2 = par.getChar(pos2);
Font const font2 =
- par.getFontSettings(cur.buffer().params(), pos2);
+ par.getFontSettings(cur.buffer()->params(), pos2);
// 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().trackChanges;
cur.recordUndo();
projects / lyx.git / blobdiff