]> git.lyx.org Git - lyx.git/blobdiff - src/paragraph_funcs.C
more cursor dispatch
[lyx.git] / src / paragraph_funcs.C
index e50cf74fbf63d3f16be0cd9bd5735f8d6d9c709b..07c9703dc1f6abd3279ed68cdd96436446ac3dd8 100644 (file)
 #include <config.h>
 
 #include "paragraph_funcs.h"
-#include "paragraph_pimpl.h"
+
 #include "buffer.h"
-#include "ParagraphParameters.h"
-#include "lyxtextclasslist.h"
+#include "bufferparams.h"
+
 #include "debug.h"
+#include "encoding.h"
+#include "errorlist.h"
+#include "factory.h"
 #include "gettext.h"
+#include "iterators.h"
 #include "language.h"
-#include "encoding.h"
-#include "lyxrc.h"
 #include "lyxlex.h"
-#include "factory.h"
-#include "Lsstream.h"
-
-#include "support/lstrings.h"
-#include "support/LAssert.h"
+#include "lyxrc.h"
+#include "outputparams.h"
+#include "paragraph_pimpl.h"
+#include "sgml.h"
+#include "texrow.h"
+#include "vspace.h"
 
-#include "insets/insetoptarg.h"
-#include "insets/insetcommandparams.h"
 #include "insets/insetbibitem.h"
+#include "insets/insethfill.h"
+#include "insets/insetlatexaccent.h"
+#include "insets/insetline.h"
+#include "insets/insetnewline.h"
+#include "insets/insetpagebreak.h"
+#include "insets/insetoptarg.h"
 #include "insets/insetspace.h"
 #include "insets/insetspecialchar.h"
-#include "insets/insetlatexaccent.h"
 #include "insets/insettabular.h"
-#include "insets/insethfill.h"
-#include "insets/insetnewline.h"
 
-extern string bibitemWidest(Buffer const *);
+#include "support/filetools.h"
+#include "support/lstrings.h"
+#include "support/lyxlib.h"
+#include "support/std_sstream.h"
 
-using namespace lyx::support;
+#include <vector>
 
 using lyx::pos_type;
-//using lyx::layout_type;
+
+using lyx::support::ascii_lowercase;
+using lyx::support::atoi;
+using lyx::support::bformat;
+using lyx::support::compare_ascii_no_case;
+using lyx::support::compare_no_case;
+using lyx::support::contains;
+using lyx::support::split;
+using lyx::support::subst;
+
+using std::auto_ptr;
 using std::endl;
+using std::string;
+using std::vector;
+using std::istringstream;
 using std::ostream;
+using std::pair;
 
 
 namespace {
@@ -56,11 +77,10 @@ bool moveItem(Paragraph & from, Paragraph & to,
        LyXFont tmpfont = from.getFontSettings(params, i);
 
        if (tmpchar == Paragraph::META_INSET) {
-               InsetOld * tmpinset = 0;
+               InsetBase * tmpinset = 0;
                if (from.getInset(i)) {
                        // the inset is not in a paragraph anymore
                        tmpinset = from.insetlist.release(i);
-                       tmpinset->parOwner(0);
                }
 
                if (!to.insetAllowed(tmpinset->lyxCode()))
@@ -112,13 +132,6 @@ void breakParagraph(BufferParams const & bparams,
                tmp->params().align(par->params().align());
                tmp->setLabelWidthString(par->params().labelWidthString());
 
-               tmp->params().lineBottom(par->params().lineBottom());
-               par->params().lineBottom(false);
-               tmp->params().pagebreakBottom(par->params().pagebreakBottom());
-               par->params().pagebreakBottom(false);
-               tmp->params().spaceBottom(par->params().spaceBottom());
-               par->params().spaceBottom(VSpace(VSpace::NONE));
-
                tmp->params().depth(par->params().depth());
                tmp->params().noindent(par->params().noindent());
 
@@ -151,9 +164,6 @@ void breakParagraph(BufferParams const & bparams,
        if (pos)
                return;
 
-       tmp->params().lineTop(par->params().lineTop());
-       tmp->params().pagebreakTop(par->params().pagebreakTop());
-       tmp->params().spaceTop(par->params().spaceTop());
        par->params().clear();
 
        par->layout(bparams.getLyXTextClass().defaultLayout());
@@ -209,11 +219,6 @@ void mergeParagraph(BufferParams const & bparams,
 {
        ParagraphList::iterator the_next = boost::next(par);
 
-       // first the DTP-stuff
-       par->params().lineBottom(the_next->params().lineBottom());
-       par->params().spaceBottom(the_next->params().spaceBottom());
-       par->params().pagebreakBottom(the_next->params().pagebreakBottom());
-
        pos_type pos_end = the_next->size() - 1;
        pos_type pos_insert = par->size();
 
@@ -298,520 +303,13 @@ int getEndLabel(ParagraphList::iterator p, ParagraphList const & plist)
 
 namespace {
 
-ParagraphList::iterator
-TeXEnvironment(Buffer const * buf,
-              ParagraphList const & paragraphs,
-              ParagraphList::iterator pit,
-              ostream & os, TexRow & texrow,
-              LatexRunParams const & runparams);
-
-ParagraphList::iterator
-TeXOnePar(Buffer const * buf,
-         ParagraphList const & paragraphs,
-         ParagraphList::iterator pit,
-         ostream & os, TexRow & texrow,
-         LatexRunParams const & runparams,
-         string const & everypar = string());
-
-
-ParagraphList::iterator
-TeXDeeper(Buffer const * buf,
-         ParagraphList const & paragraphs,
-         ParagraphList::iterator pit,
-         ostream & os, TexRow & texrow,
-         LatexRunParams const & runparams)
-{
-       lyxerr[Debug::LATEX] << "TeXDeeper...     " << &*pit << endl;
-       ParagraphList::iterator par = pit;
-
-       while (par != const_cast<ParagraphList&>(paragraphs).end() &&
-                    par->params().depth() == pit->params().depth()) {
-               if (par->layout()->isEnvironment()) {
-                       par = TeXEnvironment(buf, paragraphs, par,
-                                            os, texrow, runparams);
-               } else {
-                       par = TeXOnePar(buf, paragraphs, par,
-                                            os, texrow, runparams);
-               }
-       }
-       lyxerr[Debug::LATEX] << "TeXDeeper...done " << &*par << endl;
-
-       return par;
-}
-
-
-ParagraphList::iterator
-TeXEnvironment(Buffer const * buf,
-              ParagraphList const & paragraphs,
-              ParagraphList::iterator pit,
-              ostream & os, TexRow & texrow,
-              LatexRunParams const & runparams)
-{
-       lyxerr[Debug::LATEX] << "TeXEnvironment...     " << &*pit << endl;
-
-       BufferParams const & bparams = buf->params;
-
-       LyXLayout_ptr const & style = pit->layout();
-
-       Language const * language = pit->getParLanguage(bparams);
-       Language const * doc_language = bparams.language;
-       Language const * previous_language =
-               (pit != const_cast<ParagraphList&>(paragraphs).begin())
-               ? boost::prior(pit)->getParLanguage(bparams)
-               : doc_language;
-       if (language->babel() != previous_language->babel()) {
-
-               if (!lyxrc.language_command_end.empty() &&
-                   previous_language->babel() != doc_language->babel()) {
-                       os << subst(lyxrc.language_command_end, "$$lang",
-                                   previous_language->babel())
-                          << endl;
-                       texrow.newline();
-               }
-
-               if (lyxrc.language_command_end.empty() ||
-                   language->babel() != doc_language->babel()) {
-                       os << subst(lyxrc.language_command_begin, "$$lang",
-                                   language->babel())
-                          << endl;
-                       texrow.newline();
-               }
-       }
-
-       bool leftindent_open = false;
-       if (!pit->params().leftIndent().zero()) {
-               os << "\\begin{LyXParagraphLeftIndent}{" <<
-                       pit->params().leftIndent().asLatexString() << "}\n";
-               texrow.newline();
-               leftindent_open = true;
-       }
-
-       if (style->isEnvironment()) {
-               if (style->latextype == LATEX_LIST_ENVIRONMENT) {
-                       os << "\\begin{" << style->latexname() << "}{"
-                          << pit->params().labelWidthString() << "}\n";
-               } else if (style->labeltype == LABEL_BIBLIO) {
-                       // ale970405
-                       os << "\\begin{" << style->latexname() << "}{"
-                          <<  bibitemWidest(buf)
-                          << "}\n";
-               } else if (style->latextype == LATEX_ITEM_ENVIRONMENT) {
-                       os << "\\begin{" << style->latexname() << '}'
-                          << style->latexparam() << '\n';
-               } else
-                       os << "\\begin{" << style->latexname() << '}'
-                          << style->latexparam() << '\n';
-               texrow.newline();
-       }
-       ParagraphList::iterator par = pit;
-       do {
-               par = TeXOnePar(buf, paragraphs, par, os, texrow, runparams);
-
-               if (par != const_cast<ParagraphList&>(paragraphs).end() && par->params().depth() > pit->params().depth()) {
-                           if (par->layout()->isParagraph()) {
-
-                           // Thinko!
-                           // How to handle this? (Lgb)
-                           //&& !suffixIs(os, "\n\n")
-                                   //) {
-                               // There should be at least one '\n' already
-                               // but we need there to be two for Standard
-                               // paragraphs that are depth-increment'ed to be
-                               // output correctly.  However, tables can
-                               // also be paragraphs so don't adjust them.
-                               // ARRae
-                               // Thinkee:
-                               // Will it ever harm to have one '\n' too
-                               // many? i.e. that we sometimes will have
-                               // three in a row. (Lgb)
-                               os << '\n';
-                               texrow.newline();
-                       }
-                       par = TeXDeeper(buf, paragraphs, par, os, texrow,
-                                       runparams);
-               }
-       } while (par != const_cast<ParagraphList&>(paragraphs).end()
-                && par->layout() == pit->layout()
-                && par->params().depth() == pit->params().depth()
-                && par->params().leftIndent() == pit->params().leftIndent());
-
-       if (style->isEnvironment()) {
-               os << "\\end{" << style->latexname() << "}\n";
-               texrow.newline();
-       }
-
-       if (leftindent_open) {
-               os << "\\end{LyXParagraphLeftIndent}\n";
-               texrow.newline();
-       }
-
-       lyxerr[Debug::LATEX] << "TeXEnvironment...done " << &*par << endl;
-       return par;  // ale970302
-}
-
-
-InsetOptArg * optArgInset(Paragraph const & par)
-{
-       // Find the entry.
-       InsetList::const_iterator it = par.insetlist.begin();
-       InsetList::const_iterator end = par.insetlist.end();
-       for (; it != end; ++it) {
-               InsetOld * ins = it->inset;
-               if (ins->lyxCode() == InsetOld::OPTARG_CODE) {
-                       return static_cast<InsetOptArg *>(ins);
-               }
-       }
-       return 0;
-}
-
-
-ParagraphList::iterator
-TeXOnePar(Buffer const * buf,
-         ParagraphList const & paragraphs,
-         ParagraphList::iterator pit,
-         ostream & os, TexRow & texrow,
-         LatexRunParams const & runparams,
-         string const & everypar)
-{
-       lyxerr[Debug::LATEX] << "TeXOnePar...     " << &*pit << " '"
-               << everypar << "'" << endl;
-       BufferParams const & bparams = buf->params;
-
-       InsetOld const * in = pit->inInset();
-       bool further_blank_line = false;
-       LyXLayout_ptr 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 then "Standard" to be valid!
-       if (in == 0 || !in->forceDefaultParagraphs(in)) {
-               style = pit->layout();
-
-               if (pit->params().startOfAppendix()) {
-                       os << "\\appendix\n";
-                       texrow.newline();
-               }
-
-               if (!pit->params().spacing().isDefault()
-                       && (pit == const_cast<ParagraphList&>(paragraphs).begin() || !boost::prior(pit)->hasSameLayout(*pit))) {
-                       os << pit->params().spacing().writeEnvirBegin() << '\n';
-                       texrow.newline();
-               }
-
-               if (style->isCommand()) {
-                       os << '\n';
-                       texrow.newline();
-               }
-
-               if (pit->params().pagebreakTop()) {
-                       os << "\\newpage";
-                       further_blank_line = true;
-               }
-               if (pit->params().spaceTop().kind() != VSpace::NONE) {
-                       os << pit->params().spaceTop().asLatexCommand(bparams);
-                       further_blank_line = true;
-               }
-
-               if (pit->params().lineTop()) {
-                       os << "\\lyxline{\\"
-                          << pit->getFont(bparams, 0, outerFont(pit, paragraphs)).latexSize()
-                          << '}'
-                          << "\\vspace{-1\\parskip}";
-                       further_blank_line = true;
-               }
-
-               if (further_blank_line) {
-                       os << '\n';
-                       texrow.newline();
-               }
-       } else {
-               style = bparams.getLyXTextClass().defaultLayout();
-       }
-
-       Language const * language = pit->getParLanguage(bparams);
-       Language const * doc_language = bparams.language;
-       Language const * previous_language =
-               (pit != const_cast<ParagraphList&>(paragraphs).begin())
-               ? boost::prior(pit)->getParLanguage(bparams)
-               : doc_language;
-
-       if (language->babel() != previous_language->babel()
-           // check if we already put language command in TeXEnvironment()
-           && !(style->isEnvironment()
-                && (pit == const_cast<ParagraphList&>(paragraphs).begin() ||
-                    (boost::prior(pit)->layout() != pit->layout() &&
-                     boost::prior(pit)->getDepth() <= pit->getDepth())
-                    || boost::prior(pit)->getDepth() < pit->getDepth())))
-       {
-               if (!lyxrc.language_command_end.empty() &&
-                   previous_language->babel() != doc_language->babel())
-               {
-                       os << subst(lyxrc.language_command_end, "$$lang",
-                                   previous_language->babel())
-                          << endl;
-                       texrow.newline();
-               }
-
-               if (lyxrc.language_command_end.empty() ||
-                   language->babel() != doc_language->babel())
-               {
-                       os << subst(lyxrc.language_command_begin, "$$lang",
-                                   language->babel())
-                          << endl;
-                       texrow.newline();
-               }
-       }
-
-       if (bparams.inputenc == "auto" &&
-           language->encoding() != previous_language->encoding()) {
-               os << "\\inputencoding{"
-                  << language->encoding()->LatexName()
-                  << "}\n";
-               texrow.newline();
-       }
-
-       switch (style->latextype) {
-       case LATEX_COMMAND:
-               os << '\\' << style->latexname();
-
-               // Separate handling of optional argument inset.
-               if (style->optionalargs == 1) {
-                       InsetOptArg * it = optArgInset(*pit);
-                       if (it)
-                               it->latexOptional(buf, os, runparams);
-               }
-               else
-                       os << style->latexparam();
-               break;
-       case LATEX_ITEM_ENVIRONMENT:
-       case LATEX_LIST_ENVIRONMENT:
-               os << "\\item ";
-               break;
-       case LATEX_BIB_ENVIRONMENT:
-               // ignore this, the inset will write itself
-               break;
-       default:
-               break;
-       }
-
-       os << everypar;
-       bool need_par = pit->simpleTeXOnePar(buf, bparams,
-                                            outerFont(pit, paragraphs),
-                                            os, texrow, runparams);
-
-       // Make sure that \\par is done with the font of the last
-       // character if this has another size as the default.
-       // This is necessary because LaTeX (and LyX on the screen)
-       // calculates the space between the baselines according
-       // to this font. (Matthias)
-       //
-       // Is this really needed ? (Dekel)
-       // We do not need to use to change the font for the last paragraph
-       // or for a command.
-       LyXFont const outerfont(outerFont(pit, paragraphs));
-
-       LyXFont const font =
-               (pit->empty()
-                ? pit->getLayoutFont(bparams, outerfont)
-                : pit->getFont(bparams, pit->size() - 1, outerfont));
-
-       bool is_command = style->isCommand();
-
-       if (style->resfont.size() != font.size()
-           && boost::next(pit) != const_cast<ParagraphList&>(paragraphs).end()
-           && !is_command) {
-               if (!need_par)
-                       os << '{';
-               os << "\\" << font.latexSize() << " \\par}";
-       } else if (need_par) {
-               os << "\\par}";
-       } else if (is_command)
-               os << '}';
-
-       switch (style->latextype) {
-       case LATEX_ITEM_ENVIRONMENT:
-       case LATEX_LIST_ENVIRONMENT:
-               if (boost::next(pit) != const_cast<ParagraphList&>(paragraphs).end()
-                   && (pit->params().depth() < boost::next(pit)->params().depth())) {
-                       os << '\n';
-                       texrow.newline();
-               }
-               break;
-       case LATEX_ENVIRONMENT: {
-               // if its the last paragraph of the current environment
-               // skip it otherwise fall through
-               ParagraphList::iterator next = boost::next(pit);
-
-               if (next != const_cast<ParagraphList&>(paragraphs).end()
-                   && (next->layout() != pit->layout()
-                       || next->params().depth() != pit->params().depth()))
-                       break;
-       }
-
-               // fall through possible
-       default:
-               // we don't need it for the last paragraph!!!
-               if (boost::next(pit) != const_cast<ParagraphList&>(paragraphs).end()) {
-                       os << '\n';
-                       texrow.newline();
-               }
-       }
-
-       if (in == 0 || !in->forceDefaultParagraphs(in)) {
-               further_blank_line = false;
-               if (pit->params().lineBottom()) {
-                       os << "\\lyxline{\\" << font.latexSize() << '}';
-                       further_blank_line = true;
-               }
-
-               if (pit->params().spaceBottom().kind() != VSpace::NONE) {
-                       os << pit->params().spaceBottom().asLatexCommand(bparams);
-                       further_blank_line = true;
-               }
-
-               if (pit->params().pagebreakBottom()) {
-                       os << "\\newpage";
-                       further_blank_line = true;
-               }
-
-               if (further_blank_line) {
-                       os << '\n';
-                       texrow.newline();
-               }
-
-               if (!pit->params().spacing().isDefault()
-                       && (boost::next(pit) == const_cast<ParagraphList&>(paragraphs).end()|| !boost::next(pit)->hasSameLayout(*pit))) {
-                       os << pit->params().spacing().writeEnvirEnd() << '\n';
-                       texrow.newline();
-               }
-       }
-
-       // we don't need it for the last paragraph!!!
-       if (boost::next(pit) != const_cast<ParagraphList&>(paragraphs).end()) {
-               os << '\n';
-               texrow.newline();
-       } else {
-               // Since \selectlanguage write the language to the aux file,
-               // we need to reset the language at the end of footnote or
-               // float.
-
-               if (language->babel() != doc_language->babel()) {
-                       if (lyxrc.language_command_end.empty())
-                               os << subst(lyxrc.language_command_begin,
-                                           "$$lang",
-                                           doc_language->babel())
-                                  << endl;
-                       else
-                               os << subst(lyxrc.language_command_end,
-                                           "$$lang",
-                                           language->babel())
-                                  << endl;
-                       texrow.newline();
-               }
-       }
-
-       lyxerr[Debug::LATEX] << "TeXOnePar...done " << &*boost::next(pit) << endl;
-       return ++pit;
-}
-
-} // anon namespace
-
-
-//
-// LaTeX all paragraphs from par to endpar, if endpar == 0 then to the end
-//
-void latexParagraphs(Buffer const * buf,
-                    ParagraphList const & paragraphs,
-                    ostream & os,
-                    TexRow & texrow,
-                    LatexRunParams const & runparams,
-                    string const & everypar)
-{
-       bool was_title = false;
-       bool already_title = false;
-       LyXTextClass const & tclass = buf->params.getLyXTextClass();
-       ParagraphList::iterator par = const_cast<ParagraphList&>(paragraphs).begin();
-       ParagraphList::iterator endpar = const_cast<ParagraphList&>(paragraphs).end();
-
-       // if only_body
-       while (par != endpar) {
-               InsetOld * in = par->inInset();
-               // 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 then "Standard" to be valid!
-               if (in == 0 || !in->forceDefaultParagraphs(in)) {
-                       LyXLayout_ptr const & layout = par->layout();
-
-                       if (layout->intitle) {
-                               if (already_title) {
-                                       lyxerr <<"Error in latexParagraphs: You"
-                                               " should not mix title layouts"
-                                               " with normal ones." << endl;
-                               } else if (!was_title) {
-                                       was_title = true;
-                                       if (tclass.titletype() == TITLE_ENVIRONMENT) {
-                                               os << "\\begin{"
-                                                   << tclass.titlename()
-                                                   << "}\n";
-                                               texrow.newline();
-                                       }
-                               }
-                       } else if (was_title && !already_title) {
-                               if (tclass.titletype() == TITLE_ENVIRONMENT) {
-                                       os << "\\end{" << tclass.titlename()
-                                           << "}\n";
-                               }
-                               else {
-                                       os << "\\" << tclass.titlename()
-                                           << "\n";
-                               }
-                               texrow.newline();
-                               already_title = true;
-                               was_title = false;
-                       }
-
-                       if (layout->is_environment) {
-                               par = TeXOnePar(buf, paragraphs, par, os, texrow,
-                                               runparams, everypar);
-                       } else if (layout->isEnvironment() ||
-                               !par->params().leftIndent().zero())
-                       {
-                               par = TeXEnvironment(buf, paragraphs, par, os,
-                                                    texrow, runparams);
-                       } else {
-                               par = TeXOnePar(buf, paragraphs, par, os, texrow,
-                                               runparams, everypar);
-                       }
-               } else {
-                       par = TeXOnePar(buf, paragraphs, par, os, texrow,
-                                       runparams, everypar);
-               }
-       }
-       // It might be that we only have a title in this document
-       if (was_title && !already_title) {
-               if (tclass.titletype() == TITLE_ENVIRONMENT) {
-                       os << "\\end{" << tclass.titlename()
-                           << "}\n";
-               }
-               else {
-                       os << "\\" << tclass.titlename()
-                           << "\n";
-                               }
-               texrow.newline();
-       }
-}
-
-
-namespace {
-
-int readParToken(Buffer & buf, Paragraph & par, LyXLex & lex, string const & token)
+int readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
+       string const & token)
 {
        static LyXFont font;
        static Change change;
 
-       BufferParams const & bp = buf.params;
+       BufferParams const & bp = buf.params();
 
        if (token[0] != '\\') {
                string::const_iterator cit = token.begin();
@@ -858,8 +356,16 @@ int readParToken(Buffer & buf, Paragraph & par, LyXLex & lex, string const & tok
                lyxerr << "Solitary \\end_inset in line " << lex.getLineNo() << "\n"
                       << "Missing \\begin_inset?.\n";
        } else if (token == "\\begin_inset") {
-               InsetOld * inset = readInset(lex, buf);
-               par.insertInset(par.size(), inset, font, change);
+               InsetBase * inset = readInset(lex, buf);
+               if (inset)
+                       par.insertInset(par.size(), inset, font, change);
+               else {
+                       lex.eatLine();
+                       string line = lex.getString();
+                       buf.error(ErrorItem(_("Unknown Inset"), line,
+                                           par.id(), 0, par.size()));
+                       return 1;
+               }
        } else if (token == "\\family") {
                lex.next();
                font.setLyXFamily(lex.getString());
@@ -925,35 +431,40 @@ int readParToken(Buffer & buf, Paragraph & par, LyXLex & lex, string const & tok
                                }
                        }
                } else {
-                       InsetOld * inset = 0;
+                       auto_ptr<InsetBase> inset;
                        if (token == "\\SpecialChar" )
-                               inset = new InsetSpecialChar;
+                               inset.reset(new InsetSpecialChar);
                        else
-                               inset = new InsetSpace;
-                       inset->read(&buf, lex);
-                       par.insertInset(par.size(), inset, font, change);
+                               inset.reset(new InsetSpace);
+                       inset->read(buf, lex);
+                       par.insertInset(par.size(), inset.release(),
+                                       font, change);
                }
        } else if (token == "\\i") {
-               InsetOld * inset = new InsetLatexAccent;
-               inset->read(&buf, lex);
-               par.insertInset(par.size(), inset, font, change);
+               auto_ptr<InsetBase> inset(new InsetLatexAccent);
+               inset->read(buf, lex);
+               par.insertInset(par.size(), inset.release(), font, change);
        } else if (token == "\\backslash") {
                par.insertChar(par.size(), '\\', font, change);
        } else if (token == "\\newline") {
-               InsetOld * inset = new InsetNewline;
-               inset->read(&buf, lex);
-               par.insertInset(par.size(), inset, font, change);
+               auto_ptr<InsetBase> inset(new InsetNewline);
+               inset->read(buf, lex);
+               par.insertInset(par.size(), inset.release(), font, change);
        } else if (token == "\\LyXTable") {
-               InsetOld * inset = new InsetTabular(buf);
-               inset->read(&buf, lex);
-               par.insertInset(par.size(), inset, font, change);
+               auto_ptr<InsetBase> inset(new InsetTabular(buf));
+               inset->read(buf, lex);
+               par.insertInset(par.size(), inset.release(), font, change);
        } else if (token == "\\bibitem") {
                InsetCommandParams p("bibitem", "dummy");
-               InsetBibitem * inset = new InsetBibitem(p);
-               inset->read(&buf, lex);
-               par.insertInset(par.size(), inset, font, change);
+               auto_ptr<InsetBibitem> inset(new InsetBibitem(p));
+               inset->read(buf, lex);
+               par.insertInset(par.size(), inset.release(), font, change);
        } else if (token == "\\hfill") {
                par.insertInset(par.size(), new InsetHFill, font, change);
+       } else if (token == "\\lyxline") {
+               par.insertInset(par.size(), new InsetLine, font, change);
+       } else if (token == "\\newpage") {
+               par.insertInset(par.size(), new InsetPagebreak, font, change);
        } else if (token == "\\change_unchanged") {
                // Hack ! Needed for empty paragraphs :/
                // FIXME: is it still ??
@@ -962,14 +473,14 @@ int readParToken(Buffer & buf, Paragraph & par, LyXLex & lex, string const & tok
                change = Change(Change::UNCHANGED);
        } else if (token == "\\change_inserted") {
                lex.nextToken();
-               istringstream is(STRCONV(lex.getString()));
+               istringstream is(lex.getString());
                int aid;
                lyx::time_type ct;
                is >> aid >> ct;
                change = Change(Change::INSERTED, bp.author_map[aid], ct);
        } else if (token == "\\change_deleted") {
                lex.nextToken();
-               istringstream is(STRCONV(lex.getString()));
+               istringstream is(lex.getString());
                int aid;
                lyx::time_type ct;
                is >> aid >> ct;
@@ -989,7 +500,7 @@ int readParToken(Buffer & buf, Paragraph & par, LyXLex & lex, string const & tok
 }
 
 
-int readParagraph(Buffer & buf, Paragraph & par, LyXLex & lex)
+int readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex)
 {
        int unknown = 0;
 
@@ -1048,19 +559,68 @@ LyXFont const outerFont(ParagraphList::iterator pit,
 }
 
 
-ParagraphList::iterator outerPar(Buffer & buf, InsetOld * inset)
+ParagraphList::iterator outerPar(Buffer const & buf, InsetBase const * inset)
 {
-       ParIterator pit = buf.par_iterator_begin();
-       ParIterator end = buf.par_iterator_end();
+       ParIterator pit = const_cast<Buffer &>(buf).par_iterator_begin();
+       ParIterator end = const_cast<Buffer &>(buf).par_iterator_end();
        for ( ; pit != end; ++pit) {
+               LyXText * text;
+               // the second '=' below is intentional
+               for (int i = 0; (text = inset->getText(i)); ++i)
+                       if (&text->paragraphs() == &pit.plist())
+                               return pit.outerPar();
+
                InsetList::iterator ii = pit->insetlist.begin();
                InsetList::iterator iend = pit->insetlist.end();
                for ( ; ii != iend; ++ii)
                        if (ii->inset == inset)
                                return pit.outerPar();
        }
-       lyxerr << "outerPar: should not happen\n";
-       Assert(false);
-       return end.pit(); // shut up compiler
+       lyxerr << "outerPar: should not happen" << endl;
+       BOOST_ASSERT(false);
+       return const_cast<Buffer &>(buf).paragraphs().end(); // shut up compiler
+}
+
+
+Paragraph const & ownerPar(Buffer const & buf, InsetBase const * inset)
+{
+       ParConstIterator pit = buf.par_iterator_begin();
+       ParConstIterator end = buf.par_iterator_end();
+       for ( ; pit != end; ++pit) {
+               LyXText * text;
+               // the second '=' below is intentional
+               for (int i = 0; (text = inset->getText(i)); ++i)
+                       if (&text->paragraphs() == &pit.plist())
+                               return *pit.pit();
+
+               InsetList::const_iterator ii = pit->insetlist.begin();
+               InsetList::const_iterator iend = pit->insetlist.end();
+               for ( ; ii != iend; ++ii)
+                       if (ii->inset == inset)
+                               return *pit.pit();
+       }
+       lyxerr << "ownerPar: should not happen" << endl;
+       BOOST_ASSERT(false);
+       return buf.paragraphs().front(); // shut up compiler
+}
+
+
+/// return the range of pars [beg, end[ owning the range of y [ystart, yend] 
+void getParsInRange(ParagraphList & pl,
+                               int ystart, int yend,
+                               ParagraphList::iterator & beg,
+                               ParagraphList::iterator & end)
+{
+       ParagraphList::iterator const endpar = pl.end();
+       ParagraphList::iterator const begpar = pl.begin();
+
+       BOOST_ASSERT(begpar != endpar);
+
+       beg = endpar;
+       for (--beg; beg != begpar && beg->y > ystart; --beg)
+               ;
+
+       for (end = beg ; end != endpar && end->y <= yend; ++end)
+               ;
 }