]> git.lyx.org Git - lyx.git/blobdiff - src/paragraph.C
remove noload/don't typeset
[lyx.git] / src / paragraph.C
index f92968bac2cf75f008b6f518700e99fcd21928cd..e425d46f4d0f06f20ea99543b65ef63e0d0ce124 100644 (file)
 #include "buffer.h"
 #include "bufferparams.h"
 #include "debug.h"
-#include "LaTeXFeatures.h"
 #include "texrow.h"
 #include "BufferView.h"
 #include "encoding.h"
 #include "ParameterStruct.h"
 #include "gettext.h"
-#include "lyxtextclasslist.h"
 
-#include "insets/insetinclude.h"
 #include "insets/insetbib.h"
-#include "insets/insettext.h"
+#include "insets/insetoptarg.h"
 
 #include "support/filetools.h"
 #include "support/lstrings.h"
@@ -56,7 +53,6 @@ using std::reverse;
 
 using lyx::pos_type;
 
-int tex_code_break_column = 72;  // needs non-zero initialization. set later.
 // this is a bad idea, but how can Paragraph find its buffer to get
 // parameters? (JMarc)
 
@@ -79,10 +75,10 @@ extern BufferView * current_view;
 Paragraph::Paragraph()
        : pimpl_(new Paragraph::Pimpl(this))
 {
-       for (int i = 0; i < 10; ++i)
-               setCounter(i, 0);
+#ifndef NO_NEXT
        next_ = 0;
        previous_ = 0;
+#endif
        enumdepth = 0;
        itemdepth = 0;
        bibkey = 0; // ale970302
@@ -90,12 +86,11 @@ Paragraph::Paragraph()
 }
 
 
+#ifndef NO_NEXT
 // This constructor inserts the new paragraph in a list.
 Paragraph::Paragraph(Paragraph * par)
        : pimpl_(new Paragraph::Pimpl(this))
 {
-       for (int i = 0; i < 10; ++i)
-               setCounter(i, 0);
        enumdepth = 0;
        itemdepth = 0;
 
@@ -110,18 +105,18 @@ Paragraph::Paragraph(Paragraph * par)
        bibkey = 0; // ale970302
        params().clear();
 }
+#endif
 
 
 Paragraph::Paragraph(Paragraph const & lp, bool same_ids)
        : pimpl_(new Paragraph::Pimpl(*lp.pimpl_, this, same_ids))
 {
-       for (int i = 0; i < 10; ++i)
-               setCounter(i, 0);
        enumdepth = 0;
        itemdepth = 0;
+#ifndef NO_NEXT
        next_     = 0;
        previous_ = 0;
-
+#endif
        // this is because of the dummy layout of the paragraphs that
        // follow footnotes
        layout_ = lp.layout();
@@ -136,12 +131,13 @@ Paragraph::Paragraph(Paragraph const & lp, bool same_ids)
 
        // copy everything behind the break-position to the new paragraph
        insetlist = lp.insetlist;
-       for (InsetList::iterator it = insetlist.begin();
-            it != insetlist.end(); ++it)
-       {
-               it->inset = it->inset->clone(*current_view->buffer(), same_ids);
+       InsetList::iterator it = insetlist.begin();
+       InsetList::iterator end = insetlist.end();
+       for (; it != end; ++it) {
+               it.setInset(it.getInset()->clone(*current_view->buffer(),
+                                                same_ids));
                // tell the new inset who is the boss now
-               it->inset->parOwner(this);
+               it.getInset()->parOwner(this);
        }
 }
 
@@ -149,15 +145,12 @@ Paragraph::Paragraph(Paragraph const & lp, bool same_ids)
 // the destructor removes the new paragraph from the list
 Paragraph::~Paragraph()
 {
+#ifndef NO_NEXT
        if (previous_)
                previous_->next_ = next_;
        if (next_)
                next_->previous_ = previous_;
-
-       for (InsetList::iterator it = insetlist.begin();
-            it != insetlist.end(); ++it) {
-               delete it->inset;
-       }
+#endif
 
        // ale970302
        delete bibkey;
@@ -169,9 +162,9 @@ Paragraph::~Paragraph()
 }
 
 
-void Paragraph::writeFile(Buffer const * buf, ostream & os,
+void Paragraph::write(Buffer const * buf, ostream & os,
                          BufferParams const & bparams,
-                         depth_type dth) const
+                         depth_type dth) const
 {
        // The beginning or end of a deeper (i.e. nested) area?
        if (dth != params().depth()) {
@@ -259,11 +252,7 @@ void Paragraph::writeFile(Buffer const * buf, ostream & os,
                // Write font changes
                LyXFont font2 = getFontSettings(bparams, i);
                if (font2 != font1) {
-#ifndef INHERIT_LANGUAGE
                        font2.lyxWriteChanges(font1, os);
-#else
-                       font2.lyxWriteChanges(font1, bparams.language, os);
-#endif
                        column = 0;
                        font1 = font2;
                }
@@ -323,87 +312,12 @@ void Paragraph::writeFile(Buffer const * buf, ostream & os,
                        break;
                }
        }
-
-       // now write the next paragraph
-       if (next_)
-               next_->writeFile(buf, os, bparams, dth);
 }
 
 
 void Paragraph::validate(LaTeXFeatures & features) const
 {
-       BufferParams const & bparams = features.bufferParams();
-
-       // check the params.
-       if (params().lineTop() || params().lineBottom())
-               features.require("lyxline");
-       if (!params().spacing().isDefault())
-               features.require("setspace");
-
-       // then the layouts
-       features.useLayout(layout()->name());
-
-       // then the fonts
-       Language const * doc_language = bparams.language;
-
-       Pimpl::FontList::const_iterator fcit = pimpl_->fontlist.begin();
-       Pimpl::FontList::const_iterator fend = pimpl_->fontlist.end();
-       for (; fcit != fend; ++fcit) {
-               if (fcit->font().noun() == LyXFont::ON) {
-                       lyxerr[Debug::LATEX] << "font.noun: "
-                                            << fcit->font().noun()
-                                            << endl;
-                       features.require("noun");
-                       lyxerr[Debug::LATEX] << "Noun enabled. Font: "
-                                            << fcit->font().stateText(0)
-                                            << endl;
-               }
-               switch (fcit->font().color()) {
-               case LColor::none:
-               case LColor::inherit:
-               case LColor::ignore:
-                       // probably we should put here all interface colors used for
-                       // font displaying! For now I just add this ones I know of (Jug)
-               case LColor::latex:
-               case LColor::note:
-                       break;
-               default:
-                       features.require("color");
-                       lyxerr[Debug::LATEX] << "Color enabled. Font: "
-                                            << fcit->font().stateText(0)
-                                            << endl;
-               }
-
-               Language const * language = fcit->font().language();
-               if (language->babel() != doc_language->babel() &&
-                   language != ignore_language &&
-#ifdef INHERIT_LANGUAGE
-                   language != inherit_language &&
-#endif
-                   language != latex_language)
-               {
-                       features.useLanguage(language);
-                       lyxerr[Debug::LATEX] << "Found language "
-                                            << language->babel() << endl;
-               }
-       }
-
-       if (!params().leftIndent().zero())
-               features.require("ParagraphLeftIndent");
-
-       // then the insets
-       LyXLayout_ptr const & lout = layout();
-
-       InsetList::const_iterator icit = insetlist.begin();
-       InsetList::const_iterator iend = insetlist.end();
-       for (; icit != iend; ++icit) {
-               if (icit->inset) {
-                       icit->inset->validate(features);
-                       if (lout->needprotect &&
-                           icit->inset->lyxCode() == Inset::FOOT_CODE)
-                               features.require("NeedLyXFootnoteCode");
-               }
-       }
+       pimpl_->validate(features, *layout());
 }
 
 
@@ -434,21 +348,8 @@ void Paragraph::cutIntoMinibuffer(BufferParams const & bparams, pos_type pos)
        minibuffer_inset = 0;
        if (minibuffer_char == Paragraph::META_INSET) {
                if (getInset(pos)) {
-                       minibuffer_inset = getInset(pos);
-                       // This is a little hack since I want exactly
-                       // the inset, not just a clone. Otherwise
-                       // the inset would be deleted when calling Erase(pos)
-                       // find the entry
-                       InsetList::iterator it = insetlist.begin();
-                       InsetList::iterator end = insetlist.end();
-                       for (; it != end; ++it) {
-                               if (it->pos == pos)
-                                       break;
-                       }
-
-                       if (it != end && it->pos == pos)
-                               it->inset = 0;
                        // the inset is not in a paragraph anymore
+                       minibuffer_inset = insetlist.release(pos);
                        minibuffer_inset->parOwner(0);
                } else {
                        minibuffer_inset = 0;
@@ -537,27 +438,7 @@ Inset * Paragraph::getInset(pos_type pos)
 {
        lyx::Assert(pos < size());
 
-       // Find the inset.
-       InsetList::iterator it = insetlist.begin();
-       InsetList::iterator end = insetlist.end();
-       for (; it != end; ++it) {
-               if (it->pos == pos)
-                       break;
-       }
-
-       if (it != end && it->pos == pos)
-               return it->inset;
-
-       lyxerr << "ERROR (Paragraph::getInset): "
-              << "Inset does not exist: " << pos << endl;
-       //::raise(SIGSTOP);
-
-       // text[pos] = ' '; // WHY!!! does this set the pos to ' '????
-       // Did this commenting out introduce a bug? So far I have not
-       // see any, please enlighten me. (Lgb)
-       // My guess is that since the inset does not exist, we might
-       // as well replace it with a space to prevent craches. (Asger)
-       return 0;
+       return insetlist.get(pos);
 }
 
 
@@ -565,26 +446,7 @@ Inset const * Paragraph::getInset(pos_type pos) const
 {
        lyx::Assert(pos < size());
 
-       // Find the inset.
-       InsetList::const_iterator cit = insetlist.begin();
-       InsetList::const_iterator end = insetlist.end();
-       for (; cit != end; ++cit) {
-               if (cit->pos == pos)
-                       break;
-       }
-
-       if (cit != end && cit->pos == pos)
-               return cit->inset;
-
-       lyxerr << "ERROR (Paragraph::getInset): "
-              << "Inset does not exist: " << pos << endl;
-       //::raise(SIGSTOP);
-       //text[pos] = ' '; // WHY!!! does this set the pos to ' '????
-       // Did this commenting out introduce a bug? So far I have not
-       // see any, please enlighten me. (Lgb)
-       // My guess is that since the inset does not exist, we might
-       // as well replace it with a space to prevent craches. (Asger)
-       return 0;
+       return insetlist.get(pos);
 }
 
 
@@ -604,14 +466,10 @@ LyXFont const Paragraph::getFontSettings(BufferParams const & bparams,
        LyXFont retfont;
        if (cit != end) {
                retfont = cit->font();
-       } else if (pos == size() && size()) {
+       } else if (pos == size() && !empty()) {
                retfont = getFontSettings(bparams, pos - 1);
        } else
                retfont = LyXFont(LyXFont::ALL_INHERIT, getParLanguage(bparams));
-#ifdef INHERIT_LANGUAGE
-       if (retfont.language() == inherit_language)
-               retfont.setLanguage(bparams.language);
-#endif
 
        return retfont;
 }
@@ -620,7 +478,7 @@ LyXFont const Paragraph::getFontSettings(BufferParams const & bparams,
 // Gets uninstantiated font setting at position 0
 LyXFont const Paragraph::getFirstFontSettings() const
 {
-       if (size() > 0 && !pimpl_->fontlist.empty())
+       if (!empty() && !pimpl_->fontlist.empty())
                return pimpl_->fontlist[0].font();
 
        return LyXFont(LyXFont::ALL_INHERIT);
@@ -652,11 +510,7 @@ LyXFont const Paragraph::getFont(BufferParams const & bparams,
                layoutfont = lout->font;
 
        LyXFont tmpfont = getFontSettings(bparams, pos);
-#ifndef INHERIT_LANGUAGE
        tmpfont.realize(layoutfont);
-#else
-       tmpfont.realize(layoutfont, bparams.language);
-#endif
 
        return pimpl_->realizeFont(tmpfont, bparams);
 }
@@ -796,7 +650,7 @@ void Paragraph::setFont(pos_type pos, LyXFont const & font)
                        // Merge the singleton block with the next block
                        pimpl_->fontlist.erase(pimpl_->fontlist.begin() + i);
                        if (i > 0 && pimpl_->fontlist[i - 1].font() == font)
-                               pimpl_->fontlist.erase(pimpl_->fontlist.begin() + i-1);
+                               pimpl_->fontlist.erase(pimpl_->fontlist.begin() + i - 1);
                } else if (i > 0 && pimpl_->fontlist[i - 1].font() == font) {
                        // Merge the singleton block with the previous block
                        pimpl_->fontlist[i - 1].pos(pos);
@@ -824,7 +678,7 @@ void Paragraph::setFont(pos_type pos, LyXFont const & font)
 }
 
 
-
+#ifndef NO_NEXT
 void Paragraph::next(Paragraph * p)
 {
        next_ = p;
@@ -862,79 +716,7 @@ Paragraph const * Paragraph::previous() const
 {
        return previous_;
 }
-
-
-void Paragraph::breakParagraph(BufferParams const & bparams,
-                                 pos_type pos,
-                                 int flag)
-{
-       // create a new paragraph
-       Paragraph * tmp = new Paragraph(this);
-       tmp->layout(textclasslist[bparams.textclass].defaultLayout());
-       // remember to set the inset_owner
-       tmp->setInsetOwner(inInset());
-
-       // this is an idea for a more userfriendly layout handling, I will
-       // see what the users say
-
-       // layout stays the same with latex-environments
-       if (flag) {
-               tmp->layout(layout());
-               tmp->setLabelWidthString(params().labelWidthString());
-       }
-
-       bool isempty = (layout()->keepempty && !size());
-
-       if (!isempty && (size() > pos || !size() || flag == 2)) {
-               tmp->layout(layout());
-               tmp->params().align(params().align());
-               tmp->setLabelWidthString(params().labelWidthString());
-
-               tmp->params().lineBottom(params().lineBottom());
-               params().lineBottom(false);
-               tmp->params().pagebreakBottom(params().pagebreakBottom());
-               params().pagebreakBottom(false);
-               tmp->params().spaceBottom(params().spaceBottom());
-               params().spaceBottom(VSpace(VSpace::NONE));
-
-               tmp->params().depth(params().depth());
-               tmp->params().noindent(params().noindent());
-
-               // copy everything behind the break-position
-               // to the new paragraph
-               pos_type pos_end = size() - 1;
-               pos_type i = pos;
-               pos_type j = pos;
-               for (; i <= pos_end; ++i) {
-                       cutIntoMinibuffer(bparams, i);
-                       if (tmp->insertFromMinibuffer(j - pos))
-                               ++j;
-               }
-               for (i = pos_end; i >= pos; --i) {
-                       erase(i);
-               }
-       }
-
-       // just an idea of me
-       if (!isempty && !pos) {
-               tmp->params().lineTop(params().lineTop());
-               tmp->params().pagebreakTop(params().pagebreakTop());
-               tmp->params().spaceTop(params().spaceTop());
-               tmp->bibkey = bibkey;
-
-               bibkey = 0;
-               params().clear();
-
-               layout(textclasslist[bparams.textclass].defaultLayout());
-
-               // layout stays the same with latex-environments
-               if (flag) {
-                       layout(tmp->layout());
-                       setLabelWidthString(tmp->params().labelWidthString());
-                       params().depth(tmp->params().depth());
-               }
-       }
-}
+#endif
 
 
 void Paragraph::makeSameLayout(Paragraph const * par)
@@ -953,7 +735,7 @@ int Paragraph::stripLeadingSpaces()
        }
 
        int i = 0;
-       while (size() && (isNewline(0) || isLineSeparator(0))) {
+       while (!empty() && (isNewline(0) || isLineSeparator(0))) {
                erase(0);
                ++i;
        }
@@ -970,66 +752,6 @@ bool Paragraph::hasSameLayout(Paragraph const * par) const
 }
 
 
-void Paragraph::breakParagraphConservative(BufferParams const & bparams,
-                                          pos_type pos)
-{
-       // create a new paragraph
-       Paragraph * tmp = new Paragraph(this);
-       tmp->makeSameLayout(this);
-
-       // When can pos > Last()?
-       // I guess pos == Last() is possible.
-       if (size() > pos) {
-               // copy everything behind the break-position to the new
-               // paragraph
-               pos_type pos_end = size() - 1;
-
-               //pos_type i = pos;
-               //pos_type j = pos;
-               for (pos_type i = pos, j = pos; i <= pos_end; ++i) {
-                       cutIntoMinibuffer(bparams, i);
-                       if (tmp->insertFromMinibuffer(j - pos))
-                               ++j;
-               }
-
-               for (pos_type k = pos_end; k >= pos; --k) {
-                       erase(k);
-               }
-       }
-}
-
-
-// Be carefull, this does not make any check at all.
-// This method has wrong name, it combined this par with the next par.
-// In that sense it is the reverse of break paragraph. (Lgb)
-void Paragraph::pasteParagraph(BufferParams const & bparams)
-{
-       // copy the next paragraph to this one
-       Paragraph * the_next = next();
-
-       // first the DTP-stuff
-       params().lineBottom(the_next->params().lineBottom());
-       params().spaceBottom(the_next->params().spaceBottom());
-       params().pagebreakBottom(the_next->params().pagebreakBottom());
-
-       pos_type pos_end = the_next->pimpl_->size() - 1;
-       pos_type pos_insert = size();
-
-       // ok, now copy the paragraph
-       for (pos_type i = 0, j = 0; i <= pos_end; ++i) {
-               the_next->cutIntoMinibuffer(bparams, i);
-               if (insertFromMinibuffer(pos_insert + j))
-                       ++j;
-       }
-
-       // delete the next paragraph
-       Paragraph * ppar = the_next->previous_;
-       Paragraph * npar = the_next->next_;
-       delete the_next;
-       ppar->next(npar);
-}
-
-
 int Paragraph::getEndLabel() const
 {
        Paragraph const * par = this;
@@ -1088,12 +810,6 @@ string const & Paragraph::getLabelstring() const
 }
 
 
-int Paragraph::getFirstCounter(int i) const
-{
-       return pimpl_->counter_[i];
-}
-
-
 // the next two functions are for the manual labels
 string const Paragraph::getLabelWidthString() const
 {
@@ -1192,6 +908,7 @@ Paragraph const * Paragraph::depthHook(depth_type depth) const
        return newpar;
 }
 
+
 Paragraph * Paragraph::outerHook()
 {
        if (!getDepth())
@@ -1199,6 +916,7 @@ Paragraph * Paragraph::outerHook()
        return depthHook(depth_type(getDepth() - 1));
 }
 
+
 Paragraph const * Paragraph::outerHook() const
 {
        if (!getDepth())
@@ -1207,37 +925,40 @@ Paragraph const * Paragraph::outerHook() const
 }
 
 
-Paragraph::inset_iterator
-Paragraph::InsetIterator(pos_type pos)
+// returns -1 if inset not found
+int Paragraph::getPositionOfInset(Inset const * inset) const
 {
+       // Find the entry.
        InsetList::iterator it = insetlist.begin();
        InsetList::iterator end = insetlist.end();
        for (; it != end; ++it) {
-               if (it->pos >= pos)
-                       break;
+               if (it.getInset() == inset) {
+                       return it.getPos();
+               }
        }
+       if (inset == bibkey)
+               return 0;
 
-       return inset_iterator(it);
+       return -1;
 }
 
+namespace {
 
-// returns -1 if inset not found
-int Paragraph::getPositionOfInset(Inset const * inset) const
+InsetOptArg * optArgInset(Paragraph const & par)
 {
        // Find the entry.
-       InsetList::const_iterator cit = insetlist.begin();
-       InsetList::const_iterator end = insetlist.end();
-       for (; cit != end; ++cit) {
-               if (cit->inset == inset) {
-                       return cit->pos;
+       InsetList::iterator it = par.insetlist.begin();
+       InsetList::iterator end = par.insetlist.end();
+       for (; it != end; ++it) {
+               Inset * ins = it.getInset();
+               if (ins->lyxCode() == Inset::OPTARG_CODE) {
+                       return static_cast<InsetOptArg *>(ins);
                }
        }
-       if (inset == bibkey)
-               return 0;
-
-       return -1;
+       return 0;
 }
 
+} // end namespace
 
 Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
                                 BufferParams const & bparams,
@@ -1267,7 +988,7 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
                        texrow.newline();
                }
 
-               if (tex_code_break_column && style->isCommand()) {
+               if (style->isCommand()) {
                        os << '\n';
                        texrow.newline();
                }
@@ -1292,7 +1013,7 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
                        texrow.newline();
                }
        } else {
-               style = textclasslist[bparams.textclass].defaultLayout();
+               style = bparams.getLyXTextClass().defaultLayout();
        }
 
        Language const * language = getParLanguage(bparams);
@@ -1336,8 +1057,16 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
        switch (style->latextype) {
        case LATEX_COMMAND:
                os << '\\'
-                  << style->latexname()
-                  << style->latexparam();
+                  << style->latexname();
+
+               // Separate handling of optional argument inset.
+               if (style->optionalargs == 1) {
+                       InsetOptArg * it = optArgInset(*this);
+                       if (it != 0)
+                               it->latexOptional(buf, os, false, false);
+               }
+               else
+                       os << style->latexparam();
                break;
        case LATEX_ITEM_ENVIRONMENT:
                if (bibkey) {
@@ -1364,7 +1093,7 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
        // We do not need to use to change the font for the last paragraph
        // or for a command.
        LyXFont const font =
-               (size() == 0
+               (empty()
                 ? getLayoutFont(bparams) : getFont(bparams, size() - 1));
 
        bool is_command = style->isCommand();
@@ -1459,9 +1188,10 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
        return next_;
 }
 
+
 // This could go to ParagraphParameters if we want to
 int Paragraph::startTeXParParams(BufferParams const & bparams,
-                                ostream & os) const
+                                ostream & os, bool moving_arg) const
 {
        int column = 0;
 
@@ -1470,6 +1200,22 @@ int Paragraph::startTeXParParams(BufferParams const & bparams,
                column += 10;
        }
 
+       switch (params().align()) {
+       case LYX_ALIGN_NONE:
+       case LYX_ALIGN_BLOCK:
+       case LYX_ALIGN_LAYOUT:
+       case LYX_ALIGN_SPECIAL:
+               break;
+       case LYX_ALIGN_LEFT:
+       case LYX_ALIGN_RIGHT:
+       case LYX_ALIGN_CENTER:
+               if (moving_arg) {
+                       os << "\\protect";
+                       column = 8;
+               }
+               break;
+       }
+
        switch (params().align()) {
        case LYX_ALIGN_NONE:
        case LYX_ALIGN_BLOCK:
@@ -1503,12 +1249,29 @@ int Paragraph::startTeXParParams(BufferParams const & bparams,
        return column;
 }
 
+
 // This could go to ParagraphParameters if we want to
 int Paragraph::endTeXParParams(BufferParams const & bparams,
-                              ostream & os) const
+                              ostream & os, bool moving_arg) const
 {
        int column = 0;
 
+       switch (params().align()) {
+       case LYX_ALIGN_NONE:
+       case LYX_ALIGN_BLOCK:
+       case LYX_ALIGN_LAYOUT:
+       case LYX_ALIGN_SPECIAL:
+               break;
+       case LYX_ALIGN_LEFT:
+       case LYX_ALIGN_RIGHT:
+       case LYX_ALIGN_CENTER:
+               if (moving_arg) {
+                       os << "\\protect";
+                       column = 8;
+               }
+               break;
+       }
+
        switch (params().align()) {
        case LYX_ALIGN_NONE:
        case LYX_ALIGN_BLOCK:
@@ -1562,7 +1325,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                (inInset() && inInset()->forceDefaultParagraphs(inInset()));
 
        if (asdefault) {
-               style = textclasslist[bparams.textclass].defaultLayout();
+               style = bparams.getLyXTextClass().defaultLayout();
        } else {
                style = layout();
        }
@@ -1596,13 +1359,13 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
        texrow.start(this, 0);
 
        // if the paragraph is empty, the loop will not be entered at all
-       if (!size()) {
+       if (empty()) {
                if (style->isCommand()) {
                        os << '{';
                        ++column;
                }
                if (!asdefault)
-                       column += startTeXParParams(bparams, os);
+                       column += startTeXParParams(bparams, os, moving_arg);
 
        }
 
@@ -1626,7 +1389,8 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                        }
 
                        if (!asdefault)
-                               column += startTeXParParams(bparams, os);
+                               column += startTeXParParams(bparams, os,
+                                                           moving_arg);
                }
 
                value_type c = getChar(i);
@@ -1741,7 +1505,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
        }
 
        if (!asdefault) {
-               column += endTeXParParams(bparams, os);
+               column += endTeXParParams(bparams, os, moving_arg);
        }
 
        lyxerr[Debug::LATEX] << "SimpleTeXOnePar...done " << this << endl;
@@ -1749,70 +1513,6 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 }
 
 
-bool Paragraph::sgmlConvertChar(char c, string & sgml_string)
-{
-       bool retval = false;
-       switch (c) {
-       case Paragraph::META_HFILL:
-               sgml_string.erase();
-               break;
-       case Paragraph::META_NEWLINE:
-               sgml_string = '\n';
-               break;
-       case '&':
-               sgml_string = "&amp;";
-               break;
-       case '<':
-               sgml_string = "&lt;";
-               break;
-       case '>':
-               sgml_string = "&gt;";
-               break;
-       case '$':
-               sgml_string = "&dollar;";
-               break;
-       case '#':
-               sgml_string = "&num;";
-               break;
-       case '%':
-               sgml_string = "&percnt;";
-               break;
-       case '[':
-               sgml_string = "&lsqb;";
-               break;
-       case ']':
-               sgml_string = "&rsqb;";
-               break;
-       case '{':
-               sgml_string = "&lcub;";
-               break;
-       case '}':
-               sgml_string = "&rcub;";
-               break;
-       case '~':
-               sgml_string = "&tilde;";
-               break;
-       case '"':
-               sgml_string = "&quot;";
-               break;
-       case '\\':
-               sgml_string = "&bsol;";
-               break;
-       case ' ':
-               retval = true;
-               sgml_string = ' ';
-               break;
-       case '\0': // Ignore :-)
-               sgml_string.erase();
-               break;
-       default:
-               sgml_string = c;
-               break;
-       }
-       return retval;
-}
-
-
 Paragraph * Paragraph::TeXEnvironment(Buffer const * buf,
                                            BufferParams const & bparams,
                                            ostream & os, TexRow & texrow)
@@ -1977,18 +1677,8 @@ bool Paragraph::isWord(pos_type pos) const
 Language const *
 Paragraph::getParLanguage(BufferParams const & bparams) const
 {
-       if (size() > 0) {
-#ifndef INHERIT_LANGUAGE
+       if (!empty()) {
                return getFirstFontSettings().language();
-#else
-               Language const * lang = getFirstFontSettings().language();
-#ifdef WITH_WARNINGS
-#warning We should make this somewhat better, any ideas? (Jug)
-#endif
-               if (lang == inherit_language || lang == ignore_language)
-                       lang = bparams.language;
-               return lang;
-#endif
        } else if (previous_)
                return previous_->getParLanguage(bparams);
        else
@@ -2027,9 +1717,6 @@ bool Paragraph::isMultiLingual(BufferParams const & bparams)
        for (; cit != end; ++cit)
                if (cit->font().language() != ignore_language &&
                    cit->font().language() != latex_language &&
-#ifdef INHERIT_LANGUAGE
-                       cit->font().language() != inherit_language &&
-#endif
                        cit->font().language() != doc_language)
                        return true;
        return false;
@@ -2093,11 +1780,11 @@ string const Paragraph::asString(Buffer const * buffer,
 void Paragraph::setInsetOwner(Inset * i)
 {
        pimpl_->inset_owner = i;
-       InsetList::const_iterator cit = insetlist.begin();
-       InsetList::const_iterator end = insetlist.end();
-       for (; cit != end; ++cit) {
-               if (cit->inset)
-                       cit->inset->setOwner(i);
+       InsetList::iterator it = insetlist.begin();
+       InsetList::iterator end = insetlist.end();
+       for (; it != end; ++it) {
+               if (it.getInset())
+                       it.getInset()->setOwner(i);
        }
 }
 
@@ -2105,30 +1792,14 @@ void Paragraph::setInsetOwner(Inset * i)
 void Paragraph::deleteInsetsLyXText(BufferView * bv)
 {
        // then the insets
-       InsetList::const_iterator cit = insetlist.begin();
-       InsetList::const_iterator end = insetlist.end();
-       for (; cit != end; ++cit) {
-               if (cit->inset && cit->inset->isTextInset()) {
-                       static_cast<UpdatableInset *>
-                               (cit->inset)->deleteLyXText(bv, true);
-               }
-       }
+       insetlist.deleteInsetsLyXText(bv);
 }
 
 
 void Paragraph::resizeInsetsLyXText(BufferView * bv)
 {
        // then the insets
-       InsetList::const_iterator cit = insetlist.begin();
-       InsetList::const_iterator end = insetlist.end();
-       for (; cit != end; ++cit) {
-               if (cit->inset) {
-                       if (cit->inset->isTextInset()) {
-                               static_cast<UpdatableInset *>
-                                       (cit->inset)->resizeLyXText(bv, true);
-                       }
-               }
-       }
+       insetlist.resizeInsetsLyXText(bv);
 }
 
 
@@ -2144,21 +1815,21 @@ lyx::pos_type Paragraph::size() const
 }
 
 
-Paragraph::value_type Paragraph::getChar(pos_type pos) const
+bool Paragraph::empty() const
 {
-       return pimpl_->getChar(pos);
+       return pimpl_->empty();
 }
 
 
-int Paragraph::id() const
+Paragraph::value_type Paragraph::getChar(pos_type pos) const
 {
-       return pimpl_->id_;
+       return pimpl_->getChar(pos);
 }
 
 
-void  Paragraph::id(int id_arg)
+int Paragraph::id() const
 {
-       pimpl_->id_ = id_arg;
+       return pimpl_->id_;
 }
 
 
@@ -2194,48 +1865,12 @@ void Paragraph::clearContents()
        pimpl_->clear();
 }
 
-
-void Paragraph::setCounter(int i, int v)
-{
-       pimpl_->counter_[i] = v;
-}
-
-
-int Paragraph::getCounter(int i) const
-{
-       return pimpl_->counter_[i];
-}
-
-
-void Paragraph::incCounter(int i)
-{
-       pimpl_->counter_[i]++;
-}
-
-
 void Paragraph::setChar(pos_type pos, value_type c)
 {
        pimpl_->setChar(pos, c);
 }
 
 
-Paragraph::inset_iterator::inset_iterator(Paragraph::InsetList::iterator const & iter)
- : it(iter)
-{}
-
-
-Paragraph::inset_iterator Paragraph::inset_iterator_begin()
-{
-       return inset_iterator(insetlist.begin());
-}
-
-
-Paragraph::inset_iterator Paragraph::inset_iterator_end()
-{
-       return inset_iterator(insetlist.end());
-}
-
-
 ParagraphParameters & Paragraph::params()
 {
        return pimpl_->params;