#include "bufferparams.h"
#include "BufferView.h"
#include "cursor.h"
+#include "pariterator.h"
#include "coordcache.h"
#include "CutAndPaste.h"
#include "debug.h"
#include <sstream>
+using lyx::char_type;
using lyx::pit_type;
using lyx::pos_type;
using lyx::word_location;
} else if (token == "\\end_layout") {
lyxerr << BOOST_CURRENT_FUNCTION
- << ": Solitary \\end_layout in line "
- << lex.getLineNo() << "\n"
+ << ": Solitary \\end_layout in line "
+ << lex.getLineNo() << "\n"
<< "Missing \\begin_layout?.\n";
} else if (token == "\\end_inset") {
lyxerr << BOOST_CURRENT_FUNCTION
- << ": Solitary \\end_inset in line "
- << lex.getLineNo() << "\n"
+ << ": Solitary \\end_inset in line "
+ << lex.getLineNo() << "\n"
<< "Missing \\begin_inset?.\n";
} else if (token == "\\begin_inset") {
InsetBase * inset = readInset(lex, buf);
}
// Final change goes to paragraph break:
par.setChangeFull(par.size(), change);
-
+
// Initialize begin_of_body_ on load; redoParagraph maintains
par.setBeginOfBody();
}
int LyXText::singleWidth(Paragraph const & par,
- pos_type pos, char c, LyXFont const & font) const
+ pos_type pos, char_type c, LyXFont const & font) const
{
// The most common case is handled first (Asger)
- if (IsPrintable(c)) {
+ if (isPrintable(c)) {
Language const * language = font.language();
- if (language->RightToLeft()) {
+ if (language->rightToLeft()) {
if ((lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 ||
lyxrc.font_norm_type == LyXRC::ISO_10646_1)
&& language->lang() == "arabic") {
- if (Encodings::IsComposeChar_arabic(c))
+ if (Encodings::isComposeChar_arabic(c))
return 0;
c = par.transformChar(c, pos);
} else if (language->lang() == "hebrew" &&
- Encodings::IsComposeChar_hebrew(c))
+ Encodings::isComposeChar_hebrew(c))
return 0;
}
return font_metrics::width(c, font);
|| layout->labeltype == LABEL_TOP_ENVIRONMENT
|| layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
|| (layout->labeltype == LABEL_STATIC
- && layout->latextype == LATEX_ENVIRONMENT
- && !isFirstInSequence(pit, pars_)))
+ && layout->latextype == LATEX_ENVIRONMENT
+ && !isFirstInSequence(pit, pars_)))
&& align == LYX_ALIGN_BLOCK
&& !par.params().noindent()
// in some insets, paragraphs are never indented
&& par.isInset(pos)
&& par.getInset(pos)->display())
&& (par.layout() != tclass.defaultLayout()
- || bv()->buffer()->params().paragraph_separation ==
- BufferParams::PARSEP_INDENT))
+ || bv()->buffer()->params().paragraph_separation ==
+ BufferParams::PARSEP_INDENT))
{
l_margin += font_metrics::signedWidth(parindent, tclass.defaultfont());
}
pos_type point = end;
pos_type i = pos;
for ( ; i < end; ++i, ++fi) {
- char const c = par.getChar(i);
+ char_type const c = par.getChar(i);
int thiswidth = singleWidth(par, i, c, *fi);
// add the auto-hfill from label end to the body
w -= singleWidth(par, i - 1);
w = max(w, labelEnd(pit));
}
- char const c = par.getChar(i);
+ char_type const c = par.getChar(i);
w += singleWidth(par, i, c, *fi);
}
}
&& pit != 0
&& ((layout->isParagraph() && par.getDepth() == 0)
|| (pars_[pit - 1].layout()->isParagraph()
- && pars_[pit - 1].getDepth() == 0)))
+ && pars_[pit - 1].getDepth() == 0)))
{
maxasc += bufparams.getDefSkip().inPixels(*bv());
}
if (layout->counter == "chapter"
&& !par.params().labelString().empty()) {
labeladdon = int(font_metrics::maxHeight(labelfont)
- * layout->spacing.getValue()
- * spacing(par));
+ * layout->spacing.getValue()
+ * spacing(par));
}
// special code for the top label
while (!pars_[next_par].empty() && pars_[next_par].isNewline(0))
pars_[next_par].erase(0);
- updateCounters(cur.buffer());
+ ParIterator current_it(cur);
+ ParIterator next_it(cur); next_it.pit() = next_par;
+
+ if (needsUpdateCounters(cur.buffer(), current_it)
+ || needsUpdateCounters(cur.buffer(), next_it))
+ updateCounters(cur.buffer());
// Mark "carriage return" as inserted if change tracking:
if (cur.buffer().params().tracking_changes) {
- cur.paragraph().setChange(cur.paragraph().size(),
+ cur.paragraph().setChange(cur.paragraph().size(),
Change::INSERTED);
}
// insert a character, moves all the following breaks in the
// same Paragraph one to the right and make a rebreak
-void LyXText::insertChar(LCursor & cur, char c)
+void LyXText::insertChar(LCursor & cur, char_type c)
{
BOOST_ASSERT(this == cur.text());
BOOST_ASSERT(c != Paragraph::META_INSET);
static string const number_seperators = ".,:";
if (current_font.number() == LyXFont::ON) {
- if (!IsDigit(c) && !contains(number_operators, c) &&
+ if (!isDigit(c) && !contains(number_operators, c) &&
!(contains(number_seperators, c) &&
cur.pos() != 0 &&
cur.pos() != cur.lastpos() &&
getFont(par, cur.pos() - 1).number() == LyXFont::ON)
)
number(cur); // Set current_font.number to OFF
- } else if (IsDigit(c) &&
+ } else if (isDigit(c) &&
real_current_font.isVisibleRightToLeft()) {
number(cur); // Set current_font.number to ON
if (cur.pos() != 0) {
- char const c = par.getChar(cur.pos() - 1);
+ char_type const c = par.getChar(cur.pos() - 1);
if (contains(number_unary_operators, c) &&
(cur.pos() == 1
|| par.isSeparator(cur.pos() - 2)
// When the free-spacing option is set for the current layout,
// disable the double-space checking
- if (!freeSpacing && IsLineSeparatorChar(c)) {
+ if (!freeSpacing && isLineSeparatorChar(c)) {
if (cur.pos() == 0) {
static bool sent_space_message = false;
if (!sent_space_message) {
return;
recordUndoSelection(cur, Undo::INSERT);
-
+
DocIterator it = cur.selectionBegin();
DocIterator et = cur.selectionEnd();
pit_type pit = it.pit();
Change::Type const type = pars_[pit].lookupChange(it.pos());
for (; pit <= et.pit(); ++pit) {
pos_type left = ( pit == it.pit() ? it.pos() : 0 );
- pos_type right =
+ pos_type right =
( pit == et.pit() ? et.pos() : pars_[pit].size() + 1 );
pars_[pit].acceptChange(left, right);
}
if (it.pit() + 1 < et.pit())
pars_.erase(boost::next(plist.begin(), it.pit() + 1),
boost::next(plist.begin(), et.pit()));
-
+
// Paragraph merge if appropriate:
- if (pars_[it.pit()].lookupChange(pars_[it.pit()].size())
+ if (pars_[it.pit()].lookupChange(pars_[it.pit()].size())
== Change::DELETED) {
setCursorIntern(cur, it.pit() + 1, 0);
backspacePos0(cur);
Change::Type const type = pars_[pit].lookupChange(it.pos());
for (; pit <= et.pit(); ++pit) {
pos_type left = ( pit == it.pit() ? it.pos() : 0 );
- pos_type right =
+ pos_type right =
( pit == et.pit() ? et.pos() : pars_[pit].size() + 1 );
pars_[pit].rejectChange(left, right);
}
pars_.erase(boost::next(plist.begin(), it.pit() + 1),
boost::next(plist.begin(), et.pit()));
// Paragraph merge if appropriate:
- if (pars_[it.pit()].lookupChange(pars_[it.pit()].size())
+ if (pars_[it.pit()].lookupChange(pars_[it.pit()].size())
== Change::INSERTED) {
setCursorIntern(cur, it.pit() + 1, 0);
backspacePos0(cur);
pos = 0;
continue;
}
- unsigned char c = pars_[pit].getChar(pos);
+ char_type c = pars_[pit].getChar(pos);
if (c != Paragraph::META_INSET) {
switch (action) {
case text_lowercase:
}
-bool LyXText::Delete(LCursor & cur)
+bool LyXText::erase(LCursor & cur)
{
BOOST_ASSERT(this == cur.text());
bool needsUpdate = false;
BufferParams const & bparams = buf.params();
par.layout(bparams.getLyXTextClass().defaultLayout());
}
-
+
cursorLeft(cur);
return true;
}
if (cpit != tmppit
&& (pars_[cpit].layout() == pars_[tmppit].layout()
- || pars_[tmppit].layout() == tclass.defaultLayout()))
+ || pars_[tmppit].layout() == tclass.defaultLayout()))
{
mergeParagraph(bufparams, pars_, cpit);
needsUpdate = true;
--cur.pos();
// the counters may have changed
- updateCounters(cur.buffer());
+ ParIterator par_it(cur);
+ if (needsUpdateCounters(cur.buffer(), par_it))
+ updateCounters(cur.buffer());
+
setCursor(cur, cur.pit(), cur.pos(), false);
}
return needsUpdate;
// Insist on it being in pos 0
&& par.getChar(0) == Paragraph::META_INSET) {
InsetBase * inset = par.insetlist.begin()->inset;
- if (inset->lyxCode() == InsetBase::BIBITEM_CODE)
+ if (inset->lyxCode() == InsetBase::BIBITEM_CODE)
hasbibitem = true;
}
if (!hasbibitem) {
par.rows().push_back(row);
dim.des += row.height();
}
-
+
dim.asc += par.rows()[0].ascent();
dim.des -= par.rows()[0].ascent();
return;
lyxerr[Debug::DEBUG]
- << BOOST_CURRENT_FUNCTION
- << "draw selection at " << x
- << endl;
+ << BOOST_CURRENT_FUNCTION
+ << "draw selection at " << x
+ << endl;
DocIterator beg = cur.selectionBegin();
DocIterator end = cur.selectionEnd();
else if (par.isSeparator(pos) && pos >= body_pos)
x += m.separator;
}
-
+
// see correction above
if (boundary_correction)
if (getFont(par, ppos).isVisibleRightToLeft())
if (!boundary && font.isVisibleRightToLeft()
&& par.isInset(sl.pos()))
x -= par.getInset(sl.pos())->width();
- }
+ }
return int(x);
}
pit_type pit = getPitNearY(y);
int yy = theCoords.get(this, pit).y_ - pars_[pit].ascent();
lyxerr[Debug::DEBUG]
- << BOOST_CURRENT_FUNCTION
- << ": x: " << x
- << " y: " << y
+ << BOOST_CURRENT_FUNCTION
+ << ": x: " << x
+ << " y: " << y
<< " pit: " << pit
- << " yy: " << yy << endl;
+ << " yy: " << yy << endl;
Paragraph const & par = pars_[pit];
int r = 0;
Row const & row = par.rows()[r];
lyxerr[Debug::DEBUG]
- << BOOST_CURRENT_FUNCTION
- << ": row " << r
- << " from pos: " << row.pos()
- << endl;
+ << BOOST_CURRENT_FUNCTION
+ << ": row " << r
+ << " from pos: " << row.pos()
+ << endl;
bool bound = false;
int xx = x;
pos_type const pos = row.pos() + getColumnNearX(pit, row, xx, bound);
- lyxerr[Debug::DEBUG]
- << BOOST_CURRENT_FUNCTION
- << ": setting cursor pit: " << pit
- << " pos: " << pos
- << endl;
-
+ lyxerr[Debug::DEBUG]
+ << BOOST_CURRENT_FUNCTION
+ << ": setting cursor pit: " << pit
+ << " pos: " << pos
+ << endl;
+
return setCursor(cur, pit, pos, true, bound);
}
projects / lyx.git / blobdiff