]> git.lyx.org Git - lyx.git/blobdiff - src/Paragraph.cpp
* GuiDocument.cpp:
[lyx.git] / src / Paragraph.cpp
index 7c9780e1ae2874bb02af9723f03e24c83562e549..19997fa51b8d81f7814b3b47e23e24269b70731a 100644 (file)
@@ -4,13 +4,13 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Asger Alstrup
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  * \author Angus Leeming
  * \author John Levon
- * \author André Pönitz
+ * \author André Pönitz
  * \author Dekel Tsur
- * \author Jürgen Vigna
+ * \author Jürgen Vigna
  *
  * Full author contact details are available in file CREDITS.
  */
 #include "LyXRC.h"
 #include "OutputParams.h"
 #include "output_latex.h"
+#include "output_xhtml.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
+#include "SpellChecker.h"
 #include "sgml.h"
 #include "TextClass.h"
 #include "TexRow.h"
 #include "Text.h"
 #include "VSpace.h"
+#include "WordLangTuple.h"
 #include "WordList.h"
 
 #include "frontends/alert.h"
 #include "insets/InsetBibitem.h"
 #include "insets/InsetLabel.h"
 
-#include "support/lassert.h"
-#include "support/convert.h"
 #include "support/debug.h"
+#include "support/docstring_list.h"
 #include "support/ExceptionMessage.h"
 #include "support/gettext.h"
+#include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/Messages.h"
 #include "support/textutils.h"
@@ -109,7 +112,7 @@ public:
        /// specified by the latex macro \p ltx, to \p os starting from \p i.
        /// \return the number of characters written.
        int writeScriptChars(odocstream & os, docstring const & ltx,
-                          Change &, Encoding const &, pos_type & i);
+                          Change const &, Encoding const &, pos_type & i);
 
        /// This could go to ParagraphParameters if we want to.
        int startTeXParParams(BufferParams const &, odocstream &, TexRow &,
@@ -135,9 +138,9 @@ public:
        ///
        void latexSpecialChar(
                                   odocstream & os,
-                                  OutputParams & runparams,
-                                  Font & running_font,
-                                  Change & running_change,
+                                  OutputParams const & runparams,
+                                  Font const & running_font,
+                                  Change const & running_change,
                                   Layout const & style,
                                   pos_type & i,
                                   unsigned int & column);
@@ -146,20 +149,20 @@ public:
        bool latexSpecialT1(
                char_type const c,
                odocstream & os,
-               pos_type i,
+               pos_type i,
                unsigned int & column);
        ///
        bool latexSpecialTypewriter(
                char_type const c,
                odocstream & os,
-               pos_type i,
+               pos_type i,
                unsigned int & column);
        ///
        bool latexSpecialPhrase(
                odocstream & os,
                pos_type & i,
                unsigned int & column,
-               OutputParams & runparams);
+               OutputParams const & runparams);
 
        ///
        void validate(LaTeXFeatures & features,
@@ -279,6 +282,22 @@ Paragraph::Private::Private(Private const & p, Paragraph * owner,
 }
 
 
+void Paragraph::addChangesToToc(DocIterator const & cdit,
+       Buffer const & buf) const
+{
+       d->changes_.addToToc(cdit, buf);
+}
+
+
+bool Paragraph::isFullyDeleted(pos_type start, pos_type end) const
+{
+       LASSERT(start >= 0 && start <= size(), /**/);
+       LASSERT(end > start && end <= size() + 1, /**/);
+
+       return d->changes_.isFullyDeleted(start, end);
+}
+
+
 bool Paragraph::isChanged(pos_type start, pos_type end) const
 {
        LASSERT(start >= 0 && start <= size(), /**/);
@@ -442,17 +461,23 @@ void Paragraph::Private::insertChar(pos_type pos, char_type c,
 }
 
 
-void Paragraph::insertInset(pos_type pos, Inset * inset,
+bool Paragraph::insertInset(pos_type pos, Inset * inset,
                                   Change const & change)
 {
        LASSERT(inset, /**/);
        LASSERT(pos >= 0 && pos <= size(), /**/);
 
+       // Paragraph::insertInset() can be used in cut/copy/paste operation where
+       // d->inset_owner_ is not set yet.
+       if (d->inset_owner_ && !d->inset_owner_->insetAllowed(inset->lyxCode()))
+               return false;
+
        d->insertChar(pos, META_INSET, change);
        LASSERT(d->text_[pos] == META_INSET, /**/);
 
        // Add a new entry in the insetlist_.
        d->insetlist_.insert(inset, pos);
+       return true;
 }
 
 
@@ -590,7 +615,7 @@ bool Paragraph::Private::simpleTeXBlanks(OutputParams const & runparams,
 
 int Paragraph::Private::writeScriptChars(odocstream & os,
                                         docstring const & ltx,
-                                        Change & runningChange,
+                                        Change const & runningChange,
                                         Encoding const & encoding,
                                         pos_type & i)
 {
@@ -804,10 +829,10 @@ void Paragraph::Private::latexInset(
        }
 
        if (close) {
-       if (running_font.language()->lang() == "farsi")
-                       os << "\\endL{}";
-               else
-                       os << '}';
+               if (running_font.language()->lang() == "farsi")
+                               os << "\\endL{}";
+                       else
+                               os << '}';
        }
 
        if (tmp) {
@@ -827,9 +852,9 @@ void Paragraph::Private::latexInset(
 
 void Paragraph::Private::latexSpecialChar(
                                             odocstream & os,
-                                            OutputParams & runparams,
-                                            Font & running_font,
-                                            Change & running_change,
+                                            OutputParams const & runparams,
+                                            Font const & running_font,
+                                            Change const & running_change,
                                             Layout const & style,
                                             pos_type & i,
                                             unsigned int & column)
@@ -851,9 +876,15 @@ void Paragraph::Private::latexSpecialChar(
                return;
        }
 
-       if (lyxrc.fontenc == "T1" && latexSpecialT1(c, os, i, column))
+       // If T1 font encoding is used, use the special
+       // characters it provides.
+       // NOTE: some languages reset the font encoding
+       // internally
+       if (!running_font.language()->internalFontEncoding()
+           && lyxrc.fontenc == "T1" && latexSpecialT1(c, os, i, column))
                return;
 
+       // \tt font needs special treatment
        if (running_font.fontInfo().family() == TYPEWRITER_FAMILY
                && latexSpecialTypewriter(c, os, i, column))
                return;
@@ -902,7 +933,9 @@ void Paragraph::Private::latexSpecialChar(
                column += 17;
                break;
 
-       case '*': case '[':
+       case '*':
+       case '[':
+       case ']':
                // avoid being mistaken for optional arguments
                os << '{';
                os.put(c);
@@ -957,7 +990,7 @@ void Paragraph::Private::latexSpecialChar(
 
 
 bool Paragraph::Private::latexSpecialT1(char_type const c, odocstream & os,
-       pos_type i, unsigned int & column)
+       pos_type i, unsigned int & column)
 {
        switch (c) {
        case '>':
@@ -985,7 +1018,7 @@ bool Paragraph::Private::latexSpecialT1(char_type const c, odocstream & os,
 
 
 bool Paragraph::Private::latexSpecialTypewriter(char_type const c, odocstream & os,
-       pos_type i, unsigned int & column)
+       pos_type i, unsigned int & column)
 {
        switch (c) {
        case '-':
@@ -1007,7 +1040,7 @@ bool Paragraph::Private::latexSpecialTypewriter(char_type const c, odocstream &
 
 
 bool Paragraph::Private::latexSpecialPhrase(odocstream & os, pos_type & i,
-       unsigned int & column, OutputParams & runparams)
+       unsigned int & column, OutputParams const & runparams)
 {
        // FIXME: if we have "LaTeX" with a font
        // change in the middle (before the 'T', then
@@ -1157,15 +1190,16 @@ void Paragraph::write(ostream & os, BufferParams const & bparams,
        int column = 0;
        for (pos_type i = 0; i <= size(); ++i) {
 
-               Change change = lookupChange(i);
+               Change const change = lookupChange(i);
                Changes::lyxMarkChange(os, column, running_change, change);
                running_change = change;
 
                if (i == size())
                        break;
 
-               // Write font changes
+               // Write font changes (ignore spelling markers)
                Font font2 = getFontSettings(bparams, i);
+               font2.setMisspelled(false);
                if (font2 != font1) {
                        font2.lyxWriteChanges(font1, os);
                        column = 0;
@@ -1262,7 +1296,7 @@ void Paragraph::appendString(docstring const & s, Font const & font,
        d->text_.append(s);
 
        // FIXME: Optimize this!
-       for (pos_type i = oldsize; i != newsize; ++i) {
+       for (size_t i = oldsize; i != newsize; ++i) {
                // track change
                d->changes_.insert(change, i);
        }
@@ -1296,12 +1330,13 @@ void Paragraph::insertChar(pos_type pos, char_type c,
 }
 
 
-void Paragraph::insertInset(pos_type pos, Inset * inset,
+bool Paragraph::insertInset(pos_type pos, Inset * inset,
                            Font const & font, Change const & change)
 {
-       insertInset(pos, inset, change);
+       bool const success = insertInset(pos, inset, change);
        // Set the font/language of the inset...
        setFont(pos, font);
+       return success;
 }
 
 
@@ -1313,7 +1348,7 @@ void Paragraph::resetFonts(Font const & font)
 }
 
 // Gets uninstantiated font setting at position.
-Font const Paragraph::getFontSettings(BufferParams const & bparams,
+Font const Paragraph::getFontSettings(BufferParams const & bparams,
                                         pos_type pos) const
 {
        if (pos > size()) {
@@ -1328,7 +1363,16 @@ Font const Paragraph::getFontSettings(BufferParams const & bparams,
        if (pos == size() && !empty())
                return getFontSettings(bparams, pos - 1);
 
-       return Font(inherit_font, getParLanguage(bparams));
+       // Optimisation: avoid a full font instantiation if there is no
+       // language change from previous call.
+       static Font previous_font;
+       static Language const * previous_lang = 0;
+       Language const * lang = getParLanguage(bparams);
+       if (lang != previous_lang) {
+               previous_lang = lang;
+               previous_font = Font(inherit_font, lang);
+       }
+       return previous_font;
 }
 
 
@@ -1359,12 +1403,21 @@ FontSpan Paragraph::fontSpan(pos_type pos) const
 
 
 // Gets uninstantiated font setting at position 0
-Font const Paragraph::getFirstFontSettings(BufferParams const & bparams) const
+Font const Paragraph::getFirstFontSettings(BufferParams const & bparams) const
 {
        if (!empty() && !d->fontlist_.empty())
                return d->fontlist_.begin()->font();
 
-       return Font(inherit_font, bparams.language);
+       // Optimisation: avoid a full font instantiation if there is no
+       // language change from previous call.
+       static Font previous_font;
+       static Language const * previous_lang = 0;
+       if (bparams.language != previous_lang) {
+               previous_lang = bparams.language;
+               previous_font = Font(inherit_font, bparams.language);
+       }
+
+       return previous_font;
 }
 
 
@@ -1381,13 +1434,14 @@ Font const Paragraph::getFont(BufferParams const & bparams, pos_type pos,
        Font font = getFontSettings(bparams, pos);
 
        pos_type const body_pos = beginOfBody();
+       FontInfo & fi = font.fontInfo();
        if (pos < body_pos)
-               font.fontInfo().realize(d->layout_->labelfont);
+               fi.realize(d->layout_->labelfont);
        else
-               font.fontInfo().realize(d->layout_->font);
+               fi.realize(d->layout_->font);
 
-       font.fontInfo().realize(outerfont.fontInfo());
-       font.fontInfo().realize(bparams.getFont().fontInfo());
+       fi.realize(outerfont.fontInfo());
+       fi.realize(bparams.getFont().fontInfo());
 
        return font;
 }
@@ -1538,7 +1592,8 @@ docstring const & Paragraph::labelString() const
 // the next two functions are for the manual labels
 docstring const Paragraph::getLabelWidthString() const
 {
-       if (d->layout_->margintype == MARGIN_MANUAL)
+       if (d->layout_->margintype == MARGIN_MANUAL
+           || d->layout_->latextype == LATEX_BIB_ENVIRONMENT)
                return d->params_.labelWidthString();
        else
                return _("Senseless with this layout!");
@@ -1579,7 +1634,7 @@ docstring Paragraph::expandLabel(Layout const & layout,
 
        if (fmt.empty() && layout.labeltype == LABEL_COUNTER 
            && !layout.counter.empty())
-               fmt = "\\the" + layout.counter;
+               return tclass.counters().theCounter(layout.counter);
 
        // handle 'inherited level parts' in 'fmt',
        // i.e. the stuff between '@' in   '@Section@.\arabic{subsection}'
@@ -1813,7 +1868,12 @@ int Paragraph::Private::endTeXParParams(BufferParams const & bparams,
 {
        int column = 0;
 
-       switch (params_.align()) {
+       LyXAlignment const curAlign = params_.align();
+
+       if (curAlign == layout_->align)
+               return column;
+
+       switch (curAlign) {
        case LYX_ALIGN_NONE:
        case LYX_ALIGN_BLOCK:
        case LYX_ALIGN_LAYOUT:
@@ -1833,7 +1893,7 @@ int Paragraph::Private::endTeXParParams(BufferParams const & bparams,
        InsetCode code = owner_->ownerCode();
        bool const lastpar = runparams.isLastPar;
 
-       switch (params_.align()) {
+       switch (curAlign) {
        case LYX_ALIGN_NONE:
        case LYX_ALIGN_BLOCK:
        case LYX_ALIGN_LAYOUT:
@@ -1872,19 +1932,21 @@ int Paragraph::Private::endTeXParParams(BufferParams const & bparams,
 
 // This one spits out the text of the paragraph
 bool Paragraph::latex(BufferParams const & bparams,
-                               Font const & outerfont,
-                               odocstream & os, TexRow & texrow,
-                               OutputParams const & runparams) const
+       Font const & outerfont,
+       odocstream & os, TexRow & texrow,
+       OutputParams const & runparams,
+       int start_pos, int end_pos) const
 {
-       LYXERR(Debug::LATEX, "SimpleTeXOnePar...     " << this);
+       LYXERR(Debug::LATEX, "Paragraph::latex...     " << this);
 
        bool return_value = false;
 
-       bool asdefault = forcePlainLayout();
+       bool const allowcust = allowParagraphCustomization();
 
-       Layout const & style = asdefault ?
-               bparams.documentClass().plainLayout() :
-               *d->layout_;
+       // FIXME This check should not be needed. Perhaps issue an
+       // error if it triggers.
+       Layout const & style = forcePlainLayout() ?
+               bparams.documentClass().plainLayout() : *d->layout_;
 
        // Current base font for all inherited font changes, without any
        // change caused by an individual character, except for the language:
@@ -1899,10 +1961,8 @@ bool Paragraph::latex(BufferParams const & bparams,
        unsigned int column = 0;
 
        if (body_pos > 0) {
-               // the optional argument is kept in curly brackets in
-               // case it contains a ']'
-               os << "[{";
-               column += 2;
+               os << '[';
+               column += 1;
                basefont = getLabelFont(bparams, outerfont);
        } else {
                basefont = getLayoutFont(bparams, outerfont);
@@ -1923,7 +1983,7 @@ bool Paragraph::latex(BufferParams const & bparams,
                        os << '{';
                        ++column;
                }
-               if (!asdefault)
+               if (allowcust)
                        column += d->startTeXParParams(bparams, os, texrow,
                                                    runparams);
        }
@@ -1945,15 +2005,15 @@ bool Paragraph::latex(BufferParams const & bparams,
                                                runningChange, Change(Change::UNCHANGED));
                                runningChange = Change(Change::UNCHANGED);
 
-                               os << "}] ";
-                               column +=3;
+                               os << "] ";
+                               column +=2;
                        }
                        if (style.isCommand()) {
                                os << '{';
                                ++column;
                        }
 
-                       if (!asdefault)
+                       if (allowcust)
                                column += d->startTeXParParams(bparams, os,
                                                            texrow,
                                                            runparams);
@@ -2045,7 +2105,8 @@ bool Paragraph::latex(BufferParams const & bparams,
                                os << fontchange;
                }
 
-               if (c == ' ') {
+               // FIXME: think about end_pos implementation...
+               if (c == ' ' && i >= start_pos && (end_pos == -1 || i < end_pos)) {
                        // FIXME: integrate this case in latexSpecialChar
                        // Do not print the separation of the optional argument
                        // if style.pass_thru is false. This works because
@@ -2073,16 +2134,19 @@ bool Paragraph::latex(BufferParams const & bparams,
                // Two major modes:  LaTeX or plain
                // Handle here those cases common to both modes
                // and then split to handle the two modes separately.
-               if (c == META_INSET)
-                       d->latexInset(bparams, os,
-                                       texrow, rp, running_font,
-                                       basefont, outerfont, open_font,
-                                       runningChange, style, i, column);
-               else {
-                       try {
-                               d->latexSpecialChar(os, rp, running_font, runningChange,
-                                       style, i, column);
-                       } catch (EncodingException & e) {
+               if (c == META_INSET) {
+                       if (i >= start_pos && (end_pos == -1 || i < end_pos)) {
+                               d->latexInset(bparams, os,
+                                               texrow, rp, running_font,
+                                               basefont, outerfont, open_font,
+                                               runningChange, style, i, column);
+                       }
+               } else {
+                       if (i >= start_pos && (end_pos == -1 || i < end_pos)) {
+                               try {
+                                       d->latexSpecialChar(os, rp, running_font, runningChange,
+                                               style, i, column);
+                               } catch (EncodingException & e) {
                                if (runparams.dryrun) {
                                        os << "<" << _("LyX Warning: ")
                                           << _("uncodable character") << " '";
@@ -2096,6 +2160,7 @@ bool Paragraph::latex(BufferParams const & bparams,
                                }
                        }
                }
+               }
 
                // Set the encoding to that returned from latexSpecialChar (see
                // comment for encoding member in OutputParams.h)
@@ -2127,16 +2192,16 @@ bool Paragraph::latex(BufferParams const & bparams,
 
        // Needed if there is an optional argument but no contents.
        if (body_pos > 0 && body_pos == size()) {
-               os << "}]~";
+               os << "]~";
                return_value = false;
        }
 
-       if (!asdefault) {
+       if (allowcust) {
                column += d->endTeXParParams(bparams, os, texrow,
                                          runparams);
        }
 
-       LYXERR(Debug::LATEX, "SimpleTeXOnePar...done " << this);
+       LYXERR(Debug::LATEX, "Paragraph::latex... done " << this);
        return return_value;
 }
 
@@ -2182,7 +2247,7 @@ string Paragraph::getID(Buffer const & buf, OutputParams const & runparams)
 }
 
 
-pos_type Paragraph::firstWord(odocstream & os, OutputParams const & runparams)
+pos_type Paragraph::firstWordDocBook(odocstream & os, OutputParams const & runparams)
        const
 {
        pos_type i;
@@ -2200,6 +2265,24 @@ pos_type Paragraph::firstWord(odocstream & os, OutputParams const & runparams)
 }
 
 
+pos_type Paragraph::firstWordLyXHTML(odocstream & os, OutputParams const & runparams)
+       const
+{
+       pos_type i;
+       for (i = 0; i < size(); ++i) {
+               if (Inset const * inset = getInset(i)) {
+                       inset->xhtml(os, runparams);
+               } else {
+                       char_type c = d->text_[i];
+                       if (c == ' ')
+                               break;
+                       os << html::escapeChar(c);
+               }
+       }
+       return i;
+}
+
+
 bool Paragraph::Private::onlyText(Buffer const & buf, Font const & outerfont, pos_type initial) const
 {
        Font font_old;
@@ -2271,6 +2354,92 @@ void Paragraph::simpleDocBookOnePar(Buffer const & buf,
 }
 
 
+docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
+                                   odocstream & os,
+                                   OutputParams const & runparams,
+                                   Font const & outerfont,
+                                   pos_type initial) const
+{
+       docstring retval;
+
+       // FIXME We really need to manage the tag nesting here.
+       // Probably in the same sort of way as in output_xhtml.
+       bool emph_flag = false;
+       bool bold_flag = false;
+       std::string closing_tag;
+
+       Layout const & style = *d->layout_;
+       FontInfo font_old =
+               style.labeltype == LABEL_MANUAL ? style.labelfont : style.font;
+
+       //if (style.pass_thru && !d->onlyText(buf, outerfont, initial))
+       //      os << "]]>";
+
+       // parsing main loop
+       for (pos_type i = initial; i < size(); ++i) {
+               Font font = getFont(buf.params(), i, outerfont);
+
+               // emphasis
+               if (font_old.emph() != font.fontInfo().emph()) {
+                       if (font.fontInfo().emph() == FONT_ON) {
+                               os << "<em>";
+                               emph_flag = true;
+                       } else if (emph_flag && i != initial) {
+                               os << "</em>";
+                               emph_flag = false;
+                       }
+               }
+               // bold
+               if (font_old.series() != font.fontInfo().series()) {
+                       if (font.fontInfo().series() == BOLD_SERIES) {
+                               os << "<strong>";
+                               bold_flag = true;
+                       } else if (bold_flag && i != initial) {
+                               os << "</strong>";
+                               bold_flag = false;
+                       }
+               }
+               // FIXME Other such tags? 
+
+               if (Inset const * inset = getInset(i)) {
+                       retval += inset->xhtml(os, runparams);
+               } else {
+                       char_type c = d->text_[i];
+
+                       if (style.pass_thru)
+                               os.put(c);
+                       else if (c == '-') {
+                               docstring str;
+                               int j = i + 1;
+                               if (j < size() && d->text_[j] == '-') {
+                                       j += 1;
+                                       if (j < size() && d->text_[j] == '-') {
+                                               str += from_ascii("&mdash;");
+                                               i += 2;
+                                       } else {
+                                               str += from_ascii("&ndash;");
+                                               i += 1;
+                                       }
+                               }
+                               else
+                                       str += c;
+                               os << str;
+                       } else
+                               os << html::escapeChar(c);
+               }
+               font_old = font.fontInfo();
+       }
+
+       // FIXME This could be out of order. See above.
+       if (emph_flag)
+               os << "</em>";
+       if (bold_flag)
+               os << "</strong>";
+
+       return retval;
+}
+
+
 bool Paragraph::isHfill(pos_type pos) const
 {
        Inset const * inset = getInset(pos);
@@ -2296,13 +2465,15 @@ bool Paragraph::isLineSeparator(pos_type pos) const
 }
 
 
-/// Used by the spellchecker
-bool Paragraph::isLetter(pos_type pos) const
+bool Paragraph::isWordSeparator(pos_type pos) const
 {
        if (Inset const * inset = getInset(pos))
-               return inset->isLetter();
+               return !inset->isLetter();
        char_type const c = d->text_[pos];
-       return isLetterChar(c) || isDigit(c);
+       // We want to pass the ' and escape chars to the spellchecker
+       static docstring const quote = from_utf8(lyxrc.spellchecker_esc_chars + '\'');
+       return (!isLetterChar(c) && !isDigit(c) && !contains(quote, c))
+               || pos == size();
 }
 
 
@@ -2389,10 +2560,34 @@ docstring Paragraph::asString(pos_type beg, pos_type end, int options) const
 
        for (pos_type i = beg; i < end; ++i) {
                char_type const c = d->text_[i];
-               if (isPrintable(c))
+               if (isPrintable(c) || c == '\t'
+                   || (c == '\n' && options & AS_STR_NEWLINES))
                        os.put(c);
                else if (c == META_INSET && options & AS_STR_INSETS)
-                       getInset(i)->textString(os);
+                       getInset(i)->tocString(os);
+       }
+
+       return os.str();
+}
+
+
+docstring Paragraph::stringify(pos_type beg, pos_type end, int options, OutputParams & runparams) const
+{
+       odocstringstream os;
+
+       if (beg == 0 
+               && options & AS_STR_LABEL
+               && !d->params_.labelString().empty())
+               os << d->params_.labelString() << ' ';
+
+       for (pos_type i = beg; i < end; ++i) {
+               char_type const c = d->text_[i];
+               if (isPrintable(c) || c == '\t'
+                   || (c == '\n' && options & AS_STR_NEWLINES))
+                       os.put(c);
+               else if (c == META_INSET && options & AS_STR_INSETS) {
+                       getInset(i)->plaintext(os, runparams);
+               }
        }
 
        return os.str();
@@ -2423,19 +2618,31 @@ void Paragraph::setLayout(Layout const & layout)
 }
 
 
+void Paragraph::setDefaultLayout(DocumentClass const & tc)
+{ 
+       setLayout(tc.defaultLayout()); 
+}
+
+
+void Paragraph::setPlainLayout(DocumentClass const & tc)
+{ 
+       setLayout(tc.plainLayout()); 
+}
+
+
 void Paragraph::setPlainOrDefaultLayout(DocumentClass const & tclass)
 {
        if (usePlainLayout())
-               setLayout(tclass.plainLayout());
+               setPlainLayout(tclass);
        else
-               setLayout(tclass.defaultLayout());
+               setDefaultLayout(tclass);
 }
 
 
 Inset const & Paragraph::inInset() const
 {
        LASSERT(d->inset_owner_, throw ExceptionMessage(BufferException,
-               _("Memory problem"), _("Paragraph not properly initiliazed")));
+               _("Memory problem"), _("Paragraph not properly initialized")));
        return *d->inset_owner_;
 }
 
@@ -2677,33 +2884,32 @@ void Paragraph::changeCase(BufferParams const & bparams, pos_type pos,
                        }
                }
 
-               if (!isLetter(pos) || isDeleted(pos)) {
+               if (isWordSeparator(pos) || isDeleted(pos)) {
                        // permit capitalization again
                        capitalize = true;
                }
 
-               if (oldChar != newChar)
+               if (oldChar != newChar) {
                        changes += newChar;
+                       if (pos != right - 1)
+                               continue;
+                       // step behind the changing area
+                       pos++;
+               }
 
-               if (oldChar == newChar || pos == right - 1) {
-                       if (oldChar != newChar) {
-                               // step behind the changing area
-                               pos++;
-                       }
-                       int erasePos = pos - changes.size();
-                       for (size_t i = 0; i < changes.size(); i++) {
-                               insertChar(pos, changes[i],
-                                       getFontSettings(bparams,
-                                       erasePos),
-                                       trackChanges);
-                               if (!eraseChar(erasePos, trackChanges)) {
-                                       ++erasePos;
-                                       ++pos; // advance
-                                       ++right; // expand selection
-                               }
+               int erasePos = pos - changes.size();
+               for (size_t i = 0; i < changes.size(); i++) {
+                       insertChar(pos, changes[i],
+                                  getFontSettings(bparams,
+                                                  erasePos),
+                                  trackChanges);
+                       if (!eraseChar(erasePos, trackChanges)) {
+                               ++erasePos;
+                               ++pos; // advance
+                               ++right; // expand selection
                        }
-                       changes.clear();
                }
+               changes.clear();
        }
 }
 
@@ -2730,10 +2936,10 @@ bool Paragraph::find(docstring const & str, bool cs, bool mw,
 
        // if necessary, check whether string matches word
        if (mw) {
-               if (pos > 0 && isLetter(pos - 1))
+               if (pos > 0 && !isWordSeparator(pos - 1))
                        return false;
                if (pos + strsize < parsize
-                       && isLetter(pos + strsize))
+                       && !isWordSeparator(pos + strsize))
                        return false;
        }
 
@@ -2782,38 +2988,63 @@ void Paragraph::deregisterWords()
 }
 
 
-void Paragraph::collectWords(CursorSlice const & sl)
+void Paragraph::locateWord(pos_type & from, pos_type & to,
+       word_location const loc) const
 {
-       // find new words
-       bool inword = false;
+       switch (loc) {
+       case WHOLE_WORD_STRICT:
+               if (from == 0 || from == size()
+                   || isWordSeparator(from)
+                   || isWordSeparator(from - 1)) {
+                       to = from;
+                       return;
+               }
+               // no break here, we go to the next
 
-       //lyxerr << "Words: ";
-       pos_type n = size();
-       for (pos_type pos = 0; pos != n; ++pos) {
-               if (isDeleted(pos))
-                       continue;
+       case WHOLE_WORD:
+               // If we are already at the beginning of a word, do nothing
+               if (!from || isWordSeparator(from - 1))
+                       break;
+               // no break here, we go to the next
 
-               if (!isLetter(pos)) {
-                       inword = false;
-                       continue;
-               }
+       case PREVIOUS_WORD:
+               // always move the cursor to the beginning of previous word
+               while (from && !isWordSeparator(from - 1))
+                       --from;
+               break;
+       case NEXT_WORD:
+               LYXERR0("Paragraph::locateWord: NEXT_WORD not implemented yet");
+               break;
+       case PARTIAL_WORD:
+               // no need to move the 'from' cursor
+               break;
+       }
+       to = from;
+       while (to < size() && !isWordSeparator(to))
+               ++to;
+}
 
-               if (inword)
-                       continue;
 
-               inword = true;
-               CursorSlice from = sl;
-               CursorSlice to = sl;
-               from.pos() = pos;
-               to.pos() = pos;
-               from.text()->getWord(from, to, WHOLE_WORD);
-               if (to.pos() - from.pos() < 6)
+void Paragraph::collectWords()
+{
+       pos_type n = size();
+       WordLangTuple wl;
+       docstring_list suggestions;
+       for (pos_type pos = 0; pos < n; ++pos) {
+               if (isWordSeparator(pos))
                        continue;
-               docstring word = asString(from.pos(), to.pos(), false);
-               d->words_.insert(word);
-               //lyxerr << word << " ";
+               pos_type from = pos;
+               locateWord(from, pos, WHOLE_WORD);
+               if (pos - from >= 6) {
+                       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]);
+               }
        }
-       //lyxerr << std::endl;
 }
 
 
@@ -2826,12 +3057,59 @@ void Paragraph::registerWords()
 }
 
 
-void Paragraph::updateWords(CursorSlice const & sl)
+void Paragraph::updateWords()
 {
-       LASSERT(&sl.paragraph() == this, /**/);
        deregisterWords();
-       collectWords(sl);
+       collectWords();
        registerWords();
 }
 
+
+bool Paragraph::spellCheck(pos_type & from, pos_type & to, WordLangTuple & wl,
+       docstring_list & suggestions) const
+{
+       SpellChecker * speller = theSpellChecker();
+       if (!speller)
+               return false;
+
+       locateWord(from, to, WHOLE_WORD);
+       if (from == to || from >= pos_type(d->text_.size()))
+               return false;
+
+       docstring word = asString(from, to, AS_STR_INSETS);
+       string const lang_code = lyxrc.spellchecker_alt_lang.empty()
+               ? getFontSettings(d->inset_owner_->buffer().params(), from).language()->code()
+               : lyxrc.spellchecker_alt_lang;
+       wl = WordLangTuple(word, lang_code);
+       SpellChecker::Result res = speller->check(wl);
+       // Just ignore any error that the spellchecker reports.
+       // FIXME: we should through out an exception and catch it in the GUI to
+       // display the error.
+       if (!speller->error().empty())
+               return false;
+
+       bool const misspelled = res != SpellChecker::OK
+               && res != SpellChecker::IGNORED_WORD;
+
+       if (lyxrc.spellcheck_continuously)
+               d->fontlist_.setMisspelled(from, to, misspelled);
+
+       if (misspelled) {
+               while (!(word = speller->nextMiss()).empty())
+                       suggestions.push_back(word);
+       }
+       return misspelled;
+}
+
+
+bool Paragraph::isMisspelled(pos_type pos) const
+{
+       pos_type from = pos;
+       pos_type to = pos;
+       WordLangTuple wl;
+       docstring_list suggestions;
+       return spellCheck(from, to, wl, suggestions);
+}
+
+
 } // namespace lyx