]> git.lyx.org Git - lyx.git/blobdiff - src/paragraph_pimpl.C
couple more fixes
[lyx.git] / src / paragraph_pimpl.C
index f5a8e786dd401e6ca45e44670cc4b62d73a9ff2b..42ec28da89bfc29a2794968895aa9ea4b034bfda 100644 (file)
@@ -1,10 +1,10 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *      
+ *
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team. 
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #endif
 
 #include "paragraph_pimpl.h"
+#include "LaTeXFeatures.h"
 #include "texrow.h"
+#include "language.h"
 #include "bufferparams.h"
 #include "encoding.h"
 #include "lyxrc.h"
 #include "debug.h"
 
-extern int tex_code_break_column;
+#include "support/LAssert.h"
 
+using lyx::pos_type;
+using std::endl;
+using std::ostream;
+using std::upper_bound;
+using std::lower_bound;
 
+// Initialize static member.
+ShareContainer<LyXFont> Paragraph::Pimpl::FontTable::container;
 // Initialization of the counter for the paragraph id's,
 unsigned int Paragraph::Pimpl::paragraph_id = 0;
 
-// Initialize static member.
-ShareContainer<LyXFont> Paragraph::Pimpl::FontTable::container;
+namespace {
+
+struct special_phrase {
+       string phrase;
+       string macro;
+       bool builtin;
+};
+
+special_phrase special_phrases[] = {
+       { "LyX", "\\LyX{}", false },
+       { "TeX", "\\TeX{}", true },
+       { "LaTeX2e", "\\LaTeXe{}", true },
+       { "LaTeX", "\\LaTeX{}", true },
+};
+
+size_t const phrases_nr = sizeof(special_phrases)/sizeof(special_phrase);
+
+} // namespace anon
 
 
 Paragraph::Pimpl::Pimpl(Paragraph * owner)
@@ -39,12 +64,16 @@ Paragraph::Pimpl::Pimpl(Paragraph * owner)
 }
 
 
-Paragraph::Pimpl::Pimpl(Paragraph::Pimpl const & p, Paragraph * owner)
-       : owner_(owner)
+Paragraph::Pimpl::Pimpl(Pimpl const & p, Paragraph * owner, bool same_ids)
+       : params(p.params), owner_(owner)
 {
        inset_owner = p.inset_owner;
        text = p.text;
        fontlist = p.fontlist;
+       if (same_ids)
+               id_ = p.id_;
+       else
+               id_ = paragraph_id++;
 }
 
 
@@ -61,112 +90,101 @@ void Paragraph::Pimpl::setContentsFromPar(Paragraph const * par)
 }
 
 
-Paragraph::value_type
-Paragraph::Pimpl::getChar(Paragraph::size_type pos) const
+Paragraph::value_type Paragraph::Pimpl::getChar(pos_type pos) const
 {
-       lyx::Assert(pos <= size());
+       // This is in the critical path for loading!
+       pos_type const siz = size();
+       lyx::Assert(pos <= siz);
        // This is stronger, and I belive that this is the assertion
        // that we should really use. (Lgb)
        //Assert(pos < size());
 
        // Then this has no meaning. (Lgb)
-       if (!size() || pos == size()) return '\0';
-       
+       if (!siz || pos == siz)
+               return '\0';
+
        return text[pos];
 }
 
 
-void Paragraph::Pimpl::setChar(Paragraph::size_type pos,
-                              Paragraph::value_type c)
+void Paragraph::Pimpl::setChar(pos_type pos, value_type c)
 {
        text[pos] = c;
 }
 
 
-void Paragraph::Pimpl::insertChar(Paragraph::size_type pos,
-                                 Paragraph::value_type c,
+void Paragraph::Pimpl::insertChar(pos_type pos, value_type c,
                                  LyXFont const & font)
 {
        lyx::Assert(pos <= size());
 
+       // This is actually very common when parsing buffers (and
+       // maybe inserting ascii text)
+       if (pos == size()) {
+               // when appending characters, no need to update tables
+               text.push_back(c);
+               owner_->setFont(pos, font);
+               return;
+       }
+
        text.insert(text.begin() + pos, c);
 
        // Update the font table.
        FontTable search_font(pos, LyXFont());
        for (FontList::iterator it = lower_bound(fontlist.begin(),
-                                                fontlist.end(),
-                                                search_font, matchFT());
+                                                     fontlist.end(),
+                                                     search_font, matchFT());
             it != fontlist.end(); ++it)
-               (*it).pos((*it).pos() + 1);
-   
-       // Update the inset table.
-       InsetTable search_inset(pos, 0);
-       for (InsetList::iterator it = lower_bound(owner_->insetlist.begin(),
-                                                 owner_->insetlist.end(),
-                                                 search_inset, matchIT());
-            it != owner_->insetlist.end(); ++it)
-               ++(*it).pos;
+       {
+               it->pos(it->pos() + 1);
+       }
+
+       // Update the insets
+       owner_->insetlist.increasePosAfterPos(pos);
 
        owner_->setFont(pos, font);
 }
 
 
-void Paragraph::Pimpl::insertInset(Paragraph::size_type pos,
+void Paragraph::Pimpl::insertInset(pos_type pos,
                                   Inset * inset, LyXFont const & font)
 {
        lyx::Assert(inset);
        lyx::Assert(pos <= size());
-       
+
        insertChar(pos, META_INSET, font);
        lyx::Assert(text[pos] == META_INSET);
-       
-       // Add a new entry in the inset table.
-       InsetTable search_inset(pos, 0);
-       InsetList::iterator it = lower_bound(owner_->insetlist.begin(),
-                                            owner_->insetlist.end(),
-                                            search_inset, matchIT());
-       if (it != owner_->insetlist.end() && (*it).pos == pos) {
-               lyxerr << "ERROR (Paragraph::InsertInset): "
-                       "there is an inset in position: " << pos << std::endl;
-       } else {
-               owner_->insetlist.insert(it, InsetTable(pos, inset));
-       }
-       
+
+       // Add a new entry in the insetlist.
+       owner_->insetlist.insert(inset, pos);
+       inset->parOwner(owner_);
+
        if (inset_owner)
                inset->setOwner(inset_owner);
 }
 
 
-void Paragraph::Pimpl::erase(Paragraph::size_type pos)
+void Paragraph::Pimpl::erase(pos_type pos)
 {
        lyx::Assert(pos < size());
-       // if it is an inset, delete the inset entry 
+       // if it is an inset, delete the inset entry
        if (text[pos] == Paragraph::META_INSET) {
-               // find the entry
-               InsetTable search_inset(pos, 0);
-               InsetList::iterator it =
-                       lower_bound(owner_->insetlist.begin(),
-                                   owner_->insetlist.end(),
-                                   search_inset, matchIT());
-               if (it != owner_->insetlist.end() && (*it).pos == pos) {
-                       delete (*it).inset;
-                       owner_->insetlist.erase(it);
-               }
+               owner_->insetlist.erase(pos);
        }
-       
+
        text.erase(text.begin() + pos);
-       
+
        // Erase entries in the tables.
        FontTable search_font(pos, LyXFont());
-       
+
        FontList::iterator it =
                lower_bound(fontlist.begin(),
                            fontlist.end(),
                            search_font, matchFT());
-       if (it != fontlist.end() && (*it).pos() == pos &&
-           (pos == 0 || 
-            (it != fontlist.begin() 
-             && (*(it - 1)).pos() == pos - 1))) {
+       if (it != fontlist.end() && it->pos() == pos &&
+           (pos == 0 ||
+            (it != fontlist.begin()
+             && boost::prior(it)->pos() == pos - 1))) {
                // If it is a multi-character font
                // entry, we just make it smaller
                // (see update below), otherwise we
@@ -180,76 +198,80 @@ void Paragraph::Pimpl::erase(Paragraph::size_type pos)
                        it = fontlist.begin() + i - 1;
                }
        }
-       
+
        // Update all other entries.
        FontList::iterator fend = fontlist.end();
        for (; it != fend; ++it)
-               (*it).pos((*it).pos() - 1);
-       
-       // Update the inset table.
-       InsetTable search_inset(pos, 0);
-       InsetList::iterator lend = owner_->insetlist.end();
-       for (InsetList::iterator it =
-                    upper_bound(owner_->insetlist.begin(),
-                                lend,
-                                search_inset, matchIT());
-            it != lend; ++it)
-               --(*it).pos;
+               it->pos(it->pos() - 1);
+
+       // Update the insetlist.
+       owner_->insetlist.decreasePosAfterPos(pos);
 }
 
 
-void Paragraph::Pimpl::simpleTeXBlanks(std::ostream & os, TexRow & texrow,
-                                      Paragraph::size_type const i,
+void Paragraph::Pimpl::simpleTeXBlanks(ostream & os, TexRow & texrow,
+                                      pos_type const i,
                                       int & column, LyXFont const & font,
                                       LyXLayout const & style)
 {
-       if (column > tex_code_break_column
-           && i 
-           && owner_->getChar(i - 1) != ' '
-           && (i < owner_->size() - 1)
-#ifndef NO_LATEX
-           // In LaTeX mode, we don't want to
-           // break lines since some commands
-           // do not like this
-           && ! (font.latex() == LyXFont::ON)
-#endif
+       if (style.pass_thru) return;
+       if (column > lyxrc.ascii_linelen
+           && i
+           && getChar(i - 1) != ' '
+           && (i < size() - 1)
            // same in FreeSpacing mode
            && !style.free_spacing
-           // In typewriter mode, we want to avoid 
+               && !owner_->isFreeSpacing()
+           // In typewriter mode, we want to avoid
            // ! . ? : at the end of a line
            && !(font.family() == LyXFont::TYPEWRITER_FAMILY
-                && (owner_->getChar(i-1) == '.'
-                    || owner_->getChar(i-1) == '?' 
-                    || owner_->getChar(i-1) == ':'
-                    || owner_->getChar(i-1) == '!'))) {
-               if (tex_code_break_column == 0) {
-                       // in batchmode we need LaTeX to still
-                       // see it as a space not as an extra '\n'
-                       os << " %\n";
-               } else {
-                       os << '\n';
-               }
+                && (getChar(i - 1) == '.'
+                    || getChar(i - 1) == '?'
+                    || getChar(i - 1) == ':'
+                    || getChar(i - 1) == '!'))) {
+               os << '\n';
                texrow.newline();
                texrow.start(owner_, i + 1);
                column = 0;
-       } else
-#ifndef NO_LATEX
-               if (font.latex() == LyXFont::OFF) {
-#endif
-               if (style.free_spacing) {
-                       os << '~';
-               } else {
-                       os << ' ';
-               }
-#ifndef NO_LATEX
+       } else if (style.free_spacing) {
+               os << '~';
+       } else {
+               os << ' ';
        }
-#endif
+}
+
+
+bool Paragraph::Pimpl::isTextAt(string const & str, pos_type pos) const
+{
+       pos_type const len = str.length();
+
+       // is the paragraph large enough?
+       if (pos + len > size())
+               return false;
+
+       // does the wanted text start at point?
+       for (string::size_type i = 0; i < str.length(); ++i) {
+               if (str[i] != text[pos + i])
+                       return false;
+       }
+
+       // is there a font change in middle of the word?
+       FontList::const_iterator cit = fontlist.begin();
+       FontList::const_iterator end = fontlist.end();
+       for (; cit != end; ++cit) {
+               if (cit->pos() >= pos)
+                       break;
+       }
+       if (cit != end && pos + len - 1 > cit->pos())
+               return false;
+
+       return true;
 }
 
 
 void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                                             BufferParams const & bparams,
-                                            std::ostream & os,
+                                            ostream & os,
                                             TexRow & texrow,
                                             bool moving_arg,
                                             LyXFont & font,
@@ -257,10 +279,14 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                                             LyXFont & basefont,
                                             bool & open_font,
                                             LyXLayout const & style,
-                                            Paragraph::size_type & i,
+                                            pos_type & i,
                                             int & column,
-                                            Paragraph::value_type const c)
+                                            value_type const c)
 {
+       if (style.pass_thru) {
+               if (c != '\0') os << c;
+               return;
+       }
        // Two major modes:  LaTeX or plain
        // Handle here those cases common to both modes
        // and then split to handle the two modes separately.
@@ -279,6 +305,23 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                                close = true;
                        }
 
+#ifdef WITH_WARNINGS
+#warning Bug: we can have an empty font change here!
+// if there has just been a font change, we are going to close it
+// right now, which means stupid latex code like \textsf{}. AFAIK,
+// this does not harm dvi output. A minor bug, thus (JMarc)
+#endif
+                       // some insets cannot be inside a font change command
+                       if (open_font && inset->noFontChange()) {
+                               column +=running_font.
+                                       latexWriteEndChanges(os,
+                                                            basefont,
+                                                            basefont);
+                               open_font = false;
+                               basefont = owner_->getLayoutFont(bparams);
+                               running_font = basefont;
+                       }
+
                        int tmp = inset->latex(buf, os, moving_arg,
                                               style.free_spacing);
 
@@ -286,13 +329,14 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                                os << "}";
 
                        if (tmp) {
+                               for (int j = 0; j < tmp; ++j) {
+                                       texrow.newline();
+                               }
+                               texrow.start(owner_, i + 1);
                                column = 0;
                        } else {
                                column += int(os.tellp()) - len;
                        }
-                       for (; tmp--;) {
-                               texrow.newline();
-                       }
                }
        }
        break;
@@ -304,213 +348,174 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                                                                    basefont);
                        open_font = false;
                }
-               basefont = owner_->getFont(bparams, -1);
+               basefont = owner_->getLayoutFont(bparams);
                running_font = basefont;
                break;
 
-       case Paragraph::META_HFILL: 
+       case Paragraph::META_HFILL:
                os << "\\hfill{}";
                column += 7;
                break;
 
        default:
                // And now for the special cases within each mode
-#ifndef NO_LATEX
-               // Are we in LaTeX mode?
-               if (font.latex() == LyXFont::ON) {
-                       // at present we only have one option
-                       // but I'll leave it as a switch statement
-                       // so its simpler to extend. (ARRae)
-                       switch (c) {
-                       default:
-                               // make sure that we will not print
-                               // error generating chars to the tex
-                               // file. This test would not be needed
-                               // if it were done in the buffer
-                               // itself.
-                               if (c != '\0') {
-                                       os << c;
+
+               switch (c) {
+               case '\\':
+                       os << "\\textbackslash{}";
+                       column += 15;
+                       break;
+
+               case '±': case '²': case '³':
+               case '×': case '÷': case '¹':
+               case '¬': case 'µ':
+                       if ((bparams.inputenc == "latin1" ||
+                            bparams.inputenc == "latin9") ||
+                           (bparams.inputenc == "auto" &&
+                            (font.language()->encoding()->LatexName()
+                             == "latin1" ||
+                             font.language()->encoding()->LatexName()
+                             == "latin9"))) {
+                               os << "\\ensuremath{"
+                                  << c
+                                  << '}';
+                               column += 13;
+                       } else {
+                               os << c;
+                       }
+                       break;
+
+               case '|': case '<': case '>':
+                       // In T1 encoding, these characters exist
+                       if (lyxrc.fontenc == "T1") {
+                               os << c;
+                               //... but we should avoid ligatures
+                               if ((c == '>' || c == '<')
+                                   && i <= size() - 2
+                                   && getChar(i + 1) == c) {
+                                       //os << "\\textcompwordmark{}";
+                                       // Jean-Marc, have a look at
+                                       // this. I think this works
+                                       // equally well:
+                                       os << "\\,{}";
+                                       // Lgb
+                                       column += 19;
                                }
                                break;
                        }
-               } else {
-#endif
-                       // Plain mode (i.e. not LaTeX)
+                       // Typewriter font also has them
+                       if (font.family() == LyXFont::TYPEWRITER_FAMILY) {
+                               os << c;
+                               break;
+                       }
+                       // Otherwise, we use what LaTeX
+                       // provides us.
                        switch (c) {
-                       case '\\': 
-                               os << "\\textbackslash{}";
-                               column += 15;
+                       case '<':
+                               os << "\\textless{}";
+                               column += 10;
                                break;
-               
-                       case '°': case '±': case '²': case '³':  
-                       case '×': case '÷': case '¹': case 'ª':
-                       case 'º': case '¬': case 'µ':
-                               if (bparams.inputenc == "latin1" ||
-                                   (bparams.inputenc == "auto" &&
-                                    font.language()->encoding()->LatexName()
-                                    == "latin1")) {
-                                       os << "\\ensuremath{"
-                                          << c
-                                          << '}';
-                                       column += 13;
-                               } else {
-                                       os << c;
-                               }
+                       case '>':
+                               os << "\\textgreater{}";
+                               column += 13;
                                break;
-
-                       case '|': case '<': case '>':
-                               // In T1 encoding, these characters exist
-                               if (lyxrc.fontenc == "T1") {
-                                       os << c;
-                                       //... but we should avoid ligatures
-                                       if ((c == '>' || c == '<')
-                                           && i <= owner_->size() - 2
-                                           && owner_->getChar(i + 1) == c) {
-                                               //os << "\\textcompwordmark{}";
-                                               // Jean-Marc, have a look at
-                                               // this. I think this works
-                                               // equally well:
-                                               os << "\\,{}";
-                                               // Lgb
-                                               column += 19;
-                                       }
-                                       break;
-                               }
-                               // Typewriter font also has them
-                               if (font.family() == LyXFont::TYPEWRITER_FAMILY) {
-                                       os << c;
-                                       break;
-                               } 
-                               // Otherwise, we use what LaTeX
-                               // provides us.
-                               switch (c) {
-                               case '<':
-                                       os << "\\textless{}";
-                                       column += 10;
-                                       break;
-                               case '>':
-                                       os << "\\textgreater{}";
-                                       column += 13;
-                                       break;
-                               case '|':
-                                       os << "\\textbar{}";
-                                       column += 9;
-                                       break;
-                               }
+                       case '|':
+                               os << "\\textbar{}";
+                               column += 9;
                                break;
+                       }
+                       break;
 
-                       case '-': // "--" in Typewriter mode -> "-{}-"
-                               if (i <= owner_->size() - 2
-                                   && owner_->getChar(i + 1) == '-'
-                                   && font.family() == LyXFont::TYPEWRITER_FAMILY) {
-                                       os << "-{}";
-                                       column += 2;
-                               } else {
-                                       os << '-';
-                               }
-                               break;
+               case '-': // "--" in Typewriter mode -> "-{}-"
+                       if (i <= size() - 2
+                           && getChar(i + 1) == '-'
+                           && font.family() == LyXFont::TYPEWRITER_FAMILY) {
+                               os << "-{}";
+                               column += 2;
+                       } else {
+                               os << '-';
+                       }
+                       break;
 
-                       case '\"': 
-                               os << "\\char`\\\"{}";
-                               column += 9;
-                               break;
+               case '\"':
+                       os << "\\char`\\\"{}";
+                       column += 9;
+                       break;
 
-                       case '£':
-                               if (bparams.inputenc == "default") {
-                                       os << "\\pounds{}";
-                                       column += 8;
-                               } else {
+               case '£':
+                       if (bparams.inputenc == "default") {
+                               os << "\\pounds{}";
+                               column += 8;
+                       } else {
+                               os << c;
+                       }
+                       break;
+
+               case '$': case '&':
+               case '%': case '#': case '{':
+               case '}': case '_':
+                       os << '\\' << c;
+                       column += 1;
+                       break;
+
+               case '~':
+                       os << "\\textasciitilde{}";
+                       column += 16;
+                       break;
+
+               case '^':
+                       os << "\\textasciicircum{}";
+                       column += 17;
+                       break;
+
+               case '*': case '[': case ']':
+                       // avoid being mistaken for optional arguments
+                       os << '{' << c << '}';
+                       column += 2;
+                       break;
+
+               case ' ':
+                       // Blanks are printed before font switching.
+                       // Sure? I am not! (try nice-latex)
+                       // I am sure it's correct. LyX might be smarter
+                       // in the future, but for now, nothing wrong is
+                       // written. (Asger)
+                       break;
+
+               default:
+
+                       // I assume this is hack treating typewriter as verbatim
+                       if (font.family() == LyXFont::TYPEWRITER_FAMILY) {
+                               if (c != '\0') {
                                        os << c;
                                }
                                break;
+                       }
 
-                       case '$': case '&':
-                       case '%': case '#': case '{':
-                       case '}': case '_':
-                               os << '\\' << c;
-                               column += 1;
-                               break;
-
-                       case '~':
-                               os << "\\textasciitilde{}";
-                               column += 16;
-                               break;
-
-                       case '^':
-                               os << "\\textasciicircum{}";
-                               column += 17;
-                               break;
+                       // LyX, LaTeX etc.
 
-                       case '*': case '[': case ']':
-                               // avoid being mistaken for optional arguments
-                               os << '{' << c << '}';
-                               column += 2;
-                               break;
+                       // FIXME: if we have "LaTeX" with a font
+                       // change in the middle (before the 'T', then
+                       // the "TeX" part is still special cased.
+                       // Really we should only operate this on
+                       // "words" for some definition of word
 
-                       case ' ':
-                               // Blanks are printed before font switching.
-                               // Sure? I am not! (try nice-latex)
-                               // I am sure it's correct. LyX might be smarter
-                               // in the future, but for now, nothing wrong is
-                               // written. (Asger)
-                               break;
+                       size_t pnr = 0;
 
-                       default:
-                               /* idea for labels --- begin*/
-                               // Check for "LyX"
-                               if (c ==  'L'
-                                   && i <= owner_->size() - 3
-                                   && font.family() != LyXFont::TYPEWRITER_FAMILY
-                                   && owner_->getChar(i + 1) == 'y'
-                                   && owner_->getChar(i + 2) == 'X') {
-                                       os << "\\LyX{}";
-                                       i += 2;
-                                       column += 5;
-                               }
-                               // Check for "TeX"
-                               else if (c == 'T'
-                                        && i <= owner_->size() - 3
-                                        && font.family() != LyXFont::TYPEWRITER_FAMILY
-                                        && owner_->getChar(i + 1) == 'e'
-                                        && owner_->getChar(i + 2) == 'X') {
-                                       os << "\\TeX{}";
-                                       i += 2;
-                                       column += 5;
-                               }
-                               // Check for "LaTeX2e"
-                               else if (c == 'L'
-                                        && i <= owner_->size() - 7
-                                        && font.family() != LyXFont::TYPEWRITER_FAMILY
-                                        && owner_->getChar(i + 1) == 'a'
-                                        && owner_->getChar(i + 2) == 'T'
-                                        && owner_->getChar(i + 3) == 'e'
-                                        && owner_->getChar(i + 4) == 'X'
-                                        && owner_->getChar(i + 5) == '2'
-                                        && owner_->getChar(i + 6) == 'e') {
-                                       os << "\\LaTeXe{}";
-                                       i += 6;
-                                       column += 8;
-                               }
-                               // Check for "LaTeX"
-                               else if (c == 'L'
-                                        && i <= owner_->size() - 5
-                                        && font.family() != LyXFont::TYPEWRITER_FAMILY
-                                        && owner_->getChar(i + 1) == 'a'
-                                        && owner_->getChar(i + 2) == 'T'
-                                        && owner_->getChar(i + 3) == 'e'
-                                        && owner_->getChar(i + 4) == 'X') {
-                                       os << "\\LaTeX{}";
-                                       i += 4;
-                                       column += 7;
-                                       /* idea for labels --- end*/ 
-                               } else if (c != '\0') {
-                                       os << c;
+                       for (; pnr < phrases_nr; ++pnr) {
+                               if (isTextAt(special_phrases[pnr].phrase, i)) {
+                                       os << special_phrases[pnr].macro;
+                                       i += special_phrases[pnr].phrase.length() - 1;
+                                       column += special_phrases[pnr].macro.length() - 1;
+                                       break;
                                }
-                               break;
                        }
-#ifndef NO_LATEX
+
+                       if (pnr == phrases_nr && c != '\0') {
+                               os << c;
+                       }
+                       break;
                }
-#endif
        }
 }
 
@@ -518,14 +523,13 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
 
 Paragraph * Paragraph::Pimpl::TeXDeeper(Buffer const * buf,
                                        BufferParams const & bparams,
-                                       std::ostream & os, TexRow & texrow)
+                                       ostream & os, TexRow & texrow)
 {
-       lyxerr[Debug::LATEX] << "TeXDeeper...     " << this << std::endl;
+       lyxerr[Debug::LATEX] << "TeXDeeper...     " << this << endl;
        Paragraph * par = owner_;
 
        while (par && par->params().depth() == owner_->params().depth()) {
-               if (textclasslist.Style(bparams.textclass, 
-                                       par->layout).isEnvironment()) {
+               if (par->layout()->isEnvironment()) {
                        par = par->TeXEnvironment(buf, bparams,
                                                  os, texrow);
                } else {
@@ -533,9 +537,127 @@ Paragraph * Paragraph::Pimpl::TeXDeeper(Buffer const * buf,
                                             os, texrow, false);
                }
        }
-       lyxerr[Debug::LATEX] << "TeXDeeper...done " << par << std::endl;
+       lyxerr[Debug::LATEX] << "TeXDeeper...done " << par << endl;
 
        return par;
 }
 
 
+void Paragraph::Pimpl::validate(LaTeXFeatures & features,
+                               LyXLayout const & layout) 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;
+
+       FontList::const_iterator fcit = fontlist.begin();
+       FontList::const_iterator fend = 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 &&
+                   language != latex_language)
+               {
+                       features.useLanguage(language);
+                       lyxerr[Debug::LATEX] << "Found language "
+                                            << language->babel() << endl;
+               }
+       }
+
+       if (!params.leftIndent().zero())
+               features.require("ParagraphLeftIndent");
+
+       // then the insets
+       InsetList::iterator icit = owner_->insetlist.begin();
+       InsetList::iterator iend = owner_->insetlist.end();
+       for (; icit != iend; ++icit) {
+               if (icit.getInset()) {
+                       icit.getInset()->validate(features);
+                       if (layout.needprotect &&
+                           icit.getInset()->lyxCode() == Inset::FOOT_CODE)
+                               features.require("NeedLyXFootnoteCode");
+               }
+       }
+
+       // then the contents
+       for (pos_type i = 0; i < size() ; ++i) {
+               for (size_t pnr = 0; pnr < phrases_nr; ++pnr) {
+                       if (!special_phrases[pnr].builtin
+                           && isTextAt(special_phrases[pnr].phrase, i)) {
+                               features.require(special_phrases[pnr].phrase);
+                               break;
+                       }
+               }
+       }
+}
+
+
+Paragraph * Paragraph::Pimpl::getParFromID(int id) const
+{
+       InsetList::iterator cit = owner_->insetlist.begin();
+       InsetList::iterator lend = owner_->insetlist.end();
+       Paragraph * result;
+       for (; cit != lend; ++cit) {
+               if ((result = cit.getInset()->getParFromID(id)))
+                       return result;
+       }
+       return 0;
+}
+
+
+LyXFont const Paragraph::Pimpl::realizeFont(LyXFont const & font,
+                                           BufferParams const & bparams) const
+{
+       LyXFont tmpfont(font);
+
+       // check for environment font information
+       char par_depth = owner_->getDepth();
+       Paragraph const * par = owner_;
+       LyXTextClass const & tclass = bparams.getLyXTextClass();
+
+       while (par && par->getDepth() && !tmpfont.resolved()) {
+               par = par->outerHook();
+               if (par) {
+                       tmpfont.realize(par->layout()->font);
+                       par_depth = par->getDepth();
+               }
+       }
+
+       tmpfont.realize(tclass.defaultfont());
+       return tmpfont;
+}