Fix scale parameter for fonts.

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index b6ca89369817e1088345c615386c3a99f96155dd..599f720fc05be00e956caa89cbac684d2f9162eb 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1671,6 +1671,9 @@ void Paragraph::write(ostream & os, BufferParams const & bparams,
                                        os << "\n\\end_inset\n\n";
                                        column = 0;
                                }
+                               // FIXME This can be removed again once the mystery
+                               // crash has been resolved.
+                               os << flush;
                        }
                        break;
                case '\\':
@@ -1706,6 +1709,9 @@ void Paragraph::write(ostream & os, BufferParams const & bparams,
 
        flushString(os, write_buffer);
        os << "\n\\end_layout\n";
+       // FIXME This can be removed again once the mystery
+       // crash has been resolved.
+       os << flush;
 }
 
 
@@ -2237,7 +2243,8 @@ int Paragraph::Private::startTeXParParams(BufferParams const & bparams,
 {
        int column = 0;
 
-       if (params_.noindent() && !layout_->pass_thru) {
+       if (params_.noindent() && !layout_->pass_thru
+           && (layout_->toggle_indent != ITOGGLE_NEVER)) {
                os << "\\noindent ";
                column += 10;
        }
@@ -3840,20 +3847,28 @@ void Paragraph::locateWord(pos_type & from, pos_type & to,
 
 void Paragraph::collectWords()
 {
-       pos_type n = size();
-       for (pos_type pos = 0; pos < n; ++pos) {
+       for (pos_type pos = 0; pos < size(); ++pos) {
                if (isWordSeparator(pos))
                        continue;
                pos_type from = pos;
                locateWord(from, pos, WHOLE_WORD);
-               if ((pos - from) >= (int)lyxrc.completion_minlength) {
-                       docstring word = asString(from, pos, AS_STR_NONE);
-                       FontList::const_iterator cit = d->fontlist_.fontIterator(pos);
-                       if (cit == d->fontlist_.end())
-                               return;
-                       Language const * lang = cit->font().language();
-                       d->words_[lang->lang()].insert(word);
-               }
+               // Work around MSVC warning: The statement
+               // if (pos < from + lyxrc.completion_minlength)
+               // triggers a signed vs. unsigned warning.
+               // I don't know why this happens, it could be a MSVC bug, or
+               // related to LLP64 (windows) vs. LP64 (unix) programming
+               // model, or the C++ standard might be ambigous in the section
+               // defining the "usual arithmetic conversions". However, using
+               // a temporary variable is safe and works on all compilers.
+               pos_type const endpos = from + lyxrc.completion_minlength;
+               if (pos < endpos)
+                       continue;
+               FontList::const_iterator cit = d->fontlist_.fontIterator(from);
+               if (cit == d->fontlist_.end())
+                       return;
+               Language const * lang = cit->font().language();
+               docstring const word = asString(from, pos, AS_STR_NONE);
+               d->words_[lang->lang()].insert(word);
        }
 }