]> git.lyx.org Git - lyx.git/blobdiff - src/paragraph.C
Dekels arabic patch, + some small things by me
[lyx.git] / src / paragraph.C
index 865260776322f5ee990c3b54bab69b847bbec223..99ab8c67ba08ad16de4af89ac340225356646cfd 100644 (file)
@@ -33,9 +33,9 @@ using std::ios;
 #include "support/filetools.h"
 #include "lyx_gui_misc.h"
 #include "texrow.h"
+#include "support/lyxmanip.h"
 
 
-extern void addNewlineAndDepth(string & file, int const depth); // Jug 990923
 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)
@@ -280,10 +280,12 @@ void LyXParagraph::writeFile(ostream & os, BufferParams const & params,
                        os << "\n\\hfill \n";
                        column = 0;
                        break;
+#if 0
                case META_PROTECTED_SEPARATOR: 
                        os << "\n\\protected_separator \n";
                        column = 0;
                        break;
+#endif
                case '\\':
                        os << "\n\\backslash \n";
                        column = 0;
@@ -297,7 +299,7 @@ void LyXParagraph::writeFile(ostream & os, BufferParams const & params,
                        break;
                default:
                        if ((column > 70 && c == ' ')
-                           || column > 79){
+                           || column > 79) {
                                os << "\n";
                                column = 0;
                        }
@@ -1200,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()
 {
@@ -1565,8 +1578,36 @@ 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::LayoutList::size_type LyXParagraph::GetLayout() const
+LyXTextClass::size_type LyXParagraph::GetLayout() const
 {
        return FirstPhysicalPar()->layout;
 }
@@ -1614,7 +1655,7 @@ void LyXParagraph::SetLabelWidthString(string const & s)
 }
 
 
-void LyXParagraph::SetOnlyLayout(LyXTextClass::LayoutList::size_type new_layout)
+void LyXParagraph::SetOnlyLayout(LyXTextClass::size_type new_layout)
 {
        LyXParagraph * par = FirstPhysicalPar();
        LyXParagraph * ppar = 0;
@@ -1659,7 +1700,7 @@ void LyXParagraph::SetOnlyLayout(LyXTextClass::LayoutList::size_type new_layout)
 }
 
 
-void LyXParagraph::SetLayout(LyXTextClass::LayoutList::size_type new_layout)
+void LyXParagraph::SetLayout(LyXTextClass::size_type new_layout)
 {
        LyXParagraph
                * par = FirstPhysicalPar(),
@@ -1726,9 +1767,10 @@ int LyXParagraph::BeginningOfMainBody() const
        // remove unnecessary GetChar() calls
        size_type i = 0;
        if (i < size()
-           && GetChar(i) != LyXParagraph::META_NEWLINE) {
+           && GetChar(i) != LyXParagraph::META_NEWLINE
+               ) {
                ++i;
-               char previous_char, temp;
+               char previous_char = 0, temp = 0; 
                if (i < size()
                    && (previous_char = GetChar(i)) != LyXParagraph::META_NEWLINE) {
                        // Yes, this  ^ is supposed to be "= " not "=="
@@ -1864,8 +1906,8 @@ void LyXParagraph::readSimpleWholeFile(istream & is)
 }
 
 
-LyXParagraph * LyXParagraph::TeXOnePar(string & file, TexRow & texrow,
-                                      string & foot, TexRow & foot_texrow,
+LyXParagraph * LyXParagraph::TeXOnePar(ostream & os, TexRow & texrow,
+                                      ostream & foot, TexRow & foot_texrow,
                                       int & foot_count)
 {
        lyxerr[Debug::LATEX] << "TeXOnePar...     " << this << endl;
@@ -1879,32 +1921,32 @@ LyXParagraph * LyXParagraph::TeXOnePar(string & file, TexRow & texrow,
                lyxerr << "ERROR (LyXParagraph::TeXOnePar) is dummy." << endl;
 
        if (start_of_appendix) {
-               file += "\\appendix\n";
+               os << "\\appendix\n";
                texrow.newline();
        }
 
        if (tex_code_break_column && style.isCommand()){
-               file += '\n';
+               os << '\n';
                texrow.newline();
        }
 
        if (pagebreak_top) {
-               file += "\\newpage";
+               os << "\\newpage";
                further_blank_line = true;
        }
        if (added_space_top.kind() != VSpace::NONE) {
-               file += added_space_top.asLatexCommand(current_view->buffer()->params);
+               os << added_space_top.asLatexCommand(current_view->buffer()->params);
                further_blank_line = true;
        }
       
        if (line_top) {
-               file += "\\lyxline{\\" + getFont(0).latexSize() + '}';
-               file += "\\vspace{-1\\parskip}";
+               os << "\\lyxline{\\" << getFont(0).latexSize() << '}'
+                  << "\\vspace{-1\\parskip}";
                further_blank_line = true;
        }
 
        if (further_blank_line){
-               file += '\n';
+               os << '\n';
                texrow.newline();
        }
 
@@ -1913,41 +1955,41 @@ LyXParagraph * LyXParagraph::TeXOnePar(string & file, TexRow & texrow,
                current_view->buffer()->params.getDocumentDirection();
        if (direction != global_direction) {
                if (direction == LYX_DIR_LEFT_TO_RIGHT)
-                       file += "\\unsethebrew\n";
+                       os << lyxrc->language_command_ltr << '\n';
                else
-                       file += "\\sethebrew\n";
+                       os << lyxrc->language_command_rtl << '\n';
                texrow.newline();
        }
        
 
        switch (style.latextype) {
        case LATEX_COMMAND:
-               file += '\\';
-               file += style.latexname();
-               file += style.latexparam();
+               os << '\\'
+                  << style.latexname()
+                  << style.latexparam();
                break;
        case LATEX_ITEM_ENVIRONMENT:
-               if (bibkey) 
-                       bibkey->Latex(file, false);
-               else
-                       file += "\\item ";
+               if (bibkey) {
+                       bibkey->Latex(os, false, false);
+               else
+                       os << "\\item ";
                break;
        case LATEX_LIST_ENVIRONMENT:
-               file += "\\item ";
+               os << "\\item ";
                break;
        default:
                break;
        }
 
-       bool need_par = SimpleTeXOnePar(file, texrow);
+       bool need_par = SimpleTeXOnePar(os, texrow);
  
        // Spit out footnotes
        while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE
               && par->footnoteflag != footnoteflag) {
-               par = par->TeXFootnote(file, texrow,
+               par = par->TeXFootnote(os, texrow,
                                       foot, foot_texrow, foot_count,
                                       direction);
-               par->SimpleTeXOnePar(file, texrow);
+               par->SimpleTeXOnePar(os, texrow);
                par = par->next;
        }
 
@@ -1956,37 +1998,37 @@ LyXParagraph * LyXParagraph::TeXOnePar(string & file, TexRow & texrow,
        // 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);
+       LyXFont font = getFont(Last() - 1);
        if (need_par) {
                if (style.resfont.size() != font.size()) {
-                       file += '\\';
-                       file += font.latexSize();
-                       file += ' ';
+                       os << '\\'
+                          << font.latexSize()
+                          << ' ';
                }
-               file += "\\par}";
+               os << "\\par}";
        } else if (textclasslist.Style(current_view->buffer()->params.textclass,
                                       GetLayout()).isCommand()){
                if (style.resfont.size() != font.size()) {
-                       file += '\\';
-                       file += font.latexSize();
-                       file += ' ';
+                       os << '\\'
+                          << font.latexSize()
+                          << ' ';
                }
-               file += '}';
+               os << '}';
        } else if (style.resfont.size() != font.size()){
-               file += "{\\" + font.latexSize() + " \\par}";
+               os << "{\\" << font.latexSize() << " \\par}";
        }
 
        if (direction != global_direction)
                if (direction == LYX_DIR_LEFT_TO_RIGHT)
-                       file += "\\sethebrew";
+                       os << '\n' << lyxrc->language_command_rtl;
                else
-                       file += "\\unsethebrew";
+                       os << '\n' << lyxrc->language_command_ltr;
        
        switch (style.latextype) {
        case LATEX_ITEM_ENVIRONMENT:
        case LATEX_LIST_ENVIRONMENT:
                 if (par && (depth < par->depth)) {
-                        file += '\n';
+                        os << '\n';
                         texrow.newline();
                 }
                break;
@@ -2009,35 +2051,35 @@ LyXParagraph * LyXParagraph::TeXOnePar(string & file, TexRow & texrow,
                        // 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';
+                       os << '\n';
                        texrow.newline();
                }
        }
        
        further_blank_line = false;
        if (line_bottom) {
-               file += "\\lyxline{\\" + getFont(Last()-1).latexSize() + '}';
+               os << "\\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);
+               os << added_space_bottom.asLatexCommand(current_view->buffer()->params);
                further_blank_line = true;
        }
       
        if (pagebreak_bottom) {
-               file += "\\newpage";
+               os << "\\newpage";
                further_blank_line = true;
        }
 
        if (further_blank_line){
-               file += '\n';
+               os << '\n';
                texrow.newline();
        }
 
        if (!(footnoteflag != LyXParagraph::NO_FOOTNOTE && par &&
               par->footnoteflag == LyXParagraph::NO_FOOTNOTE)) {
-               file += '\n';
+               os << '\n';
                texrow.newline();
        }
 
@@ -2047,29 +2089,29 @@ LyXParagraph * LyXParagraph::TeXOnePar(string & file, TexRow & texrow,
 
 
 // This one spits out the text of the paragraph
-bool LyXParagraph::SimpleTeXOnePar(string & file, TexRow & texrow)
+bool LyXParagraph::SimpleTeXOnePar(ostream & os, TexRow & texrow)
 {
        lyxerr[Debug::LATEX] << "SimpleTeXOnePar...     " << this << endl;
 
        if (table)
-               return SimpleTeXOneTablePar(file, texrow);
+               return SimpleTeXOneTablePar(os, texrow);
 
-       char c;
-       size_type main_body;
-       
        bool return_value = false;
 
-       LyXLayout const & style = textclasslist.Style(current_view->buffer()->params.textclass, GetLayout());
+       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 += '[';
+               os << '[';
                basefont = getFont(-2); // Get label font
        } else {
                basefont = getFont(-1); // Get layout font
@@ -2081,17 +2123,17 @@ bool LyXParagraph::SimpleTeXOnePar(string & file, TexRow & texrow)
            && !text.size()
            && !IsDummy()) {
                if (style.isCommand()) {
-                       file += '{';
+                       os << '{';
                        ++column;
                } else if (align != LYX_ALIGN_LAYOUT) {
-                       file += '{';
+                       os << '{';
                        ++column;
                        return_value = true;
                }
        }
  
        // Which font is currently active?
-       LyXFont running_font = basefont;
+       LyXFont running_font(basefont);
        // Do we have an open font change?
        bool open_font = false;
 
@@ -2103,25 +2145,25 @@ bool LyXParagraph::SimpleTeXOnePar(string & file, TexRow & texrow)
                if (i == main_body && !IsDummy()) {
                        if (main_body > 0) {
                                if (open_font) {
-                                       column += running_font.latexWriteEndChanges(file, basefont, basefont);
+                                       column += running_font.latexWriteEndChanges(os, basefont, basefont);
                                        open_font = false;
                                }
                                basefont = getFont(-1); // Now use the layout font
                                running_font = basefont;
-                               file += ']';
+                               os << ']';
                                ++column;
                        }
                        if (style.isCommand()) {
-                               file += '{';
+                               os << '{';
                                ++column;
                        } else if (align != LYX_ALIGN_LAYOUT) {
-                               file += "{\\par";
+                               os << "{\\par";
                                column += 4;
                                return_value = true;
                        }
 
                        if (noindent) {
-                               file += "\\noindent ";
+                               os << "\\noindent ";
                                column += 10;
                        }
                        switch (align) {
@@ -2130,21 +2172,21 @@ bool LyXParagraph::SimpleTeXOnePar(string & file, TexRow & texrow)
                        case LYX_ALIGN_LAYOUT:
                        case LYX_ALIGN_SPECIAL: break;
                        case LYX_ALIGN_LEFT:
-                               file += "\\raggedright ";
+                               os << "\\raggedright ";
                                column+= 13;
                                break;
                        case LYX_ALIGN_RIGHT:
-                               file += "\\raggedleft ";
+                               os << "\\raggedleft ";
                                column+= 12;
                                break;
                        case LYX_ALIGN_CENTER:
-                               file += "\\centering ";
+                               os << "\\centering ";
                                column+= 11;
                                break;
                        }        
                }
 
-               c = GetChar(i);
+               int c = GetChar(i);
 
                // Fully instantiated font
                LyXFont font = getFont(i);
@@ -2160,7 +2202,7 @@ bool LyXParagraph::SimpleTeXOnePar(string & file, TexRow & texrow)
                }
                // We end font definition before blanks
                if (!font.equalExceptLatex(running_font) && open_font) {
-                       column += running_font.latexWriteEndChanges(file,
+                       column += running_font.latexWriteEndChanges(os,
                                                                    basefont,
                                                                    (i == main_body-1) ? basefont : font);
                        running_font = basefont;
@@ -2171,7 +2213,7 @@ bool LyXParagraph::SimpleTeXOnePar(string & file, TexRow & texrow)
                if (c == ' '){
                        // Do not print the separation of the optional argument
                        if (i != main_body - 1) {
-                               SimpleTeXBlanks(file, texrow, i,
+                               SimpleTeXBlanks(os, texrow, i,
                                                column, font, style);
                        }
                }
@@ -2179,7 +2221,8 @@ bool LyXParagraph::SimpleTeXOnePar(string & file, TexRow & texrow)
                // Do we need to change font?
                if (!font.equalExceptLatex(running_font)
                    && i != main_body-1) {
-                       column += font.latexWriteStartChanges(file, basefont, last_font);
+                       column += font.latexWriteStartChanges(os, basefont,
+                                                             last_font);
                        running_font = font;
                        open_font = true;
                }
@@ -2189,25 +2232,25 @@ bool LyXParagraph::SimpleTeXOnePar(string & file, TexRow & texrow)
                        // the default in SimpleTeXSpecialChars().
                        if (!style.newline_allowed
                            || font.latex() == LyXFont::ON) {
-                               file += '\n';
+                               os << '\n';
                        } else {
                                if (open_font) {
-                                       column += running_font.latexWriteEndChanges(file, basefont, basefont);
+                                       column += running_font.latexWriteEndChanges(os, basefont, basefont);
                                        open_font = false;
                                }
                                basefont = getFont(-1);
                                running_font = basefont;
                                if (font.family() == 
                                    LyXFont::TYPEWRITER_FAMILY) {
-                                       file += "~";
+                                       os << "~";
                                }
-                               file += "\\\\\n";
+                               os << "\\\\\n";
                        }
                        texrow.newline();
                        texrow.start(this, i + 1);
                        column = 0;
                } else {
-                       SimpleTeXSpecialChars(file, texrow,
+                       SimpleTeXSpecialChars(os, texrow,
                                              font, running_font, basefont,
                                              open_font, style, i, column, c);
                }
@@ -2215,12 +2258,12 @@ bool LyXParagraph::SimpleTeXOnePar(string & file, TexRow & texrow)
 
        // If we have an open font definition, we have to close it
        if (open_font) {
-               running_font.latexWriteEndChanges(file, basefont, basefont);
+               running_font.latexWriteEndChanges(os, basefont, basefont);
        }
 
        // Needed if there is an optional argument but no contents.
        if (main_body > 0 && main_body == size()) {
-               file += "]~";
+               os << "]~";
                return_value = false;
        }
 
@@ -2230,7 +2273,7 @@ bool LyXParagraph::SimpleTeXOnePar(string & file, TexRow & texrow)
 
 
 // This one spits out the text of a table paragraph
-bool LyXParagraph::SimpleTeXOneTablePar(string & file, TexRow & texrow)
+bool LyXParagraph::SimpleTeXOneTablePar(ostream & os, TexRow & texrow)
 {
        lyxerr[Debug::LATEX] << "SimpleTeXOneTablePar...     " << this << endl;
    
@@ -2243,15 +2286,15 @@ bool LyXParagraph::SimpleTeXOneTablePar(string & file, TexRow & texrow)
        int column = 0;
        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) {
-                       file += "\\noindent ";
+                       os << "\\noindent ";
                        column += 10;
                }
                switch (align) {
@@ -2260,15 +2303,15 @@ bool LyXParagraph::SimpleTeXOneTablePar(string & file, TexRow & texrow)
                case LYX_ALIGN_LAYOUT:
                case LYX_ALIGN_SPECIAL: break;
                case LYX_ALIGN_LEFT:
-                       file += "\\raggedright ";
+                       os << "\\raggedright ";
                        column+= 13;
                        break;
                case LYX_ALIGN_RIGHT:
-                       file += "\\raggedleft ";
+                       os << "\\raggedleft ";
                        column+= 12;
                        break;
                case LYX_ALIGN_CENTER:
-                       file += "\\centering ";
+                       os << "\\centering ";
                        column+= 11;
                        break;
                }
@@ -2281,7 +2324,7 @@ bool LyXParagraph::SimpleTeXOneTablePar(string & file, TexRow & texrow)
        // Do we have an open font change?
        bool open_font = false;
        int current_cell_number = -1;
-       int tmp = table->TexEndOfCell(file, current_cell_number);
+       int tmp = table->TexEndOfCell(os, current_cell_number);
        for (; tmp > 0 ; --tmp)
                texrow.newline();
        
@@ -2305,24 +2348,27 @@ bool LyXParagraph::SimpleTeXOneTablePar(string & file, TexRow & texrow)
                // 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);
+                   && 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);
+                       column += running_font.latexWriteEndChanges(os,
+                                                                   basefont,
+                                                                   font);
                        running_font = basefont;
                        open_font = false;
                }
                // Blanks are printed before start of fontswitch
                if (c == ' '){
-                       SimpleTeXBlanks(file, texrow, i, column, font, style);
+                       SimpleTeXBlanks(os, texrow, i, column, font, style);
                }
                // Do we need to change font?
                if (font != running_font) {
-                       column += font.latexWriteStartChanges(file, basefont, last_font);
+                       column += font.latexWriteStartChanges(os, basefont,
+                                                             last_font);
                        running_font = font;
                        open_font = true;
                }
@@ -2330,7 +2376,7 @@ bool LyXParagraph::SimpleTeXOneTablePar(string & file, TexRow & texrow)
                if (font.latex() != running_font.latex()) {
                        if (font.latex() == LyXFont::ON
                            && style.needprotect) {
-                               file += "\\protect ";
+                               os << "\\protect ";
                                column += 9;
                        }
                }
@@ -2340,14 +2386,15 @@ bool LyXParagraph::SimpleTeXOneTablePar(string & file, TexRow & texrow)
                        // SimpleTeXSpecialChars()
                        if (open_font) {
                                column += running_font
-                                       .latexWriteEndChanges(file, basefont, basefont);
+                                       .latexWriteEndChanges(os, 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,
+                               TeXContTableRows(os, i + 1,
                                                 current_cell_number,
                                                 column, texrow);
                        }
@@ -2358,7 +2405,7 @@ bool LyXParagraph::SimpleTeXOneTablePar(string & file, TexRow & texrow)
                                --current_cell_number;
                                break;
                        }
-                       int tmp = table->TexEndOfCell(file,
+                       int tmp = table->TexEndOfCell(os,
                                                      current_cell_number);
                        if (tmp > 0) {
                                column = 0;
@@ -2370,7 +2417,7 @@ bool LyXParagraph::SimpleTeXOneTablePar(string & file, TexRow & texrow)
                        }
                        texrow.start(this, i + 1);
                } else {
-                       SimpleTeXSpecialChars(file, texrow,
+                       SimpleTeXSpecialChars(os, texrow,
                                              font, running_font, basefont,
                                              open_font, style, i, column, c);
                }
@@ -2378,10 +2425,10 @@ bool LyXParagraph::SimpleTeXOneTablePar(string & file, TexRow & texrow)
 
        // If we have an open font definition, we have to close it
        if (open_font) {
-               running_font.latexWriteEndChanges(file, basefont, basefont);
+               running_font.latexWriteEndChanges(os, basefont, basefont);
        }
        ++current_cell_number;
-       tmp = table->TexEndOfCell(file, current_cell_number);
+       tmp = table->TexEndOfCell(os, current_cell_number);
        for (; tmp > 0; --tmp)
                texrow.newline();
        lyxerr[Debug::LATEX] << "SimpleTeXOneTablePar...done " << this << endl;
@@ -2390,7 +2437,7 @@ bool LyXParagraph::SimpleTeXOneTablePar(string & file, TexRow & texrow)
 
 
 // This one spits out the text off ContRows in tables
-bool LyXParagraph::TeXContTableRows(string & file,
+bool LyXParagraph::TeXContTableRows(ostream & os,
                                    LyXParagraph::size_type i,
                                    int current_cell_number,
                                    int & column, TexRow & texrow)
@@ -2426,11 +2473,11 @@ bool LyXParagraph::TeXContTableRows(string & file,
                lastpos = i;
                c = GetChar(i);
                if (table->Linebreaks(table->FirstVirtualCell(cell))) {
-                       file += " \\\\\n";
+                       os << " \\\\\n";
                        texrow.newline();
                        column = 0;
                } else if ((c != ' ') && (c != LyXParagraph::META_NEWLINE)) {
-                       file += ' ';
+                       os << ' ';
                }
 
                for (; i < size()
@@ -2454,39 +2501,40 @@ bool LyXParagraph::TeXContTableRows(string & file,
 
                        // We end font definition before blanks
                        if (font != running_font && open_font) {
-                               column += running_font.latexWriteEndChanges(file, basefont, font);
+                               column += running_font.latexWriteEndChanges(os, basefont, font);
                                running_font = basefont;
                                open_font = false;
                        }
                        // Blanks are printed before start of fontswitch
                        if (c == ' '){
-                               SimpleTeXBlanks(file, texrow, i,
+                               SimpleTeXBlanks(os, texrow, i,
                                                column, font, style);
                        }
                        // Do we need to change font?
                        if (font != running_font) {
                                column +=
-                                       font.latexWriteStartChanges(file,
-                                                                   basefont, last_font);
+                                       font.latexWriteStartChanges(os,
+                                                                   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;
-                                       }
+                                   && style.needprotect) {
+                                       os << "\\protect ";
+                                       column += 9;
+                               }
                        }
-                       SimpleTeXSpecialChars(file, texrow, font,
+                       SimpleTeXSpecialChars(os, 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);
+                       running_font.latexWriteEndChanges(os, basefont,
+                                                         basefont);
                        open_font = false;
                }
                basefont = getFont(-1);
@@ -2505,9 +2553,11 @@ bool LyXParagraph::linuxDocConvertChar(char c, string & sgml_string)
        case LyXParagraph::META_HFILL:
                sgml_string.clear();
                break;
+#if 0
        case LyXParagraph::META_PROTECTED_SEPARATOR: 
                sgml_string = ' ';
                break;
+#endif
        case LyXParagraph::META_NEWLINE:
                sgml_string = '\n';
                break;
@@ -2565,7 +2615,7 @@ bool LyXParagraph::linuxDocConvertChar(char c, string & sgml_string)
 }
 
 
-void LyXParagraph::SimpleDocBookOneTablePar(string & file, string & extra,
+void LyXParagraph::SimpleDocBookOneTablePar(ostream & os, string & extra,
                                            int & desc_on, int depth) 
 {
        if (!table) return;
@@ -2575,7 +2625,6 @@ void LyXParagraph::SimpleDocBookOneTablePar(string & file, string & extra,
        char c;
        Inset * inset;
        size_type main_body;
-       string emph = "emphasis";
        bool emph_flag = false;
        
        LyXLayout const & style =
@@ -2594,13 +2643,13 @@ void LyXParagraph::SimpleDocBookOneTablePar(string & file, string & extra,
                font1 = style.font;
        
        int char_line_count = depth;
-       addNewlineAndDepth(file, depth);
+       os << newlineAndDepth(depth);
        if (footnoteflag == LyXParagraph::NO_FOOTNOTE) {
-               file += "<INFORMALTABLE>";
-               addNewlineAndDepth(file, ++depth);
+               os << "<INFORMALTABLE>"
+                  << newlineAndDepth(++depth);
        }
        int current_cell_number = -1;
-       int tmp = table->DocBookEndOfCell(file, current_cell_number, depth);
+       int tmp = table->DocBookEndOfCell(os, current_cell_number, depth);
        
        // Parsing main loop.
        for (size_type i = 0; i < size(); ++i) {
@@ -2618,23 +2667,23 @@ void LyXParagraph::SimpleDocBookOneTablePar(string & file, string & extra,
                // Handle <emphasis> tag.
                if (font1.emph() != font2.emph() && i) {
                        if (font2.emph() == LyXFont::ON) {
-                               file += "<emphasis>";
+                               os << "<emphasis>";
                                emph_flag= true;
                        } else if (emph_flag) {
-                               file += "</emphasis>";
+                               os << "</emphasis>";
                                emph_flag= false;
                        }
                }
                if (c == LyXParagraph::META_NEWLINE) {
                        // We have only to control for emphasis open here!
                        if (emph_flag) {
-                               file += "</emphasis>";
+                               os << "</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,
+                               DocBookContTableRows(os, extra, desc_on, i + 1,
                                                     current_cell_number,
                                                     column);
                        }
@@ -2645,7 +2694,7 @@ void LyXParagraph::SimpleDocBookOneTablePar(string & file, string & extra,
                                --current_cell_number;
                                break;
                        }
-                       tmp = table->DocBookEndOfCell(file,
+                       tmp = table->DocBookEndOfCell(os,
                                                      current_cell_number,
                                                      depth);
                        
@@ -2653,8 +2702,18 @@ void LyXParagraph::SimpleDocBookOneTablePar(string & file, string & extra,
                                column = 0;
                } else if (c == LyXParagraph::META_INSET) {
                        inset = GetInset(i);
-                       string tmp_out;
-                       inset->DocBook(tmp_out);
+#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
                        //
                        // This code needs some explanation:
                        // Two insets are treated specially
@@ -2674,15 +2733,15 @@ void LyXParagraph::SimpleDocBookOneTablePar(string & file, string & extra,
                                                extra += frontStrip(tmp_out,
                                                                    '@');
                                        else
-                                               file += frontStrip(tmp_out,
-                                                                  '@');
+                                               os << frontStrip(tmp_out,
+                                                                '@');
                                } else
-                                       file += tmp_out;
+                                       os << tmp_out;
                        }
                } else if (font2.latex() == LyXFont::ON) {
                        // "TeX"-Mode on == > SGML-Mode on.
                        if (c != '\0')
-                               file += c;
+                               os << c;
                        ++char_line_count;
                } else {
                        string sgml_string;
@@ -2693,14 +2752,14 @@ void LyXParagraph::SimpleDocBookOneTablePar(string & file, string & extra,
                                // char is ' '
                                if (desc_on == 1) {
                                        ++char_line_count;
-                                       file += '\n';
-                                       file += "</term><listitem><para>";
+                                       os << '\n'
+                                          << "</term><listitem><para>";
                                        desc_on = 2;
                                } else  {
-                                       file += c;
+                                       os << c;
                                }
                        } else {
-                               file += sgml_string;
+                               os << sgml_string;
                        }
                }
                font1 = font2;
@@ -2712,27 +2771,27 @@ void LyXParagraph::SimpleDocBookOneTablePar(string & file, string & extra,
        }
 
        if (emph_flag) {
-               file += "</emphasis>";
+               os << "</emphasis>";
        }
        
        ++current_cell_number;
-       tmp = table->DocBookEndOfCell(file, current_cell_number, depth);
+       tmp = table->DocBookEndOfCell(os, current_cell_number, depth);
        // Resets description flag correctly.
        switch(desc_on){
        case 1:
                // <term> not closed...
-               file += "</term>";
+               os << "</term>";
                break;
        }
        if (footnoteflag == LyXParagraph::NO_FOOTNOTE)
-               file += "</INFORMALTABLE>";
-       file += '\n';
+               os << "</INFORMALTABLE>";
+       os << '\n';
        lyxerr[Debug::LATEX] << "SimpleDocbookOneTablePar...done "
                             << this << endl;
 }
 
 
-void LyXParagraph::DocBookContTableRows(string & file, string & extra,
+void LyXParagraph::DocBookContTableRows(ostream & os, string & extra,
                                         int & desc_on,
                                        LyXParagraph::size_type i,
                                         int current_cell_number, int &column) 
@@ -2745,9 +2804,9 @@ void LyXParagraph::DocBookContTableRows(string & file, string & extra,
        LyXFont font2;
        char c;
        Inset * inset;
-       string emph= "emphasis";
-       bool emph_flag= false;
-       int char_line_count= 0;
+       //string emph = "emphasis";
+       bool emph_flag = false;
+       int char_line_count = 0;
        
        LyXLayout const & style =
                textclasslist.Style(current_view->buffer()->params.textclass,
@@ -2786,7 +2845,7 @@ void LyXParagraph::DocBookContTableRows(string & file, string & extra,
 //                     column = 0;
 //             } else
                if ((c != ' ') && (c != LyXParagraph::META_NEWLINE)) {
-                       file += ' ';
+                       os << ' ';
                }
 
                for (; i < size()
@@ -2800,17 +2859,27 @@ void LyXParagraph::DocBookContTableRows(string & file, string & extra,
                        // Handle <emphasis> tag.
                        if (font1.emph() != font2.emph() && i) {
                                if (font2.emph() == LyXFont::ON) {
-                                       file += "<emphasis>";
+                                       os << "<emphasis>";
                                        emph_flag= true;
                                } else if (emph_flag) {
-                                       file += "</emphasis>";
+                                       os << "</emphasis>";
                                        emph_flag= false;
                                }
                        }
                        if (c == LyXParagraph::META_INSET) {
                                inset = GetInset(i);
-                               string tmp_out;
-                               inset->DocBook(tmp_out);
+#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
                                //
                                // This code needs some explanation:
                                // Two insets are treated specially
@@ -2828,14 +2897,14 @@ void LyXParagraph::DocBookContTableRows(string & file, string & extra,
                                                if(desc_on == 4)
                                                        extra += frontStrip(tmp_out, '@');
                                                else
-                                                       file += frontStrip(tmp_out, '@');
+                                                       os << frontStrip(tmp_out, '@');
                                        } else
-                                               file += tmp_out;
+                                               os << tmp_out;
                                }
                        } else if (font2.latex() == LyXFont::ON) {
                                // "TeX"-Mode on == > SGML-Mode on.
                                if (c!= '\0')
-                                       file += c;
+                                       os << c;
                                ++char_line_count;
                        } else {
                                string sgml_string;
@@ -2846,20 +2915,20 @@ void LyXParagraph::DocBookContTableRows(string & file, string & extra,
                                        // char is ' '
                                        if (desc_on == 1) {
                                                ++char_line_count;
-                                               file += '\n';
-                                               file += "</term><listitem><para>";
+                                               os << '\n'
+                                                  << "</term><listitem><para>";
                                                desc_on = 2;
                                        } else  {
-                                               file += c;
+                                               os << c;
                                        }
                                } else {
-                                       file += sgml_string;
+                                       os << sgml_string;
                                }
                        }
                }
                // we have only to control for emphasis open here!
                if (emph_flag) {
-                       file += "</emphasis>";
+                       os << "</emphasis>";
                        emph_flag= false;
                }
                font1 = font2 = getFont(-1);
@@ -2869,7 +2938,7 @@ void LyXParagraph::DocBookContTableRows(string & file, string & extra,
 }
 
 
-void LyXParagraph::SimpleTeXBlanks(string & file, TexRow & texrow,
+void LyXParagraph::SimpleTeXBlanks(ostream & os, TexRow & texrow,
                                   LyXParagraph::size_type const i,
                                   int & column, LyXFont const & font,
                                   LyXLayout const & style)
@@ -2894,24 +2963,24 @@ void LyXParagraph::SimpleTeXBlanks(string & file, TexRow & texrow,
                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";
+                       os << " %\n";
                } else {
-                       file += '\n';
+                       os << '\n';
                }
                texrow.newline();
-               texrow.start(this, i+1);
+               texrow.start(this, i + 1);
                column = 0;
        } else if (font.latex() == LyXFont::OFF) {
                if (style.free_spacing) {
-                       file += '~';
+                       os << '~';
                } else {
-                       file += ' ';
+                       os << ' ';
                }
        }
 }
 
 
-void LyXParagraph::SimpleTeXSpecialChars(string & file, TexRow & texrow,
+void LyXParagraph::SimpleTeXSpecialChars(ostream & os, TexRow & texrow,
                                         LyXFont & font,
                                         LyXFont & running_font,
                                         LyXFont & basefont,
@@ -2928,23 +2997,26 @@ void LyXParagraph::SimpleTeXSpecialChars(string & file, TexRow & texrow,
                Inset * inset = GetInset(i);
                if (inset) {
                        bool close = false;
-                       int len = file.length();
+                       int len = os.tellp();
                        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{";
+                               os << "\\L{";
                                close = true;
                        }
-                       int tmp = inset->Latex(file, style.isCommand());
+
+                       int tmp = inset->Latex(os, style.isCommand(),
+                                              style.free_spacing);
+
                        if (close)
-                               file += "}";
+                               os << "}";
                        
                        if (tmp) {
                                column = 0;
                        } else {
-                               column += file.length() - len;
+                               column += os.tellp() - len;
                        }
                        for (; tmp--;) {
                                texrow.newline();
@@ -2955,8 +3027,9 @@ void LyXParagraph::SimpleTeXSpecialChars(string & file, TexRow & texrow,
 
        case LyXParagraph::META_NEWLINE:
                if (open_font) {
-                       column += running_font.latexWriteEndChanges(file,
-                                                                   basefont, basefont);
+                       column += running_font.latexWriteEndChanges(os,
+                                                                   basefont,
+                                                                   basefont);
                        open_font = false;
                }
                basefont = getFont(-1);
@@ -2964,7 +3037,7 @@ void LyXParagraph::SimpleTeXSpecialChars(string & file, TexRow & texrow,
                break;
 
        case LyXParagraph::META_HFILL: 
-               file += "\\hfill{}";
+               os << "\\hfill{}";
                column += 7;
                break;
 
@@ -2976,10 +3049,11 @@ void LyXParagraph::SimpleTeXSpecialChars(string & file, TexRow & texrow,
                        // 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 += ' ';
+                               os << ' ';
                                break;
-
+#endif
                        default:
                                // make sure that we will not print
                                // error generating chars to the tex
@@ -2987,19 +3061,20 @@ void LyXParagraph::SimpleTeXSpecialChars(string & file, TexRow & texrow,
                                // if it were done in the buffer
                                // itself.
                                if (c != '\0') {
-                                       file += c;
+                                       os << c;
                                }
                                break;
                        }
                } else {
                        // Plain mode (i.e. not LaTeX)
                        switch (c) {
+#if 0
                        case LyXParagraph::META_PROTECTED_SEPARATOR: 
-                               file += '~';
+                               os << '~';
                                break;
-
+#endif
                        case '\\': 
-                               file += "\\textbackslash{}";
+                               os << "\\textbackslash{}";
                                column += 15;
                                break;
                
@@ -3007,46 +3082,46 @@ void LyXParagraph::SimpleTeXSpecialChars(string & file, TexRow & texrow,
                        case '×': case '÷': case '¹': case 'ª':
                        case 'º': case '¬': case 'µ':
                                if (current_view->buffer()->params.inputenc == "latin1") {
-                                       file += "\\ensuremath{";
-                                       file += c;
-                                       file += '}';
+                                       os << "\\ensuremath{"
+                                          << c
+                                          << '}';
                                        column += 13;
                                } else {
-                                       file += c;
+                                       os << c;
                                }
                                break;
 
                        case '|': case '<': case '>':
                                // In T1 encoding, these characters exist
                                if (lyxrc->fontenc == "T1") {
-                                       file += c;
+                                       os << c;
                                        //... but we should avoid ligatures
                                        if ((c == '>' || c == '<')
                                            && i <= size() - 2
-                                           && GetChar(i+1) == c){
-                                               file += "\\textcompwordmark{}";
+                                           && GetChar(i + 1) == c){
+                                               os << "\\textcompwordmark{}";
                                                column += 19;
                                        }
                                        break;
                                }
                                // Typewriter font also has them
                                if (font.family() == LyXFont::TYPEWRITER_FAMILY) {
-                                       file += c;
+                                       os << c;
                                        break;
                                } 
                                // Otherwise, we use what LaTeX
                                // provides us.
                                switch(c) {
                                case '<':
-                                       file += "\\textless{}";
+                                       os << "\\textless{}";
                                        column += 10;
                                        break;
                                case '>':
-                                       file += "\\textgreater{}";
+                                       os << "\\textgreater{}";
                                        column += 13;
                                        break;
                                case '|':
-                                       file += "\\textbar{}";
+                                       os << "\\textbar{}";
                                        column += 9;
                                        break;
                                }
@@ -3056,50 +3131,47 @@ void LyXParagraph::SimpleTeXSpecialChars(string & file, TexRow & texrow,
                                if (i <= size() - 2
                                    && GetChar(i + 1) == '-'
                                    && font.family() == LyXFont::TYPEWRITER_FAMILY) {
-                                       file += "-{}";
+                                       os << "-{}";
                                        column += 2;
                                } else {
-                                       file += '-';
+                                       os << '-';
                                }
                                break;
 
                        case '\"': 
-                               file += "\\char`\\\"{}";
+                               os << "\\char`\\\"{}";
                                column += 9;
                                break;
 
                        case '£':
                                if (current_view->buffer()->params.inputenc == "default") {
-                                       file += "\\pounds{}";
+                                       os << "\\pounds{}";
                                        column += 8;
                                } else {
-                                       file += c;
+                                       os << c;
                                }
                                break;
 
                        case '$': case '&':
                        case '%': case '#': case '{':
                        case '}': case '_':
-                               file += '\\';
-                               file += c;
+                               os << '\\' << c;
                                column += 1;
                                break;
 
                        case '~':
-                               file += "\\textasciitilde{}";
+                               os << "\\textasciitilde{}";
                                column += 16;
                                break;
 
                        case '^':
-                               file += "\\textasciicircum{}";
+                               os << "\\textasciicircum{}";
                                column += 17;
                                break;
 
                        case '*': case '[': case ']':
                                // avoid being mistaken for optional arguments
-                               file += '{';
-                               file += c;
-                               file += '}';
+                               os << '{' << c << '}';
                                column += 2;
                                break;
 
@@ -3119,7 +3191,7 @@ void LyXParagraph::SimpleTeXSpecialChars(string & file, TexRow & texrow,
                                    && font.family() != LyXFont::TYPEWRITER_FAMILY
                                    && GetChar(i + 1) == 'y'
                                    && GetChar(i + 2) == 'X') {
-                                       file += "\\LyX{}";
+                                       os << "\\LyX{}";
                                        i += 2;
                                        column += 5;
                                }
@@ -3129,7 +3201,7 @@ void LyXParagraph::SimpleTeXSpecialChars(string & file, TexRow & texrow,
                                         && font.family() != LyXFont::TYPEWRITER_FAMILY
                                         && GetChar(i + 1) == 'e'
                                         && GetChar(i + 2) == 'X') {
-                                       file += "\\TeX{}";
+                                       os << "\\TeX{}";
                                        i += 2;
                                        column += 5;
                                }
@@ -3143,7 +3215,7 @@ void LyXParagraph::SimpleTeXSpecialChars(string & file, TexRow & texrow,
                                         && GetChar(i + 4) == 'X'
                                         && GetChar(i + 5) == '2'
                                         && GetChar(i + 6) == 'e') {
-                                       file += "\\LaTeXe{}";
+                                       os << "\\LaTeXe{}";
                                        i += 6;
                                        column += 8;
                                }
@@ -3155,12 +3227,12 @@ void LyXParagraph::SimpleTeXSpecialChars(string & file, TexRow & texrow,
                                         && GetChar(i + 2) == 'T'
                                         && GetChar(i + 3) == 'e'
                                         && GetChar(i + 4) == 'X') {
-                                       file += "\\LaTeX{}";
+                                       os << "\\LaTeX{}";
                                        i += 4;
                                        column += 7;
                                        /* idea for labels --- end*/ 
                                } else if (c != '\0') {
-                                       file += c;
+                                       os << c;
                                }
                                break;
                        }
@@ -3169,6 +3241,7 @@ void LyXParagraph::SimpleTeXSpecialChars(string & file, TexRow & texrow,
 }
 
 
+#if 0
 bool LyXParagraph::RoffContTableRows(ostream & os,
                                     LyXParagraph::size_type i,
                                     int actcell)
@@ -3209,6 +3282,34 @@ bool LyXParagraph::RoffContTableRows(ostream & os,
                        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) {
@@ -3228,14 +3329,17 @@ bool LyXParagraph::RoffContTableRows(ostream & os,
                                                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;
@@ -3253,10 +3357,11 @@ bool LyXParagraph::RoffContTableRows(ostream & os,
        }
        return true;
 }
+#endif
 
 
-LyXParagraph * LyXParagraph::TeXDeeper(string & file, TexRow & texrow,
-                                      string & foot, TexRow & foot_texrow,
+LyXParagraph * LyXParagraph::TeXDeeper(ostream & os, TexRow & texrow,
+                                      ostream & foot, TexRow & foot_texrow,
                                       int & foot_count)
 {
        lyxerr[Debug::LATEX] << "TeXDeeper...     " << this << endl;
@@ -3267,16 +3372,15 @@ LyXParagraph * LyXParagraph::TeXDeeper(string & file, TexRow & texrow,
                        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);
-                       }
+                   || 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;
 
@@ -3284,8 +3388,8 @@ LyXParagraph * LyXParagraph::TeXDeeper(string & file, TexRow & texrow,
 }
 
 
-LyXParagraph * LyXParagraph::TeXEnvironment(string & file, TexRow & texrow,
-                                           string & foot,
+LyXParagraph * LyXParagraph::TeXEnvironment(ostream & os, TexRow & texrow,
+                                           ostream & foot,
                                            TexRow & foot_texrow,
                                            int & foot_count)
 {
@@ -3306,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;
@@ -3334,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;
@@ -3400,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) {
@@ -3416,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;
@@ -3443,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;
@@ -3517,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();
@@ -3537,26 +3643,26 @@ 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;
@@ -3564,8 +3670,8 @@ LyXParagraph * LyXParagraph::TeXEnvironment(string & file, TexRow & texrow,
 }
 
 
-LyXParagraph * LyXParagraph::TeXFootnote(string & file, TexRow & texrow,
-                                        string & foot, TexRow & foot_texrow,
+LyXParagraph * LyXParagraph::TeXFootnote(ostream & os, TexRow & texrow,
+                                        ostream & foot, TexRow & foot_texrow,
                                         int & foot_count,
                                         LyXDirection par_direction)
 {
@@ -3575,8 +3681,9 @@ LyXParagraph * LyXParagraph::TeXFootnote(string & file, TexRow & texrow,
                        "No footnote!" << endl;
 
        LyXParagraph * par = this;
-       LyXLayout const & style = textclasslist.Style(current_view->buffer()->params.textclass, 
-                                                     previous->GetLayout());
+       LyXLayout const & style =
+               textclasslist.Style(current_view->buffer()->params.textclass, 
+                                   previous->GetLayout());
        
        if (style.needprotect && footnotekind != LyXParagraph::FOOTNOTE){
                lyxerr << "ERROR (LyXParagraph::TeXFootnote): "
@@ -3586,15 +3693,21 @@ LyXParagraph * LyXParagraph::TeXFootnote(string & file, TexRow & texrow,
 
        if (footnotekind != LyXParagraph::FOOTNOTE
            && footnotekind != LyXParagraph::MARGIN
-           && file.length()
-           && !suffixIs(file, '\n')) {
+           && os.tellp()
+           // Thinko
+           // How to solve this?
+           //&& !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';
+               // Thinkee:
+               // As far as I can see there is never any harm in writing
+               // a '\n' too much. Please tell me if I am wrong. (Lgb)
+               os << '\n';
                texrow.newline();
        }
        
@@ -3603,21 +3716,21 @@ LyXParagraph * LyXParagraph::TeXFootnote(string & file, TexRow & texrow,
        switch (footnotekind) {
        case LyXParagraph::FOOTNOTE:
                if (style.intitle) {
-                       file += "\\thanks{\n";
+                       os << "\\thanks{\n";
                        footer_in_body = false;
                } else {
                        if (foot_count == -1) {
                                // we're at depth 0 so we can use:
-                               file += "\\footnote{%\n";
+                               os << "\\footnote{%\n";
                                footer_in_body = false;
                        } else {
-                               file += "\\footnotemark{}%\n";
+                               os << "\\footnotemark{}%\n";
                                if (foot_count) {
                                        // we only need this when there are
                                        // multiple footnotes
-                                       foot += "\\stepcounter{footnote}";
+                                       os << "\\stepcounter{footnote}";
                                }
-                               foot += "\\footnotetext{%\n";
+                               os << "\\footnotetext{%\n";
                                foot_texrow.start(this, 0);
                                foot_texrow.newline();
                                ++foot_count;
@@ -3625,64 +3738,54 @@ LyXParagraph * LyXParagraph::TeXFootnote(string & file, TexRow & texrow,
                }
                break;
        case LyXParagraph::MARGIN:
-               file += "\\marginpar{\n";
+               os << "\\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());
+                               os << "\\begin{floatingfigure}{"
+                                  << pextra_width << "}\n";
                        else
-                               sprintf(bufr,
-                                       "\\begin{floatingfigure}{%f\\textwidth}\n",
-                                       atoi(pextra_widthp.c_str())/100.0);
-                       file += bufr;
+                               os << "\\begin{floatingfigure}{"
+                                  << atoi(pextra_widthp.c_str())/100.0
+                                  << "\\textwidth}\n";
                } else {
-                       file += "\\begin{figure}";
+                       os << "\\begin{figure}";
                        if (!params->float_placement.empty()) { 
-                               file += '[';
-                               file += params->float_placement;
-                               file += "]\n";
+                               os << '[' << params->float_placement << "]\n";
                        } else {
-                               file += '\n';
+                               os << '\n';
                        }
                }
                break;
        case LyXParagraph::TAB:
-               file += "\\begin{table}";
+               os << "\\begin{table}";
                if (!params->float_placement.empty()) { 
-                       file += '[';
-                       file += params->float_placement;
-                       file += "]\n";
+                       os << '[' << params->float_placement << "]\n";
                } else {
-                       file += '\n';
+                       os << '\n';
                }
                break;
        case LyXParagraph::WIDE_FIG:
-               file += "\\begin{figure*}";
+               os << "\\begin{figure*}";
                if (!params->float_placement.empty()) { 
-                       file += '[';
-                       file += params->float_placement;
-                       file += "]\n";
+                       os << '[' << params->float_placement << "]\n";
                } else {
-                       file += '\n';
+                       os << '\n';
                }
                break;
        case LyXParagraph::WIDE_TAB:
-               file += "\\begin{table*}";
+               os << "\\begin{table*}";
                if (!params->float_placement.empty()) { 
-                       file += '[';
-                       file += params->float_placement;
-                       file += "]\n";
+                       os << '[' << params->float_placement << "]\n";
                } else {
-                       file += '\n';
+                       os << '\n';
                }
                break;
        case LyXParagraph::ALGORITHM:
-               file += "\\begin{algorithm}\n";
+               os << "\\begin{algorithm}\n";
                break;
        }
        texrow.newline();
@@ -3691,9 +3794,9 @@ LyXParagraph * LyXParagraph::TeXFootnote(string & file, TexRow & texrow,
        LyXDirection direction = getParDirection();
        if (direction != par_direction) {
                if (direction == LYX_DIR_LEFT_TO_RIGHT)
-                       file += "\\unsethebrew\n";
+                       os << lyxrc->language_command_ltr << '\n';
                else
-                       file += "\\sethebrew\n";
+                       os << lyxrc->language_command_rtl << '\n';
                texrow.newline();
        }
 
@@ -3702,8 +3805,10 @@ LyXParagraph * LyXParagraph::TeXFootnote(string & file, TexRow & texrow,
                // Process text for all floats except footnotes in body
                do {
                        LyXLayout const & style =
-                               textclasslist.Style(current_view->buffer()->params.textclass,
-                                                   par->layout);
+                               textclasslist
+                               .Style(current_view->buffer()->params
+                                      .textclass,
+                                      par->layout);
                        if (par->IsDummy())
                                lyxerr << "ERROR (LyXParagraph::TeXFootnote)"
                                       << endl;
@@ -3713,17 +3818,17 @@ LyXParagraph * LyXParagraph::TeXFootnote(string & file, TexRow & texrow,
                                // environments. Shouldn't be circular because
                                // we don't support footnotes inside
                                // floats (yet). ARRae
-                               par = par->TeXEnvironment(file, texrow,
+                               par = par->TeXEnvironment(os, texrow,
                                                          foot, foot_texrow,
                                                          foot_count);
                        } else {
-                               par = par->TeXOnePar(file, texrow,
+                               par = par->TeXOnePar(os, texrow,
                                                     foot, foot_texrow,
                                                     foot_count);
                        }
                        
                        if (par && !par->IsDummy() && par->depth > depth) {
-                               par = par->TeXDeeper(file, texrow,
+                               par = par->TeXDeeper(os, texrow,
                                                     foot, foot_texrow,
                                                     foot_count);
                        }
@@ -3732,13 +3837,19 @@ LyXParagraph * LyXParagraph::TeXFootnote(string & file, TexRow & texrow,
                // 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;
+#ifdef HAVE_SSTREAM
+               ostringstream dummy;
+#else
+               ostrstream dummy;
+#endif
                TexRow dummy_texrow;
                int dummy_count = 0;
                do {
                        LyXLayout const & style =
-                               textclasslist.Style(current_view->buffer()->params.textclass,
-                                                   par->layout);
+                               textclasslist
+                               .Style(current_view->buffer()->params
+                                      .textclass,
+                                      par->layout);
                        if (par->IsDummy())
                                lyxerr << "ERROR (LyXParagraph::TeXFootnote)"
                                       << endl;
@@ -3769,6 +3880,9 @@ LyXParagraph * LyXParagraph::TeXFootnote(string & file, TexRow & texrow,
                                "Footnote in a Footnote -- not supported"
                               << endl;
                }
+#ifndef HAVE_OSTREAM
+               delete [] dummy.str();
+#endif
        }
 
        switch (footnotekind) {
@@ -3776,34 +3890,34 @@ LyXParagraph * LyXParagraph::TeXFootnote(string & file, TexRow & texrow,
                if (footer_in_body) {
                        // This helps tell which of the multiple
                        // footnotetexts an error was in.
-                       foot += "}%\n";
+                       foot << "}%\n";
                        foot_texrow.newline();
                } else {
-                       file += '}';
+                       os << '}';
                }
                break;
        case LyXParagraph::MARGIN:
-               file += '}';
+               os << '}';
                break;
        case LyXParagraph::FIG:
                if (pextra_type == PEXTRA_FLOATFLT
                    && (!pextra_width.empty()
                        || !pextra_widthp.empty()))
-                       file += "\\end{floatingfigure}";
+                       os << "\\end{floatingfigure}";
                else
-                       file += "\\end{figure}";
+                       os << "\\end{figure}";
                break;
        case LyXParagraph::TAB:
-               file += "\\end{table}";
+               os << "\\end{table}";
                break;
        case LyXParagraph::WIDE_FIG:
-               file += "\\end{figure*}";
+               os << "\\end{figure*}";
                break;
        case LyXParagraph::WIDE_TAB:
-               file += "\\end{table*}";
+               os << "\\end{table*}";
                break;
        case LyXParagraph::ALGORITHM:
-               file += "\\end{algorithm}";
+               os << "\\end{algorithm}";
                break;
        }
 
@@ -3812,7 +3926,7 @@ LyXParagraph * LyXParagraph::TeXFootnote(string & file, TexRow & texrow,
                // 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";
+               os << "\n";
                texrow.newline();
        }