]> git.lyx.org Git - lyx.git/blobdiff - src/paragraph.C
Dekels arabic patch, + some small things by me
[lyx.git] / src / paragraph.C
index 96a747857b8f2f585ff3139c87663f80eb5538c4..99ab8c67ba08ad16de4af89ac340225356646cfd 100644 (file)
@@ -33,13 +33,9 @@ using std::ios;
 #include "support/filetools.h"
 #include "lyx_gui_misc.h"
 #include "texrow.h"
+#include "support/lyxmanip.h"
 
 
-#ifdef USE_OSTREAM_ONLY
-#include "support/lyxmanip.h"
-#else
-extern void addNewlineAndDepth(string & file, int depth); // Jug 990923
-#endif
 int tex_code_break_column = 72;  // needs non-zero initialization. set later.
 // this is a bad idea, but how can LyXParagraph find its buffer to get
 // parameters? (JMarc)
@@ -1206,9 +1202,20 @@ LyXParagraph * LyXParagraph::LastPhysicalPar()
                tmp = tmp->NextAfterFootnote();
    
        return tmp;
-   
 }
 
+LyXParagraph const * LyXParagraph::LastPhysicalPar() const
+{
+       if (footnoteflag != LyXParagraph::NO_FOOTNOTE)
+               return this;
+   
+       LyXParagraph const * tmp = this;
+       while (tmp->next
+              && tmp->next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
+               tmp = tmp->NextAfterFootnote();
+   
+       return tmp;  
+}
 
 LyXParagraph * LyXParagraph::FirstPhysicalPar()
 {
@@ -1571,6 +1578,34 @@ void LyXParagraph::CloseFootnote(LyXParagraph::size_type pos)
        }
 }
 
+int LyXParagraph::GetEndLabel() const
+{
+       LyXParagraph const * par = this;
+       int par_depth = GetDepth();
+       while (par) {
+               LyXTextClass::LayoutList::size_type layout = par->GetLayout();
+               int endlabeltype =
+                       textclasslist.Style(current_view->buffer()->params.textclass,
+                                           layout).endlabeltype;
+               if (endlabeltype != END_LABEL_NO_LABEL) {
+                       LyXParagraph const * last = LastPhysicalPar();
+                       if (!last || !last->next)
+                               return endlabeltype;
+
+                       int next_depth = last->next->GetDepth();
+                       if (par_depth > next_depth ||
+                           (par_depth == next_depth && layout != last->next->GetLayout() ))
+                               return endlabeltype;
+                       break;
+               }
+               if (par_depth == 0)
+                       break;
+               par = par->DepthHook(par_depth - 1);
+               if (par)
+                       par_depth = par->GetDepth();
+       }
+       return END_LABEL_NO_LABEL;
+}
 
 LyXTextClass::size_type LyXParagraph::GetLayout() const
 {
@@ -1871,7 +1906,6 @@ void LyXParagraph::readSimpleWholeFile(istream & is)
 }
 
 
-#ifdef USE_OSTREAM_ONLY
 LyXParagraph * LyXParagraph::TeXOnePar(ostream & os, TexRow & texrow,
                                       ostream & foot, TexRow & foot_texrow,
                                       int & foot_count)
@@ -1921,9 +1955,9 @@ LyXParagraph * LyXParagraph::TeXOnePar(ostream & os, TexRow & texrow,
                current_view->buffer()->params.getDocumentDirection();
        if (direction != global_direction) {
                if (direction == LYX_DIR_LEFT_TO_RIGHT)
-                       os << "\\unsethebrew\n";
+                       os << lyxrc->language_command_ltr << '\n';
                else
-                       os << "\\sethebrew\n";
+                       os << lyxrc->language_command_rtl << '\n';
                texrow.newline();
        }
        
@@ -1936,7 +1970,7 @@ LyXParagraph * LyXParagraph::TeXOnePar(ostream & os, TexRow & texrow,
                break;
        case LATEX_ITEM_ENVIRONMENT:
                if (bibkey) {
-                       bibkey->Latex(os, false);
+                       bibkey->Latex(os, false, false);
                } else
                        os << "\\item ";
                break;
@@ -1986,9 +2020,9 @@ LyXParagraph * LyXParagraph::TeXOnePar(ostream & os, TexRow & texrow,
 
        if (direction != global_direction)
                if (direction == LYX_DIR_LEFT_TO_RIGHT)
-                       os << "\\sethebrew";
+                       os << '\n' << lyxrc->language_command_rtl;
                else
-                       os << "\\unsethebrew";
+                       os << '\n' << lyxrc->language_command_ltr;
        
        switch (style.latextype) {
        case LATEX_ITEM_ENVIRONMENT:
@@ -2052,207 +2086,9 @@ LyXParagraph * LyXParagraph::TeXOnePar(ostream & os, TexRow & texrow,
        lyxerr[Debug::LATEX] << "TeXOnePar...done " << par << endl;
        return par;
 }
-#else
-LyXParagraph * LyXParagraph::TeXOnePar(string & file, TexRow & texrow,
-                                      string & foot, TexRow & foot_texrow,
-                                      int & foot_count)
-{
-       lyxerr[Debug::LATEX] << "TeXOnePar...     " << this << endl;
-       LyXParagraph * par = next;
-       LyXLayout const & style =
-               textclasslist.Style(current_view->buffer()->params.textclass,
-                                   layout);
-
-       bool further_blank_line = false;
-       if (IsDummy())
-               lyxerr << "ERROR (LyXParagraph::TeXOnePar) is dummy." << endl;
-
-       if (start_of_appendix) {
-               file += "\\appendix\n";
-               texrow.newline();
-       }
-
-       if (tex_code_break_column && style.isCommand()){
-               file += '\n';
-               texrow.newline();
-       }
-
-       if (pagebreak_top) {
-               file += "\\newpage";
-               further_blank_line = true;
-       }
-       if (added_space_top.kind() != VSpace::NONE) {
-               file += added_space_top.asLatexCommand(current_view->buffer()->params);
-               further_blank_line = true;
-       }
-      
-       if (line_top) {
-               file += "\\lyxline{\\" + getFont(0).latexSize() + '}';
-               file += "\\vspace{-1\\parskip}";
-               further_blank_line = true;
-       }
-
-       if (further_blank_line){
-               file += '\n';
-               texrow.newline();
-       }
-
-       LyXDirection direction = getParDirection();
-       LyXDirection global_direction =
-               current_view->buffer()->params.getDocumentDirection();
-       if (direction != global_direction) {
-               if (direction == LYX_DIR_LEFT_TO_RIGHT)
-                       file += "\\unsethebrew\n";
-               else
-                       file += "\\sethebrew\n";
-               texrow.newline();
-       }
-       
-
-       switch (style.latextype) {
-       case LATEX_COMMAND:
-               file += '\\';
-               file += style.latexname();
-               file += style.latexparam();
-               break;
-       case LATEX_ITEM_ENVIRONMENT:
-               if (bibkey) {
-#ifdef USE_OSTREAM_ONLY
-#ifdef HAVE_SSTREAM
-                       ostringstream ost;
-                       bibkey->Latex(ost, false);
-                       file += ost.str().c_str();
-#else
-                       ostrstream ost;
-                       bibkey->Latex(ost, false);
-                       ost << '\0';
-                       char * tmp = ost.str();
-                       file += tmp;
-                       delete [] tmp;
-#endif
-#else
-                       bibkey->Latex(file, false);
-#endif
-               } else
-                       file += "\\item ";
-               break;
-       case LATEX_LIST_ENVIRONMENT:
-               file += "\\item ";
-               break;
-       default:
-               break;
-       }
-
-       bool need_par = SimpleTeXOnePar(file, texrow);
-       // Spit out footnotes
-       while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE
-              && par->footnoteflag != footnoteflag) {
-               par = par->TeXFootnote(file, texrow,
-                                      foot, foot_texrow, foot_count,
-                                      direction);
-               par->SimpleTeXOnePar(file, texrow);
-               par = par->next;
-       }
-
-       // 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)
-       LyXFont font = getFont(Last()-1);
-       if (need_par) {
-               if (style.resfont.size() != font.size()) {
-                       file += '\\';
-                       file += font.latexSize();
-                       file += ' ';
-               }
-               file += "\\par}";
-       } else if (textclasslist.Style(current_view->buffer()->params.textclass,
-                                      GetLayout()).isCommand()){
-               if (style.resfont.size() != font.size()) {
-                       file += '\\';
-                       file += font.latexSize();
-                       file += ' ';
-               }
-               file += '}';
-       } else if (style.resfont.size() != font.size()){
-               file += "{\\" + font.latexSize() + " \\par}";
-       }
-
-       if (direction != global_direction)
-               if (direction == LYX_DIR_LEFT_TO_RIGHT)
-                       file += "\\sethebrew";
-               else
-                       file += "\\unsethebrew";
-       
-       switch (style.latextype) {
-       case LATEX_ITEM_ENVIRONMENT:
-       case LATEX_LIST_ENVIRONMENT:
-                if (par && (depth < par->depth)) {
-                        file += '\n';
-                        texrow.newline();
-                }
-               break;
-       case LATEX_ENVIRONMENT:
-               // if its the last paragraph of the current environment
-               // skip it otherwise fall through
-               if (par
-                   && (par->layout != layout
-                       || par->depth != depth
-                       || par->pextra_type != pextra_type))
-                       break;
-       default:
-               if (!(footnoteflag != LyXParagraph::NO_FOOTNOTE
-                     && footnotekind != LyXParagraph::FOOTNOTE
-                     && footnotekind != LyXParagraph::MARGIN
-                     && (table
-                         || (par
-                             && par->table)))) {
-                       // don't insert this if we would be adding it
-                       // before or after a table in a float.  This 
-                       // little trick is needed in order to allow
-                       // use of tables in \subfigures or \subtables.
-                       file += '\n';
-                       texrow.newline();
-               }
-       }
-       
-       further_blank_line = false;
-       if (line_bottom) {
-               file += "\\lyxline{\\" + getFont(Last()-1).latexSize() + '}';
-               further_blank_line = true;
-       }
-
-       if (added_space_bottom.kind() != VSpace::NONE) {
-               file += added_space_bottom.asLatexCommand(current_view->buffer()->params);
-               further_blank_line = true;
-       }
-      
-       if (pagebreak_bottom) {
-               file += "\\newpage";
-               further_blank_line = true;
-       }
-
-       if (further_blank_line){
-               file += '\n';
-               texrow.newline();
-       }
-
-       if (!(footnoteflag != LyXParagraph::NO_FOOTNOTE && par &&
-              par->footnoteflag == LyXParagraph::NO_FOOTNOTE)) {
-               file += '\n';
-               texrow.newline();
-       }
-
-       lyxerr[Debug::LATEX] << "TeXOnePar...done " << par << endl;
-       return par;
-}
-#endif
 
 
 // This one spits out the text of the paragraph
-#ifdef USE_OSTREAM_ONLY
 bool LyXParagraph::SimpleTeXOnePar(ostream & os, TexRow & texrow)
 {
        lyxerr[Debug::LATEX] << "SimpleTeXOnePar...     " << this << endl;
@@ -2434,256 +2270,73 @@ bool LyXParagraph::SimpleTeXOnePar(ostream & os, TexRow & texrow)
        lyxerr[Debug::LATEX] << "SimpleTeXOnePar...done " << this << endl;
        return return_value;
 }
-#else
-bool LyXParagraph::SimpleTeXOnePar(string & file, TexRow & texrow)
-{
-       lyxerr[Debug::LATEX] << "SimpleTeXOnePar...     " << this << endl;
 
-       if (table)
-               return SimpleTeXOneTablePar(file, texrow);
 
+// This one spits out the text of a table paragraph
+bool LyXParagraph::SimpleTeXOneTablePar(ostream & os, TexRow & texrow)
+{
+       lyxerr[Debug::LATEX] << "SimpleTeXOneTablePar...     " << this << endl;
+   
        bool return_value = false;
 
-       LyXLayout const & style =
+       LyXLayout const & style = 
                textclasslist.Style(current_view->buffer()->params.textclass,
                                    GetLayout());
-       LyXFont basefont, last_font;
-
-       // Maybe we have to create a optional argument.
-       size_type main_body;
-       if (style.labeltype != LABEL_MANUAL)
-               main_body = 0;
-       else
-               main_body = BeginningOfMainBody();
-
-       if (main_body > 0) {
-               file += '[';
-               basefont = getFont(-2); // Get label font
-       } else {
-               basefont = getFont(-1); // Get layout font
-       }
-
        int column = 0;
-
-       if (main_body >= 0
-           && !text.size()
-           && !IsDummy()) {
+       if (!IsDummy()) { // it is dummy if it is in a float!!!
                if (style.isCommand()) {
-                       file += '{';
+                       os << '{';
                        ++column;
                } else if (align != LYX_ALIGN_LAYOUT) {
-                       file += '{';
+                       os << '{';
                        ++column;
                        return_value = true;
                }
+               if (noindent) {
+                       os << "\\noindent ";
+                       column += 10;
+               }
+               switch (align) {
+               case LYX_ALIGN_NONE:
+               case LYX_ALIGN_BLOCK:
+               case LYX_ALIGN_LAYOUT:
+               case LYX_ALIGN_SPECIAL: break;
+               case LYX_ALIGN_LEFT:
+                       os << "\\raggedright ";
+                       column+= 13;
+                       break;
+               case LYX_ALIGN_RIGHT:
+                       os << "\\raggedleft ";
+                       column+= 12;
+                       break;
+               case LYX_ALIGN_CENTER:
+                       os << "\\centering ";
+                       column+= 11;
+                       break;
+               }
        }
+
+       LyXFont basefont = getFont(-1); // Get layout font
        // Which font is currently active?
        LyXFont running_font = basefont;
+       LyXFont last_font;
        // Do we have an open font change?
        bool open_font = false;
-
+       int current_cell_number = -1;
+       int tmp = table->TexEndOfCell(os, current_cell_number);
+       for (; tmp > 0 ; --tmp)
+               texrow.newline();
+       
        texrow.start(this, 0);
 
        for (size_type i = 0; i < size(); ++i) {
-               ++column;
-               // First char in paragraph or after label?
-               if (i == main_body && !IsDummy()) {
-                       if (main_body > 0) {
-                               if (open_font) {
-                                       column += running_font.latexWriteEndChanges(file, basefont, basefont);
-                                       open_font = false;
-                               }
-                               basefont = getFont(-1); // Now use the layout font
-                               running_font = basefont;
-                               file += ']';
-                               ++column;
-                       }
-                       if (style.isCommand()) {
-                               file += '{';
-                               ++column;
-                       } else if (align != LYX_ALIGN_LAYOUT) {
-                               file += "{\\par";
-                               column += 4;
-                               return_value = true;
-                       }
-
-                       if (noindent) {
-                               file += "\\noindent ";
-                               column += 10;
-                       }
-                       switch (align) {
-                       case LYX_ALIGN_NONE:
-                       case LYX_ALIGN_BLOCK:
-                       case LYX_ALIGN_LAYOUT:
-                       case LYX_ALIGN_SPECIAL: break;
-                       case LYX_ALIGN_LEFT:
-                               file += "\\raggedright ";
-                               column+= 13;
-                               break;
-                       case LYX_ALIGN_RIGHT:
-                               file += "\\raggedleft ";
-                               column+= 12;
-                               break;
-                       case LYX_ALIGN_CENTER:
-                               file += "\\centering ";
-                               column+= 11;
-                               break;
-                       }        
-               }
-
-               int c = GetChar(i);
-
-               // Fully instantiated font
-               LyXFont font = getFont(i);
-               last_font = running_font;
-
-               // Spaces at end of font change are simulated to be
-               // outside font change, i.e. we write "\textXX{text} "
-               // rather than "\textXX{text }". (Asger)
-               if (open_font && c == ' ' && i <= size() - 2 
-                   && !getFont(i+1).equalExceptLatex(running_font) 
-                   && !getFont(i+1).equalExceptLatex(font)) {
-                       font = getFont(i + 1);
-               }
-               // We end font definition before blanks
-               if (!font.equalExceptLatex(running_font) && open_font) {
-                       column += running_font.latexWriteEndChanges(file,
-                                                                   basefont,
-                                                                   (i == main_body-1) ? basefont : font);
-                       running_font = basefont;
-                       open_font = false;
-               }
-
-               // Blanks are printed before start of fontswitch
-               if (c == ' '){
-                       // Do not print the separation of the optional argument
-                       if (i != main_body - 1) {
-                               SimpleTeXBlanks(file, texrow, i,
-                                               column, font, style);
-                       }
-               }
-
-               // Do we need to change font?
-               if (!font.equalExceptLatex(running_font)
-                   && i != main_body-1) {
-                       column += font.latexWriteStartChanges(file, basefont, last_font);
-                       running_font = font;
-                       open_font = true;
-               }
-
-               if (c == LyXParagraph::META_NEWLINE) {
-                       // newlines are handled differently here than
-                       // the default in SimpleTeXSpecialChars().
-                       if (!style.newline_allowed
-                           || font.latex() == LyXFont::ON) {
-                               file += '\n';
-                       } else {
-                               if (open_font) {
-                                       column += running_font.latexWriteEndChanges(file, basefont, basefont);
-                                       open_font = false;
-                               }
-                               basefont = getFont(-1);
-                               running_font = basefont;
-                               if (font.family() == 
-                                   LyXFont::TYPEWRITER_FAMILY) {
-                                       file += "~";
-                               }
-                               file += "\\\\\n";
-                       }
-                       texrow.newline();
-                       texrow.start(this, i + 1);
-                       column = 0;
-               } else {
-                       SimpleTeXSpecialChars(file, texrow,
-                                             font, running_font, basefont,
-                                             open_font, style, i, column, c);
-               }
-       }
-
-       // If we have an open font definition, we have to close it
-       if (open_font) {
-               running_font.latexWriteEndChanges(file, basefont, basefont);
-       }
-
-       // Needed if there is an optional argument but no contents.
-       if (main_body > 0 && main_body == size()) {
-               file += "]~";
-               return_value = false;
-       }
-
-       lyxerr[Debug::LATEX] << "SimpleTeXOnePar...done " << this << endl;
-       return return_value;
-}
-#endif
-
-
-#ifdef USE_OSTREAM_ONLY
-// This one spits out the text of a table paragraph
-bool LyXParagraph::SimpleTeXOneTablePar(ostream & os, TexRow & texrow)
-{
-       lyxerr[Debug::LATEX] << "SimpleTeXOneTablePar...     " << this << endl;
-   
-       bool return_value = false;
-
-       LyXLayout const & style = 
-               textclasslist.Style(current_view->buffer()->params.textclass,
-                                   GetLayout());
-       int column = 0;
-       if (!IsDummy()) { // it is dummy if it is in a float!!!
-               if (style.isCommand()) {
-                       os << '{';
-                       ++column;
-               } else if (align != LYX_ALIGN_LAYOUT) {
-                       os << '{';
-                       ++column;
-                       return_value = true;
-               }
-               if (noindent) {
-                       os << "\\noindent ";
-                       column += 10;
-               }
-               switch (align) {
-               case LYX_ALIGN_NONE:
-               case LYX_ALIGN_BLOCK:
-               case LYX_ALIGN_LAYOUT:
-               case LYX_ALIGN_SPECIAL: break;
-               case LYX_ALIGN_LEFT:
-                       os << "\\raggedright ";
-                       column+= 13;
-                       break;
-               case LYX_ALIGN_RIGHT:
-                       os << "\\raggedleft ";
-                       column+= 12;
-                       break;
-               case LYX_ALIGN_CENTER:
-                       os << "\\centering ";
-                       column+= 11;
-                       break;
-               }
-       }
-
-       LyXFont basefont = getFont(-1); // Get layout font
-       // Which font is currently active?
-       LyXFont running_font = basefont;
-       LyXFont last_font;
-       // Do we have an open font change?
-       bool open_font = false;
-       int current_cell_number = -1;
-       int tmp = table->TexEndOfCell(os, current_cell_number);
-       for (; tmp > 0 ; --tmp)
-               texrow.newline();
-       
-       texrow.start(this, 0);
-
-       for (size_type i = 0; i < size(); ++i) {
-               char c = GetChar(i);
-               if (table->IsContRow(current_cell_number + 1)) {
-                       if (c == LyXParagraph::META_NEWLINE)
-                               ++current_cell_number;
-                       continue;
-               }
+               char c = GetChar(i);
+               if (table->IsContRow(current_cell_number + 1)) {
+                       if (c == LyXParagraph::META_NEWLINE)
+                               ++current_cell_number;
+                       continue;
+               }
                ++column;
                
                // Fully instantiated font
@@ -2781,211 +2434,50 @@ bool LyXParagraph::SimpleTeXOneTablePar(ostream & os, TexRow & texrow)
        lyxerr[Debug::LATEX] << "SimpleTeXOneTablePar...done " << this << endl;
        return return_value;
 }
-#else
-// This one spits out the text of a table paragraph
-bool LyXParagraph::SimpleTeXOneTablePar(string & file, TexRow & texrow)
+
+
+// This one spits out the text off ContRows in tables
+bool LyXParagraph::TeXContTableRows(ostream & os,
+                                   LyXParagraph::size_type i,
+                                   int current_cell_number,
+                                   int & column, TexRow & texrow)
 {
-       lyxerr[Debug::LATEX] << "SimpleTeXOneTablePar...     " << this << endl;
+       lyxerr[Debug::LATEX] << "TeXContTableRows...     " << this << endl;
+       if (!table)
+               return false;
+    
+       char c;
    
        bool return_value = false;
-
-       LyXLayout const & style = 
+       LyXLayout const & style =
                textclasslist.Style(current_view->buffer()->params.textclass,
                                    GetLayout());
-       int column = 0;
-       if (!IsDummy()) { // it is dummy if it is in a float!!!
-               if (style.isCommand()) {
-                       file += '{';
-                       ++column;
-               } else if (align != LYX_ALIGN_LAYOUT) {
-                       file += '{';
-                       ++column;
-                       return_value = true;
-               }
-               if (noindent) {
-                       file += "\\noindent ";
-                       column += 10;
-               }
-               switch (align) {
-               case LYX_ALIGN_NONE:
-               case LYX_ALIGN_BLOCK:
-               case LYX_ALIGN_LAYOUT:
-               case LYX_ALIGN_SPECIAL: break;
-               case LYX_ALIGN_LEFT:
-                       file += "\\raggedright ";
-                       column+= 13;
-                       break;
-               case LYX_ALIGN_RIGHT:
-                       file += "\\raggedleft ";
-                       column+= 12;
-                       break;
-               case LYX_ALIGN_CENTER:
-                       file += "\\centering ";
-                       column+= 11;
-                       break;
-               }
-       }
-
        LyXFont basefont = getFont(-1); // Get layout font
+       LyXFont last_font;
        // Which font is currently active?
        LyXFont running_font = basefont;
-       LyXFont last_font;
        // Do we have an open font change?
        bool open_font = false;
-       int current_cell_number = -1;
-       int tmp = table->TexEndOfCell(file, current_cell_number);
-       for (; tmp > 0 ; --tmp)
-               texrow.newline();
-       
-       texrow.start(this, 0);
 
-       for (size_type i = 0; i < size(); ++i) {
-               char c = GetChar(i);
-               if (table->IsContRow(current_cell_number + 1)) {
+       size_type lastpos = i;
+       int cell = table->CellHasContRow(current_cell_number);
+       ++current_cell_number;
+       while(cell >= 0) {
+               // first find the right position
+               i = lastpos;
+               for (; (i < size()) && (current_cell_number<cell); ++i) {
+                       c = GetChar(i);
                        if (c == LyXParagraph::META_NEWLINE)
                                ++current_cell_number;
-                       continue;
                }
-               ++column;
-               
-               // Fully instantiated font
-               LyXFont font = getFont(i);
-               last_font = running_font;
-
-               // Spaces at end of font change are simulated to be
-               // outside font change.
-               // i.e. we write "\textXX{text} " rather than
-               // "\textXX{text }". (Asger)
-               if (open_font && c == ' ' && i <= size() - 2
-                   && getFont(i+1) != running_font && getFont(i+1) != font) {
-                       font = getFont(i+1);
-               }
-
-               // We end font definition before blanks
-               if (font != running_font && open_font) {
-                       column += running_font.latexWriteEndChanges(file,
-                                                                   basefont, font);
-                       running_font = basefont;
-                       open_font = false;
-               }
-               // Blanks are printed before start of fontswitch
-               if (c == ' '){
-                       SimpleTeXBlanks(file, texrow, i, column, font, style);
-               }
-               // Do we need to change font?
-               if (font != running_font) {
-                       column += font.latexWriteStartChanges(file, basefont, last_font);
-                       running_font = font;
-                       open_font = true;
-               }
-               // Do we need to turn on LaTeX mode?
-               if (font.latex() != running_font.latex()) {
-                       if (font.latex() == LyXFont::ON
-                           && style.needprotect) {
-                               file += "\\protect ";
-                               column += 9;
-                       }
-               }
-               if (c == LyXParagraph::META_NEWLINE) {
-                       // special case for inside a table
-                       // different from default case in
-                       // SimpleTeXSpecialChars()
-                       if (open_font) {
-                               column += running_font
-                                       .latexWriteEndChanges(file, basefont, basefont);
-                               open_font = false;
-                       }
-                       basefont = getFont(-1);
-                       running_font = basefont;
-                       ++current_cell_number;
-                       if (table->CellHasContRow(current_cell_number) >= 0) {
-                               TeXContTableRows(file, i + 1,
-                                                current_cell_number,
-                                                column, texrow);
-                       }
-                       // if this cell follow only ContRows till end don't
-                       // put the EndOfCell because it is put after the
-                       // for(...)
-                       if (table->ShouldBeVeryLastCell(current_cell_number)) {
-                               --current_cell_number;
-                               break;
-                       }
-                       int tmp = table->TexEndOfCell(file,
-                                                     current_cell_number);
-                       if (tmp > 0) {
-                               column = 0;
-                       } else if (tmp < 0) {
-                               tmp = -tmp;
-                       }
-                       for (; tmp--;) {
-                               texrow.newline();
-                       }
-                       texrow.start(this, i + 1);
-               } else {
-                       SimpleTeXSpecialChars(file, texrow,
-                                             font, running_font, basefont,
-                                             open_font, style, i, column, c);
-               }
-       }
-
-       // If we have an open font definition, we have to close it
-       if (open_font) {
-               running_font.latexWriteEndChanges(file, basefont, basefont);
-       }
-       ++current_cell_number;
-       tmp = table->TexEndOfCell(file, current_cell_number);
-       for (; tmp > 0; --tmp)
-               texrow.newline();
-       lyxerr[Debug::LATEX] << "SimpleTeXOneTablePar...done " << this << endl;
-       return return_value;
-}
-#endif
-
-
-#ifdef USE_OSTREAM_ONLY
-// This one spits out the text off ContRows in tables
-bool LyXParagraph::TeXContTableRows(ostream & os,
-                                   LyXParagraph::size_type i,
-                                   int current_cell_number,
-                                   int & column, TexRow & texrow)
-{
-       lyxerr[Debug::LATEX] << "TeXContTableRows...     " << this << endl;
-       if (!table)
-               return false;
-    
-       char c;
-   
-       bool return_value = false;
-       LyXLayout const & style =
-               textclasslist.Style(current_view->buffer()->params.textclass,
-                                   GetLayout());
-       LyXFont basefont = getFont(-1); // Get layout font
-       LyXFont last_font;
-       // Which font is currently active?
-       LyXFont running_font = basefont;
-       // Do we have an open font change?
-       bool open_font = false;
-
-       size_type lastpos = i;
-       int cell = table->CellHasContRow(current_cell_number);
-       ++current_cell_number;
-       while(cell >= 0) {
-               // first find the right position
-               i = lastpos;
-               for (; (i < size()) && (current_cell_number<cell); ++i) {
-                       c = GetChar(i);
-                       if (c == LyXParagraph::META_NEWLINE)
-                               ++current_cell_number;
-               }
-               lastpos = i;
-               c = GetChar(i);
-               if (table->Linebreaks(table->FirstVirtualCell(cell))) {
-                       os << " \\\\\n";
-                       texrow.newline();
-                       column = 0;
-               } else if ((c != ' ') && (c != LyXParagraph::META_NEWLINE)) {
-                       os << ' ';
+               lastpos = i;
+               c = GetChar(i);
+               if (table->Linebreaks(table->FirstVirtualCell(cell))) {
+                       os << " \\\\\n";
+                       texrow.newline();
+                       column = 0;
+               } else if ((c != ' ') && (c != LyXParagraph::META_NEWLINE)) {
+                       os << ' ';
                }
 
                for (; i < size()
@@ -3052,115 +2544,6 @@ bool LyXParagraph::TeXContTableRows(ostream & os,
        lyxerr[Debug::LATEX] << "TeXContTableRows...done " << this << endl;
        return return_value;
 }
-#else
-// This one spits out the text off ContRows in tables
-bool LyXParagraph::TeXContTableRows(string & file,
-                                   LyXParagraph::size_type i,
-                                   int current_cell_number,
-                                   int & column, TexRow & texrow)
-{
-       lyxerr[Debug::LATEX] << "TeXContTableRows...     " << this << endl;
-       if (!table)
-               return false;
-    
-       char c;
-   
-       bool return_value = false;
-       LyXLayout const & style =
-               textclasslist.Style(current_view->buffer()->params.textclass,
-                                   GetLayout());
-       LyXFont basefont = getFont(-1); // Get layout font
-       LyXFont last_font;
-       // Which font is currently active?
-       LyXFont running_font = basefont;
-       // Do we have an open font change?
-       bool open_font = false;
-
-       size_type lastpos = i;
-       int cell = table->CellHasContRow(current_cell_number);
-       ++current_cell_number;
-       while(cell >= 0) {
-               // first find the right position
-               i = lastpos;
-               for (; (i < size()) && (current_cell_number<cell); ++i) {
-                       c = GetChar(i);
-                       if (c == LyXParagraph::META_NEWLINE)
-                               ++current_cell_number;
-               }
-               lastpos = i;
-               c = GetChar(i);
-               if (table->Linebreaks(table->FirstVirtualCell(cell))) {
-                       file += " \\\\\n";
-                       texrow.newline();
-                       column = 0;
-               } else if ((c != ' ') && (c != LyXParagraph::META_NEWLINE)) {
-                       file += ' ';
-               }
-
-               for (; i < size()
-                            && (c = GetChar(i)) != LyXParagraph::META_NEWLINE;
-                    ++i) {
-                       ++column;
-
-                       // Fully instantiated font
-                       LyXFont font = getFont(i);
-                       last_font = running_font;
-
-                       // Spaces at end of font change are simulated to
-                       // be outside font change. i.e. we write
-                       // "\textXX{text} " rather than "\textXX{text }".
-                       // (Asger)
-                       if (open_font && c == ' ' && i <= size() - 2 
-                           && getFont(i + 1) != running_font
-                           && getFont(i + 1) != font) {
-                               font = getFont(i + 1);
-                       }
-
-                       // We end font definition before blanks
-                       if (font != running_font && open_font) {
-                               column += running_font.latexWriteEndChanges(file, basefont, font);
-                               running_font = basefont;
-                               open_font = false;
-                       }
-                       // Blanks are printed before start of fontswitch
-                       if (c == ' '){
-                               SimpleTeXBlanks(file, texrow, i,
-                                               column, font, style);
-                       }
-                       // Do we need to change font?
-                       if (font != running_font) {
-                               column +=
-                                       font.latexWriteStartChanges(file,
-                                                                   basefont, last_font);
-                               running_font = font;
-                               open_font = true;
-                       }
-                       // Do we need to turn on LaTeX mode?
-                       if (font.latex() != running_font.latex()) {
-                               if (font.latex() == LyXFont::ON
-                                   && style.needprotect)
-                                       {
-                                               file += "\\protect ";
-                                               column += 9;
-                                       }
-                       }
-                       SimpleTeXSpecialChars(file, texrow, font,
-                                             running_font, basefont,
-                                             open_font, style, i, column, c);
-               }
-               // If we have an open font definition, we have to close it
-               if (open_font) {
-                       running_font.latexWriteEndChanges(file, basefont, basefont);
-                       open_font = false;
-               }
-               basefont = getFont(-1);
-               running_font = basefont;
-               cell = table->CellHasContRow(current_cell_number);
-       }
-       lyxerr[Debug::LATEX] << "TeXContTableRows...done " << this << endl;
-       return return_value;
-}
-#endif
 
 
 bool LyXParagraph::linuxDocConvertChar(char c, string & sgml_string)
@@ -3232,7 +2615,6 @@ bool LyXParagraph::linuxDocConvertChar(char c, string & sgml_string)
 }
 
 
-#ifdef USE_OSTREAM_ONLY
 void LyXParagraph::SimpleDocBookOneTablePar(ostream & os, string & extra,
                                            int & desc_on, int depth) 
 {
@@ -3407,232 +2789,50 @@ void LyXParagraph::SimpleDocBookOneTablePar(ostream & os, string & extra,
        lyxerr[Debug::LATEX] << "SimpleDocbookOneTablePar...done "
                             << this << endl;
 }
-#else
-void LyXParagraph::SimpleDocBookOneTablePar(string & file, string & extra,
-                                           int & desc_on, int depth) 
+
+
+void LyXParagraph::DocBookContTableRows(ostream & os, string & extra,
+                                        int & desc_on,
+                                       LyXParagraph::size_type i,
+                                        int current_cell_number, int &column) 
+
 {
        if (!table) return;
-       lyxerr[Debug::LATEX] << "SimpleDocbookOneTablePar... " << this << endl;
-       int column = 0;
-       LyXFont font1, font2;
+       
+       lyxerr[Debug::LATEX] << "DocBookContTableRows... " << this << endl;
+
+       LyXFont font2;
        char c;
        Inset * inset;
-       size_type main_body;
+       //string emph = "emphasis";
        bool emph_flag = false;
+       int char_line_count = 0;
        
        LyXLayout const & style =
                textclasslist.Style(current_view->buffer()->params.textclass,
                                    GetLayout());
        
+       size_type main_body;
        if (style.labeltype != LABEL_MANUAL)
                main_body = 0;
        else
                main_body = BeginningOfMainBody();
        
        // Gets paragraph main font.
+       LyXFont font1;
        if (main_body > 0)
                font1 = style.labelfont;
        else
                font1 = style.font;
        
-       int char_line_count = depth;
-       addNewlineAndDepth(file, depth);
-       if (footnoteflag == LyXParagraph::NO_FOOTNOTE) {
-               file += "<INFORMALTABLE>";
-               addNewlineAndDepth(file, ++depth);
-       }
-       int current_cell_number = -1;
-       int tmp = table->DocBookEndOfCell(file, current_cell_number, depth);
-       
-       // Parsing main loop.
-       for (size_type i = 0; i < size(); ++i) {
-               c = GetChar(i);
-               if (table->IsContRow(current_cell_number+1)) {
-                       if (c == LyXParagraph::META_NEWLINE)
-                               ++current_cell_number;
-                       continue;
-               }
-               ++column;
-               
-               // Fully instantiated font
-               font2 = getFont(i);
-               
-               // Handle <emphasis> tag.
-               if (font1.emph() != font2.emph() && i) {
-                       if (font2.emph() == LyXFont::ON) {
-                               file += "<emphasis>";
-                               emph_flag= true;
-                       } else if (emph_flag) {
-                               file += "</emphasis>";
-                               emph_flag= false;
-                       }
-               }
-               if (c == LyXParagraph::META_NEWLINE) {
-                       // We have only to control for emphasis open here!
-                       if (emph_flag) {
-                               file += "</emphasis>";
-                               emph_flag= false;
-                       }
-                       font1 = font2 = getFont(-1);
-                       ++current_cell_number;
-                       if (table->CellHasContRow(current_cell_number) >= 0) {
-                               DocBookContTableRows(file, extra, desc_on, i+1,
-                                                    current_cell_number,
-                                                    column);
-                       }
-                       // if this cell follow only ContRows till end don't
-                       // put the EndOfCell because it is put after the
-                       // for(...)
-                       if (table->ShouldBeVeryLastCell(current_cell_number)) {
-                               --current_cell_number;
-                               break;
-                       }
-                       tmp = table->DocBookEndOfCell(file,
-                                                     current_cell_number,
-                                                     depth);
-                       
-                       if (tmp > 0)
-                               column = 0;
-               } else if (c == LyXParagraph::META_INSET) {
-                       inset = GetInset(i);
-#ifdef USE_OSTREAM_ONLY
-#ifdef HAVE_SSTREAM
-                       ostringstream ost;
-                       inset->DocBook(ost);
-                       string tmp_out = ost.str().c_str();
-#else
-                       ostrstream ost;
-                       inset->DocBook(ost);
-                       ost << '\0';
-                       char * ctmp = ost.str();
-                       string tmp_out(ctmp);
-                       delete [] ctmp;
-#endif
-#else
-                       string tmp_out;
-                       inset->DocBook(tmp_out);
-#endif
-                       //
-                       // This code needs some explanation:
-                       // Two insets are treated specially
-                       //   label if it is the first element in a
-                       //   command paragraph
-                       //         desc_on == 3
-                       //   graphics inside tables or figure floats
-                       //   can't go on
-                       //   title (the equivalente in latex for this
-                       //   case is caption
-                       //   and title should come first
-                       //         desc_on == 4
-                       //
-                       if(desc_on != 3 || i != 0) {
-                               if(tmp_out[0] == '@') {
-                                       if(desc_on == 4)
-                                               extra += frontStrip(tmp_out,
-                                                                   '@');
-                                       else
-                                               file += frontStrip(tmp_out,
-                                                                  '@');
-                               } else
-                                       file += tmp_out;
-                       }
-               } else if (font2.latex() == LyXFont::ON) {
-                       // "TeX"-Mode on == > SGML-Mode on.
-                       if (c != '\0')
-                               file += c;
-                       ++char_line_count;
-               } else {
-                       string sgml_string;
-                       if (linuxDocConvertChar(c, sgml_string) 
-                           && !style.free_spacing) {
-                               // in freespacing mode, spaces are
-                               // non-breaking characters
-                               // char is ' '
-                               if (desc_on == 1) {
-                                       ++char_line_count;
-                                       file += '\n';
-                                       file += "</term><listitem><para>";
-                                       desc_on = 2;
-                               } else  {
-                                       file += c;
-                               }
-                       } else {
-                               file += sgml_string;
-                       }
-               }
-               font1 = font2;
-       }
-       
-       // Needed if there is an optional argument but no contents.
-       if (main_body > 0 && main_body == size()) {
-               font1 = style.font;
-       }
-
-       if (emph_flag) {
-               file += "</emphasis>";
-       }
-       
-       ++current_cell_number;
-       tmp = table->DocBookEndOfCell(file, current_cell_number, depth);
-       // Resets description flag correctly.
-       switch(desc_on){
-       case 1:
-               // <term> not closed...
-               file += "</term>";
-               break;
-       }
-       if (footnoteflag == LyXParagraph::NO_FOOTNOTE)
-               file += "</INFORMALTABLE>";
-       file += '\n';
-       lyxerr[Debug::LATEX] << "SimpleDocbookOneTablePar...done "
-                            << this << endl;
-}
-#endif
-
-
-#ifdef USE_OSTREAM_ONLY
-void LyXParagraph::DocBookContTableRows(ostream & os, string & extra,
-                                        int & desc_on,
-                                       LyXParagraph::size_type i,
-                                        int current_cell_number, int &column) 
-
-{
-       if (!table) return;
-       
-       lyxerr[Debug::LATEX] << "DocBookContTableRows... " << this << endl;
-
-       LyXFont font2;
-       char c;
-       Inset * inset;
-       //string emph = "emphasis";
-       bool emph_flag = false;
-       int char_line_count = 0;
-       
-       LyXLayout const & style =
-               textclasslist.Style(current_view->buffer()->params.textclass,
-                                   GetLayout());
-       
-       size_type main_body;
-       if (style.labeltype != LABEL_MANUAL)
-               main_body = 0;
-       else
-               main_body = BeginningOfMainBody();
-       
-       // Gets paragraph main font.
-       LyXFont font1;
-       if (main_body > 0)
-               font1 = style.labelfont;
-       else
-               font1 = style.font;
-       
-       size_type lastpos = i;
-       int cell = table->CellHasContRow(current_cell_number);
-       ++current_cell_number;
-       while(cell >= 0) {
-               // first find the right position
-               i = lastpos;
-               for (; i < size() && current_cell_number < cell; ++i) {
-                       c = GetChar(i);
+       size_type lastpos = i;
+       int cell = table->CellHasContRow(current_cell_number);
+       ++current_cell_number;
+       while(cell >= 0) {
+               // first find the right position
+               i = lastpos;
+               for (; i < size() && current_cell_number < cell; ++i) {
+                       c = GetChar(i);
                        if (c == LyXParagraph::META_NEWLINE)
                                ++current_cell_number;
                }
@@ -3736,246 +2936,50 @@ void LyXParagraph::DocBookContTableRows(ostream & os, string & extra,
        }
        lyxerr[Debug::LATEX] << "DocBookContTableRows...done " << this << endl;
 }
-#else
-void LyXParagraph::DocBookContTableRows(string & file, string & extra,
-                                        int & desc_on,
-                                       LyXParagraph::size_type i,
-                                        int current_cell_number, int &column) 
 
-{
-       if (!table) return;
-       
-       lyxerr[Debug::LATEX] << "DocBookContTableRows... " << this << endl;
 
-       LyXFont font2;
-       char c;
-       Inset * inset;
-       //string emph = "emphasis";
-       bool emph_flag= false;
-       int char_line_count= 0;
-       
-       LyXLayout const & style =
-               textclasslist.Style(current_view->buffer()->params.textclass,
-                                   GetLayout());
-       
-       size_type main_body;
-       if (style.labeltype != LABEL_MANUAL)
-               main_body = 0;
-       else
-               main_body = BeginningOfMainBody();
-       
-       // Gets paragraph main font.
-       LyXFont font1;
-       if (main_body > 0)
-               font1 = style.labelfont;
-       else
-               font1 = style.font;
-       
-       size_type lastpos = i;
-       int cell = table->CellHasContRow(current_cell_number);
-       ++current_cell_number;
-       while(cell >= 0) {
-               // first find the right position
-               i = lastpos;
-               for (; i < size() && current_cell_number < cell; ++i) {
-                       c = GetChar(i);
-                       if (c == LyXParagraph::META_NEWLINE)
-                               ++current_cell_number;
+void LyXParagraph::SimpleTeXBlanks(ostream & os, TexRow & texrow,
+                                  LyXParagraph::size_type const i,
+                                  int & column, LyXFont const & font,
+                                  LyXLayout const & style)
+{
+       if (column > tex_code_break_column
+           && i 
+           && GetChar(i - 1) != ' '
+           && (i < size() - 1)
+           // In LaTeX mode, we don't want to
+           // break lines since some commands
+           // do not like this
+           && ! (font.latex() == LyXFont::ON)
+           // same in FreeSpacing mode
+           && !style.free_spacing
+           // In typewriter mode, we want to avoid 
+           // ! . ? : at the end of a line
+           && !(font.family() == LyXFont::TYPEWRITER_FAMILY
+                && (GetChar(i-1) == '.'
+                    || GetChar(i-1) == '?' 
+                    || GetChar(i-1) == ':'
+                    || 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';
                }
-               lastpos = i;
-               c = GetChar(i);
-               // I don't know how to handle this so I comment it
-                // for the moment (Jug)
-//             if (table->Linebreaks(table->FirstVirtualCell(cell))) {
-//                     file += " \\\\\n";
-//                     column = 0;
-//             } else
-               if ((c != ' ') && (c != LyXParagraph::META_NEWLINE)) {
-                       file += ' ';
+               texrow.newline();
+               texrow.start(this, i + 1);
+               column = 0;
+       } else if (font.latex() == LyXFont::OFF) {
+               if (style.free_spacing) {
+                       os << '~';
+               } else {
+                       os << ' ';
                }
-
-               for (; i < size()
-                            && (c = GetChar(i)) != LyXParagraph::META_NEWLINE;
-                    ++i) {
-                       ++column;
-                       
-                       // Fully instantiated font
-                       font2 = getFont(i);
-                       
-                       // Handle <emphasis> tag.
-                       if (font1.emph() != font2.emph() && i) {
-                               if (font2.emph() == LyXFont::ON) {
-                                       file += "<emphasis>";
-                                       emph_flag= true;
-                               } else if (emph_flag) {
-                                       file += "</emphasis>";
-                                       emph_flag= false;
-                               }
-                       }
-                       if (c == LyXParagraph::META_INSET) {
-                               inset = GetInset(i);
-#ifdef USE_OSTREAM_ONLY
-#ifdef HAVE_SSTREAM
-                               ostringstream ost;
-                               inset->DocBook(ost);
-                               string tmp_out = ost.str().c_str();
-#else
-                               ostrstream ost;
-                               inset->DocBook(ost);
-                               ost << '\0';
-                               char * ctmp = ost.str();
-                               string tmp_out(ctmp);
-                               delete [] ctmp;
-#endif
-#else
-                               string tmp_out;
-                               inset->DocBook(tmp_out);
-#endif
-                               //
-                               // This code needs some explanation:
-                               // Two insets are treated specially
-                               //   label if it is the first element in a
-                               //   command paragraph
-                               //       desc_on == 3
-                               //   graphics inside tables or figure floats
-                               //   can't go on title (the equivalente in
-                               //   latex for this case is caption and title
-                               //   should come first
-                               //       desc_on == 4
-                               //
-                               if(desc_on != 3 || i != 0) {
-                                       if(tmp_out[0] == '@') {
-                                               if(desc_on == 4)
-                                                       extra += frontStrip(tmp_out, '@');
-                                               else
-                                                       file += frontStrip(tmp_out, '@');
-                                       } else
-                                               file += tmp_out;
-                               }
-                       } else if (font2.latex() == LyXFont::ON) {
-                               // "TeX"-Mode on == > SGML-Mode on.
-                               if (c!= '\0')
-                                       file += c;
-                               ++char_line_count;
-                       } else {
-                               string sgml_string;
-                               if (linuxDocConvertChar(c, sgml_string) 
-                                   && !style.free_spacing) {
-                                       // in freespacing mode, spaces are
-                                       // non-breaking characters
-                                       // char is ' '
-                                       if (desc_on == 1) {
-                                               ++char_line_count;
-                                               file += '\n';
-                                               file += "</term><listitem><para>";
-                                               desc_on = 2;
-                                       } else  {
-                                               file += c;
-                                       }
-                               } else {
-                                       file += sgml_string;
-                               }
-                       }
-               }
-               // we have only to control for emphasis open here!
-               if (emph_flag) {
-                       file += "</emphasis>";
-                       emph_flag= false;
-               }
-               font1 = font2 = getFont(-1);
-               cell = table->CellHasContRow(current_cell_number);
-       }
-       lyxerr[Debug::LATEX] << "DocBookContTableRows...done " << this << endl;
-}
-#endif
-
-
-#ifdef USE_OSTREAM_ONLY
-void LyXParagraph::SimpleTeXBlanks(ostream & os, TexRow & texrow,
-                                  LyXParagraph::size_type const i,
-                                  int & column, LyXFont const & font,
-                                  LyXLayout const & style)
-{
-       if (column > tex_code_break_column
-           && i 
-           && GetChar(i - 1) != ' '
-           && (i < size() - 1)
-           // In LaTeX mode, we don't want to
-           // break lines since some commands
-           // do not like this
-           && ! (font.latex() == LyXFont::ON)
-           // same in FreeSpacing mode
-           && !style.free_spacing
-           // In typewriter mode, we want to avoid 
-           // ! . ? : at the end of a line
-           && !(font.family() == LyXFont::TYPEWRITER_FAMILY
-                && (GetChar(i-1) == '.'
-                    || GetChar(i-1) == '?' 
-                    || GetChar(i-1) == ':'
-                    || 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';
-               }
-               texrow.newline();
-               texrow.start(this, i + 1);
-               column = 0;
-       } else if (font.latex() == LyXFont::OFF) {
-               if (style.free_spacing) {
-                       os << '~';
-               } else {
-                       os << ' ';
-               }
-       }
-}
-#else
-void LyXParagraph::SimpleTeXBlanks(string & file, TexRow & texrow,
-                                  LyXParagraph::size_type const i,
-                                  int & column, LyXFont const & font,
-                                  LyXLayout const & style)
-{
-       if (column > tex_code_break_column
-           && i 
-           && GetChar(i - 1) != ' '
-           && (i < size() - 1)
-           // In LaTeX mode, we don't want to
-           // break lines since some commands
-           // do not like this
-           && ! (font.latex() == LyXFont::ON)
-           // same in FreeSpacing mode
-           && !style.free_spacing
-           // In typewriter mode, we want to avoid 
-           // ! . ? : at the end of a line
-           && !(font.family() == LyXFont::TYPEWRITER_FAMILY
-                && (GetChar(i-1) == '.'
-                    || GetChar(i-1) == '?' 
-                    || GetChar(i-1) == ':'
-                    || 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'
-                       file += " %\n";
-               } else {
-                       file += '\n';
-               }
-               texrow.newline();
-               texrow.start(this, i+1);
-               column = 0;
-       } else if (font.latex() == LyXFont::OFF) {
-               if (style.free_spacing) {
-                       file += '~';
-               } else {
-                       file += ' ';
-               }
-       }
-}
-#endif
+       }
+}
 
 
-#ifdef USE_OSTREAM_ONLY
 void LyXParagraph::SimpleTeXSpecialChars(ostream & os, TexRow & texrow,
                                         LyXFont & font,
                                         LyXFont & running_font,
@@ -4003,7 +3007,8 @@ void LyXParagraph::SimpleTeXSpecialChars(ostream & os, TexRow & texrow,
                                close = true;
                        }
 
-                       int tmp = inset->Latex(os, style.isCommand());
+                       int tmp = inset->Latex(os, style.isCommand(),
+                                              style.free_spacing);
 
                        if (close)
                                os << "}";
@@ -4234,744 +3239,157 @@ void LyXParagraph::SimpleTeXSpecialChars(ostream & os, TexRow & texrow,
                }
        }
 }
-#else
-void LyXParagraph::SimpleTeXSpecialChars(string & file, TexRow & texrow,
-                                        LyXFont & font,
-                                        LyXFont & running_font,
-                                        LyXFont & basefont,
-                                        bool & open_font,
-                                        LyXLayout const & style,
-                                        LyXParagraph::size_type & i,
-                                        int & column, char const c)
+
+
+#if 0
+bool LyXParagraph::RoffContTableRows(ostream & os,
+                                    LyXParagraph::size_type i,
+                                    int actcell)
 {
-       // Two major modes:  LaTeX or plain
-       // Handle here those cases common to both modes
-       // and then split to handle the two modes separately.
-       switch (c) {
-       case LyXParagraph::META_INSET: {
-               Inset * inset = GetInset(i);
-               if (inset) {
-                       bool close = false;
-                       int len = file.length();
-                       if ((inset->LyxCode() == Inset::GRAPHICS_CODE
-                            || inset->LyxCode() == Inset::MATH_CODE
-                            || inset->LyxCode() == Inset::URL_CODE)
-                           && running_font.getFontDirection()
-                           == LYX_DIR_RIGHT_TO_LEFT) {
-                               file += "\\L{";
-                               close = true;
+       if (!table)
+               return false;
+
+       LyXFont font1(LyXFont::ALL_INHERIT);
+       LyXFont font2;
+       Inset * inset;
+       char c;
+
+       string fname2 = TmpFileName(string(), "RAT2");
+       int lastpos = i;
+       int cell = table->CellHasContRow(actcell);
+       ++actcell;
+       while(cell >= 0) {
+               // first find the right position
+               i = lastpos;
+               for (; i < size() && actcell < cell; ++i) {
+                       c = GetChar(i);
+                       if (c == LyXParagraph::META_NEWLINE)
+                               ++actcell;
+               }
+               lastpos = i;
+               c = GetChar(i);
+               if ((c != ' ') && (c != LyXParagraph::META_NEWLINE))
+                       os << " ";
+               for (; i < size()
+                            && (c = GetChar(i)) != LyXParagraph::META_NEWLINE;
+                    ++i) {
+                       font2 = GetFontSettings(i);
+                       if (font1.latex() != font2.latex()) {
+                               if (font2.latex() != LyXFont::OFF)
+                                       continue;
                        }
-#ifdef USE_OSTREAM_ONLY
+                       c = GetChar(i);
+                       switch (c) {
+                       case LyXParagraph::META_INSET:
+                               if ((inset = GetInset(i))) {
+#if 1
 #ifdef HAVE_SSTREAM
-                       ostringstream ost;
-                       int tmp = inset->Latex(ost, style.isCommand());
-                       file += ost.str().c_str();
+                                       stringstream ss(ios::in | ios::out);
+                                       inset->Latex(ss, -1);
+                                       ss.seekp(0);
+                                       ss.get(c);
+                                       while (!ss) {
+                                               if (c == '\\')
+                                                       os << "\\\\";
+                                               else
+                                                       os << c;
+                                               ss.get(c);
+                                       }
 #else
-                       ostrstream ost;
-                       int tmp = inset->Latex(ost, style.isCommand());
-                       ost << '\0';
-                       char * chtmp = ost.str();
-                       file += chtmp;
-                       delete [] chtmp;
-#endif         
+                                       strstream ss;
+                                       inset->Latex(ss, -1);
+                                       ss.seekp(0);
+                                       ss.get(c);
+                                       while (!ss) {
+                                               if (c == '\\')
+                                                       os << "\\\\";
+                                               else
+                                                       os << c;
+                                               ss.get(c);
+                                       }
+                                       delete [] ss.str();
+#endif
 #else
-                       int tmp = inset->Latex(file, style.isCommand());
-#endif
-                       if (close)
-                               file += "}";
-                       
-                       if (tmp) {
-                               column = 0;
-                       } else {
-                               column += file.length() - len;
-                       }
-                       for (; tmp--;) {
-                               texrow.newline();
-                       }
-               }
-       }
-       break;
-
-       case LyXParagraph::META_NEWLINE:
-               if (open_font) {
-                       column += running_font.latexWriteEndChanges(file,
-                                                                   basefont, basefont);
-                       open_font = false;
-               }
-               basefont = getFont(-1);
-               running_font = basefont;
-               break;
-
-       case LyXParagraph::META_HFILL: 
-               file += "\\hfill{}";
-               column += 7;
-               break;
-
-       default:
-               // And now for the special cases within each mode
-               // 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) {
-#if 0
-                       case LyXParagraph::META_PROTECTED_SEPARATOR: 
-                               file += ' ';
-                               break;
-#endif
-                       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') {
-                                       file += c;
-                               }
-                               break;
-                       }
-               } else {
-                       // Plain mode (i.e. not LaTeX)
-                       switch (c) {
-#if 0
-                       case LyXParagraph::META_PROTECTED_SEPARATOR: 
-                               file += '~';
-                               break;
-#endif
-                       case '\\': 
-                               file += "\\textbackslash{}";
-                               column += 15;
-                               break;
-               
-                       case '°': case '±': case '²': case '³':  
-                       case '×': case '÷': case '¹': case 'ª':
-                       case 'º': case '¬': case 'µ':
-                               if (current_view->buffer()->params.inputenc == "latin1") {
-                                       file += "\\ensuremath{";
-                                       file += c;
-                                       file += '}';
-                                       column += 13;
-                               } else {
-                                       file += c;
-                               }
-                               break;
-
-                       case '|': case '<': case '>':
-                               // In T1 encoding, these characters exist
-                               if (lyxrc->fontenc == "T1") {
-                                       file += c;
-                                       //... but we should avoid ligatures
-                                       if ((c == '>' || c == '<')
-                                           && i <= size() - 2
-                                           && GetChar(i+1) == c){
-                                               file += "\\textcompwordmark{}";
-                                               column += 19;
-                                       }
-                                       break;
-                               }
-                               // Typewriter font also has them
-                               if (font.family() == LyXFont::TYPEWRITER_FAMILY) {
-                                       file += c;
-                                       break;
-                               } 
-                               // Otherwise, we use what LaTeX
-                               // provides us.
-                               switch(c) {
-                               case '<':
-                                       file += "\\textless{}";
-                                       column += 10;
-                                       break;
-                               case '>':
-                                       file += "\\textgreater{}";
-                                       column += 13;
-                                       break;
-                               case '|':
-                                       file += "\\textbar{}";
-                                       column += 9;
-                                       break;
-                               }
-                               break;
-
-                       case '-': // "--" in Typewriter mode -> "-{}-"
-                               if (i <= size() - 2
-                                   && GetChar(i + 1) == '-'
-                                   && font.family() == LyXFont::TYPEWRITER_FAMILY) {
-                                       file += "-{}";
-                                       column += 2;
-                               } else {
-                                       file += '-';
-                               }
-                               break;
-
-                       case '\"': 
-                               file += "\\char`\\\"{}";
-                               column += 9;
-                               break;
-
-                       case '£':
-                               if (current_view->buffer()->params.inputenc == "default") {
-                                       file += "\\pounds{}";
-                                       column += 8;
-                               } else {
-                                       file += c;
-                               }
-                               break;
-
-                       case '$': case '&':
-                       case '%': case '#': case '{':
-                       case '}': case '_':
-                               file += '\\';
-                               file += c;
-                               column += 1;
-                               break;
-
-                       case '~':
-                               file += "\\textasciitilde{}";
-                               column += 16;
-                               break;
-
-                       case '^':
-                               file += "\\textasciicircum{}";
-                               column += 17;
-                               break;
-
-                       case '*': case '[': case ']':
-                               // avoid being mistaken for optional arguments
-                               file += '{';
-                               file += c;
-                               file += '}';
-                               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:
-                               /* idea for labels --- begin*/
-                               // Check for "LyX"
-                               if (c ==  'L'
-                                   && i <= size() - 3
-                                   && font.family() != LyXFont::TYPEWRITER_FAMILY
-                                   && GetChar(i + 1) == 'y'
-                                   && GetChar(i + 2) == 'X') {
-                                       file += "\\LyX{}";
-                                       i += 2;
-                                       column += 5;
-                               }
-                               // Check for "TeX"
-                               else if (c == 'T'
-                                        && i <= size() - 3
-                                        && font.family() != LyXFont::TYPEWRITER_FAMILY
-                                        && GetChar(i + 1) == 'e'
-                                        && GetChar(i + 2) == 'X') {
-                                       file += "\\TeX{}";
-                                       i += 2;
-                                       column += 5;
-                               }
-                               // Check for "LaTeX2e"
-                               else if (c == 'L'
-                                        && i <= size() - 7
-                                        && font.family() != LyXFont::TYPEWRITER_FAMILY
-                                        && GetChar(i + 1) == 'a'
-                                        && GetChar(i + 2) == 'T'
-                                        && GetChar(i + 3) == 'e'
-                                        && GetChar(i + 4) == 'X'
-                                        && GetChar(i + 5) == '2'
-                                        && GetChar(i + 6) == 'e') {
-                                       file += "\\LaTeXe{}";
-                                       i += 6;
-                                       column += 8;
-                               }
-                               // Check for "LaTeX"
-                               else if (c == 'L'
-                                        && i <= size() - 5
-                                        && font.family() != LyXFont::TYPEWRITER_FAMILY
-                                        && GetChar(i + 1) == 'a'
-                                        && GetChar(i + 2) == 'T'
-                                        && GetChar(i + 3) == 'e'
-                                        && GetChar(i + 4) == 'X') {
-                                       file += "\\LaTeX{}";
-                                       i += 4;
-                                       column += 7;
-                                       /* idea for labels --- end*/ 
-                               } else if (c != '\0') {
-                                       file += c;
-                               }
-                               break;
-                       }
-               }
-       }
-}
-#endif
-
-
-#if 0
-bool LyXParagraph::RoffContTableRows(ostream & os,
-                                    LyXParagraph::size_type i,
-                                    int actcell)
-{
-       if (!table)
-               return false;
-
-       LyXFont font1(LyXFont::ALL_INHERIT);
-       LyXFont font2;
-       Inset * inset;
-       char c;
-
-       string fname2 = TmpFileName(string(), "RAT2");
-       int lastpos = i;
-       int cell = table->CellHasContRow(actcell);
-       ++actcell;
-       while(cell >= 0) {
-               // first find the right position
-               i = lastpos;
-               for (; i < size() && actcell < cell; ++i) {
-                       c = GetChar(i);
-                       if (c == LyXParagraph::META_NEWLINE)
-                               ++actcell;
-               }
-               lastpos = i;
-               c = GetChar(i);
-               if ((c != ' ') && (c != LyXParagraph::META_NEWLINE))
-                       os << " ";
-               for (; i < size()
-                            && (c = GetChar(i)) != LyXParagraph::META_NEWLINE;
-                    ++i) {
-                       font2 = GetFontSettings(i);
-                       if (font1.latex() != font2.latex()) {
-                               if (font2.latex() != LyXFont::OFF)
-                                       continue;
-                       }
-                       c = GetChar(i);
-                       switch (c) {
-                       case LyXParagraph::META_INSET:
-                               if ((inset = GetInset(i))) {
-#if 1
-#ifdef HAVE_SSTREAM
-                                       stringstream ss(ios::in | ios::out);
-                                       inset->Latex(ss, -1);
-                                       ss.seekp(0);
-                                       ss.get(c);
-                                       while (!ss) {
-                                               if (c == '\\')
-                                                       os << "\\\\";
-                                               else
-                                                       os << c;
-                                               ss.get(c);
-                                       }
-#else
-                                       strstream ss;
-                                       inset->Latex(ss, -1);
-                                       ss.seekp(0);
-                                       ss.get(c);
-                                       while (!ss) {
-                                               if (c == '\\')
-                                                       os << "\\\\";
-                                               else
-                                                       os << c;
-                                               ss.get(c);
-                                       }
-                                       delete [] ss.str();
-#endif
-#else
-                                       fstream fs(fname2.c_str(),
-                                                  ios::in|ios::out);
-                                       if (!fs) {
-                                               WriteAlert(_("LYX_ERROR:"),
-                                                          _("Cannot open temporary file:"),
-                                                          fname2);
-                                               return false;
-                                       }
-                                       inset->Latex(fs, -1);
-                                       fs.seekp(0);
-                                       fs.get(c);
-                                       while (!fs) {
-                                               if (c == '\\')
-                                                       os << "\\\\";
-                                               else
-                                                       os << c;
-                                               fs.get(c);
-                                       }
-                                       fs.close();
+                                       fstream fs(fname2.c_str(),
+                                                  ios::in|ios::out);
+                                       if (!fs) {
+                                               WriteAlert(_("LYX_ERROR:"),
+                                                          _("Cannot open temporary file:"),
+                                                          fname2);
+                                               return false;
+                                       }
+                                       inset->Latex(fs, -1);
+                                       fs.seekp(0);
+                                       fs.get(c);
+                                       while (!fs) {
+                                               if (c == '\\')
+                                                       os << "\\\\";
+                                               else
+                                                       os << c;
+                                               fs.get(c);
+                                       }
+                                       fs.close();
 #endif
                                }
                                break;
                        case LyXParagraph::META_NEWLINE:
                                break;
-                       case LyXParagraph::META_HFILL: 
-                               break;
-#if 0
-                       case LyXParagraph::META_PROTECTED_SEPARATOR:
-                               break;
-#endif
-                       case '\\': 
-                               os << "\\\\";
-                               break;
-                       default:
-                               if (c != '\0')
-                                       os << c;
-                               else
-                                       lyxerr.debug() << "RoffAsciiTable: "
-                                               "NULL char in structure."
-                                                      << endl;
-                               break;
-                       }
-               }
-               cell = table->CellHasContRow(actcell);
-       }
-       return true;
-}
-#endif
-
-
-#ifdef USE_OSTREAM_ONLY
-LyXParagraph * LyXParagraph::TeXDeeper(ostream & os, TexRow & texrow,
-                                      ostream & foot, TexRow & foot_texrow,
-                                      int & foot_count)
-{
-       lyxerr[Debug::LATEX] << "TeXDeeper...     " << this << endl;
-       LyXParagraph * par = this;
-
-       while (par && par->depth == depth) {
-               if (par->IsDummy())
-                       lyxerr << "ERROR (LyXParagraph::TeXDeeper)" << endl;
-               if (textclasslist.Style(current_view->buffer()->params.textclass, 
-                                       par->layout).isEnvironment()
-                   || par->pextra_type != PEXTRA_NONE) {
-                       par = par->TeXEnvironment(os, texrow,
-                                                 foot, foot_texrow,
-                                                 foot_count);
-               } else {
-                       par = par->TeXOnePar(os, texrow,
-                                            foot, foot_texrow,
-                                            foot_count);
-               }
-       }
-       lyxerr[Debug::LATEX] << "TeXDeeper...done " << par << endl;
-
-       return par;
-}
-#else
-LyXParagraph * LyXParagraph::TeXDeeper(string & file, TexRow & texrow,
-                                      string & foot, TexRow & foot_texrow,
-                                      int & foot_count)
-{
-       lyxerr[Debug::LATEX] << "TeXDeeper...     " << this << endl;
-       LyXParagraph * par = this;
-
-       while (par && par->depth == depth) {
-               if (par->IsDummy())
-                       lyxerr << "ERROR (LyXParagraph::TeXDeeper)" << endl;
-               if (textclasslist.Style(current_view->buffer()->params.textclass, 
-                                       par->layout).isEnvironment()
-                   || par->pextra_type != PEXTRA_NONE) 
-                       {
-                               par = par->TeXEnvironment(file, texrow,
-                                                         foot, foot_texrow,
-                                                         foot_count);
-                       } else {
-                               par = par->TeXOnePar(file, texrow,
-                                                    foot, foot_texrow,
-                                                    foot_count);
-                       }
-       }
-       lyxerr[Debug::LATEX] << "TeXDeeper...done " << par << endl;
-
-       return par;
-}
-#endif
-
-
-#ifdef USE_OSTREAM_ONLY
-LyXParagraph * LyXParagraph::TeXEnvironment(ostream & os, TexRow & texrow,
-                                           ostream & foot,
-                                           TexRow & foot_texrow,
-                                           int & foot_count)
-{
-       bool eindent_open = false;
-       bool foot_this_level = false;
-       // flags when footnotetext should be appended to file.
-        static bool minipage_open = false;
-        static int minipage_open_depth = 0;
-       char par_sep = current_view->buffer()->params.paragraph_separation;
-    
-       lyxerr[Debug::LATEX] << "TeXEnvironment...     " << this << endl;
-       if (IsDummy())
-               lyxerr << "ERROR (LyXParagraph::TeXEnvironment)" << endl;
-
-       LyXLayout const & style =
-               textclasslist.Style(current_view->buffer()->params.textclass,
-                                   layout);
-       
-       if (pextra_type == PEXTRA_INDENT) {
-               if (!pextra_width.empty()) {
-                       os << "\\begin{LyXParagraphIndent}{"
-                          << pextra_width << "}\n";
-               } else {
-                       //float ib = atof(pextra_widthp.c_str())/100;
-                       // string can't handle floats at present (971109)
-                       // so I'll do a conversion by hand knowing that
-                       // the limits are 0.0 to 1.0. ARRae.
-                       os << "\\begin{LyXParagraphIndent}{";
-                       switch (pextra_widthp.length()) {
-                       case 3:
-                               os << "1.00";
-                               break;
-                       case 2:
-                               os << "0."
-                                  << pextra_widthp;
-                               break;
-                       case 1:
-                               os << "0.0"
-                                  << pextra_widthp;
-                       }
-                       os << "\\columnwidth}\n";
-               }
-               texrow.newline();
-               eindent_open = true;
-       }
-       if ((pextra_type == PEXTRA_MINIPAGE) && !minipage_open) {
-               if (pextra_hfill && Previous() &&
-                   (Previous()->pextra_type == PEXTRA_MINIPAGE)) {
-                       os << "\\hfill{}\n";
-                       texrow.newline();
-               }
-               if (par_sep == BufferParams::PARSEP_INDENT) {
-                       os << "{\\setlength\\parindent{0pt}\n";
-                       texrow.newline();
-               }
-               os << "\\begin{minipage}";
-               switch(pextra_alignment) {
-               case MINIPAGE_ALIGN_TOP:
-                       os << "[t]";
-                       break;
-               case MINIPAGE_ALIGN_MIDDLE:
-                       os << "[m]";
-                       break;
-               case MINIPAGE_ALIGN_BOTTOM:
-                       os << "[b]";
-                       break;
-               }
-               if (!pextra_width.empty()) {
-                       os << '{' << pextra_width << "}\n";
-               } else {
-                       //float ib = atof(par->pextra_width.c_str())/100;
-                       // string can't handle floats at present
-                       // so I'll do a conversion by hand knowing that
-                       // the limits are 0.0 to 1.0. ARRae.
-                       os << '{';
-                       switch (pextra_widthp.length()) {
-                       case 3:
-                               os << "1.00";
+                       case LyXParagraph::META_HFILL: 
                                break;
-                       case 2:
-                               os << "0."
-                                  << pextra_widthp;
+#if 0
+                       case LyXParagraph::META_PROTECTED_SEPARATOR:
+                               break;
+#endif
+                       case '\\': 
+                               os << "\\\\";
+                               break;
+                       default:
+                               if (c != '\0')
+                                       os << c;
+                               else
+                                       lyxerr.debug() << "RoffAsciiTable: "
+                                               "NULL char in structure."
+                                                      << endl;
                                break;
-                       case 1:
-                               os << "0.0"
-                                  << pextra_widthp;
                        }
-                       os << "\\columnwidth}\n";
-               }
-               texrow.newline();
-               if (par_sep == BufferParams::PARSEP_INDENT) {
-                       os << "\\setlength\\parindent{\\LyXMinipageIndent}\n";
-                       texrow.newline();
                }
-               minipage_open = true;
-                minipage_open_depth = depth;
+               cell = table->CellHasContRow(actcell);
        }
-
-#ifdef WITH_WARNINGS
-#warning Define FANCY_FOOTNOTE_CODE to re-enable Allan footnote code
-       //I disabled it because it breaks when lists span on several
-       //pages (JMarc)
-#endif
-       if (style.isEnvironment()){
-               if (style.latextype == LATEX_LIST_ENVIRONMENT) {
-#ifdef FANCY_FOOTNOTE_CODE
-                       if (foot_count < 0) {
-                               // flag that footnote[mark][text] should be
-                               // used for any footnotes from now on
-                               foot_count = 0;
-                               foot_this_level = true;
-                       }
-#endif
-                       os << "\\begin{" << style.latexname() << "}{"
-                          << labelwidthstring << "}\n";
-               } else if (style.labeltype == LABEL_BIBLIO) {
-                       // ale970405
-                       os << "\\begin{" << style.latexname() << "}{"
-                          << bibitemWidthest(current_view->painter())
-                          << "}\n";
-               } else if (style.latextype == LATEX_ITEM_ENVIRONMENT) {
-#ifdef FANCY_FOOTNOTE_CODE
-                       if (foot_count < 0) {
-                               // flag that footnote[mark][text] should be
-                               // used for any footnotes from now on
-                               foot_count = 0;
-                               foot_this_level = true;
-                       }
+       return true;
+}
 #endif
-                       os << "\\begin{" << style.latexname() << '}'
-                          << style.latexparam() << '\n';
-               } else 
-                       os << "\\begin{" << style.latexname() << '}'
-                          << style.latexparam() << '\n';
-               texrow.newline();
-       }
+
+
+LyXParagraph * LyXParagraph::TeXDeeper(ostream & os, TexRow & texrow,
+                                      ostream & foot, TexRow & foot_texrow,
+                                      int & foot_count)
+{
+       lyxerr[Debug::LATEX] << "TeXDeeper...     " << this << endl;
        LyXParagraph * par = this;
-       do {
-               par = par->TeXOnePar(os, texrow,
-                                    foot, foot_texrow, foot_count);
 
-                if (minipage_open && par && !style.isEnvironment() &&
-                    (par->pextra_type == PEXTRA_MINIPAGE) &&
-                    par->pextra_start_minipage) {
-                       os << "\\end{minipage}\n";
-                       texrow.newline();
-                       if (par_sep == BufferParams::PARSEP_INDENT) {
-                               os << "}\n";
-                               texrow.newline();
-                       }
-                       minipage_open = false;
-                }
-               if (par && par->depth > depth) {
-                       if (textclasslist.Style(current_view->buffer()->params.textclass,
-                                               par->layout).isParagraph()
-                           && !par->table
-                           // 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 = par->TeXDeeper(os, texrow,
-                                            foot, foot_texrow, foot_count);
-               }
-               if (par && par->layout == layout && par->depth == depth &&
-                   (par->pextra_type == PEXTRA_MINIPAGE) && !minipage_open) {
-                       if (par->pextra_hfill && par->Previous() &&
-                           (par->Previous()->pextra_type == PEXTRA_MINIPAGE)){
-                               os << "\\hfill{}\n";
-                                texrow.newline();
-                        }
-                       if (par_sep == BufferParams::PARSEP_INDENT) {
-                               os << "{\\setlength\\parindent{0pt}\n";
-                               texrow.newline();
-                       }
-                       os << "\\begin{minipage}";
-                       switch(par->pextra_alignment) {
-                       case MINIPAGE_ALIGN_TOP:
-                               os << "[t]";
-                               break;
-                       case MINIPAGE_ALIGN_MIDDLE:
-                               os << "[m]";
-                               break;
-                       case MINIPAGE_ALIGN_BOTTOM:
-                               os << "[b]";
-                               break;
-                       }
-                       if (!par->pextra_width.empty()) {
-                               os << '{' << par->pextra_width << "}\n";
-                       } else {
-                               //float ib = atof(par->pextra_widthp.c_str())/100;
-                               // string can't handle floats at present
-                               // so I'll do a conversion by hand knowing that
-                               // the limits are 0.0 to 1.0. ARRae.
-                               os << '{';
-                               switch (par->pextra_widthp.length()) {
-                               case 3:
-                                       os << "1.00";
-                                       break;
-                               case 2:
-                                       os << "0." << par->pextra_widthp;
-                                       break;
-                               case 1:
-                                       os << "0.0" << par->pextra_widthp;
-                               }
-                               os << "\\columnwidth}\n";
-                       }
-                       texrow.newline();
-                       if (par_sep == BufferParams::PARSEP_INDENT) {
-                               os << "\\setlength\\parindent{\\LyXMinipageIndent}\n";
-                               texrow.newline();
-                       }
-                       minipage_open = true;
-                        minipage_open_depth = par->depth;
-               }
-       } while (par
-                && par->layout == layout
-                && par->depth == depth
-                && par->pextra_type == pextra_type);
-       if (style.isEnvironment()) {
-               os << "\\end{" << style.latexname() << '}';
-               // maybe this should go after the minipage closes?
-               if (foot_this_level) {
-                       if (foot_count >= 1) {
-                               if (foot_count > 1) {
-                                       os << "\\addtocounter{footnote}{-"
-                                          << foot_count - 1
-                                          << '}';
-                               }
-                               os << foot;
-                               texrow += foot_texrow;
-                               foot.clear();
-                               foot_texrow.reset();
-                               foot_count = 0;
-                       }
+       while (par && par->depth == depth) {
+               if (par->IsDummy())
+                       lyxerr << "ERROR (LyXParagraph::TeXDeeper)" << endl;
+               if (textclasslist.Style(current_view->buffer()->params.textclass, 
+                                       par->layout).isEnvironment()
+                   || par->pextra_type != PEXTRA_NONE) {
+                       par = par->TeXEnvironment(os, texrow,
+                                                 foot, foot_texrow,
+                                                 foot_count);
+               } else {
+                       par = par->TeXOnePar(os, texrow,
+                                            foot, foot_texrow,
+                                            foot_count);
                }
        }
-        if (minipage_open && (minipage_open_depth == depth) &&
-            (!par || par->pextra_start_minipage ||
-             par->pextra_type != PEXTRA_MINIPAGE)) {
-                os << "\\end{minipage}\n";
-               texrow.newline();
-                if (par_sep == BufferParams::PARSEP_INDENT) {
-                        os << "}\n";
-                       texrow.newline();
-                }
-                if (par && par->pextra_type != PEXTRA_MINIPAGE) {
-                        os << "\\medskip\n\n";
-                       texrow.newline();
-                       texrow.newline();
-                }
-                minipage_open = false;
-        }
-       if (eindent_open) {
-               os << "\\end{LyXParagraphIndent}\n";
-               texrow.newline();
-       }
-        if (!(par && (par->pextra_type == PEXTRA_MINIPAGE) 
-             && par->pextra_hfill)) {
-                os << '\n';
-               texrow.newline();
-       }
-       lyxerr[Debug::LATEX] << "TeXEnvironment...done " << par << endl;
-       return par;  // ale970302
+       lyxerr[Debug::LATEX] << "TeXDeeper...done " << par << endl;
+
+       return par;
 }
-#else
-LyXParagraph * LyXParagraph::TeXEnvironment(string & file, TexRow & texrow,
-                                           string & foot,
+
+
+LyXParagraph * LyXParagraph::TeXEnvironment(ostream & os, TexRow & texrow,
+                                           ostream & foot,
                                            TexRow & foot_texrow,
                                            int & foot_count)
 {
@@ -4992,27 +3410,27 @@ LyXParagraph * LyXParagraph::TeXEnvironment(string & file, TexRow & texrow,
        
        if (pextra_type == PEXTRA_INDENT) {
                if (!pextra_width.empty()) {
-                       file += "\\begin{LyXParagraphIndent}{"
-                               + pextra_width + "}\n";
+                       os << "\\begin{LyXParagraphIndent}{"
+                          << pextra_width << "}\n";
                } else {
                        //float ib = atof(pextra_widthp.c_str())/100;
                        // string can't handle floats at present (971109)
                        // so I'll do a conversion by hand knowing that
                        // the limits are 0.0 to 1.0. ARRae.
-                       file += "\\begin{LyXParagraphIndent}{";
+                       os << "\\begin{LyXParagraphIndent}{";
                        switch (pextra_widthp.length()) {
                        case 3:
-                               file += "1.00";
+                               os << "1.00";
                                break;
                        case 2:
-                               file += "0.";
-                               file += pextra_widthp;
+                               os << "0."
+                                  << pextra_widthp;
                                break;
                        case 1:
-                               file += "0.0";
-                               file += pextra_widthp;
+                               os << "0.0"
+                                  << pextra_widthp;
                        }
-                       file += "\\columnwidth}\n";
+                       os << "\\columnwidth}\n";
                }
                texrow.newline();
                eindent_open = true;
@@ -5020,51 +3438,50 @@ LyXParagraph * LyXParagraph::TeXEnvironment(string & file, TexRow & texrow,
        if ((pextra_type == PEXTRA_MINIPAGE) && !minipage_open) {
                if (pextra_hfill && Previous() &&
                    (Previous()->pextra_type == PEXTRA_MINIPAGE)) {
-                       file += "\\hfill{}\n";
+                       os << "\\hfill{}\n";
                        texrow.newline();
                }
                if (par_sep == BufferParams::PARSEP_INDENT) {
-                       file += "{\\setlength\\parindent{0pt}\n";
+                       os << "{\\setlength\\parindent{0pt}\n";
                        texrow.newline();
                }
-               file += "\\begin{minipage}";
+               os << "\\begin{minipage}";
                switch(pextra_alignment) {
                case MINIPAGE_ALIGN_TOP:
-                       file += "[t]";
+                       os << "[t]";
                        break;
                case MINIPAGE_ALIGN_MIDDLE:
-                       file += "[m]";
+                       os << "[m]";
                        break;
                case MINIPAGE_ALIGN_BOTTOM:
-                       file += "[b]";
+                       os << "[b]";
                        break;
                }
                if (!pextra_width.empty()) {
-                       file += '{';
-                       file += pextra_width + "}\n";
+                       os << '{' << pextra_width << "}\n";
                } else {
                        //float ib = atof(par->pextra_width.c_str())/100;
                        // string can't handle floats at present
                        // so I'll do a conversion by hand knowing that
                        // the limits are 0.0 to 1.0. ARRae.
-                       file += '{';
+                       os << '{';
                        switch (pextra_widthp.length()) {
                        case 3:
-                               file += "1.00";
+                               os << "1.00";
                                break;
                        case 2:
-                               file += "0.";
-                               file += pextra_widthp;
+                               os << "0."
+                                  << pextra_widthp;
                                break;
                        case 1:
-                               file += "0.0";
-                               file += pextra_widthp;
+                               os << "0.0"
+                                  << pextra_widthp;
                        }
-                       file += "\\columnwidth}\n";
+                       os << "\\columnwidth}\n";
                }
                texrow.newline();
                if (par_sep == BufferParams::PARSEP_INDENT) {
-                       file += "\\setlength\\parindent{\\LyXMinipageIndent}\n";
+                       os << "\\setlength\\parindent{\\LyXMinipageIndent}\n";
                        texrow.newline();
                }
                minipage_open = true;
@@ -5086,13 +3503,13 @@ LyXParagraph * LyXParagraph::TeXEnvironment(string & file, TexRow & texrow,
                                foot_this_level = true;
                        }
 #endif
-                       file += "\\begin{" + style.latexname() + "}{"
-                               + labelwidthstring + "}\n";
+                       os << "\\begin{" << style.latexname() << "}{"
+                          << labelwidthstring << "}\n";
                } else if (style.labeltype == LABEL_BIBLIO) {
                        // ale970405
-                       file += "\\begin{" + style.latexname() + "}{"
-                               + bibitemWidthest(current_view->painter())
-                               + "}\n";
+                       os << "\\begin{" << style.latexname() << "}{"
+                          << bibitemWidthest(current_view->painter())
+                          << "}\n";
                } else if (style.latextype == LATEX_ITEM_ENVIRONMENT) {
 #ifdef FANCY_FOOTNOTE_CODE
                        if (foot_count < 0) {
@@ -5102,25 +3519,25 @@ LyXParagraph * LyXParagraph::TeXEnvironment(string & file, TexRow & texrow,
                                foot_this_level = true;
                        }
 #endif
-                       file += "\\begin{" + style.latexname() + '}'
-                               + style.latexparam() + '\n';
+                       os << "\\begin{" << style.latexname() << '}'
+                          << style.latexparam() << '\n';
                } else 
-                       file += "\\begin{" + style.latexname() + '}'
-                               + style.latexparam() + '\n';
+                       os << "\\begin{" << style.latexname() << '}'
+                          << style.latexparam() << '\n';
                texrow.newline();
        }
        LyXParagraph * par = this;
        do {
-               par = par->TeXOnePar(file, texrow,
+               par = par->TeXOnePar(os, texrow,
                                     foot, foot_texrow, foot_count);
 
                 if (minipage_open && par && !style.isEnvironment() &&
                     (par->pextra_type == PEXTRA_MINIPAGE) &&
                     par->pextra_start_minipage) {
-                       file += "\\end{minipage}\n";
+                       os << "\\end{minipage}\n";
                        texrow.newline();
                        if (par_sep == BufferParams::PARSEP_INDENT) {
-                               file += "}\n";
+                               os << "}\n";
                                texrow.newline();
                        }
                        minipage_open = false;
@@ -5129,69 +3546,72 @@ LyXParagraph * LyXParagraph::TeXEnvironment(string & file, TexRow & texrow,
                        if (textclasslist.Style(current_view->buffer()->params.textclass,
                                                par->layout).isParagraph()
                            && !par->table
-                           && !suffixIs(file, "\n\n")) {
+                           // 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
-                               file += '\n';
+                               // 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 = par->TeXDeeper(file, texrow,
+                       par = par->TeXDeeper(os, texrow,
                                             foot, foot_texrow, foot_count);
                }
                if (par && par->layout == layout && par->depth == depth &&
                    (par->pextra_type == PEXTRA_MINIPAGE) && !minipage_open) {
                        if (par->pextra_hfill && par->Previous() &&
                            (par->Previous()->pextra_type == PEXTRA_MINIPAGE)){
-                               file += "\\hfill{}\n";
+                               os << "\\hfill{}\n";
                                 texrow.newline();
                         }
                        if (par_sep == BufferParams::PARSEP_INDENT) {
-                               file += "{\\setlength\\parindent{0pt}\n";
+                               os << "{\\setlength\\parindent{0pt}\n";
                                texrow.newline();
                        }
-                       file += "\\begin{minipage}";
+                       os << "\\begin{minipage}";
                        switch(par->pextra_alignment) {
                        case MINIPAGE_ALIGN_TOP:
-                               file += "[t]";
+                               os << "[t]";
                                break;
                        case MINIPAGE_ALIGN_MIDDLE:
-                               file += "[m]";
+                               os << "[m]";
                                break;
                        case MINIPAGE_ALIGN_BOTTOM:
-                               file += "[b]";
+                               os << "[b]";
                                break;
                        }
                        if (!par->pextra_width.empty()) {
-                               file += '{';
-                               file += par->pextra_width;
-                               file += "}\n";
+                               os << '{' << par->pextra_width << "}\n";
                        } else {
                                //float ib = atof(par->pextra_widthp.c_str())/100;
                                // string can't handle floats at present
                                // so I'll do a conversion by hand knowing that
                                // the limits are 0.0 to 1.0. ARRae.
-                               file += '{';
+                               os << '{';
                                switch (par->pextra_widthp.length()) {
                                case 3:
-                                       file += "1.00";
+                                       os << "1.00";
                                        break;
                                case 2:
-                                       file += "0.";
-                                       file += par->pextra_widthp;
+                                       os << "0." << par->pextra_widthp;
                                        break;
                                case 1:
-                                       file += "0.0";
-                                       file += par->pextra_widthp;
+                                       os << "0.0" << par->pextra_widthp;
                                }
-                               file += "\\columnwidth}\n";
+                               os << "\\columnwidth}\n";
                        }
                        texrow.newline();
                        if (par_sep == BufferParams::PARSEP_INDENT) {
-                               file += "\\setlength\\parindent{\\LyXMinipageIndent}\n";
+                               os << "\\setlength\\parindent{\\LyXMinipageIndent}\n";
                                texrow.newline();
                        }
                        minipage_open = true;
@@ -5203,16 +3623,16 @@ LyXParagraph * LyXParagraph::TeXEnvironment(string & file, TexRow & texrow,
                 && par->pextra_type == pextra_type);
  
        if (style.isEnvironment()) {
-               file += "\\end{" + style.latexname() + '}';
+               os << "\\end{" << style.latexname() << '}';
                // maybe this should go after the minipage closes?
                if (foot_this_level) {
                        if (foot_count >= 1) {
                                if (foot_count > 1) {
-                                       file += "\\addtocounter{footnote}{-";
-                                       file += tostr(foot_count - 1);
-                                       file += '}';
+                                       os << "\\addtocounter{footnote}{-"
+                                          << foot_count - 1
+                                          << '}';
                                }
-                               file += foot;
+                               os << foot;
                                texrow += foot_texrow;
                                foot.clear();
                                foot_texrow.reset();
@@ -5223,35 +3643,33 @@ LyXParagraph * LyXParagraph::TeXEnvironment(string & file, TexRow & texrow,
         if (minipage_open && (minipage_open_depth == depth) &&
             (!par || par->pextra_start_minipage ||
              par->pextra_type != PEXTRA_MINIPAGE)) {
-                file += "\\end{minipage}\n";
+                os << "\\end{minipage}\n";
                texrow.newline();
                 if (par_sep == BufferParams::PARSEP_INDENT) {
-                        file += "}\n";
+                        os << "}\n";
                        texrow.newline();
                 }
                 if (par && par->pextra_type != PEXTRA_MINIPAGE) {
-                        file += "\\medskip\n\n";
+                        os << "\\medskip\n\n";
                        texrow.newline();
                        texrow.newline();
                 }
                 minipage_open = false;
         }
        if (eindent_open) {
-               file += "\\end{LyXParagraphIndent}\n";
+               os << "\\end{LyXParagraphIndent}\n";
                texrow.newline();
        }
         if (!(par && (par->pextra_type == PEXTRA_MINIPAGE) 
              && par->pextra_hfill)) {
-                file += '\n';
+                os << '\n';
                texrow.newline();
        }
        lyxerr[Debug::LATEX] << "TeXEnvironment...done " << par << endl;
        return par;  // ale970302
 }
-#endif
 
 
-#ifdef USE_OSTREAM_ONLY
 LyXParagraph * LyXParagraph::TeXFootnote(ostream & os, TexRow & texrow,
                                         ostream & foot, TexRow & foot_texrow,
                                         int & foot_count,
@@ -5326,15 +3744,13 @@ LyXParagraph * LyXParagraph::TeXFootnote(ostream & os, TexRow & texrow,
                if (pextra_type == PEXTRA_FLOATFLT
                    && (!pextra_width.empty()
                        || !pextra_widthp.empty())) {
-                       char bufr[80];
                        if (!pextra_width.empty())
-                               sprintf(bufr, "\\begin{floatingfigure}{%s}\n",
-                                       pextra_width.c_str());
+                               os << "\\begin{floatingfigure}{"
+                                  << pextra_width << "}\n";
                        else
-                               sprintf(bufr,
-                                       "\\begin{floatingfigure}{%f\\textwidth}\n",
-                                       atoi(pextra_widthp.c_str())/100.0);
-                       os << bufr;
+                               os << "\\begin{floatingfigure}{"
+                                  << atoi(pextra_widthp.c_str())/100.0
+                                  << "\\textwidth}\n";
                } else {
                        os << "\\begin{figure}";
                        if (!params->float_placement.empty()) { 
@@ -5378,9 +3794,9 @@ LyXParagraph * LyXParagraph::TeXFootnote(ostream & os, TexRow & texrow,
        LyXDirection direction = getParDirection();
        if (direction != par_direction) {
                if (direction == LYX_DIR_LEFT_TO_RIGHT)
-                       os << "\\unsethebrew\n";
+                       os << lyxrc->language_command_ltr << '\n';
                else
-                       os << "\\sethebrew\n";
+                       os << lyxrc->language_command_rtl << '\n';
                texrow.newline();
        }
 
@@ -5517,268 +3933,6 @@ LyXParagraph * LyXParagraph::TeXFootnote(ostream & os, TexRow & texrow,
        lyxerr[Debug::LATEX] << "TeXFootnote...done " << par->next << endl;
        return par;
 }
-#else
-LyXParagraph * LyXParagraph::TeXFootnote(string & file, TexRow & texrow,
-                                        string & foot, TexRow & foot_texrow,
-                                        int & foot_count,
-                                        LyXDirection par_direction)
-{
-       lyxerr[Debug::LATEX] << "TeXFootnote...  " << this << endl;
-       if (footnoteflag == LyXParagraph::NO_FOOTNOTE)
-               lyxerr << "ERROR (LyXParagraph::TeXFootnote): "
-                       "No footnote!" << endl;
-
-       LyXParagraph * par = this;
-       LyXLayout const & style =
-               textclasslist.Style(current_view->buffer()->params.textclass, 
-                                   previous->GetLayout());
-       
-       if (style.needprotect && footnotekind != LyXParagraph::FOOTNOTE){
-               lyxerr << "ERROR (LyXParagraph::TeXFootnote): "
-                       "Float other than footnote in command"
-                       " with moving argument is illegal" << endl;
-       }
-
-       if (footnotekind != LyXParagraph::FOOTNOTE
-           && footnotekind != LyXParagraph::MARGIN
-           && file.length()
-           && !suffixIs(file, '\n')) {
-               // we need to ensure that real floats like tables and figures
-               // have their \begin{} on a new line otherwise we can get
-               // incorrect results when using the endfloat.sty package
-               // especially if two floats follow one another.  ARRae 981022
-               // NOTE: if the file is length 0 it must have just been
-               //       written out so we assume it ended with a '\n'
-               file += '\n';
-               texrow.newline();
-       }
-       
-       BufferParams * params = &current_view->buffer()->params;
-       bool footer_in_body = true;
-       switch (footnotekind) {
-       case LyXParagraph::FOOTNOTE:
-               if (style.intitle) {
-                       file += "\\thanks{\n";
-                       footer_in_body = false;
-               } else {
-                       if (foot_count == -1) {
-                               // we're at depth 0 so we can use:
-                               file += "\\footnote{%\n";
-                               footer_in_body = false;
-                       } else {
-                               file += "\\footnotemark{}%\n";
-                               if (foot_count) {
-                                       // we only need this when there are
-                                       // multiple footnotes
-                                       foot += "\\stepcounter{footnote}";
-                               }
-                               foot += "\\footnotetext{%\n";
-                               foot_texrow.start(this, 0);
-                               foot_texrow.newline();
-                               ++foot_count;
-                       }
-               }
-               break;
-       case LyXParagraph::MARGIN:
-               file += "\\marginpar{\n";
-               break;
-       case LyXParagraph::FIG:
-               if (pextra_type == PEXTRA_FLOATFLT
-                   && (!pextra_width.empty()
-                       || !pextra_widthp.empty())) {
-                       char bufr[80];
-                       if (!pextra_width.empty())
-                               sprintf(bufr, "\\begin{floatingfigure}{%s}\n",
-                                       pextra_width.c_str());
-                       else
-                               sprintf(bufr,
-                                       "\\begin{floatingfigure}{%f\\textwidth}\n",
-                                       atoi(pextra_widthp.c_str())/100.0);
-                       file += bufr;
-               } else {
-                       file += "\\begin{figure}";
-                       if (!params->float_placement.empty()) { 
-                               file += '[';
-                               file += params->float_placement;
-                               file += "]\n";
-                       } else {
-                               file += '\n';
-                       }
-               }
-               break;
-       case LyXParagraph::TAB:
-               file += "\\begin{table}";
-               if (!params->float_placement.empty()) { 
-                       file += '[';
-                       file += params->float_placement;
-                       file += "]\n";
-               } else {
-                       file += '\n';
-               }
-               break;
-       case LyXParagraph::WIDE_FIG:
-               file += "\\begin{figure*}";
-               if (!params->float_placement.empty()) { 
-                       file += '[';
-                       file += params->float_placement;
-                       file += "]\n";
-               } else {
-                       file += '\n';
-               }
-               break;
-       case LyXParagraph::WIDE_TAB:
-               file += "\\begin{table*}";
-               if (!params->float_placement.empty()) { 
-                       file += '[';
-                       file += params->float_placement;
-                       file += "]\n";
-               } else {
-                       file += '\n';
-               }
-               break;
-       case LyXParagraph::ALGORITHM:
-               file += "\\begin{algorithm}\n";
-               break;
-       }
-       texrow.newline();
-   
-       LyXDirection direction = getParDirection();
-       if (direction != par_direction) {
-               if (direction == LYX_DIR_LEFT_TO_RIGHT)
-                       file += "\\unsethebrew\n";
-               else
-                       file += "\\sethebrew\n";
-               texrow.newline();
-       }
-
-       if (footnotekind != LyXParagraph::FOOTNOTE
-           || !footer_in_body) {
-               // Process text for all floats except footnotes in body
-               do {
-                       LyXLayout const & style =
-                               textclasslist
-                               .Style(current_view->buffer()->params
-                                      .textclass,
-                                      par->layout);
-                       if (par->IsDummy())
-                               lyxerr << "ERROR (LyXParagraph::TeXFootnote)"
-                                      << endl;
-                       if (style.isEnvironment()
-                           || par->pextra_type == PEXTRA_MINIPAGE) { /* && !minipage_open ?? */
-                               // Allows the use of minipages within float
-                               // environments. Shouldn't be circular because
-                               // we don't support footnotes inside
-                               // floats (yet). ARRae
-                               par = par->TeXEnvironment(file, texrow,
-                                                         foot, foot_texrow,
-                                                         foot_count);
-                       } else {
-                               par = par->TeXOnePar(file, texrow,
-                                                    foot, foot_texrow,
-                                                    foot_count);
-                       }
-                       
-                       if (par && !par->IsDummy() && par->depth > depth) {
-                               par = par->TeXDeeper(file, texrow,
-                                                    foot, foot_texrow,
-                                                    foot_count);
-                       }
-               } while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE);
-       } else {
-               // process footnotes > depth 0 or in environments separately
-               // NOTE: Currently don't support footnotes within footnotes
-               //       even though that is possible using the \footnotemark
-               string dummy;
-               TexRow dummy_texrow;
-               int dummy_count = 0;
-               do {
-                       LyXLayout const & style =
-                               textclasslist
-                               .Style(current_view->buffer()->params
-                                      .textclass,
-                                      par->layout);
-                       if (par->IsDummy())
-                               lyxerr << "ERROR (LyXParagraph::TeXFootnote)"
-                                      << endl;
-                       if (style.isEnvironment()
-                           || par->pextra_type == PEXTRA_MINIPAGE) { /* && !minipage_open ?? */
-                               // Allows the use of minipages within float
-                               // environments. Shouldn't be circular because
-                               // we don't support footnotes inside
-                               // floats (yet). ARRae
-                               par = par->TeXEnvironment(foot, foot_texrow,
-                                                         dummy, dummy_texrow,
-                                                         dummy_count);
-                       } else {
-                               par = par->TeXOnePar(foot, foot_texrow,
-                                                    dummy, dummy_texrow,
-                                                    dummy_count);
-                       }
-
-                       if (par && !par->IsDummy() && par->depth > depth) {
-                               par = par->TeXDeeper(foot, foot_texrow,
-                                                    dummy, dummy_texrow,
-                                                    dummy_count);
-                       }
-               } while (par
-                        && par->footnoteflag != LyXParagraph::NO_FOOTNOTE);
-               if (dummy_count) {
-                       lyxerr << "ERROR (LyXParagraph::TeXFootnote): "
-                               "Footnote in a Footnote -- not supported"
-                              << endl;
-               }
-       }
-
-       switch (footnotekind) {
-       case LyXParagraph::FOOTNOTE:
-               if (footer_in_body) {
-                       // This helps tell which of the multiple
-                       // footnotetexts an error was in.
-                       foot += "}%\n";
-                       foot_texrow.newline();
-               } else {
-                       file += '}';
-               }
-               break;
-       case LyXParagraph::MARGIN:
-               file += '}';
-               break;
-       case LyXParagraph::FIG:
-               if (pextra_type == PEXTRA_FLOATFLT
-                   && (!pextra_width.empty()
-                       || !pextra_widthp.empty()))
-                       file += "\\end{floatingfigure}";
-               else
-                       file += "\\end{figure}";
-               break;
-       case LyXParagraph::TAB:
-               file += "\\end{table}";
-               break;
-       case LyXParagraph::WIDE_FIG:
-               file += "\\end{figure*}";
-               break;
-       case LyXParagraph::WIDE_TAB:
-               file += "\\end{table*}";
-               break;
-       case LyXParagraph::ALGORITHM:
-               file += "\\end{algorithm}";
-               break;
-       }
-
-       if (footnotekind != LyXParagraph::FOOTNOTE
-           && footnotekind != LyXParagraph::MARGIN) {
-               // we need to ensure that real floats like tables and figures
-               // have their \end{} on a line of their own otherwise we can
-               // get incorrect results when using the endfloat.sty package.
-               file += "\n";
-               texrow.newline();
-       }
-
-       lyxerr[Debug::LATEX] << "TeXFootnote...done " << par->next << endl;
-       return par;
-}
-#endif
 
 
 void LyXParagraph::SetPExtraType(int type, char const * width,