]> git.lyx.org Git - lyx.git/blobdiff - src/paragraph_funcs.C
more cursor dispatch
[lyx.git] / src / paragraph_funcs.C
index 77462f1e936dcc2c5e0fe2e4f7f151297edd5893..07c9703dc1f6abd3279ed68cdd96436446ac3dd8 100644 (file)
  *
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #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 "language.h"
 #include "encoding.h"
+#include "errorlist.h"
+#include "factory.h"
+#include "gettext.h"
+#include "iterators.h"
+#include "language.h"
+#include "lyxlex.h"
 #include "lyxrc.h"
-#include "support/lstrings.h"
+#include "outputparams.h"
+#include "paragraph_pimpl.h"
+#include "sgml.h"
+#include "texrow.h"
+#include "vspace.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/insettabular.h"
 
-extern string bibitemWidest(Buffer const *);
+#include "support/filetools.h"
+#include "support/lstrings.h"
+#include "support/lyxlib.h"
+#include "support/std_sstream.h"
+
+#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 {
+
+bool moveItem(Paragraph & from, Paragraph & to,
+       BufferParams const & params, pos_type i, pos_type j)
+{
+       char const tmpchar = from.getChar(i);
+       LyXFont tmpfont = from.getFontSettings(params, i);
+
+       if (tmpchar == Paragraph::META_INSET) {
+               InsetBase * tmpinset = 0;
+               if (from.getInset(i)) {
+                       // the inset is not in a paragraph anymore
+                       tmpinset = from.insetlist.release(i);
+               }
+
+               if (!to.insetAllowed(tmpinset->lyxCode()))
+                       return false;
+               to.insertInset(j, tmpinset, tmpfont);
+       } else {
+               if (!to.checkInsertChar(tmpfont))
+                       return false;
+               to.insertChar(j, tmpchar, tmpfont);
+       }
+       return true;
+}
+
+}
+
 
 void breakParagraph(BufferParams const & bparams,
+                   ParagraphList & paragraphs,
                    ParagraphList::iterator par,
                    pos_type pos,
                    int flag)
 {
        // create a new paragraph, and insert into the list
-       Paragraph * tmp = new Paragraph(&*par);
+       ParagraphList::iterator tmp = paragraphs.insert(boost::next(par),
+                                                       Paragraph());
+
        // without doing that we get a crash when typing <Return> at the
        // end of a paragraph
        tmp->layout(bparams.getLyXTextClass().defaultLayout());
@@ -54,20 +125,13 @@ void breakParagraph(BufferParams const & bparams,
                tmp->setLabelWidthString(par->params().labelWidthString());
        }
 
-       bool const isempty = (par->layout()->keepempty && par->empty());
+       bool const isempty = (par->allowEmpty() && par->empty());
 
        if (!isempty && (par->size() > pos || par->empty() || flag == 2)) {
                tmp->layout(par->layout());
                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());
 
@@ -86,24 +150,20 @@ void breakParagraph(BufferParams const & bparams,
                pos_type j = pos;
 
                for (; i <= pos_end; ++i) {
-                       Change::Type change(par->lookupChange(i));
-                       par->cutIntoMinibuffer(bparams, i);
-                       if (tmp->insertFromMinibuffer(j - pos)) {
+                       Change::Type change = par->lookupChange(i);
+                       if (moveItem(*par, *tmp, bparams, i, j - pos)) {
                                tmp->setChange(j - pos, change);
                                ++j;
                        }
                }
-               for (i = pos_end; i >= pos; --i) {
+
+               for (i = pos_end; i >= pos; --i)
                        par->eraseIntern(i);
-               }
        }
 
        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());
@@ -127,496 +187,440 @@ void breakParagraph(BufferParams const & bparams,
 
 
 void breakParagraphConservative(BufferParams const & bparams,
+                               ParagraphList & paragraphs,
                                ParagraphList::iterator par,
                                pos_type pos)
 {
        // create a new paragraph
-       Paragraph * tmp = new Paragraph(&*par);
-       tmp->makeSameLayout(&*par);
+       ParagraphList::iterator tmp = paragraphs.insert(boost::next(par),
+                                                       Paragraph());
+       tmp->makeSameLayout(*par);
 
-       // When can pos > Last()?
-       // I guess pos == Last() is possible.
+       // When can pos > size()?
+       // I guess pos == size() is possible.
        if (par->size() > pos) {
                // copy everything behind the break-position to the new
                // paragraph
                pos_type pos_end = par->size() - 1;
 
-               for (pos_type i = pos, j = pos; i <= pos_end; ++i) {
-                       par->cutIntoMinibuffer(bparams, i);
-                       if (tmp->insertFromMinibuffer(j - pos))
+               for (pos_type i = pos, j = pos; i <= pos_end; ++i)
+                       if (moveItem(*par, *tmp, bparams, i, j - pos))
                                ++j;
-               }
 
-               for (pos_type k = pos_end; k >= pos; --k) {
+               for (pos_type k = pos_end; k >= pos; --k)
                        par->erase(k);
-               }
        }
 }
 
 
-void mergeParagraph(Buffer * buf, ParagraphList::iterator par)
+void mergeParagraph(BufferParams const & bparams,
+                   ParagraphList & paragraphs,
+                   ParagraphList::iterator par)
 {
-       BufferParams const & bparams = buf->params;
-
        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();
 
        // ok, now copy the paragraph
-       for (pos_type i = 0, j = 0; i <= pos_end; ++i) {
-               the_next->cutIntoMinibuffer(bparams, i);
-               if (par->insertFromMinibuffer(pos_insert + j))
+       for (pos_type i = 0, j = 0; i <= pos_end; ++i)
+               if (moveItem(*the_next, *par, bparams, i, pos_insert + j))
                        ++j;
-       }
 
-       buf->paragraphs.erase(the_next);
+       paragraphs.erase(the_next);
 }
 
 
-#if 0
-Paragraph * depthHook(Paragraph * par, Paragraph::depth_type depth)
+ParagraphList::iterator depthHook(ParagraphList::iterator pit,
+                                 ParagraphList const & plist,
+                                 Paragraph::depth_type depth)
 {
-       Paragraph * newpar = par;
+       ParagraphList::iterator newpit = pit;
+       ParagraphList::iterator beg = const_cast<ParagraphList&>(plist).begin();
 
-       do {
-               newpar = newpar->previous();
-       } while (newpar && newpar->getDepth() > depth);
+       if (newpit != beg)
+               --newpit;
 
-       if (!newpar) {
-               if (par->previous() || par->getDepth())
-                       lyxerr << "Error (depthHook): "
-                              << "no hook." << endl;
-               newpar = par;
+       while (newpit != beg && newpit->getDepth() > depth) {
+               --newpit;
        }
-       return newpar;
+
+       if (newpit->getDepth() > depth)
+               return pit;
+
+       return newpit;
 }
 
 
-Paragraph * outerHook(Paragraph * par)
+ParagraphList::iterator outerHook(ParagraphList::iterator pit,
+                                 ParagraphList const & plist)
 {
-       if (!par->getDepth())
-               return 0;
-       return depthHook(par, Paragraph::depth_type(par->getDepth() - 1));
+       if (!pit->getDepth())
+               return const_cast<ParagraphList&>(plist).end();
+       return depthHook(pit, plist,
+                        Paragraph::depth_type(pit->getDepth() - 1));
 }
 
 
-bool isFirstInSequence(Paragraph * par)
+bool isFirstInSequence(ParagraphList::iterator pit,
+                      ParagraphList const & plist)
 {
-       Paragraph const * dhook = depthHook(par, par->getDepth());
-       return (dhook == par
-               || dhook->getLayout() != par->getLayout()
-               || dhook->getDepth() != par->getDepth());
+       ParagraphList::iterator dhook = depthHook(pit, plist, pit->getDepth());
+       return (dhook == pit
+               || dhook->layout() != pit->layout()
+               || dhook->getDepth() != pit->getDepth());
 }
 
 
-int getEndLabel(Paragraph * para, BufferParams const & bparams)
+int getEndLabel(ParagraphList::iterator p, ParagraphList const & plist)
 {
-       Paragraph * par = para;
-       while (par) {
-               Paragraph::depth_type par_depth = par->getDepth();
-               layout_type layout = par->getLayout();
-               int const endlabeltype =
-                       textclasslist.Style(bparams.textclass,
-                                           layout).endlabeltype;
+       ParagraphList::iterator pit = p;
+       Paragraph::depth_type par_depth = p->getDepth();
+       while (pit != const_cast<ParagraphList&>(plist).end()) {
+               LyXLayout_ptr const & layout = pit->layout();
+               int const endlabeltype = layout->endlabeltype;
+
                if (endlabeltype != END_LABEL_NO_LABEL) {
-                       if (!para->next())
+                       if (boost::next(p) == const_cast<ParagraphList&>(plist).end())
                                return endlabeltype;
 
-                       Paragraph::depth_type const next_depth =
-                               para->next()->getDepth();
+                       Paragraph::depth_type const next_depth = boost::next(p)->getDepth();
                        if (par_depth > next_depth ||
-                           (par_depth == next_depth
-                            && layout != para->next()->getLayout()))
+                           (par_depth == next_depth &&
+                            layout != boost::next(p)->layout()))
                                return endlabeltype;
                        break;
                }
                if (par_depth == 0)
                        break;
-               par = outerHook(par);
+               pit = outerHook(pit, plist);
+               if (pit != const_cast<ParagraphList&>(plist).end())
+                       par_depth = pit->getDepth();
        }
        return END_LABEL_NO_LABEL;
 }
-#endif
 
 
-ParagraphList::iterator
-TeXDeeper(Buffer const * buf,
-         BufferParams const & bparams,
-         ParagraphList::iterator pit,
-         ostream & os, TexRow & texrow)
+namespace {
+
+int readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
+       string const & token)
 {
-       lyxerr[Debug::LATEX] << "TeXDeeper...     " << &*pit << endl;
-       ParagraphList::iterator par = pit;
+       static LyXFont font;
+       static Change change;
 
-       while (par != buf->paragraphs.end()&& par->params().depth() == pit->params().depth()) {
-               if (par->layout()->isEnvironment()) {
-                       par = TeXEnvironment(buf, bparams, par,
-                                                 os, texrow);
-               } else {
-                       par = TeXOnePar(buf, bparams, par,
-                                            os, texrow, false);
+       BufferParams const & bp = buf.params();
+
+       if (token[0] != '\\') {
+               string::const_iterator cit = token.begin();
+               for (; cit != token.end(); ++cit) {
+                       par.insertChar(par.size(), (*cit), font, change);
                }
-       }
-       lyxerr[Debug::LATEX] << "TeXDeeper...done " << &*par << endl;
+       } else if (token == "\\begin_layout") {
+               lex.eatLine();
+               string layoutname = lex.getString();
 
-       return par;
-}
+               font = LyXFont(LyXFont::ALL_INHERIT, bp.language);
+               change = Change();
 
+               LyXTextClass const & tclass = bp.getLyXTextClass();
 
-ParagraphList::iterator
-TeXEnvironment(Buffer const * buf,
-              BufferParams const & bparams,
-              ParagraphList::iterator pit,
-              ostream & os, TexRow & texrow)
-{
-       lyxerr[Debug::LATEX] << "TeXEnvironment...     " << &*pit << endl;
-
-       LyXLayout_ptr const & style = pit->layout();
-
-       Language const * language = pit->getParLanguage(bparams);
-       Language const * doc_language = bparams.language;
-       Language const * previous_language = pit->previous()
-               ? pit->previous()->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 (layoutname.empty()) {
+                       layoutname = tclass.defaultLayoutName();
                }
 
-               if (lyxrc.language_command_end.empty() ||
-                   language->babel() != doc_language->babel()) {
-                       os << subst(lyxrc.language_command_begin, "$$lang",
-                                   language->babel())
-                          << endl;
-                       texrow.newline();
-               }
-       }
+               bool hasLayout = tclass.hasLayout(layoutname);
 
-       bool leftindent_open = false;
-       if (!pit->params().leftIndent().zero()) {
-               os << "\\begin{LyXParagraphLeftIndent}{" <<
-                       pit->params().leftIndent().asLatexString() << "}\n";
-               texrow.newline();
-               leftindent_open = true;
-       }
+               if (!hasLayout) {
+                       lyxerr << "Layout '" << layoutname << "' does not"
+                              << " exist in textclass '" << tclass.name()
+                              << "'." << endl;
+                       lyxerr << "Trying to use default layout instead."
+                              << endl;
+                       layoutname = tclass.defaultLayoutName();
+               }
 
-       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, bparams, par, os, texrow, false);
-
-               if (par != buf->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.layout(bp.getLyXTextClass()[layoutname]);
+
+               // Test whether the layout is obsolete.
+               LyXLayout_ptr const & layout = par.layout();
+               if (!layout->obsoleted_by().empty())
+                       par.layout(bp.getLyXTextClass()[layout->obsoleted_by()]);
+
+               par.params().read(lex);
+
+       } else if (token == "\\end_layout") {
+               lyxerr << "Solitary \\end_layout in line " << lex.getLineNo() << "\n"
+                      << "Missing \\begin_layout?.\n";
+       } else if (token == "\\end_inset") {
+               lyxerr << "Solitary \\end_inset in line " << lex.getLineNo() << "\n"
+                      << "Missing \\begin_inset?.\n";
+       } else if (token == "\\begin_inset") {
+               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());
+       } else if (token == "\\series") {
+               lex.next();
+               font.setLyXSeries(lex.getString());
+       } else if (token == "\\shape") {
+               lex.next();
+               font.setLyXShape(lex.getString());
+       } else if (token == "\\size") {
+               lex.next();
+               font.setLyXSize(lex.getString());
+       } else if (token == "\\lang") {
+               lex.next();
+               string const tok = lex.getString();
+               Language const * lang = languages.getLanguage(tok);
+               if (lang) {
+                       font.setLanguage(lang);
+               } else {
+                       font.setLanguage(bp.language);
+                       lex.printError("Unknown language `$$Token'");
+               }
+       } else if (token == "\\numeric") {
+               lex.next();
+               font.setNumber(font.setLyXMisc(lex.getString()));
+       } else if (token == "\\emph") {
+               lex.next();
+               font.setEmph(font.setLyXMisc(lex.getString()));
+       } else if (token == "\\bar") {
+               lex.next();
+               string const tok = lex.getString();
+
+               if (tok == "under")
+                       font.setUnderbar(LyXFont::ON);
+               else if (tok == "no")
+                       font.setUnderbar(LyXFont::OFF);
+               else if (tok == "default")
+                       font.setUnderbar(LyXFont::INHERIT);
+               else
+                       lex.printError("Unknown bar font flag "
+                                      "`$$Token'");
+       } else if (token == "\\noun") {
+               lex.next();
+               font.setNoun(font.setLyXMisc(lex.getString()));
+       } else if (token == "\\color") {
+               lex.next();
+               font.setLyXColor(lex.getString());
+       } else if (token == "\\InsetSpace" || token == "\\SpecialChar") {
+
+               // Insets don't make sense in a free-spacing context! ---Kayvan
+               if (par.isFreeSpacing()) {
+                       if (token == "\\InsetSpace")
+                               par.insertChar(par.size(), ' ', font, change);
+                       else if (lex.isOK()) {
+                               lex.next();
+                               string const next_token = lex.getString();
+                               if (next_token == "\\-")
+                                       par.insertChar(par.size(), '-', font, change);
+                               else {
+                                       lex.printError("Token `$$Token' "
+                                                      "is in free space "
+                                                      "paragraph layout!");
+                               }
                        }
-                       par = TeXDeeper(buf, bparams, par, os, texrow);
+               } else {
+                       auto_ptr<InsetBase> inset;
+                       if (token == "\\SpecialChar" )
+                               inset.reset(new InsetSpecialChar);
+                       else
+                               inset.reset(new InsetSpace);
+                       inset->read(buf, lex);
+                       par.insertInset(par.size(), inset.release(),
+                                       font, change);
                }
-       } while (par != buf->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
-}
-
-
-namespace {
+       } else if (token == "\\i") {
+               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") {
+               auto_ptr<InsetBase> inset(new InsetNewline);
+               inset->read(buf, lex);
+               par.insertInset(par.size(), inset.release(), font, change);
+       } else if (token == "\\LyXTable") {
+               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");
+               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 ??
+               if (!par.size())
+                       par.cleanChanges();
+               change = Change(Change::UNCHANGED);
+       } else if (token == "\\change_inserted") {
+               lex.nextToken();
+               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(lex.getString());
+               int aid;
+               lyx::time_type ct;
+               is >> aid >> ct;
+               change = Change(Change::DELETED, bp.author_map[aid], ct);
+       } else {
+               lex.eatLine();
+               string const s = bformat(_("Unknown token: %1$s %2$s\n"),
+                       token, lex.getString());
 
-InsetOptArg * optArgInset(Paragraph const & par)
-{
-       // Find the entry.
-       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);
-               }
+               buf.error(ErrorItem(_("Unknown token"), s,
+                                   par.id(), 0, par.size()));
+               return 1;
        }
        return 0;
 }
 
-} // end namespace
+}
 
 
-ParagraphList::iterator
-TeXOnePar(Buffer const * buf,
-         BufferParams const & bparams,
-         ParagraphList::iterator pit,
-         ostream & os, TexRow & texrow,
-         bool moving_arg)
+int readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex)
 {
-       lyxerr[Debug::LATEX] << "TeXOnePar...     " << &*pit << endl;
-       Inset 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
-       // lenght (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();
-               }
+       int unknown = 0;
 
-               if (!pit->params().spacing().isDefault()
-                       && (!pit->previous() || !pit->previous()->hasSameLayout(&*pit))) {
-                       os << pit->params().spacing().writeEnvirBegin() << '\n';
-                       texrow.newline();
-               }
+       lex.nextToken();
+       string token = lex.getString();
 
-               if (style->isCommand()) {
-                       os << '\n';
-                       texrow.newline();
-               }
+       while (lex.isOK()) {
 
-               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;
-               }
+               unknown += readParToken(buf, par, lex, token);
 
-               if (pit->params().lineTop()) {
-                       os << "\\lyxline{\\" << pit->getFont(bparams, 0).latexSize() << '}'
-                          << "\\vspace{-1\\parskip}";
-                       further_blank_line = true;
-               }
+               lex.nextToken();
+               token = lex.getString();
 
-               if (further_blank_line) {
-                       os << '\n';
-                       texrow.newline();
-               }
-       } else {
-               style = bparams.getLyXTextClass().defaultLayout();
-       }
+               if (token.empty())
+                       continue;
 
-       Language const * language = pit->getParLanguage(bparams);
-       Language const * doc_language = bparams.language;
-       Language const * previous_language = pit->previous()
-               ? pit->previous()->getParLanguage(bparams) : doc_language;
-
-       if (language->babel() != previous_language->babel()
-           // check if we already put language command in TeXEnvironment()
-           && !(style->isEnvironment()
-                && (!pit->previous() ||
-                    (pit->previous()->layout() != pit->layout() &&
-                     pit->previous()->getDepth() <= pit->getDepth())
-                    || pit->previous()->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 (token == "\\end_layout") {
+                       //Ok, paragraph finished
+                       break;
                }
 
-               if (lyxrc.language_command_end.empty() ||
-                   language->babel() != doc_language->babel())
-               {
-                       os << subst(lyxrc.language_command_begin, "$$lang",
-                                   language->babel())
-                          << endl;
-                       texrow.newline();
+               lyxerr[Debug::PARSER] << "Handling paragraph token: `"
+                                     << token << '\'' << endl;
+               if (token == "\\begin_layout" || token == "\\end_document"
+                   || token == "\\end_inset" || token == "\\begin_deeper"
+                   || token == "\\end_deeper") {
+                       lex.pushToken(token);
+                       lyxerr << "Paragraph ended in line "
+                              << lex.getLineNo() << "\n"
+                              << "Missing \\end_layout.\n";
+                       break;
                }
        }
 
-       if (bparams.inputenc == "auto" &&
-           language->encoding() != previous_language->encoding()) {
-               os << "\\inputencoding{"
-                  << language->encoding()->LatexName()
-                  << "}\n";
-               texrow.newline();
-       }
+       return unknown;
+}
 
-       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, false, false);
+LyXFont const outerFont(ParagraphList::iterator pit,
+                       ParagraphList const & plist)
+{
+       Paragraph::depth_type par_depth = pit->getDepth();
+       LyXFont tmpfont(LyXFont::ALL_INHERIT);
+
+       // Resolve against environment font information
+       while (pit != const_cast<ParagraphList&>(plist).end() &&
+              par_depth && !tmpfont.resolved()) {
+               pit = outerHook(pit, plist);
+               if (pit != const_cast<ParagraphList&>(plist).end()) {
+                       tmpfont.realize(pit->layout()->font);
+                       par_depth = pit->getDepth();
                }
-               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;
        }
 
-       bool need_par = pit->simpleTeXOnePar(buf, bparams, os, texrow, moving_arg);
-
-       // 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 font =
-               (pit->empty()
-                ? pit->getLayoutFont(bparams) : pit->getFont(bparams, pit->size() - 1));
-
-       bool is_command = style->isCommand();
-
-       if (style->resfont.size() != font.size() && pit->next() && !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 (pit->next() && (pit->params().depth() < pit->next()->params().depth())) {
-                       os << '\n';
-                       texrow.newline();
-               }
-               break;
-       case LATEX_ENVIRONMENT:
-               // if its the last paragraph of the current environment
-               // skip it otherwise fall through
-               if (pit->next()
-                   && (pit->next()->layout() != pit->layout()
-                       || pit->next()->params().depth() != pit->params().depth()))
-                       break;
-               // fall through possible
-       default:
-               // we don't need it for the last paragraph!!!
-               if (pit->next()) {
-                       os << '\n';
-                       texrow.newline();
-               }
+       return tmpfont;
+}
+
+
+ParagraphList::iterator outerPar(Buffer const & buf, InsetBase const * inset)
+{
+       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" << endl;
+       BOOST_ASSERT(false);
+       return const_cast<Buffer &>(buf).paragraphs().end(); // shut up compiler
+}
 
-       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;
-               }
+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
+}
 
-               if (pit->params().pagebreakBottom()) {
-                       os << "\\newpage";
-                       further_blank_line = true;
-               }
 
-               if (further_blank_line) {
-                       os << '\n';
-                       texrow.newline();
-               }
+/// 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();
 
-               if (!pit->params().spacing().isDefault()
-                       && (!pit->next() || !pit->next()->hasSameLayout(&*pit))) {
-                       os << pit->params().spacing().writeEnvirEnd() << '\n';
-                       texrow.newline();
-               }
-       }
+       BOOST_ASSERT(begpar != endpar);
 
-       // we don't need it for the last paragraph!!!
-       if (pit->next()) {
-               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();
-               }
-       }
+       beg = endpar;
+       for (--beg; beg != begpar && beg->y > ystart; --beg)
+               ;
 
-       lyxerr[Debug::LATEX] << "TeXOnePar...done " << pit->next() << endl;
-       return ++pit;
+       for (end = beg ; end != endpar && end->y <= yend; ++end)
+               ;
 }
+