Import last layout translations

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 81deac4f393a180862e33f1d0a76661f671bf6eb..41889b80bf833aa008550c438dedcf727a420daa 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -2731,10 +2731,11 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
 
        bool emph_flag = false;
        bool bold_flag = false;
-       string closing_tag;
 
        Layout const & style = *d->layout_;
 
+       xs.startParagraph();
+
        if (!runparams.for_toc && runparams.html_make_pars) {
                // generate a magic label for this paragraph
                string const attr = "id='" + magicLabel() + "'";
@@ -2814,6 +2815,7 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
        }
 
        xs.closeFontTags();
+       xs.endParagraph();
        return retval;
 }
 
@@ -3781,9 +3783,9 @@ void Paragraph::spellCheck() const
 bool Paragraph::isMisspelled(pos_type pos, bool check_boundary) const
 {
        bool result = SpellChecker::misspelled(d->speller_state_.getState(pos));
-       if (result || pos <= 0 || pos >= size())
+       if (result || pos <= 0 || pos > size())
                return result;
-       if (check_boundary && isWordSeparator(pos))
+       if (check_boundary && (pos == size() || isWordSeparator(pos)))
                result = SpellChecker::misspelled(d->speller_state_.getState(pos - 1));
        return result;
 }