for (pos_type i = row.pos(); i < row.endpos(); ++i) {
char_type const b[] = { par_->getChar(i) };
crc.process_bytes(b, sizeof(char_type));
- if (bparams.trackChanges) {
+ if (bparams.track_changes) {
Change change = par_->lookupChange(i);
char_type const b[] = { static_cast<char_type>(change.type) };
// 1 byte is enough to encode Change::Type
{
lyxerr << "Paragraph::dump: rows.size(): " << rows_.size() << endl;
for (size_t i = 0; i != rows_.size(); ++i) {
- lyxerr << " row " << i << ": ";
- rows_[i].dump();
+ lyxerr << " row " << i << ": " << rows_[i];
}
}
if (Inset const * inset = par_->getInset(pos))
return insetDimension(inset).wid;
- char_type c = par_->getChar(pos);
+ char_type const c = par_->getChar(pos);
if (c == '\t')
return 4 * theFontMetrics(font).width(' ');
-
- if (!isPrintable(c))
- return theFontMetrics(font).width(c);
-
- Language const * language = font.language();
- if (language->rightToLeft()) {
- if (language->lang() == "arabic_arabtex" ||
- language->lang() == "arabic_arabi" ||
- language->lang() == "farsi") {
- if (Encodings::isArabicComposeChar(c))
- return 0;
- c = par_->transformChar(c, pos);
- } else if (language->lang() == "hebrew" &&
- Encodings::isHebrewComposeChar(c)) {
- return 0;
- }
- }
+
+ // Note that this function is only called in
+ // RowPainter::paintText, and only used for characters that do
+ // not require handling of compose chars or ligatures. It can
+ // therefore be kept simple.
return theFontMetrics(font).width(c);
}
// the specified position that is neither a newline nor an hfill,
// the hfill will be expanded, otherwise it won't
for (pos_type i = row.pos(); i < pos; i++) {
- if (!par_->isNewline(i) && !par_->isHfill(i))
+ if (!par_->isNewline(i) && !par_->isEnvSeparator(i) && !par_->isHfill(i))
return true;
}
return false;