A couple comments and some very minor cleanup.

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 6dce930e9a47e2bc0d036e2bbba67a8bece1c86a..ca3b3414ec7d32442c1ac571fa3a1be35a48117d 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -593,8 +593,8 @@ bool Paragraph::Private::simpleTeXBlanks(OutputParams const & runparams,
                }
        }
 
-       if (lyxrc.plaintext_linelen > 0
-           && column > lyxrc.plaintext_linelen
+       if (runparams.linelen > 0
+           && column > runparams.linelen
            && i
            && text_[i - 1] != ' '
            && (i + 1 < int(text_.size()))
@@ -771,7 +771,7 @@ void Paragraph::Private::latexInset(
 
        if (inset->canTrackChanges()) {
                column += Changes::latexMarkChange(os, bparams, running_change,
-                       Change(Change::UNCHANGED));
+                       Change(Change::UNCHANGED), runparams);
                running_change = Change(Change::UNCHANGED);
        }
 
@@ -1168,6 +1168,18 @@ Paragraph::~Paragraph()
 }
 
 
+namespace {
+
+// this shall be called just before every "os << ..." action.
+void flushString(ostream & os, docstring & s)
+{
+       os << to_utf8(s);
+       s.erase();
+}
+
+}
+
+
 void Paragraph::write(ostream & os, BufferParams const & bparams,
        depth_type & dth) const
 {
@@ -1195,10 +1207,16 @@ void Paragraph::write(ostream & os, BufferParams const & bparams,
 
        Change running_change = Change(Change::UNCHANGED);
 
+       // this string is used as a buffer to avoid repetitive calls
+       // to to_utf8(), which turn out to be expensive (JMarc)
+       docstring write_buffer;
+
        int column = 0;
        for (pos_type i = 0; i <= size(); ++i) {
 
                Change const change = lookupChange(i);
+               if (change != running_change)
+                       flushString(os, write_buffer);
                Changes::lyxMarkChange(os, bparams, column, running_change, change);
                running_change = change;
 
@@ -1209,6 +1227,7 @@ void Paragraph::write(ostream & os, BufferParams const & bparams,
                Font font2 = getFontSettings(bparams, i);
                font2.setMisspelled(false);
                if (font2 != font1) {
+                       flushString(os, write_buffer);
                        font2.lyxWriteChanges(font1, os);
                        column = 0;
                        font1 = font2;
@@ -1218,6 +1237,7 @@ void Paragraph::write(ostream & os, BufferParams const & bparams,
                switch (c) {
                case META_INSET:
                        if (Inset const * inset = getInset(i)) {
+                               flushString(os, write_buffer);
                                if (inset->directWrite()) {
                                        // international char, let it write
                                        // code directly so it's shorter in
@@ -1234,10 +1254,12 @@ void Paragraph::write(ostream & os, BufferParams const & bparams,
                        }
                        break;
                case '\\':
+                       flushString(os, write_buffer);
                        os << "\n\\backslash\n";
                        column = 0;
                        break;
                case '.':
+                       flushString(os, write_buffer);
                        if (i + 1 < size() && d->text_[i + 1] == ' ') {
                                os << ".\n";
                                column = 0;
@@ -1247,13 +1269,14 @@ void Paragraph::write(ostream & os, BufferParams const & bparams,
                default:
                        if ((column > 70 && c == ' ')
                            || column > 79) {
+                               flushString(os, write_buffer);
                                os << '\n';
                                column = 0;
                        }
                        // this check is to amend a bug. LyX sometimes
                        // inserts '\0' this could cause problems.
                        if (c != '\0')
-                               os << to_utf8(docstring(1, c));
+                               write_buffer.push_back(c);
                        else
                                LYXERR0("NUL char in structure.");
                        ++column;
@@ -1261,6 +1284,7 @@ void Paragraph::write(ostream & os, BufferParams const & bparams,
                }
        }
 
+       flushString(os, write_buffer);
        os << "\n\\end_layout\n";
 }
 
@@ -1988,7 +2012,8 @@ bool Paragraph::latex(BufferParams const & bparams,
                                running_font = basefont;
 
                                column += Changes::latexMarkChange(os, bparams,
-                                               runningChange, Change(Change::UNCHANGED));
+                                               runningChange, Change(Change::UNCHANGED),
+                                               runparams);
                                runningChange = Change(Change::UNCHANGED);
 
                                os << "] ";
@@ -2017,7 +2042,8 @@ bool Paragraph::latex(BufferParams const & bparams,
                        basefont = getLayoutFont(bparams, outerfont);
                        running_font = basefont;
 
-                       column += Changes::latexMarkChange(os, bparams, runningChange, change);
+                       column += Changes::latexMarkChange(os, bparams, runningChange,
+                                                          change, runparams);
                        runningChange = change;
                }
 
@@ -2179,7 +2205,8 @@ bool Paragraph::latex(BufferParams const & bparams,
 #endif
        }
 
-       column += Changes::latexMarkChange(os, bparams, runningChange, Change(Change::UNCHANGED));
+       column += Changes::latexMarkChange(os, bparams, runningChange,
+                                          Change(Change::UNCHANGED), runparams);
 
        // Needed if there is an optional argument but no contents.
        if (body_pos > 0 && body_pos == size()) {
@@ -2187,8 +2214,12 @@ bool Paragraph::latex(BufferParams const & bparams,
                return_value = false;
        }
 
-       if (allowcust && d->endTeXParParams(bparams, os, texrow, runparams))
+       if (allowcust && d->endTeXParParams(bparams, os, texrow, runparams)
+           && runparams.encoding != prev_encoding) {
                runparams.encoding = prev_encoding;
+               if (!bparams.useXetex)
+                       os << setEncoding(prev_encoding->iconvName());
+       }
 
        LYXERR(Debug::LATEX, "Paragraph::latex... done " << this);
        return return_value;
@@ -3015,8 +3046,6 @@ void Paragraph::locateWord(pos_type & from, pos_type & to,
 void Paragraph::collectWords()
 {
        pos_type n = size();
-       WordLangTuple wl;
-       docstring_list suggestions;
        for (pos_type pos = 0; pos < n; ++pos) {
                if (isWordSeparator(pos))
                        continue;
@@ -3026,11 +3055,6 @@ void Paragraph::collectWords()
                        docstring word = asString(from, pos, AS_STR_NONE);
                        d->words_.insert(word);
                }
-               if (lyxrc.spellcheck_continuously
-                   && spellCheck(from, pos, wl, suggestions)) {
-                       for (size_t i = 0; i != suggestions.size(); ++i)
-                               d->words_.insert(suggestions[i]);
-               }
        }
 }