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())
int i = 0;
while (!empty() && (isNewline(0) || isLineSeparator(0))
- && (lookupChange(0).type != Change::DELETED)) {
+ && !isDeleted(0)) {
eraseChar(0, false); // no change tracking here
++i;
}
// Do we have an open font change?
bool open_font = false;
- Change::Type running_change = Change::UNCHANGED;
+ Change::Type runningChangeType = Change::UNCHANGED;
texrow.start(id(), 0);
open_font = true;
}
- Change::Type change = pimpl_->lookupChange(i).type;
+ Change::Type changeType = pimpl_->lookupChange(i).type;
- column += Changes::latexMarkChange(os, running_change,
- change, output);
- running_change = change;
+ column += Changes::latexMarkChange(os, runningChangeType,
+ changeType, output);
+ runningChangeType = changeType;
// do not output text which is marked deleted
// if change tracking output is not desired
- if (output || running_change != Change::DELETED) {
+ if (output || runningChangeType != Change::DELETED) {
OutputParams rp = runparams;
rp.free_spacing = style->free_spacing;
rp.local_font = &font;
os, texrow, rp,
font, running_font,
basefont, outerfont, open_font,
- running_change,
+ runningChangeType,
*style, i, column, c);
}
}
column += Changes::latexMarkChange(os,
- running_change, Change::UNCHANGED, output);
+ runningChangeType, Change::UNCHANGED, output);
// If we have an open font definition, we have to close it
if (open_font) {
if (style->pass_thru)
os.put(c);
else
- // FIXME UNICODE
os << sgml::escapeChar(c);
}
font_old = font;
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);
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)
}
-void Paragraph::setContentsFromPar(Paragraph const & par)
-{
- pimpl_->setContentsFromPar(par);
-}
-
-
Change const Paragraph::lookupChange(pos_type pos) const
{
BOOST_ASSERT(pos <= size());
}
-void Paragraph::acceptChange(pos_type start, pos_type end)
+void Paragraph::acceptChanges(pos_type start, pos_type end)
{
- return pimpl_->acceptChange(start, end);
+ return pimpl_->acceptChanges(start, 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);
}
{
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;