/**
- * \file src/text.cpp
+ * \file src/Text.cpp
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
#include "buffer_funcs.h"
#include "BufferParams.h"
#include "BufferView.h"
-#include "bufferview_funcs.h"
+#include "Changes.h"
#include "Cursor.h"
#include "ParIterator.h"
-#include "CoordCache.h"
#include "CutAndPaste.h"
-#include "debug.h"
#include "DispatchResult.h"
#include "Encoding.h"
#include "ErrorList.h"
#include "FuncRequest.h"
#include "factory.h"
#include "FontIterator.h"
-#include "gettext.h"
#include "Language.h"
-#include "Color.h"
#include "Length.h"
#include "Lexer.h"
#include "LyXRC.h"
-#include "Row.h"
-#include "MetricsInfo.h"
#include "Paragraph.h"
#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
-#include "Undo.h"
+#include "TextClass.h"
+#include "TextMetrics.h"
#include "VSpace.h"
#include "WordLangTuple.h"
#include "insets/InsetHFill.h"
#include "insets/InsetLine.h"
#include "insets/InsetNewline.h"
-#include "insets/InsetPagebreak.h"
+#include "insets/InsetNewpage.h"
#include "insets/InsetOptArg.h"
#include "insets/InsetSpace.h"
#include "insets/InsetSpecialChar.h"
#include "insets/InsetTabular.h"
+#include "support/convert.h"
+#include "support/debug.h"
+#include "support/docstream.h"
+#include "support/gettext.h"
#include "support/lstrings.h"
#include "support/textutils.h"
-#include "support/convert.h"
-#include <boost/current_function.hpp>
+#include <boost/next_prior.hpp>
#include <sstream>
using std::auto_ptr;
-using std::advance;
-using std::distance;
-using std::max;
-using std::min;
-using std::endl;
using std::string;
namespace lyx {
using support::bformat;
using support::contains;
-using support::lowercase;
using support::split;
-using support::uppercase;
+using support::subst;
using cap::cutSelection;
using cap::pasteParagraphList;
BufferParams const & bp = buf.params();
if (token[0] != '\\') {
-#if 0
- string::const_iterator cit = token.begin();
- for (; cit != token.end(); ++cit)
- par.insertChar(par.size(), (*cit), font, change);
-#else
docstring dstr = lex.getDocString();
- docstring::const_iterator cit = dstr.begin();
- docstring::const_iterator cend = dstr.end();
- for (; cit != cend; ++cit)
- par.insertChar(par.size(), *cit, font, change);
-#endif
+ par.appendString(dstr, font, change);
+
} else if (token == "\\begin_layout") {
lex.eatLine();
docstring layoutname = lex.getDocString();
- font = Font(Font::ALL_INHERIT, bp.language);
+ font = Font(inherit_font, bp.language);
change = Change(Change::UNCHANGED);
TextClass const & tclass = bp.getTextClass();
par.params().read(lex);
} else if (token == "\\end_layout") {
- lyxerr << BOOST_CURRENT_FUNCTION
- << ": Solitary \\end_layout in line "
- << lex.getLineNo() << "\n"
- << "Missing \\begin_layout?.\n";
+ LYXERR0("Solitary \\end_layout in line " << lex.getLineNo() << "\n"
+ << "Missing \\begin_layout ?");
} else if (token == "\\end_inset") {
- lyxerr << BOOST_CURRENT_FUNCTION
- << ": Solitary \\end_inset in line "
- << lex.getLineNo() << "\n"
- << "Missing \\begin_inset?.\n";
+ LYXERR0("Solitary \\end_inset in line " << lex.getLineNo() << "\n"
+ << "Missing \\begin_inset ?");
} else if (token == "\\begin_inset") {
Inset * inset = readInset(lex, buf);
if (inset)
}
} else if (token == "\\family") {
lex.next();
- font.setLyXFamily(lex.getString());
+ setLyXFamily(lex.getString(), font.fontInfo());
} else if (token == "\\series") {
lex.next();
- font.setLyXSeries(lex.getString());
+ setLyXSeries(lex.getString(), font.fontInfo());
} else if (token == "\\shape") {
lex.next();
- font.setLyXShape(lex.getString());
+ setLyXShape(lex.getString(), font.fontInfo());
} else if (token == "\\size") {
lex.next();
- font.setLyXSize(lex.getString());
+ setLyXSize(lex.getString(), font.fontInfo());
} else if (token == "\\lang") {
lex.next();
string const tok = lex.getString();
}
} else if (token == "\\numeric") {
lex.next();
- font.setNumber(font.setLyXMisc(lex.getString()));
+ font.fontInfo().setNumber(font.setLyXMisc(lex.getString()));
} else if (token == "\\emph") {
lex.next();
- font.setEmph(font.setLyXMisc(lex.getString()));
+ font.fontInfo().setEmph(font.setLyXMisc(lex.getString()));
} else if (token == "\\bar") {
lex.next();
string const tok = lex.getString();
if (tok == "under")
- font.setUnderbar(Font::ON);
+ font.fontInfo().setUnderbar(FONT_ON);
else if (tok == "no")
- font.setUnderbar(Font::OFF);
+ font.fontInfo().setUnderbar(FONT_OFF);
else if (tok == "default")
- font.setUnderbar(Font::INHERIT);
+ font.fontInfo().setUnderbar(FONT_INHERIT);
else
lex.printError("Unknown bar font flag "
"`$$Token'");
} else if (token == "\\noun") {
lex.next();
- font.setNoun(font.setLyXMisc(lex.getString()));
+ font.fontInfo().setNoun(font.setLyXMisc(lex.getString()));
} else if (token == "\\color") {
lex.next();
- font.setLyXColor(lex.getString());
+ setLyXColor(lex.getString(), font.fontInfo());
} else if (token == "\\InsetSpace" || token == "\\SpecialChar") {
// Insets don't make sense in a free-spacing context! ---Kayvan
if (par.isFreeSpacing()) {
if (token == "\\InsetSpace")
- par.insertChar(par.size(), ' ', font, change);
+ par.appendChar(' ', font, change);
else if (lex.isOK()) {
lex.next();
string const next_token = lex.getString();
if (next_token == "\\-")
- par.insertChar(par.size(), '-', font, change);
+ par.appendChar('-', font, change);
else {
lex.printError("Token `$$Token' "
"is in free space "
font, change);
}
} else if (token == "\\backslash") {
- par.insertChar(par.size(), '\\', font, change);
+ par.appendChar('\\', font, change);
+ } else if (token == "\\linebreak") {
+ auto_ptr<Inset> inset(new InsetLinebreak);
+ inset->read(buf, lex);
+ par.insertInset(par.size(), inset.release(), font, change);
} else if (token == "\\newline") {
auto_ptr<Inset> inset(new InsetNewline);
inset->read(buf, lex);
} else if (token == "\\lyxline") {
par.insertInset(par.size(), new InsetLine, font, change);
} else if (token == "\\newpage") {
+ par.insertInset(par.size(), new InsetNewpage, font, change);
+ } else if (token == "\\pagebreak") {
par.insertInset(par.size(), new InsetPagebreak, font, change);
} else if (token == "\\clearpage") {
par.insertInset(par.size(), new InsetClearPage, font, change);
lex.eatLine();
std::istringstream is(lex.getString());
unsigned int aid;
- time_type ct;
+ time_t ct;
is >> aid >> ct;
if (aid >= bp.author_map.size()) {
errorList.push_back(ErrorItem(_("Change tracking error"),
lex.eatLine();
std::istringstream is(lex.getString());
unsigned int aid;
- time_type ct;
+ time_t ct;
is >> aid >> ct;
if (aid >= bp.author_map.size()) {
errorList.push_back(ErrorItem(_("Change tracking error"),
break;
}
- LYXERR(Debug::PARSER) << "Handling paragraph token: `"
- << token << '\'' << endl;
+ LYXERR(Debug::PARSER, "Handling paragraph token: `" << token << '\'');
if (token == "\\begin_layout" || token == "\\end_document"
|| token == "\\end_inset" || token == "\\begin_deeper"
|| token == "\\end_deeper") {
}
-int Text::leftMargin(Buffer const & buffer, int max_width, pit_type pit) const
-{
- BOOST_ASSERT(pit >= 0);
- BOOST_ASSERT(pit < int(pars_.size()));
- return leftMargin(buffer, max_width, pit, pars_[pit].size());
-}
-
-
-int Text::leftMargin(Buffer const & buffer, int max_width,
- pit_type const pit, pos_type const pos) const
-{
- BOOST_ASSERT(pit >= 0);
- BOOST_ASSERT(pit < int(pars_.size()));
- Paragraph const & par = pars_[pit];
- BOOST_ASSERT(pos >= 0);
- BOOST_ASSERT(pos <= par.size());
- //lyxerr << "Text::leftMargin: pit: " << pit << " pos: " << pos << endl;
- TextClass const & tclass = buffer.params().getTextClass();
- LayoutPtr const & layout = par.layout();
-
- docstring parindent = layout->parindent;
-
- int l_margin = 0;
-
- if (isMainText(buffer))
- l_margin += changebarMargin();
-
- l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
- tclass.leftmargin());
-
- if (par.getDepth() != 0) {
- // find the next level paragraph
- pit_type newpar = outerHook(pit, pars_);
- if (newpar != pit_type(pars_.size())) {
- if (pars_[newpar].layout()->isEnvironment()) {
- l_margin = leftMargin(buffer, max_width, newpar);
- }
- if (par.layout() == tclass.defaultLayout()) {
- if (pars_[newpar].params().noindent())
- parindent.erase();
- else
- parindent = pars_[newpar].layout()->parindent;
- }
- }
- }
-
- // This happens after sections in standard classes. The 1.3.x
- // code compared depths too, but it does not seem necessary
- // (JMarc)
- if (par.layout() == tclass.defaultLayout()
- && pit > 0 && pars_[pit - 1].layout()->nextnoindent)
- parindent.erase();
-
- Font const labelfont = getLabelFont(buffer, par);
- FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
-
- switch (layout->margintype) {
- case MARGIN_DYNAMIC:
- if (!layout->leftmargin.empty()) {
- l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
- layout->leftmargin);
- }
- if (!par.getLabelstring().empty()) {
- l_margin += labelfont_metrics.signedWidth(layout->labelindent);
- l_margin += labelfont_metrics.width(par.getLabelstring());
- l_margin += labelfont_metrics.width(layout->labelsep);
- }
- break;
-
- case MARGIN_MANUAL: {
- l_margin += labelfont_metrics.signedWidth(layout->labelindent);
- // The width of an empty par, even with manual label, should be 0
- if (!par.empty() && pos >= par.beginOfBody()) {
- if (!par.getLabelWidthString().empty()) {
- docstring labstr = par.getLabelWidthString();
- l_margin += labelfont_metrics.width(labstr);
- l_margin += labelfont_metrics.width(layout->labelsep);
- }
- }
- break;
- }
-
- case MARGIN_STATIC: {
- l_margin += theFontMetrics(buffer.params().getFont()).
- signedWidth(layout->leftmargin) * 4 / (par.getDepth() + 4);
- break;
- }
-
- case MARGIN_FIRST_DYNAMIC:
- if (layout->labeltype == LABEL_MANUAL) {
- if (pos >= par.beginOfBody()) {
- l_margin += labelfont_metrics.signedWidth(layout->leftmargin);
- } else {
- l_margin += labelfont_metrics.signedWidth(layout->labelindent);
- }
- } else if (pos != 0
- // Special case to fix problems with
- // theorems (JMarc)
- || (layout->labeltype == LABEL_STATIC
- && layout->latextype == LATEX_ENVIRONMENT
- && !isFirstInSequence(pit, pars_))) {
- l_margin += labelfont_metrics.signedWidth(layout->leftmargin);
- } else if (layout->labeltype != LABEL_TOP_ENVIRONMENT
- && layout->labeltype != LABEL_BIBLIO
- && layout->labeltype !=
- LABEL_CENTERED_TOP_ENVIRONMENT) {
- l_margin += labelfont_metrics.signedWidth(layout->labelindent);
- l_margin += labelfont_metrics.width(layout->labelsep);
- l_margin += labelfont_metrics.width(par.getLabelstring());
- }
- break;
-
- case MARGIN_RIGHT_ADDRESS_BOX: {
-#if 0
- // ok, a terrible hack. The left margin depends on the widest
- // row in this paragraph.
- RowList::iterator rit = par.rows().begin();
- RowList::iterator end = par.rows().end();
- // FIXME: This is wrong.
- int minfill = max_width;
- for ( ; rit != end; ++rit)
- if (rit->fill() < minfill)
- minfill = rit->fill();
- l_margin += theFontMetrics(params.getFont()).signedWidth(layout->leftmargin);
- l_margin += minfill;
-#endif
- // also wrong, but much shorter.
- l_margin += max_width / 2;
- break;
- }
- }
-
- if (!par.params().leftIndent().zero())
- l_margin += par.params().leftIndent().inPixels(max_width);
-
- LyXAlignment align;
-
- if (par.params().align() == LYX_ALIGN_LAYOUT)
- align = layout->align;
- else
- align = par.params().align();
-
- // set the correct parindent
- if (pos == 0
- && (layout->labeltype == LABEL_NO_LABEL
- || layout->labeltype == LABEL_TOP_ENVIRONMENT
- || layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
- || (layout->labeltype == LABEL_STATIC
- && layout->latextype == LATEX_ENVIRONMENT
- && !isFirstInSequence(pit, pars_)))
- && align == LYX_ALIGN_BLOCK
- && !par.params().noindent()
- // in some insets, paragraphs are never indented
- && !(par.inInset() && par.inInset()->neverIndent(buffer))
- // display style insets are always centered, omit indentation
- && !(!par.empty()
- && par.isInset(pos)
- && par.getInset(pos)->display())
- && (par.layout() != tclass.defaultLayout()
- || buffer.params().paragraph_separation ==
- BufferParams::PARSEP_INDENT))
- {
- l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
- parindent);
- }
-
- return l_margin;
-}
-
-
-Color_color Text::backgroundColor() const
-{
- return Color_color(Color::color(background_color_));
-}
-
-
-void Text::breakParagraph(Cursor & cur, bool keep_layout)
+void Text::breakParagraph(Cursor & cur, bool inverse_logic)
{
BOOST_ASSERT(this == cur.text());
cpar.eraseChar(cur.pos(), cur.buffer().params().trackChanges);
// What should the layout for the new paragraph be?
- int preserve_layout = 0;
- if (keep_layout)
- preserve_layout = 2;
- else
- preserve_layout = layout->isEnvironment();
+ bool keep_layout = inverse_logic ?
+ !layout->isEnvironment()
+ : layout->isEnvironment();
// We need to remember this before we break the paragraph, because
// that invalidates the layout variable
bool const isempty = cpar.allowEmpty() && cpar.empty();
lyx::breakParagraph(cur.buffer().params(), paragraphs(), cpit,
- cur.pos(), preserve_layout);
+ cur.pos(), keep_layout);
// After this, neither paragraph contains any rows!
void Text::insertChar(Cursor & cur, char_type c)
{
BOOST_ASSERT(this == cur.text());
- BOOST_ASSERT(c != Paragraph::META_INSET);
- recordUndo(cur, Undo::INSERT);
+ cur.recordUndo(INSERT_UNDO);
+ TextMetrics const & tm = cur.bv().textMetrics(this);
Buffer const & buffer = cur.buffer();
Paragraph & par = cur.paragraph();
// try to remove this
static docstring const number_unary_operators = from_ascii("+-");
static docstring const number_seperators = from_ascii(".,:");
- if (current_font.number() == Font::ON) {
+ if (cur.current_font.fontInfo().number() == FONT_ON) {
if (!isDigit(c) && !contains(number_operators, c) &&
!(contains(number_seperators, c) &&
cur.pos() != 0 &&
cur.pos() != cur.lastpos() &&
- getFont(buffer, par, cur.pos()).number() == Font::ON &&
- getFont(buffer, par, cur.pos() - 1).number() == Font::ON)
+ tm.getDisplayFont(pit, cur.pos()).fontInfo().number() == FONT_ON &&
+ tm.getDisplayFont(pit, cur.pos() - 1).fontInfo().number() == FONT_ON)
)
number(cur); // Set current_font.number to OFF
} else if (isDigit(c) &&
- real_current_font.isVisibleRightToLeft()) {
+ cur.real_current_font.isVisibleRightToLeft()) {
number(cur); // Set current_font.number to ON
if (cur.pos() != 0) {
|| par.isSeparator(cur.pos() - 2)
|| par.isNewline(cur.pos() - 2))
) {
- setCharFont(buffer, pit, cur.pos() - 1, current_font);
+ setCharFont(buffer, pit, cur.pos() - 1, cur.current_font,
+ tm.font_);
} else if (contains(number_seperators, c)
&& cur.pos() >= 2
- && getFont(buffer, par, cur.pos() - 2).number() == Font::ON) {
- setCharFont(buffer, pit, cur.pos() - 1, current_font);
+ && tm.getDisplayFont(pit, cur.pos() - 2).fontInfo().number() == FONT_ON) {
+ setCharFont(buffer, pit, cur.pos() - 1, cur.current_font,
+ tm.font_);
}
}
}
if ((cur.pos() >= 2) && (par.isLineSeparator(cur.pos() - 1))) {
// 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 = getFont(buffer, par, cur.pos() - 2);
- Font const & post_space_font = real_current_font;
+ Font const pre_space_font = tm.getDisplayFont(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();
// adjacent character whose direction is the paragraph's
// direction; don't touch other properties of the font
Language const * lang =
- (pre_space_rtl == par.isRightToLeftPar(buffer.params())) ?
+ (pre_space_rtl == par.isRTL(buffer.params())) ?
pre_space_font.language() : post_space_font.language();
- Font space_font = getFont(buffer, par, cur.pos() - 1);
+ Font space_font = tm.getDisplayFont(cur.pit(), cur.pos() - 1);
space_font.setLanguage(lang);
par.setFont(cur.pos() - 1, space_font);
}
}
}
- par.insertChar(cur.pos(), c, current_font, cur.buffer().params().trackChanges);
+ par.insertChar(cur.pos(), c, cur.current_font, cur.buffer().params().trackChanges);
checkBufferStructure(cur.buffer(), cur);
// cur.updateFlags(Update::Force);
setCursor(cur.top(), cur.pit(), cur.pos() + 1);
- charInserted();
+ charInserted(cur);
}
-void Text::charInserted()
+void Text::charInserted(Cursor & cur)
{
// Here we call finishUndo for every 20 characters inserted.
// This is from my experience how emacs does it. (Lgb)
if (counter < 20) {
++counter;
} else {
- finishUndo();
+ cur.finishUndo();
counter = 0;
}
}
// the cursor set functions have a special mechanism. When they
// realize, that you left an empty paragraph, they will delete it.
-bool Text::cursorRightOneWord(Cursor & cur)
+bool Text::cursorForwardOneWord(Cursor & cur)
{
BOOST_ASSERT(this == cur.text());
}
-bool Text::cursorLeftOneWord(Cursor & cur)
+bool Text::cursorBackwardOneWord(Cursor & cur)
{
BOOST_ASSERT(this == cur.text());
if (!cur.selection())
return;
- recordUndoSelection(cur, Undo::ATOMIC);
+ cur.recordUndoSelection();
pit_type begPit = cur.selectionBegin().pit();
pit_type endPit = cur.selectionEnd().pit();
//
- finishUndo();
+ cur.finishUndo();
cur.clearSelection();
setCursorIntern(cur, begPit, begPos);
cur.updateFlags(Update::Force);
}
-// Delete from cursor up to the end of the current or next word.
void Text::deleteWordForward(Cursor & cur)
{
BOOST_ASSERT(this == cur.text());
if (cur.lastpos() == 0)
- cursorRight(cur);
+ cursorForward(cur);
else {
cur.resetAnchor();
cur.selection() = true;
- cursorRightOneWord(cur);
+ cursorForwardOneWord(cur);
cur.setSelection();
cutSelection(cur, true, false);
checkBufferStructure(cur.buffer(), cur);
}
-// Delete from cursor to start of current or prior word.
void Text::deleteWordBackward(Cursor & cur)
{
BOOST_ASSERT(this == cur.text());
if (cur.lastpos() == 0)
- cursorLeft(cur);
+ cursorBackward(cur);
else {
cur.resetAnchor();
cur.selection() = true;
- cursorLeftOneWord(cur);
+ cursorBackwardOneWord(cur);
cur.setSelection();
cutSelection(cur, true, false);
checkBufferStructure(cur.buffer(), cur);
// Kill to end of line.
-void Text::deleteLineForward(Cursor & cur)
-{
- BOOST_ASSERT(this == cur.text());
- if (cur.lastpos() == 0) {
- // Paragraph is empty, so we just go to the right
- cursorRight(cur);
- } else {
- cur.resetAnchor();
- cur.selection() = true; // to avoid deletion
- cursorEnd(cur);
- cur.setSelection();
- // What is this test for ??? (JMarc)
- if (!cur.selection())
- deleteWordForward(cur);
- else
- cutSelection(cur, true, false);
- checkBufferStructure(cur.buffer(), cur);
- }
-}
-
-
-void Text::changeCase(Cursor & cur, Text::TextCase action)
+void Text::changeCase(Cursor & cur, TextCase action)
{
BOOST_ASSERT(this == cur.text());
CursorSlice from;
} else {
from = cur.top();
getWord(from, to, PARTIAL_WORD);
- cursorRightOneWord(cur);
+ cursorForwardOneWord(cur);
}
- recordUndoSelection(cur, Undo::ATOMIC);
+ cur.recordUndoSelection();
pit_type begPit = from.pit();
pit_type endPit = to.pit();
pos_type begPos = from.pos();
pos_type endPos = to.pos();
- bool const trackChanges = cur.buffer().params().trackChanges;
-
pos_type right = 0; // needed after the for loop
for (pit_type pit = begPit; pit <= endPit; ++pit) {
- pos_type parSize = pars_[pit].size();
-
- pos_type pos = (pit == begPit ? begPos : 0);
- right = (pit == endPit ? endPos : parSize);
-
- // process sequences of modified characters; in change
- // tracking mode, this approach results in much better
- // usability than changing case on a char-by-char basis
- docstring changes;
-
- bool capitalize = true;
-
- for (; pos < right; ++pos) {
- char_type oldChar = pars_[pit].getChar(pos);
- char_type newChar = oldChar;
-
- // ignore insets and don't play with deleted text!
- if (oldChar != Paragraph::META_INSET && !pars_[pit].isDeleted(pos)) {
- switch (action) {
- case text_lowercase:
- newChar = lowercase(oldChar);
- break;
- case text_capitalization:
- if (capitalize) {
- newChar = uppercase(oldChar);
- capitalize = false;
- }
- break;
- case text_uppercase:
- newChar = uppercase(oldChar);
- break;
- }
- }
-
- if (!pars_[pit].isLetter(pos) || pars_[pit].isDeleted(pos)) {
- capitalize = true; // permit capitalization again
- }
-
- if (oldChar != newChar) {
- changes += newChar;
- }
-
- if (oldChar == newChar || pos == right - 1) {
- if (oldChar != newChar) {
- pos++; // step behind the changing area
- }
- int erasePos = pos - changes.size();
- for (size_t i = 0; i < changes.size(); i++) {
- pars_[pit].insertChar(pos, changes[i],
- pars_[pit].getFontSettings(cur.buffer().params(),
- erasePos),
- trackChanges);
- if (!pars_[pit].eraseChar(erasePos, trackChanges)) {
- ++erasePos;
- ++pos; // advance
- ++right; // expand selection
- }
- }
- changes.clear();
- }
- }
+ 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);
}
// the selection may have changed due to logically-only deleted chars
}
Paragraph const & prevpar = prevcur.paragraph();
if (cur.pit() > 0 && par.layout() == prevpar.layout()) {
- recordUndo(cur, Undo::ATOMIC, prevcur.pit());
+ cur.recordUndo(ATOMIC_UNDO, prevcur.pit());
mergeParagraph(bufparams, cur.text()->paragraphs(),
prevcur.pit());
updateLabels(cur.buffer());
if (cur.pos() != cur.lastpos()) {
// this is the code for a normal delete, not pasting
// any paragraphs
- recordUndo(cur, Undo::DELETE);
+ cur.recordUndo(DELETE_UNDO);
if(!par.eraseChar(cur.pos(), cur.buffer().params().trackChanges)) {
// the character has been logically deleted only => skip it
cur.top().forwardPos();
// is it an empty paragraph?
if (cur.lastpos() == 0
|| (cur.lastpos() == 1 && par.isSeparator(0))) {
- recordUndo(cur, Undo::ATOMIC, prevcur.pit(), cur.pit());
+ cur.recordUndo(ATOMIC_UNDO, prevcur.pit(), cur.pit());
plist.erase(boost::next(plist.begin(), cur.pit()));
needsUpdate = true;
}
// is previous par empty?
else if (prevcur.lastpos() == 0
|| (prevcur.lastpos() == 1 && prevpar.isSeparator(0))) {
- recordUndo(cur, Undo::ATOMIC, prevcur.pit(), cur.pit());
+ cur.recordUndo(ATOMIC_UNDO, prevcur.pit(), cur.pit());
plist.erase(boost::next(plist.begin(), prevcur.pit()));
needsUpdate = true;
}
// Correction: Pasting is always allowed with standard-layout
else if (par.layout() == prevpar.layout()
|| par.layout() == tclass.defaultLayout()) {
- recordUndo(cur, Undo::ATOMIC, prevcur.pit());
+ cur.recordUndo(ATOMIC_UNDO, prevcur.pit());
mergeParagraph(bufparams, plist, prevcur.pit());
needsUpdate = true;
}
} else {
// this is the code for a normal backspace, not pasting
// any paragraphs
- recordUndo(cur, Undo::DELETE);
- // We used to do cursorLeftIntern() here, but it is
+ cur.recordUndo(DELETE_UNDO);
+ // We used to do cursorBackwardIntern() here, but it is
// not a good idea since it triggers the auto-delete
- // mechanism. So we do a cursorLeftIntern()-lite,
+ // mechanism. So we do a cursorBackwardIntern()-lite,
// without the dreaded mechanism. (JMarc)
setCursorIntern(cur, cur.pit(), cur.pos() - 1,
false, cur.boundary());
}
if (cur.pos() == cur.lastpos())
- setCurrentFont(cur);
+ cur.setCurrentFont();
needsUpdate |= handleBibitems(cur);
if (isMainText(cur.bv().buffer()) || cur.inset().nargs() != 1)
return false;
- recordUndoInset(cur);
+ cur.recordUndoInset();
cur.selHandle(false);
// save position
pos_type spos = cur.pos();
ParagraphList plist;
if (cur.lastpit() != 0 || cur.lastpos() != 0)
plist = paragraphs();
- cur.popLeft();
+ cur.popBackward();
// store cursor offset
if (spit == 0)
spos += cur.pos();
// change it to the buffer language.
ParagraphList::iterator it = plist.begin();
ParagraphList::iterator it_end = plist.end();
- for (; it != it_end; it++) {
- it->changeLanguage(b.params(), latex_language,
- b.getLanguage());
- }
+ for (; it != it_end; it++)
+ it->changeLanguage(b.params(), latex_language, b.language());
- pasteParagraphList(cur, plist, b.params().getTextClass_ptr(),
+ pasteParagraphList(cur, plist, b.params().getTextClassPtr(),
b.errorList("Paste"));
// restore position
cur.pit() = std::min(cur.lastpit(), spit);
}
-bool Text::isLastRow(pit_type pit, Row const & row) const
-{
- return row.endpos() >= pars_[pit].size()
- && pit + 1 == pit_type(paragraphs().size());
-}
-
-
-bool Text::isFirstRow(pit_type pit, Row const & row) const
-{
- return row.pos() == 0 && pit == 0;
-}
-
-
void Text::getWord(CursorSlice & from, CursorSlice & to,
word_location const loc)
{
--from.pos();
break;
case NEXT_WORD:
- lyxerr << "Text::getWord: NEXT_WORD not implemented yet"
- << endl;
+ LYXERR0("Text::getWord: NEXT_WORD not implemented yet");
break;
case PARTIAL_WORD:
// no need to move the 'from' cursor
Paragraph par;
par.params().depth(depth);
- par.setFont(0, Font(Font::ALL_INHERIT, buf.params().language));
+ par.setFont(0, Font(inherit_font, buf.params().language));
pars_.push_back(par);
// FIXME: goddamn InsetTabular makes us pass a Buffer
} else if (token == "\\begin_deeper") {
++depth;
} else if (token == "\\end_deeper") {
- if (!depth) {
+ if (!depth)
lex.printError("\\end_deeper: " "depth is already null");
- } else {
+ else
--depth;
- }
} else {
- lyxerr << "Handling unknown body token: `"
- << token << '\'' << endl;
+ LYXERR0("Handling unknown body token: `" << token << '\'');
}
}
return true;
}
-int Text::cursorX(BufferView const & bv, CursorSlice const & sl,
- bool boundary) const
-{
- TextMetrics const & tm = bv.textMetrics(sl.text());
- pit_type const pit = sl.pit();
- Paragraph const & par = pars_[pit];
- ParagraphMetrics const & pm = tm.parMetrics(pit);
- if (pm.rows().empty())
- return 0;
-
- pos_type ppos = sl.pos();
- // Correct position in front of big insets
- bool const boundary_correction = ppos != 0 && boundary;
- if (boundary_correction)
- --ppos;
-
- Row const & row = pm.getRow(sl.pos(), boundary);
-
- pos_type cursor_vpos = 0;
-
- Buffer const & buffer = bv.buffer();
- double x = row.x;
- Bidi bidi;
- bidi.computeTables(par, buffer, row);
-
- pos_type const row_pos = row.pos();
- pos_type const end = row.endpos();
- // Spaces at logical line breaks in bidi text must be skipped during
- // cursor positioning. However, they may appear visually in the middle
- // of a row; they must be skipped, wherever they are...
- // * logically "abc_[HEBREW_\nHEBREW]"
- // * visually "abc_[_WERBEH\nWERBEH]"
- pos_type skipped_sep_vpos = -1;
-
- if (end <= row_pos)
- cursor_vpos = row_pos;
- else if (ppos >= end)
- cursor_vpos = isRTL(buffer, par) ? row_pos : end;
- else if (ppos > row_pos && ppos >= end)
- // Place cursor after char at (logical) position pos - 1
- cursor_vpos = (bidi.level(ppos - 1) % 2 == 0)
- ? bidi.log2vis(ppos - 1) + 1 : bidi.log2vis(ppos - 1);
- else
- // Place cursor before char at (logical) position ppos
- cursor_vpos = (bidi.level(ppos) % 2 == 0)
- ? bidi.log2vis(ppos) : bidi.log2vis(ppos) + 1;
-
- pos_type body_pos = par.beginOfBody();
- if (body_pos > 0 &&
- (body_pos > end || !par.isLineSeparator(body_pos - 1)))
- body_pos = 0;
-
- // Use font span to speed things up, see below
- FontSpan font_span;
- Font font;
-
- // If the last logical character is a separator, skip it, unless
- // it's in the last row of a paragraph; see skipped_sep_vpos declaration
- if (end > 0 && end < par.size() && par.isSeparator(end - 1))
- skipped_sep_vpos = bidi.log2vis(end - 1);
-
- for (pos_type vpos = row_pos; vpos < cursor_vpos; ++vpos) {
- // Skip the separator which is at the logical end of the row
- if (vpos == skipped_sep_vpos)
- continue;
- pos_type pos = bidi.vis2log(vpos);
- if (body_pos > 0 && pos == body_pos - 1) {
- FontMetrics const & labelfm = theFontMetrics(
- getLabelFont(buffer, par));
- x += row.label_hfill + labelfm.width(par.layout()->labelsep);
- if (par.isLineSeparator(body_pos - 1))
- x -= tm.singleWidth(pit, body_pos - 1);
- }
-
- // Use font span to speed things up, see above
- if (pos < font_span.first || pos > font_span.last) {
- font_span = par.fontSpan(pos);
- font = getFont(buffer, par, pos);
- }
-
- x += pm.singleWidth(pos, font);
-
- if (par.hfillExpansion(row, pos))
- x += (pos >= body_pos) ? row.hfill : row.label_hfill;
- else if (par.isSeparator(pos) && pos >= body_pos)
- x += row.separator;
- }
-
- // see correction above
- if (boundary_correction) {
- if (isRTL(buffer, sl, boundary))
- x -= tm.singleWidth(pit, ppos);
- else
- x += tm.singleWidth(pit, ppos);
- }
-
- return int(x);
-}
-
-
-int Text::cursorY(BufferView const & bv, CursorSlice const & sl, bool boundary) const
-{
- //lyxerr << "Text::cursorY: boundary: " << boundary << std::endl;
- ParagraphMetrics const & pm = bv.parMetrics(this, sl.pit());
- if (pm.rows().empty())
- return 0;
-
- int h = 0;
- h -= bv.parMetrics(this, 0).rows()[0].ascent();
- for (pit_type pit = 0; pit < sl.pit(); ++pit) {
- h += bv.parMetrics(this, pit).height();
- }
- int pos = sl.pos();
- if (pos && boundary)
- --pos;
- size_t const rend = pm.pos2row(pos);
- for (size_t rit = 0; rit != rend; ++rit)
- h += pm.rows()[rit].height();
- h += pm.rows()[rend].ascent();
- return h;
-}
-
-
// Returns the current font and depth as a message.
docstring Text::currentState(Cursor & cur)
{
// I think we should only show changes from the default
// font. (Asger)
// No, from the document font (MV)
- Font font = real_current_font;
- font.reduce(buf.params().getFont());
+ Font font = cur.real_current_font;
+ font.fontInfo().reduce(buf.params().getFont().fontInfo());
os << bformat(_("Font: %1$s"), font.stateText(&buf.params()));
docstring text;
docstring par_text = pars_[pit].asString(cur.buffer(), false);
+ string piece;
+ // the return string of math matrices might contain linebreaks
+ par_text = subst(par_text, '\n', '-');
for (int i = 0; i < lyxrc.label_init_length; ++i) {
if (par_text.empty())
break;
name = from_ascii(layout->latexname());
// for captions, we just take the caption type
- Inset * caption_inset = cur.innerInsetOfType(Inset::CAPTION_CODE);
+ Inset * caption_inset = cur.innerInsetOfType(CAPTION_CODE);
if (caption_inset)
name = from_ascii(static_cast<InsetCaption *>(caption_inset)->type());
// If none of the above worked, we'll see if we're inside various
// types of insets and take our abbreviation from them.
if (name.empty()) {
- Inset::Code const codes[] = {
- Inset::FLOAT_CODE,
- Inset::WRAP_CODE,
- Inset::FOOT_CODE
+ InsetCode const codes[] = {
+ FLOAT_CODE,
+ WRAP_CODE,
+ FOOT_CODE
};
for (unsigned int i = 0; i < (sizeof codes / sizeof codes[0]); ++i) {
Inset * float_inset = cur.innerInsetOfType(codes[i]);
}
-void Text::setCursorFromCoordinates(Cursor & cur, int const x, int const y)
-{
- BOOST_ASSERT(this == cur.text());
- pit_type pit = getPitNearY(cur.bv(), y);
-
- TextMetrics const & tm = cur.bv().textMetrics(this);
- ParagraphMetrics const & pm = tm.parMetrics(pit);
-
- int yy = cur.bv().coordCache().get(this, pit).y_ - pm.ascent();
- LYXERR(Debug::DEBUG)
- << BOOST_CURRENT_FUNCTION
- << ": x: " << x
- << " y: " << y
- << " pit: " << pit
- << " yy: " << yy << endl;
-
- int r = 0;
- BOOST_ASSERT(pm.rows().size());
- for (; r < int(pm.rows().size()) - 1; ++r) {
- Row const & row = pm.rows()[r];
- if (int(yy + row.height()) > y)
- break;
- yy += row.height();
- }
-
- Row const & row = pm.rows()[r];
-
- LYXERR(Debug::DEBUG)
- << BOOST_CURRENT_FUNCTION
- << ": row " << r
- << " from pos: " << row.pos()
- << endl;
-
- bool bound = false;
- int xx = x;
- pos_type const pos = row.pos()
- + tm.getColumnNearX(pit, row, xx, bound);
-
- LYXERR(Debug::DEBUG)
- << BOOST_CURRENT_FUNCTION
- << ": setting cursor pit: " << pit
- << " pos: " << pos
- << endl;
-
- setCursor(cur, pit, pos, true, bound);
- // remember new position.
- cur.setTargetX();
-}
-
-
void Text::charsTranspose(Cursor & cur)
{
BOOST_ASSERT(this == cur.text());
// Track the changes if Change Tracking is enabled.
bool const trackChanges = cur.buffer().params().trackChanges;
- recordUndo(cur);
+ cur.recordUndo();
par.eraseChar(pos2, trackChanges);
par.eraseChar(pos1, trackChanges);
projects / lyx.git / blobdiff