#include <sstream>
-using lyx::par_type;
+using lyx::pit_type;
using lyx::pos_type;
using lyx::word_location;
}
-int readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
- string const & token)
+void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
+ string const & token, LyXFont & font)
{
- static LyXFont font;
static Change change;
BufferParams const & bp = buf.params();
bool hasLayout = tclass.hasLayout(layoutname);
if (!hasLayout) {
- lyxerr << "Layout '" << layoutname << "' does not"
- << " exist in textclass '" << tclass.name()
- << "'." << endl;
- lyxerr << "Trying to use default layout instead."
- << endl;
+ buf.error(ErrorItem(_("Unknown layout"),
+ bformat(_("Layout '%1$s' does not exists in textclass '%2$s'\nTrying to use the default instead.\n"),
+ layoutname, tclass.name()), par.id(), 0, par.size()));
layoutname = tclass.defaultLayoutName();
}
string line = lex.getString();
buf.error(ErrorItem(_("Unknown Inset"), line,
par.id(), 0, par.size()));
- return 1;
}
} else if (token == "\\family") {
lex.next();
par.cleanChanges();
change = Change(Change::UNCHANGED);
} else if (token == "\\change_inserted") {
- lex.nextToken();
+ lex.eatLine();
std::istringstream is(lex.getString());
int aid;
lyx::time_type ct;
is >> aid >> ct;
change = Change(Change::INSERTED, bp.author_map[aid], ct);
} else if (token == "\\change_deleted") {
- lex.nextToken();
+ lex.eatLine();
std::istringstream is(lex.getString());
int aid;
lyx::time_type ct;
buf.error(ErrorItem(_("Unknown token"),
bformat(_("Unknown token: %1$s %2$s\n"), token, lex.getString()),
par.id(), 0, par.size()));
- return 1;
}
- return 0;
}
-int readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex)
+void readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex)
{
- int unknown = 0;
-
lex.nextToken();
string token = lex.getString();
+ LyXFont font;
while (lex.isOK()) {
- unknown += readParToken(buf, par, lex, token);
+ readParToken(buf, par, lex, token, font);
lex.nextToken();
token = lex.getString();
break;
}
}
-
- return unknown;
}
void LyXText::updateParPositions()
{
- par_type pit = 0;
- par_type end = pars_.size();
+ pit_type pit = 0;
+ pit_type end = pars_.size();
for (height_ = 0; pit != end; ++pit) {
pars_[pit].y = height_;
height_ += pars_[pit].height;
int LyXText::singleWidth(Paragraph const & par,
pos_type pos, char c, LyXFont const & font) const
{
- if (pos >= par.size()) {
- lyxerr << "in singleWidth(), pos: " << pos << endl;
- BOOST_ASSERT(false);
- return 0;
- }
+ BOOST_ASSERT(pos < par.size());
// The most common case is handled first (Asger)
if (IsPrintable(c)) {
- if (!font.language()->RightToLeft()) {
+ if (font.language()->RightToLeft()) {
if ((lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 ||
lyxrc.font_norm_type == LyXRC::ISO_10646_1)
&& font.language()->lang() == "arabic") {
else
c = par.transformChar(c, pos);
} else if (font.language()->lang() == "hebrew" &&
- Encodings::IsComposeChar_hebrew(c))
+ Encodings::IsComposeChar_hebrew(c))
return 0;
}
return font_metrics::width(c, font);
}
-int LyXText::leftMargin(par_type pit) const
+int LyXText::leftMargin(pit_type pit) const
{
return leftMargin(pit, pars_[pit].size());
}
-int LyXText::leftMargin(par_type const pit, pos_type const pos) const
+int LyXText::leftMargin(pit_type const pit, pos_type const pos) const
{
Paragraph const & par = pars_[pit];
LyXTextClass const & tclass =
if (par.getDepth() != 0) {
// find the next level paragraph
- par_type newpar = outerHook(pit, pars_);
- if (newpar != par_type(pars_.size())) {
+ pit_type newpar = outerHook(pit, pars_);
+ if (newpar != pit_type(pars_.size())) {
if (pars_[newpar].layout()->isEnvironment()) {
l_margin = leftMargin(newpar);
}
&& !isFirstInSequence(pit, pars_)))
&& align == LYX_ALIGN_BLOCK
&& !par.params().noindent()
- // in tabulars and ert paragraphs are never indented!
+ // in charstyles, tabulars and ert paragraphs are never indented!
&& (par.ownerCode() != InsetBase::TEXT_CODE
- && par.ownerCode() != InsetBase::ERT_CODE)
+ && par.ownerCode() != InsetBase::ERT_CODE
+ && par.ownerCode() != InsetBase::CHARSTYLE_CODE)
&& (par.layout() != tclass.defaultLayout()
|| bv()->buffer()->params().paragraph_separation ==
BufferParams::PARSEP_INDENT))
int LyXText::rightMargin(Paragraph const & par) const
{
- LyXTextClass const & tclass = bv()->buffer()->params().getLyXTextClass();
-
// We do not want rightmargins on inner texts.
if (bv()->text() != this)
return 0;
+ LyXTextClass const & tclass = bv()->buffer()->params().getLyXTextClass();
int const r_margin =
::rightMargin()
+ font_metrics::signedWidth(tclass.rightmargin(),
* 4 / (par.getDepth() + 4);
return r_margin;
-
}
-int LyXText::labelEnd(par_type const pit) const
+int LyXText::labelEnd(pit_type const pit) const
{
// labelEnd is only needed if the layout fills a flushleft label.
if (pars_[pit].layout()->margintype != MARGIN_MANUAL)
};
-void LyXText::rowBreakPoint(par_type const pit, Row & row) const
+void LyXText::rowBreakPoint(pit_type const pit, Row & row) const
{
Paragraph const & par = pars_[pit];
pos_type const end = par.size();
}
-void LyXText::setRowWidth(par_type const pit, Row & row) const
+void LyXText::setRowWidth(pit_type const pit, Row & row) const
{
// get the pure distance
pos_type const end = row.endpos();
}
-void LyXText::setHeightOfRow(par_type const pit, Row & row)
+void LyXText::setHeightOfRow(pit_type const pit, Row & row)
{
Paragraph const & par = pars_[pit];
// get the maximum ascent and the maximum descent
// a section, or between the items of a itemize or enumerate
// environment.
- par_type prev = depthHook(pit, pars_, par.getDepth());
+ pit_type prev = depthHook(pit, pars_, par.getDepth());
if (prev != pit
&& pars_[prev].layout() == layout
&& pars_[prev].getDepth() == par.getDepth()
}
prev = outerHook(pit, pars_);
- if (prev != par_type(pars_.size())) {
+ if (prev != pit_type(pars_.size())) {
maxasc += int(pars_[prev].layout()->parsep * dh);
} else if (pit != 0) {
if (pars_[pit - 1].getDepth() != 0 ||
// add the layout spaces, for example before and after
// a section, or between the items of a itemize or enumerate
// environment
- par_type nextpit = pit + 1;
- if (nextpit != par_type(pars_.size())) {
- par_type cpit = pit;
+ pit_type nextpit = pit + 1;
+ if (nextpit != pit_type(pars_.size())) {
+ pit_type cpit = pit;
double usual = 0;
double unusual = 0;
BOOST_ASSERT(this == cur.text());
// allow only if at start or end, or all previous is new text
Paragraph & cpar = cur.paragraph();
- par_type cpit = cur.par();
+ pit_type cpit = cur.pit();
if (cur.pos() != 0 && cur.pos() != cur.lastpos()
&& cpar.isChangeEdited(0, cur.pos()))
return;
// a layout change may affect also the following paragraph
- recUndo(cur.par(), undoSpan(cur.par()) - 1);
+ recUndo(cur.pit(), undoSpan(cur.pit()) - 1);
// Always break behind a space
// It is better to erase the space (Dekel)
::breakParagraph(cur.buffer().params(), paragraphs(), cpit,
cur.pos(), keep_layout);
- cpit = cur.par();
- par_type next_par = cpit + 1;
+ cpit = cur.pit();
+ pit_type next_par = cpit + 1;
// well this is the caption hack since one caption is really enough
if (layout->labeltype == LABEL_SENSITIVE) {
// This check is necessary. Otherwise the new empty paragraph will
// be deleted automatically. And it is more friendly for the user!
if (cur.pos() != 0 || isempty)
- setCursor(cur, cur.par() + 1, 0);
+ setCursor(cur, cur.pit() + 1, 0);
else
- setCursor(cur, cur.par(), 0);
+ setCursor(cur, cur.pit(), 0);
}
{
BOOST_ASSERT(this == cur.text());
cur.clearSelection();
- redoParagraph(cur.par());
- setCursorIntern(cur, cur.par(), cur.pos());
+ redoParagraph(cur.pit());
+ setCursorIntern(cur, cur.pit(), cur.pos());
}
Paragraph & par = cur.paragraph();
// try to remove this
- par_type const pit = cur.par();
+ pit_type const pit = cur.pit();
bool const freeSpacing = par.layout()->free_spacing ||
par.isFreeSpacing();
current_font = rawtmpfont;
real_current_font = realtmpfont;
redoParagraph(cur);
- setCursor(cur, cur.par(), cur.pos() + 1, false, cur.boundary());
+ setCursor(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
charInserted();
}
}
-RowMetrics LyXText::computeRowMetrics(par_type const pit, Row const & row) const
+RowMetrics LyXText::computeRowMetrics(pit_type const pit, Row const & row) const
{
RowMetrics result;
Paragraph const & par = pars_[pit];
void LyXText::cursorRightOneWord(LCursor & cur)
{
BOOST_ASSERT(this == cur.text());
- if (cur.pos() == cur.lastpos() && cur.par() != cur.lastpar()) {
- ++cur.par();
+ if (cur.pos() == cur.lastpos() && cur.pit() != cur.lastpit()) {
+ ++cur.pit();
cur.pos() = 0;
} else {
// Skip through initial nonword stuff.
// Treat floats and insets as words.
- while (cur.pos() != cur.lastpos() && !cur.paragraph().isWord(cur.pos()))
+ while (cur.pos() != cur.lastpos() && !cur.paragraph().isLetter(cur.pos()))
++cur.pos();
// Advance through word.
- while (cur.pos() != cur.lastpos() && cur.paragraph().isWord(cur.pos()))
+ while (cur.pos() != cur.lastpos() && cur.paragraph().isLetter(cur.pos()))
++cur.pos();
}
- setCursor(cur, cur.par(), cur.pos());
+ setCursor(cur, cur.pit(), cur.pos());
}
void LyXText::cursorLeftOneWord(LCursor & cur)
{
BOOST_ASSERT(this == cur.text());
- if (cur.pos() == 0 && cur.par() != 0) {
- --cur.par();
+ if (cur.pos() == 0 && cur.pit() != 0) {
+ --cur.pit();
cur.pos() = cur.lastpos();
} else {
// Skip through initial nonword stuff.
// Treat floats and insets as words.
- while (cur.pos() != 0 && !cur.paragraph().isWord(cur.pos() - 1))
+ while (cur.pos() != 0 && !cur.paragraph().isLetter(cur.pos() - 1))
--cur.pos();
// Advance through word.
- while (cur.pos() != 0 && cur.paragraph().isWord(cur.pos() - 1))
+ while (cur.pos() != 0 && cur.paragraph().isLetter(cur.pos() - 1))
--cur.pos();
}
- setCursor(cur, cur.par(), cur.pos());
+ setCursor(cur, cur.pit(), cur.pos());
}
CursorSlice to = cur.top();
getWord(from, to, loc);
if (cur.top() != from)
- setCursor(cur, from.par(), from.pos());
+ setCursor(cur, from.pit(), from.pos());
if (to == from)
return;
cur.resetAnchor();
- setCursor(cur, to.par(), to.pos());
+ setCursor(cur, to.pit(), to.pos());
cur.setSelection();
}
CursorSlice const & startc = cur.selBegin();
CursorSlice const & endc = cur.selEnd();
- if (startc.par() == endc.par()) {
+ if (startc.pit() == endc.pit()) {
recordUndoSelection(cur, Undo::INSERT);
- pars_[startc.par()].acceptChange(startc.pos(), endc.pos());
+ pars_[startc.pit()].acceptChange(startc.pos(), endc.pos());
finishUndo();
cur.clearSelection();
- redoParagraph(startc.par());
- setCursorIntern(cur, startc.par(), 0);
+ redoParagraph(startc.pit());
+ setCursorIntern(cur, startc.pit(), 0);
}
#ifdef WITH_WARNINGS
#warning handle multi par selection
CursorSlice const & startc = cur.selBegin();
CursorSlice const & endc = cur.selEnd();
- if (startc.par() == endc.par()) {
+ if (startc.pit() == endc.pit()) {
recordUndoSelection(cur, Undo::INSERT);
- pars_[startc.par()].rejectChange(startc.pos(), endc.pos());
+ pars_[startc.pit()].rejectChange(startc.pos(), endc.pos());
finishUndo();
cur.clearSelection();
- redoParagraph(startc.par());
- setCursorIntern(cur, startc.par(), 0);
+ redoParagraph(startc.pit());
+ setCursorIntern(cur, startc.pit(), 0);
}
#ifdef WITH_WARNINGS
#warning handle multi par selection
} else {
from = cur.top();
getWord(from, to, lyx::PARTIAL_WORD);
- setCursor(cur, to.par(), to.pos() + 1);
+ setCursor(cur, to.pit(), to.pos() + 1);
}
recordUndoSelection(cur);
pos_type pos = from.pos();
- int par = from.par();
+ int par = from.pit();
- while (par != int(pars_.size()) && (pos != to.pos() || par != to.par())) {
- par_type pit = par;
+ while (par != int(pars_.size()) && (pos != to.pos() || par != to.pit())) {
+ pit_type pit = par;
if (pos == pars_[pit].size()) {
++par;
pos = 0;
{
BOOST_ASSERT(this == cur.text());
if (cur.pos() != cur.lastpos()) {
- recordUndo(cur, Undo::DELETE, cur.par());
- setCursorIntern(cur, cur.par(), cur.pos() + 1, false, cur.boundary());
+ recordUndo(cur, Undo::DELETE, cur.pit());
+ setCursorIntern(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
backspace(cur);
}
// should we do anything in an else branch?
// left and let the DeleteEmptyParagraphMechanism
// handle the actual deletion of the paragraph.
- if (cur.par() != 0) {
+ if (cur.pit() != 0) {
cursorLeft(cur);
// the layout things can change the height of a row !
redoParagraph(cur);
}
}
- if (cur.par() != 0)
- recordUndo(cur, Undo::DELETE, cur.par() - 1);
+ if (cur.pit() != 0)
+ recordUndo(cur, Undo::DELETE, cur.pit() - 1);
- par_type tmppit = cur.par();
+ pit_type tmppit = cur.pit();
// We used to do cursorLeftIntern() here, but it is
// not a good idea since it triggers the auto-delete
// mechanism. So we do a cursorLeftIntern()-lite,
// without the dreaded mechanism. (JMarc)
- if (cur.par() != 0) {
+ if (cur.pit() != 0) {
// steps into the above paragraph.
- setCursorIntern(cur, cur.par() - 1,
- pars_[cur.par() - 1].size(),
+ setCursorIntern(cur, cur.pit() - 1,
+ pars_[cur.pit() - 1].size(),
false);
}
Buffer & buf = cur.buffer();
BufferParams const & bufparams = buf.params();
LyXTextClass const & tclass = bufparams.getLyXTextClass();
- par_type const cpit = cur.par();
+ pit_type const cpit = cur.pit();
if (cpit != tmppit
&& (pars_[cpit].layout() == pars_[tmppit].layout()
|| pars_[tmppit].layout() == tclass.defaultLayout())
&& pars_[cpit].getAlign() == pars_[tmppit].getAlign()) {
- mergeParagraph(bufparams, buf.paragraphs(), cpit);
+ mergeParagraph(bufparams, pars_, cpit);
if (cur.pos() != 0 && pars_[cpit].isSeparator(cur.pos() - 1))
--cur.pos();
// the counters may have changed
updateCounters();
- setCursor(cur, cur.par(), cur.pos(), false);
+ setCursor(cur, cur.pit(), cur.pos(), false);
}
} else {
// this is the code for a normal backspace, not pasting
// not a good idea since it triggers the auto-delete
// mechanism. So we do a cursorLeftIntern()-lite,
// without the dreaded mechanism. (JMarc)
- setCursorIntern(cur, cur.par(), cur.pos() - 1,
+ setCursorIntern(cur, cur.pit(), cur.pos() - 1,
false, cur.boundary());
cur.paragraph().erase(cur.pos());
}
setCurrentFont(cur);
redoParagraph(cur);
- setCursor(cur, cur.par(), cur.pos(), false, cur.boundary());
+ setCursor(cur, cur.pit(), cur.pos(), false, cur.boundary());
}
-Paragraph & LyXText::getPar(par_type par) const
+Paragraph & LyXText::getPar(pit_type par) const
{
//lyxerr << "getPar: " << par << " from " << paragraphs().size() << endl;
BOOST_ASSERT(par >= 0);
}
-void LyXText::redoParagraphInternal(par_type const pit)
+void LyXText::redoParagraphInternal(pit_type const pit)
{
// remove rows of paragraph, keep track of height changes
Paragraph & par = pars_[pit];
}
-void LyXText::redoParagraphs(par_type pit, par_type end)
+void LyXText::redoParagraphs(pit_type pit, pit_type end)
{
for (; pit != end; ++pit)
redoParagraphInternal(pit);
}
-void LyXText::redoParagraph(par_type pit)
+void LyXText::redoParagraph(pit_type pit)
{
redoParagraphInternal(pit);
updateParPositions();
}
-bool LyXText::isLastRow(par_type pit, Row const & row) const
+bool LyXText::isLastRow(pit_type pit, Row const & row) const
{
return row.endpos() >= pars_[pit].size()
- && pit + 1 == par_type(paragraphs().size());
+ && pit + 1 == pit_type(paragraphs().size());
}
-bool LyXText::isFirstRow(par_type pit, Row const & row) const
+bool LyXText::isFirstRow(pit_type pit, Row const & row) const
{
return row.pos() == 0 && pit == 0;
}
void LyXText::getWord(CursorSlice & from, CursorSlice & to,
word_location const loc)
{
- Paragraph const & from_par = pars_[from.par()];
+ Paragraph const & from_par = pars_[from.pit()];
switch (loc) {
case lyx::WHOLE_WORD_STRICT:
if (from.pos() == 0 || from.pos() == from_par.size()
- || !from_par.isWord(from.pos())
- || !from_par.isWord(from.pos() - 1)) {
+ || !from_par.isLetter(from.pos())
+ || !from_par.isLetter(from.pos() - 1)) {
to = from;
return;
}
case lyx::WHOLE_WORD:
// If we are already at the beginning of a word, do nothing
- if (!from.pos() || !from_par.isWord(from.pos() - 1))
+ if (!from.pos() || !from_par.isLetter(from.pos() - 1))
break;
// no break here, we go to the next
case lyx::PREVIOUS_WORD:
// always move the cursor to the beginning of previous word
- while (from.pos() && from_par.isWord(from.pos() - 1))
+ while (from.pos() && from_par.isLetter(from.pos() - 1))
--from.pos();
break;
case lyx::NEXT_WORD:
break;
}
to = from;
- Paragraph & to_par = pars_[to.par()];
- while (to.pos() < to_par.size() && to_par.isWord(to.pos()))
+ Paragraph & to_par = pars_[to.pit()];
+ while (to.pos() < to_par.size() && to_par.isLetter(to.pos()))
++to.pos();
}
break;
}
+ if (token == "\\end_body") {
+ continue;
+ }
+
+ if (token == "\\begin_body") {
+ continue;
+ }
+
if (token == "\\end_document") {
return false;
}
- // FIXME: ugly.
- int unknown = 0;
-
if (token == "\\begin_layout") {
lex.pushToken(token);
--depth;
}
} else {
- ++unknown;
+ lyxerr << "Handling unknown body token: `"
+ << token << '\'' << endl;
}
-
}
return true;
}
int LyXText::cursorX(CursorSlice const & cur) const
{
- par_type const pit = cur.par();
+ pit_type const pit = cur.pit();
Paragraph const & par = pars_[pit];
if (par.rows.empty())
return xo_;
int LyXText::cursorY(CursorSlice const & cur) const
{
- Paragraph const & par = getPar(cur.par());
+ Paragraph const & par = getPar(cur.pit());
Row const & row = *par.getRow(cur.pos());
return yo_ + par.y + row.y_offset() + row.baseline();
}
#ifdef DEVEL_VERSION
os << _(", Inset: ") << &cur.inset();
- os << _(", Paragraph: ") << cur.par();
+ os << _(", Paragraph: ") << cur.pit();
os << _(", Id: ") << par.id();
os << _(", Position: ") << cur.pos();
Row & row = cur.textRow();
string LyXText::getPossibleLabel(LCursor & cur) const
{
- par_type pit = cur.par();
+ pit_type pit = cur.pit();
LyXLayout_ptr layout = pars_[pit].layout();
else if (y > yo_ + descent())
yy = y - yo_ - descent();
+ lyxerr << " xo_=" << xo_ << " yo_=" << yo_
+ << " width_=" << width_ << " ascent=" << ascent()
+ << " descent=" << descent()
+ << " dist=" << xx+yy <<endl;
return xx + yy;
}