X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.C;h=c0c53c3e524220eed2aefacf3aef80680facef39;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=6f9701139c36bad41940c77842a640bcb16ffdd0;hpb=00ffa3ca7c9c54fabe87acdee867b54974138174;p=lyx.git diff --git a/src/paragraph.C b/src/paragraph.C index 6f9701139c..c0c53c3e52 100644 --- a/src/paragraph.C +++ b/src/paragraph.C @@ -153,13 +153,12 @@ void Paragraph::write(Buffer const & buf, ostream & os, LyXFont font1(LyXFont::ALL_INHERIT, bparams.language); Change running_change = Change(Change::UNCHANGED); - time_type const curtime = current_time(); int column = 0; for (pos_type i = 0; i <= size(); ++i) { Change change = pimpl_->lookupChange(i); - Changes::lyxMarkChange(os, column, curtime, running_change, change); + Changes::lyxMarkChange(os, column, running_change, change); running_change = change; if (i == size()) @@ -1241,7 +1240,6 @@ void Paragraph::simpleDocBookOnePar(Buffer const & buf, if (style->pass_thru) os.put(c); else - // FIXME UNICODE os << sgml::escapeChar(c); } font_old = font; @@ -1309,7 +1307,8 @@ bool Paragraph::isRightToLeftPar(BufferParams const & bparams) const void Paragraph::changeLanguage(BufferParams const & bparams, Language const * from, Language const * to) { - for (pos_type i = 0; i < size(); ++i) { + // change language including dummy font change at the end + for (pos_type i = 0; i <= size(); ++i) { LyXFont font = getFontSettings(bparams, i); if (font.language() == from) { font.setLanguage(to); @@ -1393,7 +1392,6 @@ docstring const Paragraph::asString(Buffer const & buffer, for (pos_type i = beg; i < end; ++i) { value_type const c = getUChar(buffer.params(), i); - // FIXME: isPrintable does not work for lyx::char_type if (isPrintable(c)) os.put(c); else if (c == META_INSET) @@ -1410,12 +1408,6 @@ void Paragraph::setInsetOwner(InsetBase * inset) } -void Paragraph::setContentsFromPar(Paragraph const & par) -{ - pimpl_->setContentsFromPar(par); -} - - Change const Paragraph::lookupChange(pos_type pos) const { BOOST_ASSERT(pos <= size()); @@ -1447,9 +1439,9 @@ void Paragraph::acceptChanges(pos_type start, pos_type end) } -void Paragraph::rejectChange(pos_type start, pos_type end) +void Paragraph::rejectChanges(pos_type start, pos_type end) { - return pimpl_->rejectChange(start, end); + return pimpl_->rejectChanges(start, end); } @@ -1577,6 +1569,7 @@ char_type Paragraph::transformChar(char_type c, pos_type pos) const { if (!Encodings::is_arabic(c)) if (lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 && isDigit(c)) + // FIXME UNICODE What does this do? return c + (0xb0 - '0'); else return c;