]> git.lyx.org Git - lyx.git/blobdiff - src/Paragraph.cpp
* src/insets/InsetNote.h:
[lyx.git] / src / Paragraph.cpp
index 3b66a68de395f3966f2e0bf8ea039f3c309a927c..e26f70f4bce4ca04754af67565dd6263acd09e30 100644 (file)
@@ -19,6 +19,7 @@
 
 #include "Paragraph.h"
 
+#include "LayoutFile.h"
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "Changes.h"
 #include "sgml.h"
 #include "TextClass.h"
 #include "TexRow.h"
+#include "Text.h"
 #include "VSpace.h"
+#include "WordList.h"
 
 #include "frontends/alert.h"
-#include "frontends/FontMetrics.h"
 
 #include "insets/InsetBibitem.h"
 #include "insets/InsetLabel.h"
@@ -53,7 +55,6 @@
 #include "support/lstrings.h"
 #include "support/Messages.h"
 #include "support/textutils.h"
-#include "support/unicode.h"
 
 #include <sstream>
 #include <vector>
@@ -78,7 +79,7 @@ class Paragraph::Private
 {
 public:
        ///
-       Private(Paragraph * owner);
+       Private(Paragraph * owner, Layout const & layout);
        /// "Copy constructor"
        Private(Private const &, Paragraph * owner);
 
@@ -115,7 +116,7 @@ public:
                            bool) const;
 
        ///
-       void latexInset(Buffer const &, BufferParams const &,
+       void latexInset(BufferParams const &,
                                   odocstream &,
                                   TexRow & texrow, OutputParams &,
                                   Font & running_font,
@@ -183,25 +184,24 @@ public:
        ///
        ParagraphParameters params_;
 
-       /// position of the paragraph in the buffer. Only macros from
-       /// paragraphs strictly smaller are visible in this paragraph
-       unsigned int macrocontext_position_;
-       
        /// for recording and looking up changes
        Changes changes_;
 
        ///
        InsetList insetlist_;
 
-       ///
-       LayoutPtr layout_;
-
        /// end of label
        pos_type begin_of_body_;
 
        typedef docstring TextContainer;
        ///
        TextContainer text_;
+       
+       typedef std::set<docstring> Words;
+       ///
+       Words words_;
+       ///
+       Layout const * layout_;
 };
 
 
@@ -228,11 +228,10 @@ size_t const phrases_nr = sizeof(special_phrases)/sizeof(special_phrase);
 } // namespace anon
 
 
-Paragraph::Private::Private(Paragraph * owner)
-       : owner_(owner), inset_owner_(0), begin_of_body_(0)
+Paragraph::Private::Private(Paragraph * owner, Layout const & layout)
+       : owner_(owner), inset_owner_(0), begin_of_body_(0), layout_(&layout)
 {
        id_ = paragraph_id++;
-       macrocontext_position_ = 0;
        text_.reserve(100);
 }
 
@@ -240,7 +239,8 @@ Paragraph::Private::Private(Paragraph * owner)
 Paragraph::Private::Private(Private const & p, Paragraph * owner)
        : owner_(owner), inset_owner_(p.inset_owner_), fontlist_(p.fontlist_), 
          params_(p.params_), changes_(p.changes_), insetlist_(p.insetlist_),
-         layout_(p.layout_), begin_of_body_(p.begin_of_body_), text_(p.text_)
+         begin_of_body_(p.begin_of_body_), text_(p.text_), words_(p.words_),
+         layout_(p.layout_)
 {
        id_ = paragraph_id++;
 }
@@ -255,15 +255,13 @@ bool Paragraph::isChanged(pos_type start, pos_type end) const
 }
 
 
-bool Paragraph::isMergedOnEndOfParDeletion(bool trackChanges) const {
+bool Paragraph::isMergedOnEndOfParDeletion(bool trackChanges) const
+{
        // keep the logic here in sync with the logic of eraseChars()
-
-       if (!trackChanges) {
+       if (!trackChanges)
                return true;
-       }
-
-       Change change = d->changes_.lookup(size());
 
+       Change const change = d->changes_.lookup(size());
        return change.type == Change::INSERTED && change.author == 0;
 }
 
@@ -287,8 +285,8 @@ void Paragraph::setChange(Change const & change)
 
        if (change.type != Change::DELETED) {
                for (pos_type pos = 0; pos < size(); ++pos) {
-                       if (isInset(pos))
-                               getInset(pos)->setChange(change);
+                       if (Inset * inset = getInset(pos))
+                               inset->setChange(change);
                }
        }
 }
@@ -297,22 +295,18 @@ void Paragraph::setChange(Change const & change)
 void Paragraph::setChange(pos_type pos, Change const & change)
 {
        BOOST_ASSERT(pos >= 0 && pos <= size());
-
        d->changes_.set(change, pos);
 
        // see comment in setChange(Change const &) above
-
-       if (change.type != Change::DELETED &&
-           pos < size() && isInset(pos)) {
-               getInset(pos)->setChange(change);
-       }
+       if (change.type != Change::DELETED && pos < size())
+                       if (Inset * inset = getInset(pos))
+                               inset->setChange(change);
 }
 
 
 Change const & Paragraph::lookupChange(pos_type pos) const
 {
        BOOST_ASSERT(pos >= 0 && pos <= size());
-
        return d->changes_.lookup(pos);
 }
 
@@ -327,17 +321,15 @@ void Paragraph::acceptChanges(BufferParams const & bparams, pos_type start,
                switch (lookupChange(pos).type) {
                        case Change::UNCHANGED:
                                // accept changes in nested inset
-                               if (pos < size() && isInset(pos))
-                                       getInset(pos)->acceptChanges(bparams);
-
+                               if (Inset * inset = getInset(pos))
+                                       inset->acceptChanges(bparams);
                                break;
 
                        case Change::INSERTED:
                                d->changes_.set(Change(Change::UNCHANGED), pos);
                                // also accept changes in nested inset
-                               if (pos < size() && isInset(pos)) {
-                                       getInset(pos)->acceptChanges(bparams);
-                               }
+                               if (Inset * inset = getInset(pos))
+                                       inset->acceptChanges(bparams);
                                break;
 
                        case Change::DELETED:
@@ -365,9 +357,8 @@ void Paragraph::rejectChanges(BufferParams const & bparams,
                switch (lookupChange(pos).type) {
                        case Change::UNCHANGED:
                                // reject changes in nested inset
-                               if (pos < size() && isInset(pos)) {
-                                       getInset(pos)->rejectChanges(bparams);
-                               }
+                               if (Inset * inset = getInset(pos))
+                                               inset->rejectChanges(bparams);
                                break;
 
                        case Change::INSERTED:
@@ -641,7 +632,7 @@ bool Paragraph::Private::isTextAt(string const & str, pos_type pos) const
 }
 
 
-void Paragraph::Private::latexInset(Buffer const & buf,
+void Paragraph::Private::latexInset(
                                             BufferParams const & bparams,
                                             odocstream & os,
                                             TexRow & texrow,
@@ -659,7 +650,7 @@ void Paragraph::Private::latexInset(Buffer const & buf,
        BOOST_ASSERT(inset);
 
        if (style.pass_thru) {
-               inset->plaintext(buf, os, runparams);
+               inset->plaintext(os, runparams);
                return;
        }
 
@@ -752,7 +743,7 @@ void Paragraph::Private::latexInset(Buffer const & buf,
                }
        }
 
-       int tmp = inset->latex(buf, os, runparams);
+       int tmp = inset->latex(os, runparams);
 
        if (close) {
        if (running_font.language()->lang() == "farsi")
@@ -1043,8 +1034,12 @@ void Paragraph::Private::validate(LaTeXFeatures & features,
 //
 /////////////////////////////////////////////////////////////////////
 
-Paragraph::Paragraph()
-       : d(new Paragraph::Private(this))
+namespace {
+       Layout const emptyParagraphLayout;
+}
+
+Paragraph::Paragraph() 
+       : d(new Paragraph::Private(this, emptyParagraphLayout))
 {
        itemdepth = 0;
        d->params_.clear();
@@ -1055,6 +1050,7 @@ Paragraph::Paragraph(Paragraph const & par)
        : itemdepth(par.itemdepth),
        d(new Paragraph::Private(*par.d, this))
 {
+       registerWords();
 }
 
 
@@ -1064,8 +1060,10 @@ Paragraph & Paragraph::operator=(Paragraph const & par)
        if (&par != this) {
                itemdepth = par.itemdepth;
 
+               deregisterWords();
                delete d;
                d = new Private(*par.d, this);
+               registerWords();
        }
        return *this;
 }
@@ -1073,23 +1071,23 @@ Paragraph & Paragraph::operator=(Paragraph const & par)
 
 Paragraph::~Paragraph()
 {
+       deregisterWords();
        delete d;
 }
 
 
-void Paragraph::write(Buffer const & buf, ostream & os,
-                         BufferParams const & bparams,
-                         depth_type & dth) const
+void Paragraph::write(ostream & os, BufferParams const & bparams,
+       depth_type & dth) const
 {
        // The beginning or end of a deeper (i.e. nested) area?
-       if (dth != params().depth()) {
-               if (params().depth() > dth) {
-                       while (params().depth() > dth) {
+       if (dth != d->params_.depth()) {
+               if (d->params_.depth() > dth) {
+                       while (d->params_.depth() > dth) {
                                os << "\n\\begin_deeper";
                                ++dth;
                        }
                } else {
-                       while (params().depth() < dth) {
+                       while (d->params_.depth() < dth) {
                                os << "\n\\end_deeper";
                                --dth;
                        }
@@ -1097,9 +1095,9 @@ void Paragraph::write(Buffer const & buf, ostream & os,
        }
 
        // First write the layout
-       os << "\n\\begin_layout " << to_utf8(layout()->name()) << '\n';
+       os << "\n\\begin_layout " << to_utf8(d->layout_->name()) << '\n';
 
-       params().write(os);
+       d->params_.write(os);
 
        Font font1(inherit_font, bparams.language);
 
@@ -1126,24 +1124,22 @@ void Paragraph::write(Buffer const & buf, ostream & os,
                char_type const c = d->text_[i];
                switch (c) {
                case META_INSET:
-               {
-                       Inset const * inset = getInset(i);
-                       if (inset)
+                       if (Inset const * inset = getInset(i)) {
                                if (inset->directWrite()) {
                                        // international char, let it write
                                        // code directly so it's shorter in
                                        // the file
-                                       inset->write(buf, os);
+                                       inset->write(os);
                                } else {
                                        if (i)
                                                os << '\n';
                                        os << "\\begin_inset ";
-                                       inset->write(buf, os);
+                                       inset->write(os);
                                        os << "\n\\end_inset\n\n";
                                        column = 0;
                                }
-               }
-               break;
+                       }
+                       break;
                case '\\':
                        os << "\n\\backslash\n";
                        column = 0;
@@ -1163,11 +1159,9 @@ void Paragraph::write(Buffer const & buf, ostream & os,
                        }
                        // this check is to amend a bug. LyX sometimes
                        // inserts '\0' this could cause problems.
-                       if (c != '\0') {
-                               vector<char> tmp = ucs4_to_utf8(c);
-                               tmp.push_back('\0');
-                               os << &tmp[0];
-                       } else
+                       if (c != '\0')
+                               os << to_utf8(docstring(1, c));
+                       else
                                lyxerr << "ERROR (Paragraph::writeFile):"
                                        " NULL char in structure." << endl;
                        ++column;
@@ -1181,7 +1175,7 @@ void Paragraph::write(Buffer const & buf, ostream & os,
 
 void Paragraph::validate(LaTeXFeatures & features) const
 {
-       d->validate(features, *layout());
+       d->validate(features, *d->layout_);
 }
 
 
@@ -1359,7 +1353,7 @@ Font const Paragraph::getFont(BufferParams const & bparams, pos_type pos,
 Font const Paragraph::getLabelFont
        (BufferParams const & bparams, Font const & outerfont) const
 {
-       FontInfo tmpfont = layout()->labelfont;
+       FontInfo tmpfont = d->layout_->labelfont;
        tmpfont.realize(outerfont.fontInfo());
        tmpfont.realize(bparams.getFont().fontInfo());
        return Font(tmpfont, getParLanguage(bparams));
@@ -1369,7 +1363,7 @@ Font const Paragraph::getLabelFont
 Font const Paragraph::getLayoutFont
        (BufferParams const & bparams, Font const & outerfont) const
 {
-       FontInfo tmpfont = layout()->font;
+       FontInfo tmpfont = d->layout_->font;
        tmpfont.realize(outerfont.fontInfo());
        tmpfont.realize(bparams.getFont().fontInfo());
        return Font(tmpfont, getParLanguage(bparams));
@@ -1439,9 +1433,8 @@ void Paragraph::setFont(pos_type pos, Font const & font)
 
 void Paragraph::makeSameLayout(Paragraph const & par)
 {
-       layout(par.layout());
-       // move to pimpl?
-       d->params_ = par.params();
+       d->layout_ = par.d->layout_;
+       d->params_ = par.d->params_;
 }
 
 
@@ -1466,45 +1459,46 @@ bool Paragraph::stripLeadingSpaces(bool trackChanges)
 
 bool Paragraph::hasSameLayout(Paragraph const & par) const
 {
-       return par.layout() == layout() && d->params_.sameLayout(par.params());
+       return par.d->layout_ == d->layout_
+               && d->params_.sameLayout(par.d->params_);
 }
 
 
 depth_type Paragraph::getDepth() const
 {
-       return params().depth();
+       return d->params_.depth();
 }
 
 
 depth_type Paragraph::getMaxDepthAfter() const
 {
-       if (layout()->isEnvironment())
-               return params().depth() + 1;
+       if (d->layout_->isEnvironment())
+               return d->params_.depth() + 1;
        else
-               return params().depth();
+               return d->params_.depth();
 }
 
 
 char Paragraph::getAlign() const
 {
-       if (params().align() == LYX_ALIGN_LAYOUT)
-               return layout()->align;
+       if (d->params_.align() == LYX_ALIGN_LAYOUT)
+               return d->layout_->align;
        else
-               return params().align();
+               return d->params_.align();
 }
 
 
-docstring const & Paragraph::getLabelstring() const
+docstring const & Paragraph::labelString() const
 {
-       return params().labelString();
+       return d->params_.labelString();
 }
 
 
 // the next two functions are for the manual labels
 docstring const Paragraph::getLabelWidthString() const
 {
-       if (layout()->margintype == MARGIN_MANUAL)
-               return params().labelWidthString();
+       if (d->layout_->margintype == MARGIN_MANUAL)
+               return d->params_.labelWidthString();
        else
                return _("Senseless with this layout!");
 }
@@ -1512,7 +1506,7 @@ docstring const Paragraph::getLabelWidthString() const
 
 void Paragraph::setLabelWidthString(docstring const & s)
 {
-       params().labelWidthString(s);
+       d->params_.labelWidthString(s);
 }
 
 
@@ -1530,21 +1524,21 @@ docstring const Paragraph::translateIfPossible(docstring const & s,
 }
 
 
-docstring Paragraph::expandLabel(LayoutPtr const & layout,
+docstring Paragraph::expandLabel(Layout const & layout,
                BufferParams const & bparams, bool process_appendix) const
 {
-       TextClass const & tclass = bparams.getTextClass();
+       DocumentClass const & tclass = bparams.documentClass();
 
        docstring fmt;
-       if (process_appendix && params().appendix())
-               fmt = translateIfPossible(layout->labelstring_appendix(),
+       if (process_appendix && d->params_.appendix())
+               fmt = translateIfPossible(layout.labelstring_appendix(),
                        bparams);
        else
-               fmt = translateIfPossible(layout->labelstring(), bparams);
+               fmt = translateIfPossible(layout.labelstring(), bparams);
 
-       if (fmt.empty() && layout->labeltype == LABEL_COUNTER 
-           && !layout->counter.empty())
-               fmt = "\\the" + layout->counter;
+       if (fmt.empty() && layout.labeltype == LABEL_COUNTER 
+           && !layout.counter.empty())
+               fmt = "\\the" + layout.counter;
 
        // handle 'inherited level parts' in 'fmt',
        // i.e. the stuff between '@' in   '@Section@.\arabic{subsection}'
@@ -1566,15 +1560,15 @@ docstring Paragraph::expandLabel(LayoutPtr const & layout,
 }
 
 
-void Paragraph::applyLayout(LayoutPtr const & new_layout)
+void Paragraph::applyLayout(Layout const & new_layout)
 {
-       layout(new_layout);
-       LyXAlignment const oldAlign = params().align();
+       d->layout_ = &new_layout;
+       LyXAlignment const oldAlign = d->params_.align();
        
-       if (!(oldAlign & layout()->alignpossible)) {
+       if (!(oldAlign & d->layout_->alignpossible)) {
                frontend::Alert::warning(_("Alignment not permitted"), 
                        _("The new layout does not permit the alignment previously used.\nSetting to default."));
-               params().align(LYX_ALIGN_LAYOUT);
+               d->params_.align(LYX_ALIGN_LAYOUT);
        }
 }
 
@@ -1587,7 +1581,7 @@ pos_type Paragraph::beginOfBody() const
 
 void Paragraph::setBeginOfBody()
 {
-       if (layout()->labeltype != LABEL_MANUAL) {
+       if (d->layout_->labeltype != LABEL_MANUAL) {
                d->begin_of_body_ = 0;
                return;
        }
@@ -1620,9 +1614,21 @@ void Paragraph::setBeginOfBody()
 }
 
 
-bool Paragraph::forceDefaultParagraphs() const
+bool Paragraph::forceEmptyLayout() const
+{
+       return inInset() && inInset()->forceEmptyLayout();
+}
+
+
+bool Paragraph::allowParagraphCustomization() const
+{
+       return inInset() && inInset()->allowParagraphCustomization(0);
+}
+
+
+bool Paragraph::useEmptyLayout() const
 {
-       return inInset() && inInset()->forceDefaultParagraphs(0);
+       return inInset() && inInset()->useEmptyLayout();
 }
 
 
@@ -1807,8 +1813,7 @@ int Paragraph::Private::endTeXParParams(BufferParams const & bparams,
 
 
 // This one spits out the text of the paragraph
-bool Paragraph::latex(Buffer const & buf,
-                               BufferParams const & bparams,
+bool Paragraph::latex(BufferParams const & bparams,
                                Font const & outerfont,
                                odocstream & os, TexRow & texrow,
                                OutputParams const & runparams) const
@@ -1817,20 +1822,11 @@ bool Paragraph::latex(Buffer const & buf,
 
        bool return_value = false;
 
-       LayoutPtr style;
-
-       // well we have to check if we are in an inset with unlimited
-       // length (all in one row) if that is true then we don't allow
-       // any special options in the paragraph and also we don't allow
-       // any environment other than the default layout of the text class
-       // to be valid!
-       bool asdefault = forceDefaultParagraphs();
+       bool asdefault = forceEmptyLayout();
 
-       if (asdefault) {
-               style = bparams.getTextClass().defaultLayout();
-       } else {
-               style = layout();
-       }
+       Layout const & style = asdefault ?
+               bparams.documentClass().emptyLayout() :
+               *d->layout_;
 
        // Current base font for all inherited font changes, without any
        // change caused by an individual character, except for the language:
@@ -1865,7 +1861,7 @@ bool Paragraph::latex(Buffer const & buf,
 
        // if the paragraph is empty, the loop will not be entered at all
        if (empty()) {
-               if (style->isCommand()) {
+               if (style.isCommand()) {
                        os << '{';
                        ++column;
                }
@@ -1894,7 +1890,7 @@ bool Paragraph::latex(Buffer const & buf,
                                os << "}] ";
                                column +=3;
                        }
-                       if (style->isCommand()) {
+                       if (style.isCommand()) {
                                os << '{';
                                ++column;
                        }
@@ -1994,13 +1990,13 @@ bool Paragraph::latex(Buffer const & buf,
                if (c == ' ') {
                        // FIXME: integrate this case in latexSpecialChar
                        // Do not print the separation of the optional argument
-                       // if style->pass_thru is false. This works because
+                       // if style.pass_thru is false. This works because
                        // latexSpecialChar ignores spaces if
-                       // style->pass_thru is false.
+                       // style.pass_thru is false.
                        if (i != body_pos - 1) {
                                if (d->simpleTeXBlanks(
                                                runparams, os, texrow,
-                                               i, column, font, *style)) {
+                                               i, column, font, style)) {
                                        // A surrogate pair was output. We
                                        // must not call latexSpecialChar
                                        // in this iteration, since it would output
@@ -2012,21 +2008,36 @@ bool Paragraph::latex(Buffer const & buf,
                }
 
                OutputParams rp = runparams;
-               rp.free_spacing = style->free_spacing;
+               rp.free_spacing = style.free_spacing;
                rp.local_font = &font;
-               rp.intitle = style->intitle;
+               rp.intitle = style.intitle;
 
                // 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(buf, bparams, os,
+                       d->latexInset(bparams, os,
                                        texrow, rp, running_font,
                                        basefont, outerfont, open_font,
-                                       runningChange, *style, i, column);
-               else
-                       d->latexSpecialChar(os, rp, running_font, runningChange,
-                               *style, i, column);
+                                       runningChange, style, i, column);
+               else {
+                       try {
+                               d->latexSpecialChar(os, rp, running_font, runningChange,
+                                       style, i, column);
+                       } catch (EncodingException & e) {
+                               if (runparams.dryrun) {
+                                       os << "<" << _("LyX Warning: ")
+                                          << _("uncodable character") << " '";
+                                       os.put(c);
+                                       os << "'>";
+                               } else {
+                                       // add location information and throw again.
+                                       e.par_id = id();
+                                       e.pos = i;
+                                       throw(e);
+                               }
+                       }
+               }
 
                // Set the encoding to that returned from simpleTeXSpecialChars (see
                // comment for encoding member in OutputParams.h)
@@ -2075,8 +2086,7 @@ bool Paragraph::latex(Buffer const & buf,
 bool Paragraph::emptyTag() const
 {
        for (pos_type i = 0; i < size(); ++i) {
-               if (isInset(i)) {
-                       Inset const * inset = getInset(i);
+               if (Inset const * inset = getInset(i)) {
                        InsetCode lyx_code = inset->lyxCode();
                        if (lyx_code != TOC_CODE &&
                            lyx_code != INCLUDE_CODE &&
@@ -2097,11 +2107,11 @@ bool Paragraph::emptyTag() const
 }
 
 
-string Paragraph::getID(Buffer const & buf, OutputParams const & runparams) const
+string Paragraph::getID(Buffer const & buf, OutputParams const & runparams)
+       const
 {
        for (pos_type i = 0; i < size(); ++i) {
-               if (isInset(i)) {
-                       Inset const * inset = getInset(i);
+               if (Inset const * inset = getInset(i)) {
                        InsetCode lyx_code = inset->lyxCode();
                        if (lyx_code == LABEL_CODE) {
                                InsetLabel const * const il = static_cast<InsetLabel const *>(inset);
@@ -2109,19 +2119,18 @@ string Paragraph::getID(Buffer const & buf, OutputParams const & runparams) cons
                                return "id='" + to_utf8(sgml::cleanID(buf, runparams, id)) + "'";
                        }
                }
-
        }
        return string();
 }
 
 
-pos_type Paragraph::getFirstWord(Buffer const & buf, odocstream & os, OutputParams const & runparams) const
+pos_type Paragraph::firstWord(odocstream & os, OutputParams const & runparams)
+       const
 {
        pos_type i;
        for (i = 0; i < size(); ++i) {
-               if (isInset(i)) {
-                       Inset const * inset = getInset(i);
-                       inset->docbook(buf, os, runparams);
+               if (Inset const * inset = getInset(i)) {
+                       inset->docbook(os, runparams);
                } else {
                        char_type c = d->text_[i];
                        if (c == ' ')
@@ -2158,11 +2167,11 @@ void Paragraph::simpleDocBookOnePar(Buffer const & buf,
 {
        bool emph_flag = false;
 
-       LayoutPtr const & style = layout();
+       Layout const & style = *d->layout_;
        FontInfo font_old =
-               style->labeltype == LABEL_MANUAL ? style->labelfont : style->font;
+               style.labeltype == LABEL_MANUAL ? style.labelfont : style.font;
 
-       if (style->pass_thru && !d->onlyText(buf, outerfont, initial))
+       if (style.pass_thru && !d->onlyText(buf, outerfont, initial))
                os << "]]>";
 
        // parsing main loop
@@ -2180,13 +2189,12 @@ void Paragraph::simpleDocBookOnePar(Buffer const & buf,
                        }
                }
 
-               if (isInset(i)) {
-                       Inset const * inset = getInset(i);
-                       inset->docbook(buf, os, runparams);
+               if (Inset const * inset = getInset(i)) {
+                       inset->docbook(os, runparams);
                } else {
                        char_type c = d->text_[i];
 
-                       if (style->pass_thru)
+                       if (style.pass_thru)
                                os.put(c);
                        else
                                os << sgml::escapeChar(c);
@@ -2198,45 +2206,44 @@ void Paragraph::simpleDocBookOnePar(Buffer const & buf,
                os << "</emphasis>";
        }
 
-       if (style->free_spacing)
+       if (style.free_spacing)
                os << '\n';
-       if (style->pass_thru && !d->onlyText(buf, outerfont, initial))
+       if (style.pass_thru && !d->onlyText(buf, outerfont, initial))
                os << "<![CDATA[";
 }
 
 
 bool Paragraph::isHfill(pos_type pos) const
 {
-       return isInset(pos)
-               && getInset(pos)->lyxCode() == HFILL_CODE;
+       Inset const * inset = getInset(pos);
+       return inset && inset->lyxCode() == HFILL_CODE;
 }
 
 
 bool Paragraph::isNewline(pos_type pos) const
 {
-       return isInset(pos)
-               && getInset(pos)->lyxCode() == NEWLINE_CODE;
+       Inset const * inset = getInset(pos);
+       return inset && inset->lyxCode() == NEWLINE_CODE;
 }
 
 
 bool Paragraph::isLineSeparator(pos_type pos) const
 {
        char_type const c = d->text_[pos];
-       return isLineSeparatorChar(c)
-               || (c == META_INSET && getInset(pos) &&
-               getInset(pos)->isLineSeparator());
+       if (isLineSeparatorChar(c))
+               return true;
+       Inset const * inset = getInset(pos);
+       return inset && inset->isLineSeparator();
 }
 
 
 /// Used by the spellchecker
 bool Paragraph::isLetter(pos_type pos) const
 {
-       if (isInset(pos))
-               return getInset(pos)->isLetter();
-       else {
-               char_type const c = d->text_[pos];
-               return isLetterChar(c) || isDigit(c);
-       }
+       if (Inset const * inset = getInset(pos))
+               return inset->isLetter();
+       char_type const c = d->text_[pos];
+       return isLetterChar(c) || isDigit(c);
 }
 
 
@@ -2288,29 +2295,26 @@ bool Paragraph::isMultiLingual(BufferParams const & bparams) const
 }
 
 
-// Convert the paragraph to a string.
-// Used for building the table of contents
-docstring const Paragraph::asString(Buffer const & buffer, bool label) const
+docstring Paragraph::asString(bool label) const
 {
-       return asString(buffer, 0, size(), label);
+       return asString(0, size(), label);
 }
 
 
-docstring const Paragraph::asString(Buffer const & buffer,
-                                pos_type beg, pos_type end, bool label) const
+docstring Paragraph::asString(pos_type beg, pos_type end, bool label) const
 {
 
        odocstringstream os;
 
-       if (beg == 0 && label && !params().labelString().empty())
-               os << params().labelString() << ' ';
+       if (beg == 0 && 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))
                        os.put(c);
                else if (c == META_INSET)
-                       getInset(i)->textString(buffer, os);
+                       getInset(i)->textString(os);
        }
 
        return os.str();
@@ -2329,15 +2333,24 @@ int Paragraph::id() const
 }
 
 
-LayoutPtr const & Paragraph::layout() const
+Layout const & Paragraph::layout() const
 {
-       return d->layout_;
+       return *d->layout_;
 }
 
 
-void Paragraph::layout(LayoutPtr const & new_layout)
+void Paragraph::setLayout(Layout const & layout)
 {
-       d->layout_ = new_layout;
+       d->layout_ = &layout;
+}
+
+
+void Paragraph::setEmptyOrDefaultLayout(DocumentClass const & tclass)
+{
+       if (useEmptyLayout())
+               setLayout(tclass.emptyLayout());
+       else
+               setLayout(tclass.defaultLayout());
 }
 
 
@@ -2349,8 +2362,7 @@ Inset * Paragraph::inInset() const
 
 InsetCode Paragraph::ownerCode() const
 {
-       return d->inset_owner_ ?
-               d->inset_owner_->lyxCode() : NO_CODE;
+       return d->inset_owner_ ? d->inset_owner_->lyxCode() : NO_CODE;
 }
 
 
@@ -2368,7 +2380,7 @@ ParagraphParameters const & Paragraph::params() const
 
 bool Paragraph::isFreeSpacing() const
 {
-       if (layout()->free_spacing)
+       if (d->layout_->free_spacing)
                return true;
        return d->inset_owner_ && d->inset_owner_->isFreeSpacing();
 }
@@ -2376,7 +2388,7 @@ bool Paragraph::isFreeSpacing() const
 
 bool Paragraph::allowEmpty() const
 {
-       if (layout()->keepempty)
+       if (d->layout_->keepempty)
                return true;
        return d->inset_owner_ && d->inset_owner_->allowEmpty();
 }
@@ -2422,14 +2434,14 @@ char_type Paragraph::transformChar(char_type c, pos_type pos) const
 }
 
 
-int Paragraph::checkBiblio(bool track_changes)
+int Paragraph::checkBiblio(Buffer const & buffer)
 {
-       //FIXME From JS:
-       //This is getting more and more a mess. ...We really should clean
-       //up this bibitem issue for 1.6. See also bug 2743.
+       // FIXME From JS:
+       // This is getting more and more a mess. ...We really should clean
+       // up this bibitem issue for 1.6. See also bug 2743.
 
        // Add bibitem insets if necessary
-       if (layout()->labeltype != LABEL_BIBLIO)
+       if (d->layout_->labeltype != LABEL_BIBLIO)
                return 0;
 
        bool hasbibitem = !d->insetlist_.empty()
@@ -2437,6 +2449,8 @@ int Paragraph::checkBiblio(bool track_changes)
                && d->text_[0] == META_INSET
                && d->insetlist_.begin()->inset->lyxCode() == BIBITEM_CODE;
 
+       bool track_changes = buffer.params().trackChanges;
+
        docstring oldkey;
        docstring oldlabel;
 
@@ -2459,13 +2473,13 @@ int Paragraph::checkBiblio(bool track_changes)
                        break;
        }
 
-       //There was an InsetBibitem at the beginning, and we didn't
-       //have to erase one.
+       // There was an InsetBibitem at the beginning, and we didn't
+       // have to erase one.
        if (hasbibitem && erasedInsetPosition < 0)
                        return 0;
 
-       //There was an InsetBibitem at the beginning and we did have to
-       //erase one. So we give its properties to the beginning inset.
+       // There was an InsetBibitem at the beginning and we did have to
+       // erase one. So we give its properties to the beginning inset.
        if (hasbibitem) {
                InsetBibitem * inset =
                        static_cast<InsetBibitem *>(d->insetlist_.begin()->inset);
@@ -2475,9 +2489,10 @@ int Paragraph::checkBiblio(bool track_changes)
                return -erasedInsetPosition;
        }
 
-       //There was no inset at the beginning, so we need to create one with
-       //the key and label of the one we erased.
-       InsetBibitem * inset(new InsetBibitem(InsetCommandParams(BIBITEM_CODE)));
+       // There was no inset at the beginning, so we need to create one with
+       // the key and label of the one we erased.
+       InsetBibitem * inset = new InsetBibitem(InsetCommandParams(BIBITEM_CODE));
+       inset->setBuffer(const_cast<Buffer &>(buffer));
        // restore values of previously deleted item in this par.
        if (!oldkey.empty())
                inset->setParam("key", oldkey);
@@ -2489,18 +2504,6 @@ int Paragraph::checkBiblio(bool track_changes)
 }
 
 
-unsigned int Paragraph::macrocontextPosition() const
-{
-       return d->macrocontext_position_;
-}
-
-
-void Paragraph::setMacrocontextPosition(unsigned int pos)
-{
-       d->macrocontext_position_ = pos;
-}
-
-
 void Paragraph::checkAuthors(AuthorList const & authorList)
 {
        d->changes_.checkAuthors(authorList);
@@ -2542,18 +2545,20 @@ Inset * Paragraph::releaseInset(pos_type pos)
 
 Inset * Paragraph::getInset(pos_type pos)
 {
-       return d->insetlist_.get(pos);
+       return (pos < pos_type(d->text_.size()) && d->text_[pos] == META_INSET)
+                ? d->insetlist_.get(pos) : 0;
 }
 
 
 Inset const * Paragraph::getInset(pos_type pos) const
 {
-       return d->insetlist_.get(pos);
+       return (pos < pos_type(d->text_.size()) && d->text_[pos] == META_INSET)
+                ? d->insetlist_.get(pos) : 0;
 }
 
 
 void Paragraph::changeCase(BufferParams const & bparams, pos_type pos,
-               pos_type right, TextCase action)
+               pos_type right, TextCase action)
 {
        // process sequences of modified characters; in change
        // tracking mode, this approach results in much better
@@ -2681,4 +2686,66 @@ bool Paragraph::isSeparator(pos_type pos) const
 }
 
 
+void Paragraph::deregisterWords()
+{
+       Private::Words::const_iterator it;
+       WordList & wl = theWordList();
+       for (it = d->words_.begin(); it != d->words_.end(); ++it)
+               wl.remove(*it);
+       d->words_.clear();
+}
+
+
+void Paragraph::collectWords(CursorSlice const & sl)
+{
+       // find new words
+       bool inword = false;
+
+       //lyxerr << "Words: ";
+       pos_type n = size();
+       for (pos_type pos = 0; pos != n; ++pos) {
+               if (isDeleted(pos))
+                       continue;
+
+               if (!isLetter(pos)) {
+                       inword = false;
+                       continue;
+               }
+
+               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)
+                       continue;
+               docstring word = asString(from.pos(), to.pos(), false);
+               d->words_.insert(word);
+               //lyxerr << word << " ";
+       }
+       //lyxerr << std::endl;
+}
+
+
+void Paragraph::registerWords()
+{
+       Private::Words::const_iterator it;
+       WordList & wl = theWordList();
+       for (it = d->words_.begin(); it != d->words_.end(); ++it)
+               wl.insert(*it);
+}
+
+
+void Paragraph::updateWords(CursorSlice const & sl)
+{
+       BOOST_ASSERT(&sl.paragraph() == this);
+       deregisterWords();
+       collectWords(sl);
+       registerWords();
+}
+
 } // namespace lyx