#include "support/lstrings.h"
#include "support/textutils.h"
#include "support/tostr.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
using lyx::par_type;
using lyx::pos_type;
using std::string;
-/// some space for drawing the 'nested' markers (in pixel)
-extern int const NEST_MARGIN = 20;
-/// margin for changebar
-extern int const CHANGEBAR_MARGIN = 10;
-/// right margin
-extern int const RIGHT_MARGIN = 10;
-
-
namespace {
int numberOfSeparators(Paragraph const & par, Row const & row)
}
-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;
}
}
-int LyXText::singleWidth(par_type par, pos_type pos) const
+int LyXText::singleWidth(Paragraph const & par, pos_type pos) const
{
- if (pos >= pars_[par].size())
- return 0;
-
- char const c = pars_[par].getChar(pos);
- return singleWidth(par, pos, c, getFont(par, pos));
+ return singleWidth(par, pos, par.getChar(pos), getFont(par, pos));
}
-int LyXText::singleWidth(par_type pit,
+int LyXText::singleWidth(Paragraph const & par,
pos_type pos, char c, LyXFont const & font) const
{
- if (pos >= pars_[pit].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") {
if (Encodings::IsComposeChar_arabic(c))
return 0;
else
- c = pars_[pit].transformChar(c, pos);
+ 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);
}
if (c == Paragraph::META_INSET)
- return pars_[pit].getInset(pos)->width();
+ return par.getInset(pos)->width();
if (IsSeparatorChar(c))
c = ' ';
}
-int LyXText::leftMargin(par_type pit, pos_type pos) const
+int LyXText::leftMargin(par_type const pit, pos_type const pos) const
{
+ Paragraph const & par = pars_[pit];
LyXTextClass const & tclass =
bv()->buffer()->params().getLyXTextClass();
- LyXLayout_ptr const & layout = pars_[pit].layout();
+ LyXLayout_ptr const & layout = par.layout();
string parindent = layout->parindent;
- int x = NEST_MARGIN + CHANGEBAR_MARGIN;
+ int l_margin = 0;
+
+ if (xo_ == 0)
+ l_margin += changebarMargin();
- x += font_metrics::signedWidth(tclass.leftmargin(), tclass.defaultfont());
+ l_margin += font_metrics::signedWidth(tclass.leftmargin(), tclass.defaultfont());
- // This is the way LyX handles LaTeX-Environments.
- // I have had this idea very late, so it seems to be a
- // later added hack and this is true
- if (pars_[pit].getDepth() == 0) {
- if (pars_[pit].layout() == tclass.defaultLayout()) {
- // find the previous same level paragraph
- if (pit != 0) {
- par_type newpit =
- depthHook(pit, paragraphs(), pars_[pit].getDepth());
- if (newpit == pit && pars_[newpit].layout()->nextnoindent)
+ if (par.getDepth() != 0) {
+ // find the next level paragraph
+ par_type newpar = outerHook(pit, pars_);
+ if (newpar != par_type(pars_.size())) {
+ if (pars_[newpar].layout()->isEnvironment()) {
+ l_margin = leftMargin(newpar);
+ }
+ if (par.layout() == tclass.defaultLayout()) {
+ if (pars_[newpar].params().noindent())
parindent.erase();
+ else
+ parindent = pars_[newpar].layout()->parindent;
}
}
- } else {
- // find the next level paragraph
- par_type newpar = outerHook(pit, pars_);
-
- // Make a corresponding row. Need to call leftMargin()
- // to check whether it is a sufficent paragraph.
- if (newpar != par_type(pars_.size())
- && pars_[newpar].layout()->isEnvironment()) {
- x = leftMargin(newpar);
- }
-
- if (newpar != par_type(paragraphs().size())
- && pars_[pit].layout() == tclass.defaultLayout()) {
- if (pars_[newpar].params().noindent())
- parindent.erase();
- else
- parindent = pars_[newpar].layout()->parindent;
- }
}
- LyXFont const labelfont = getLabelFont(pit);
+ LyXFont const labelfont = getLabelFont(par);
switch (layout->margintype) {
case MARGIN_DYNAMIC:
if (!layout->leftmargin.empty())
- x += font_metrics::signedWidth(layout->leftmargin,
+ l_margin += font_metrics::signedWidth(layout->leftmargin,
tclass.defaultfont());
- if (!pars_[pit].getLabelstring().empty()) {
- x += font_metrics::signedWidth(layout->labelindent,
+ if (!par.getLabelstring().empty()) {
+ l_margin += font_metrics::signedWidth(layout->labelindent,
labelfont);
- x += font_metrics::width(pars_[pit].getLabelstring(),
+ l_margin += font_metrics::width(par.getLabelstring(),
labelfont);
- x += font_metrics::width(layout->labelsep, labelfont);
+ l_margin += font_metrics::width(layout->labelsep, labelfont);
}
break;
case MARGIN_MANUAL:
- x += font_metrics::signedWidth(layout->labelindent, labelfont);
+ l_margin += font_metrics::signedWidth(layout->labelindent, labelfont);
// The width of an empty par, even with manual label, should be 0
- if (!pars_[pit].empty() && pos >= pars_[pit].beginOfBody()) {
- if (!pars_[pit].getLabelWidthString().empty()) {
- x += font_metrics::width(pars_[pit].getLabelWidthString(),
+ if (!par.empty() && pos >= par.beginOfBody()) {
+ if (!par.getLabelWidthString().empty()) {
+ l_margin += font_metrics::width(par.getLabelWidthString(),
labelfont);
- x += font_metrics::width(layout->labelsep, labelfont);
+ l_margin += font_metrics::width(layout->labelsep, labelfont);
}
}
break;
case MARGIN_STATIC:
- x += font_metrics::signedWidth(layout->leftmargin, tclass.defaultfont()) * 4
- / (pars_[pit].getDepth() + 4);
+ l_margin += font_metrics::signedWidth(layout->leftmargin, tclass.defaultfont()) * 4
+ / (par.getDepth() + 4);
break;
case MARGIN_FIRST_DYNAMIC:
if (layout->labeltype == LABEL_MANUAL) {
- if (pos >= pars_[pit].beginOfBody()) {
- x += font_metrics::signedWidth(layout->leftmargin,
+ if (pos >= par.beginOfBody()) {
+ l_margin += font_metrics::signedWidth(layout->leftmargin,
labelfont);
} else {
- x += font_metrics::signedWidth(layout->labelindent,
+ l_margin += font_metrics::signedWidth(layout->labelindent,
labelfont);
}
} else if (pos != 0
// theorems (JMarc)
|| (layout->labeltype == LABEL_STATIC
&& layout->latextype == LATEX_ENVIRONMENT
- && !isFirstInSequence(pit, paragraphs()))) {
- x += font_metrics::signedWidth(layout->leftmargin,
+ && !isFirstInSequence(pit, pars_))) {
+ l_margin += font_metrics::signedWidth(layout->leftmargin,
labelfont);
} else if (layout->labeltype != LABEL_TOP_ENVIRONMENT
&& layout->labeltype != LABEL_BIBLIO
&& layout->labeltype !=
LABEL_CENTERED_TOP_ENVIRONMENT) {
- x += font_metrics::signedWidth(layout->labelindent,
+ l_margin += font_metrics::signedWidth(layout->labelindent,
labelfont);
- x += font_metrics::width(layout->labelsep, labelfont);
- x += font_metrics::width(pars_[pit].getLabelstring(),
+ l_margin += font_metrics::width(layout->labelsep, labelfont);
+ l_margin += font_metrics::width(par.getLabelstring(),
labelfont);
}
break;
#if 0
// ok, a terrible hack. The left margin depends on the widest
// row in this paragraph.
- RowList::iterator rit = pars_[pit].rows.begin();
- RowList::iterator end = pars_[pit].rows.end();
+ RowList::iterator rit = par.rows.begin();
+ RowList::iterator end = par.rows.end();
#ifdef WITH_WARNINGS
#warning This is wrong.
#endif
for ( ; rit != end; ++rit)
if (rit->fill() < minfill)
minfill = rit->fill();
- x += font_metrics::signedWidth(layout->leftmargin,
+ l_margin += font_metrics::signedWidth(layout->leftmargin,
tclass.defaultfont());
- x += minfill;
+ l_margin += minfill;
#endif
// also wrong, but much shorter.
- x += maxwidth_ / 2;
+ l_margin += maxwidth_ / 2;
break;
}
}
-
- if (!pars_[pit].params().leftIndent().zero())
- x += pars_[pit].params().leftIndent().inPixels(maxwidth_);
+ if (!par.params().leftIndent().zero())
+ l_margin += par.params().leftIndent().inPixels(maxwidth_);
LyXAlignment align;
- if (pars_[pit].params().align() == LYX_ALIGN_LAYOUT)
+ if (par.params().align() == LYX_ALIGN_LAYOUT)
align = layout->align;
else
- align = pars_[pit].params().align();
+ align = par.params().align();
// set the correct parindent
if (pos == 0
|| layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
|| (layout->labeltype == LABEL_STATIC
&& layout->latextype == LATEX_ENVIRONMENT
- && !isFirstInSequence(pit, paragraphs())))
+ && !isFirstInSequence(pit, pars_)))
&& align == LYX_ALIGN_BLOCK
- && !pars_[pit].params().noindent()
+ && !par.params().noindent()
// in tabulars and ert paragraphs are never indented!
- && (pars_[pit].ownerCode() != InsetOld::TABULAR_CODE
- && pars_[pit].ownerCode() != InsetOld::ERT_CODE)
- && (pars_[pit].layout() != tclass.defaultLayout()
+ && (par.ownerCode() != InsetBase::TEXT_CODE
+ && par.ownerCode() != InsetBase::ERT_CODE)
+ && (par.layout() != tclass.defaultLayout()
|| bv()->buffer()->params().paragraph_separation ==
BufferParams::PARSEP_INDENT))
{
- x += font_metrics::signedWidth(parindent, tclass.defaultfont());
+ l_margin += font_metrics::signedWidth(parindent, tclass.defaultfont());
}
- return x;
+ return l_margin;
}
{
LyXTextClass const & tclass = bv()->buffer()->params().getLyXTextClass();
- return
- RIGHT_MARGIN
+ // We do not want rightmargins on inner texts.
+ if (bv()->text() != this)
+ return 0;
+
+ int const r_margin =
+ ::rightMargin()
+ font_metrics::signedWidth(tclass.rightmargin(),
- tclass.defaultfont())
+ tclass.defaultfont())
+ font_metrics::signedWidth(par.layout()->rightmargin,
- tclass.defaultfont())
+ tclass.defaultfont())
* 4 / (par.getDepth() + 4);
+
+ return r_margin;
+
}
-int LyXText::labelEnd(par_type pit) const
+int LyXText::labelEnd(par_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 pit, Row & row) const
+void LyXText::rowBreakPoint(par_type const pit, Row & row) const
{
- pos_type const end = pars_[pit].size();
+ Paragraph const & par = pars_[pit];
+ pos_type const end = par.size();
pos_type const pos = row.pos();
if (pos == end) {
row.endpos(end);
}
// maximum pixel width of a row
- int width = maxwidth_ - rightMargin(pars_[pit]); // - leftMargin(pit, row);
+ int width = maxwidth_ - rightMargin(par); // - leftMargin(pit, row);
if (width < 0) {
row.endpos(end);
return;
}
- LyXLayout_ptr const & layout = pars_[pit].layout();
+ LyXLayout_ptr const & layout = par.layout();
if (layout->margintype == MARGIN_RIGHT_ADDRESS_BOX) {
- row.endpos(addressBreakPoint(pos, pars_[pit]));
+ row.endpos(addressBreakPoint(pos, par));
return;
}
- pos_type const body_pos = pars_[pit].beginOfBody();
+ pos_type const body_pos = par.beginOfBody();
// Now we iterate through until we reach the right margin
pos_type point = end;
pos_type i = pos;
for ( ; i < end; ++i, ++fi) {
- char const c = pars_[pit].getChar(i);
+ char const c = par.getChar(i);
{
- int thiswidth = singleWidth(pit, i, c, *fi);
+ int thiswidth = singleWidth(par, i, c, *fi);
// add the auto-hfill from label end to the body
if (body_pos && i == body_pos) {
- int add = font_metrics::width(layout->labelsep, getLabelFont(pit));
- if (pars_[pit].isLineSeparator(i - 1))
- add -= singleWidth(pit, i - 1);
+ int add = font_metrics::width(layout->labelsep, getLabelFont(par));
+ if (par.isLineSeparator(i - 1))
+ add -= singleWidth(par, i - 1);
add = std::max(add, labelEnd(pit) - x);
thiswidth += add;
break;
}
- if (pars_[pit].isNewline(i)) {
+ if (par.isNewline(i)) {
point = i + 1;
break;
}
// Break before...
if (i + 1 < end) {
- if (pars_[pit].isInset(i + 1) && pars_[pit].getInset(i + 1)->display()) {
+ if (par.isInset(i + 1) && par.getInset(i + 1)->display()) {
point = i + 1;
break;
}
// ...and after.
- if (pars_[pit].isInset(i) && pars_[pit].getInset(i)->display()) {
+ if (par.isInset(i) && par.getInset(i)->display()) {
point = i + 1;
break;
}
}
- if (!pars_[pit].isInset(i) || pars_[pit].getInset(i)->isChar()) {
+ if (!par.isInset(i) || par.getInset(i)->isChar()) {
// some insets are line separators too
- if (pars_[pit].isLineSeparator(i)) {
+ if (par.isLineSeparator(i)) {
// register breakpoint:
point = i + 1;
chunkwidth = 0;
}
-void LyXText::setRowWidth(par_type pit, Row & row) const
+void LyXText::setRowWidth(par_type const pit, Row & row) const
{
// get the pure distance
pos_type const end = row.endpos();
- string labelsep = pars_[pit].layout()->labelsep;
+ Paragraph const & par = pars_[pit];
+ string labelsep = par.layout()->labelsep;
int w = leftMargin(pit, row.pos());
- pos_type const body_pos = pars_[pit].beginOfBody();
+ pos_type const body_pos = par.beginOfBody();
pos_type i = row.pos();
if (i < end) {
FontIterator fi = FontIterator(*this, pit, i);
for ( ; i < end; ++i, ++fi) {
if (body_pos > 0 && i == body_pos) {
- w += font_metrics::width(labelsep, getLabelFont(pit));
- if (pars_[pit].isLineSeparator(i - 1))
- w -= singleWidth(pit, i - 1);
+ w += font_metrics::width(labelsep, getLabelFont(par));
+ if (par.isLineSeparator(i - 1))
+ w -= singleWidth(par, i - 1);
w = max(w, labelEnd(pit));
}
- char const c = pars_[pit].getChar(i);
- w += singleWidth(pit, i, c, *fi);
+ char const c = par.getChar(i);
+ w += singleWidth(par, i, c, *fi);
}
}
if (body_pos > 0 && body_pos >= end) {
- w += font_metrics::width(labelsep, getLabelFont(pit));
- if (end > 0 && pars_[pit].isLineSeparator(end - 1))
- w -= singleWidth(pit, end - 1);
+ w += font_metrics::width(labelsep, getLabelFont(par));
+ if (end > 0 && par.isLineSeparator(end - 1))
+ w -= singleWidth(par, end - 1);
w = max(w, labelEnd(pit));
}
- row.width(w + rightMargin(pars_[pit]));
+ row.width(w + rightMargin(par));
}
// returns the minimum space a manual label needs on the screen in pixel
-int LyXText::labelFill(par_type pit, Row const & row) const
+int LyXText::labelFill(Paragraph const & par, Row const & row) const
{
- pos_type last = pars_[pit].beginOfBody();
+ pos_type last = par.beginOfBody();
BOOST_ASSERT(last > 0);
--last;
// a separator at this end does not count
- if (pars_[pit].isLineSeparator(last))
+ if (par.isLineSeparator(last))
--last;
int w = 0;
for (pos_type i = row.pos(); i <= last; ++i)
- w += singleWidth(pit, i);
+ w += singleWidth(par, i);
- string const & label = pars_[pit].params().labelWidthString();
+ string const & label = par.params().labelWidthString();
if (label.empty())
return 0;
- return max(0, font_metrics::width(label, getLabelFont(pit)) - w);
+ return max(0, font_metrics::width(label, getLabelFont(par)) - w);
}
}
-void LyXText::setHeightOfRow(par_type pit, Row & row)
+void LyXText::setHeightOfRow(par_type const pit, Row & row)
{
+ Paragraph const & par = pars_[pit];
// get the maximum ascent and the maximum descent
double layoutasc = 0;
double layoutdesc = 0;
// ok, let us initialize the maxasc and maxdesc value.
// Only the fontsize count. The other properties
// are taken from the layoutfont. Nicer on the screen :)
- LyXLayout_ptr const & layout = pars_[pit].layout();
+ LyXLayout_ptr const & layout = par.layout();
// as max get the first character of this row then it can
// increase but not decrease the height. Just some point to
// start with so we don't have to do the assignment below too
// often.
- LyXFont font = getFont(pit, row.pos());
+ LyXFont font = getFont(par, row.pos());
LyXFont::FONT_SIZE const tmpsize = font.size();
font = getLayoutFont(pit);
LyXFont::FONT_SIZE const size = font.size();
font.setSize(tmpsize);
- LyXFont labelfont = getLabelFont(pit);
+ LyXFont labelfont = getLabelFont(par);
// these are minimum values
- double const spacing_val =
- layout->spacing.getValue() * spacing(pars_[pit]);
+ double const spacing_val = layout->spacing.getValue() * spacing(par);
//lyxerr << "spacing_val = " << spacing_val << endl;
int maxasc = int(font_metrics::maxAscent(font) * spacing_val);
int maxdesc = int(font_metrics::maxDescent(font) * spacing_val);
// insets may be taller
- InsetList::iterator ii = pars_[pit].insetlist.begin();
- InsetList::iterator iend = pars_[pit].insetlist.end();
+ InsetList::const_iterator ii = par.insetlist.begin();
+ InsetList::const_iterator iend = par.insetlist.end();
for ( ; ii != iend; ++ii) {
if (ii->pos >= row.pos() && ii->pos < row.endpos()) {
maxasc = max(maxasc, ii->inset->ascent());
pos_type const pos_end = row.endpos();
LyXFont::FONT_SIZE maxsize =
- pars_[pit].highestFontInRange(row.pos(), pos_end, size);
+ par.highestFontInRange(row.pos(), pos_end, size);
if (maxsize > font.size()) {
font.setSize(maxsize);
maxasc = max(maxasc, font_metrics::maxAscent(font));
if (bv()->buffer()->params().paragraph_separation
== BufferParams::PARSEP_SKIP
&& pit != 0
- && ((layout->isParagraph() && pars_[pit].getDepth() == 0)
+ && ((layout->isParagraph() && par.getDepth() == 0)
|| (pars_[pit - 1].layout()->isParagraph()
&& pars_[pit - 1].getDepth() == 0)))
{
if (layout->counter == "chapter" && bufparams.secnumdepth >= 0) {
labeladdon = int(font_metrics::maxHeight(labelfont)
* layout->spacing.getValue()
- * spacing(pars_[pit]));
+ * spacing(par));
}
// special code for the top label
|| layout->labeltype == LABEL_BIBLIO
|| layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)
&& isFirstInSequence(pit, paragraphs())
- && !pars_[pit].getLabelstring().empty())
+ && !par.getLabelstring().empty())
{
labeladdon = int(
font_metrics::maxHeight(labelfont)
* layout->spacing.getValue()
- * spacing(pars_[pit])
+ * spacing(par)
+ (layout->topsep + layout->labelbottomsep) * dh);
}
// a section, or between the items of a itemize or enumerate
// environment.
- par_type prev = depthHook(pit, pars_, pars_[pit].getDepth());
+ par_type prev = depthHook(pit, pars_, par.getDepth());
if (prev != pit
&& pars_[prev].layout() == layout
- && pars_[prev].getDepth() == pars_[pit].getDepth()
- && pars_[prev].getLabelWidthString() == pars_[pit].getLabelWidthString())
+ && pars_[prev].getDepth() == par.getDepth()
+ && pars_[prev].getLabelWidthString() == par.getLabelWidthString())
{
layoutasc = layout->itemsep * dh;
} else if (pit != 0 || row.pos() != 0) {
}
// is it a bottom line?
- if (row.endpos() >= pars_[pit].size()) {
+ if (row.endpos() >= par.size()) {
// add the layout spaces, for example before and after
// a section, or between the items of a itemize or enumerate
// environment
}
+namespace {
+
+}
+
void LyXText::breakParagraph(LCursor & cur, char keep_layout)
{
BOOST_ASSERT(this == cur.text());
// well this is the caption hack since one caption is really enough
if (layout->labeltype == LABEL_SENSITIVE) {
- if (!cur.pos())
+ if (cur.pos() == 0)
// set to standard-layout
pars_[cpit].applyLayout(tclass.defaultLayout());
else
Paragraph & par = cur.paragraph();
// try to remove this
- par_type pit = cur.par();
+ par_type const pit = cur.par();
bool const freeSpacing = par.layout()->free_spacing ||
par.isFreeSpacing();
!(contains(number_seperators, c) &&
cur.pos() != 0 &&
cur.pos() != cur.lastpos() &&
- getFont(pit, cur.pos()).number() == LyXFont::ON &&
- getFont(pit, cur.pos() - 1).number() == LyXFont::ON)
+ getFont(par, cur.pos()).number() == LyXFont::ON &&
+ getFont(par, cur.pos() - 1).number() == LyXFont::ON)
)
number(cur); // Set current_font.number to OFF
} else if (IsDigit(c) &&
setCharFont(pit, cur.pos() - 1, current_font);
} else if (contains(number_seperators, c)
&& cur.pos() >= 2
- && getFont(pit, cur.pos() - 2).number() == LyXFont::ON) {
+ && getFont(par, cur.pos() - 2).number() == LyXFont::ON) {
setCharFont(pit, cur.pos() - 1, current_font);
}
}
}
}
- par.insertChar(cur.pos(), c);
- setCharFont(pit, cur.pos(), rawtmpfont);
+ par.insertChar(cur.pos(), c, rawtmpfont);
current_font = rawtmpfont;
real_current_font = realtmpfont;
}
-RowMetrics LyXText::computeRowMetrics(par_type pit, Row const & row) const
+RowMetrics LyXText::computeRowMetrics(par_type const pit, Row const & row) const
{
RowMetrics result;
+ Paragraph const & par = pars_[pit];
double w = width_ - row.width();
- bool const is_rtl = isRTL(pars_[pit]);
+ bool const is_rtl = isRTL(par);
if (is_rtl)
- result.x = rightMargin(pars_[pit]);
+ result.x = rightMargin(par);
else
result.x = leftMargin(pit, row.pos());
// is there a manual margin with a manual label
- LyXLayout_ptr const & layout = pars_[pit].layout();
+ LyXLayout_ptr const & layout = par.layout();
if (layout->margintype == MARGIN_MANUAL
&& layout->labeltype == LABEL_MANUAL) {
/// We might have real hfills in the label part
- int nlh = numberOfLabelHfills(pars_[pit], row);
+ int nlh = numberOfLabelHfills(par, row);
// A manual label par (e.g. List) has an auto-hfill
// between the label text and the body of the
// paragraph too.
// But we don't want to do this auto hfill if the par
// is empty.
- if (!pars_[pit].empty())
+ if (!par.empty())
++nlh;
- if (nlh && !pars_[pit].getLabelWidthString().empty())
- result.label_hfill = labelFill(pit, row) / double(nlh);
+ if (nlh && !par.getLabelWidthString().empty())
+ result.label_hfill = labelFill(par, row) / double(nlh);
}
// are there any hfills in the row?
- int const nh = numberOfHfills(pars_[pit], row);
+ int const nh = numberOfHfills(par, row);
if (nh) {
if (w > 0)
// is it block, flushleft or flushright?
// set x how you need it
int align;
- if (pars_[pit].params().align() == LYX_ALIGN_LAYOUT)
+ if (par.params().align() == LYX_ALIGN_LAYOUT)
align = layout->align;
else
- align = pars_[pit].params().align();
+ align = par.params().align();
// Display-style insets should always be on a centred row
- // The test on pars_[pit].size() is to catch zero-size pars, which
+ // The test on par.size() is to catch zero-size pars, which
// would trigger the assert in Paragraph::getInset().
- //inset = pars_[pit].size() ? pars_[pit].getInset(row.pos()) : 0;
- if (!pars_[pit].empty()
- && pars_[pit].isInset(row.pos())
- && pars_[pit].getInset(row.pos())->display())
+ //inset = par.size() ? par.getInset(row.pos()) : 0;
+ if (!par.empty()
+ && par.isInset(row.pos())
+ && par.getInset(row.pos())->display())
{
align = LYX_ALIGN_CENTER;
}
switch (align) {
case LYX_ALIGN_BLOCK: {
- int const ns = numberOfSeparators(pars_[pit], row);
+ int const ns = numberOfSeparators(par, row);
bool disp_inset = false;
- if (row.endpos() < pars_[pit].size()) {
- InsetBase const * in = pars_[pit].getInset(row.endpos());
+ if (row.endpos() < par.size()) {
+ InsetBase const * in = par.getInset(row.endpos());
if (in)
disp_inset = in->display();
}
// par, does not end in newline, and is not row above a
// display inset... then stretch it
if (ns
- && row.endpos() < pars_[pit].size()
- && !pars_[pit].isNewline(row.endpos() - 1)
+ && row.endpos() < par.size()
+ && !par.isNewline(row.endpos() - 1)
&& !disp_inset
) {
result.separator = w / ns;
}
}
- bidi.computeTables(pars_[pit], *bv()->buffer(), row);
+ bidi.computeTables(par, *bv()->buffer(), row);
if (is_rtl) {
- pos_type body_pos = pars_[pit].beginOfBody();
+ pos_type body_pos = par.beginOfBody();
pos_type end = row.endpos();
if (body_pos > 0
- && (body_pos > end || !pars_[pit].isLineSeparator(body_pos - 1)))
+ && (body_pos > end || !par.isLineSeparator(body_pos - 1)))
{
- result.x += font_metrics::width(layout->labelsep, getLabelFont(pit));
+ result.x += font_metrics::width(layout->labelsep, getLabelFont(par));
if (body_pos <= end)
result.x += result.label_hfill;
}
}
-// y is relative to this LyXText's top
-RowList::iterator LyXText::getRowNearY(int y, par_type & pit) const
+Row const & LyXText::firstRow() const
{
- BOOST_ASSERT(!paragraphs().empty());
- BOOST_ASSERT(!paragraphs().begin()->rows.empty());
-#if 1
- par_type const pend = paragraphs().size() - 1;
- pit = 0;
- while (int(pars_[pit].y + pars_[pit].height) < y && pit != pend)
- ++pit;
-
- RowList::iterator rit = pars_[pit].rows.end();
- RowList::iterator const rbegin = pars_[pit].rows.begin();
- do {
- --rit;
- } while (rit != rbegin && int(pars_[pit].y + rit->y_offset()) > y);
-
- return rit;
-#else
- pit = paragraphs().size() - 1;
-
- RowList::iterator rit = lastRow();
- RowList::iterator rbegin = firstRow();
-
- while (rit != rbegin && int(pars_[pit].y + rit->y_offset()) > y)
- previousRow(pit, rit);
-
- return rit;
-#endif
+ return *paragraphs().front().rows.begin();
}
-RowList::iterator LyXText::firstRow() const
-{
- return paragraphs().front().rows.begin();
-}
-
-
-RowList::iterator LyXText::lastRow() const
-{
- return boost::prior(endRow());
-}
-
-
-RowList::iterator LyXText::endRow() const
-{
- return paragraphs().back().rows.end();
-}
-
-
-void LyXText::nextRow(par_type & pit, RowList::iterator & rit) const
-{
- ++rit;
- if (rit == pars_[pit].rows.end()) {
- ++pit;
- if (pit == par_type(paragraphs().size()))
- --pit;
- else
- rit = pars_[pit].rows.begin();
- }
-}
-
-
-void LyXText::previousRow(par_type & pit, RowList::iterator & rit) const
-{
- if (rit != pars_[pit].rows.begin())
- --rit;
- else {
- BOOST_ASSERT(pit != 0);
- --pit;
- rit = boost::prior(pars_[pit].rows.end());
- }
-}
-
-
-void LyXText::redoParagraphInternal(par_type pit)
+void LyXText::redoParagraphInternal(par_type const pit)
{
// remove rows of paragraph, keep track of height changes
- height_ -= pars_[pit].height;
+ Paragraph & par = pars_[pit];
+ height_ -= par.height;
// clear old data
- pars_[pit].rows.clear();
- pars_[pit].height = 0;
- pars_[pit].width = 0;
+ par.rows.clear();
+ par.height = 0;
+ par.width = 0;
// redo insets
- InsetList::iterator ii = pars_[pit].insetlist.begin();
- InsetList::iterator iend = pars_[pit].insetlist.end();
+ InsetList::iterator ii = par.insetlist.begin();
+ InsetList::iterator iend = par.insetlist.end();
for (; ii != iend; ++ii) {
Dimension dim;
- int const w = maxwidth_ - leftMargin(pit) - rightMargin(pars_[pit]);
- MetricsInfo mi(bv(), getFont(pit, ii->pos), w);
+ int const w = maxwidth_ - leftMargin(pit) - rightMargin(par);
+ MetricsInfo mi(bv(), getFont(par, ii->pos), w);
ii->inset->metrics(mi, dim);
}
// rebreak the paragraph
- pars_[pit].setBeginOfBody();
+ par.setBeginOfBody();
pos_type z = 0;
do {
Row row(z);
rowBreakPoint(pit, row);
setRowWidth(pit, row);
setHeightOfRow(pit, row);
- row.y_offset(pars_[pit].height);
- pars_[pit].rows.push_back(row);
- pars_[pit].width = std::max(pars_[pit].width, row.width());
- pars_[pit].height += row.height();
+ row.y_offset(par.height);
+ par.rows.push_back(row);
+ par.width = std::max(par.width, row.width());
+ par.height += row.height();
z = row.endpos();
- } while (z < pars_[pit].size());
+ } while (z < par.size());
- height_ += pars_[pit].height;
- //lyxerr << "redoParagraph: " << pars_[pit].rows.size() << " rows\n";
+ height_ += par.height;
+ //lyxerr << "redoParagraph: " << par.rows.size() << " rows\n";
}
void LyXText::redoParagraphs(par_type pit, par_type end)
{
- for ( ; pit != end; ++pit)
+ for (; pit != end; ++pit)
redoParagraphInternal(pit);
updateParPositions();
+ updateCounters();
}
width_ = maxParagraphWidth(paragraphs());
// final dimension
- dim.asc = firstRow()->ascent_of_text();
+ dim.asc = firstRow().ascent_of_text();
dim.des = height_ - dim.asc;
dim.wid = width_;
}
void LyXText::getWord(CursorSlice & from, CursorSlice & to,
word_location const loc)
{
- Paragraph & from_par = pars_[from.par()];
+ Paragraph const & from_par = pars_[from.par()];
switch (loc) {
case lyx::WHOLE_WORD_STRICT:
if (from.pos() == 0 || from.pos() == from_par.size()
- || from_par.isSeparator(from.pos())
- || from_par.isKomma(from.pos())
- || from_par.isNewline(from.pos())
- || from_par.isSeparator(from.pos() - 1)
- || from_par.isKomma(from.pos() - 1)
- || from_par.isNewline(from.pos() - 1)) {
+ || !from_par.isWord(from.pos())
+ || !from_par.isWord(from.pos() - 1)) {
to = from;
return;
}
// no break here, we go to the next
case lyx::WHOLE_WORD:
- // Move cursor to the beginning, when not already there.
- if (from.pos() && !from_par.isSeparator(from.pos() - 1)
- && !(from_par.isKomma(from.pos() - 1)
- || from_par.isNewline(from.pos() - 1)))
- cursorLeftOneWord(bv()->cursor());
- break;
+ // If we are already at the beginning of a word, do nothing
+ if (!from.pos() || !from_par.isWord(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
- cursorLeftOneWord(bv()->cursor());
+ while (from.pos() && from_par.isWord(from.pos() - 1))
+ --from.pos();
break;
case lyx::NEXT_WORD:
lyxerr << "LyXText::getWord: NEXT_WORD not implemented yet"
<< endl;
break;
case lyx::PARTIAL_WORD:
+ // no need to move the 'from' cursor
break;
}
to = from;
Paragraph & to_par = pars_[to.par()];
- while (to.pos() < to_par.size()
- && !to_par.isSeparator(to.pos())
- && !to_par.isKomma(to.pos())
- && !to_par.isNewline(to.pos())
- && !to_par.isHfill(to.pos())
- && !to_par.isInset(to.pos()))
- {
+ while (to.pos() < to_par.size() && to_par.isWord(to.pos()))
++to.pos();
- }
}
{
static Change current_change;
- bool the_end_read = false;
Paragraph::depth_type depth = 0;
while (lex.isOK()) {
lex.nextToken();
- string token = lex.getString();
+ string const token = lex.getString();
if (token.empty())
continue;
if (token == "\\end_inset") {
- the_end_read = true;
break;
}
+ if (token == "\\end_body") {
+ continue;
+ }
+
+ if (token == "\\begin_body") {
+ continue;
+ }
+
if (token == "\\end_document") {
-#ifdef WITH_WARNINGS
-#warning Look here!
-#endif
-#if 0
- lex.printError("\\end_document read in inset! Error in document!");
-#endif
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 the_end_read;
+ return true;
}
int LyXText::ascent() const
{
- return firstRow()->ascent_of_text();
+ return firstRow().ascent_of_text();
}
int LyXText::descent() const
{
- return height_ - firstRow()->ascent_of_text();
+ return height_ - firstRow().ascent_of_text();
}
int LyXText::cursorX(CursorSlice const & cur) const
{
- par_type pit = cur.par();
- if (pars_[pit].rows.empty())
+ par_type const pit = cur.par();
+ Paragraph const & par = pars_[pit];
+ if (par.rows.empty())
return xo_;
- Row const & row = *pars_[pit].getRow(cur.pos());
+ Row const & row = *par.getRow(cur.pos());
pos_type pos = cur.pos();
pos_type cursor_vpos = 0;
if (end <= row_pos)
cursor_vpos = row_pos;
else if (pos >= end)
- cursor_vpos = isRTL(pars_[pit]) ? row_pos : end;
+ cursor_vpos = isRTL(par) ? row_pos : end;
else if (pos > row_pos && pos >= end)
// Place cursor after char at (logical) position pos - 1
cursor_vpos = (bidi.level(pos - 1) % 2 == 0)
cursor_vpos = (bidi.level(pos) % 2 == 0)
? bidi.log2vis(pos) : bidi.log2vis(pos) + 1;
- pos_type body_pos = pars_[pit].beginOfBody();
+ pos_type body_pos = par.beginOfBody();
if (body_pos > 0 &&
- (body_pos > end || !pars_[pit].isLineSeparator(body_pos - 1)))
+ (body_pos > end || !par.isLineSeparator(body_pos - 1)))
body_pos = 0;
for (pos_type vpos = row_pos; vpos < cursor_vpos; ++vpos) {
pos_type pos = bidi.vis2log(vpos);
if (body_pos > 0 && pos == body_pos - 1) {
x += m.label_hfill
- + font_metrics::width(pars_[pit].layout()->labelsep,
- getLabelFont(pit));
- if (pars_[pit].isLineSeparator(body_pos - 1))
- x -= singleWidth(pit, body_pos - 1);
+ + font_metrics::width(par.layout()->labelsep,
+ getLabelFont(par));
+ if (par.isLineSeparator(body_pos - 1))
+ x -= singleWidth(par, body_pos - 1);
}
- if (hfillExpansion(pars_[pit], row, pos)) {
- x += singleWidth(pit, pos);
+ if (hfillExpansion(par, row, pos)) {
+ x += singleWidth(par, pos);
if (pos >= body_pos)
x += m.hfill;
else
x += m.label_hfill;
- } else if (pars_[pit].isSeparator(pos)) {
- x += singleWidth(pit, pos);
+ } else if (par.isSeparator(pos)) {
+ x += singleWidth(par, pos);
if (pos >= body_pos)
x += m.separator;
} else
- x += singleWidth(pit, pos);
+ x += singleWidth(par, pos);
}
return xo_ + int(x);
}
int LyXText::cursorY(CursorSlice const & cur) const
{
- Paragraph & par = getPar(cur.par());
- Row & row = *par.getRow(cur.pos());
+ Paragraph const & par = getPar(cur.par());
+ Row const & row = *par.getRow(cur.pos());
return yo_ + par.y + row.y_offset() + row.baseline();
}
break;
}
}
+
#ifdef DEVEL_VERSION
os << _(", Inset: ") << &cur.inset();
os << _(", Paragraph: ") << cur.par();
}
+// Manhattan distance to nearest corner
int LyXText::dist(int x, int y) const
{
int xx = 0;
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;
}