]> git.lyx.org Git - lyx.git/blobdiff - src/buffer.C
more changes, read the Changelog
[lyx.git] / src / buffer.C
index 1d4b8dc05957f693b41355f1ad2d8b479df05cd3..55785a6b3c94e9ceadd4116e746167723ab4d025 100644 (file)
@@ -71,6 +71,7 @@
 #include "insets/insetfloat.h"
 #include "insets/insetlist.h"
 #include "insets/insettabular.h"
+#include "insets/insettheorem.h"
 #include "support/filetools.h"
 #include "support/path.h"
 #include "LaTeX.h"
@@ -871,6 +872,11 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
                        inset->Read(this, lex);
                        par->InsertInset(pos, inset, font);
                        ++pos;
+               } else if (tmptok == "Theorem") {
+                       Inset * inset = new InsetList;
+                       inset->Read(this, lex);
+                       par->InsertInset(pos, inset, font);
+                       ++pos;
                } else if (tmptok == "GRAPHICS") {
                        Inset * inset = new InsetGraphics;
                                //inset->Read(this, lex);
@@ -1613,7 +1619,8 @@ void Buffer::makeLaTeXFile(string const & fname,
                
                string options; // the document class options.
                
-               if (tokenPos(tclass.opt_fontsize(), '|', params.fontsize) >= 0) {
+               if (tokenPos(tclass.opt_fontsize(),
+                            '|', params.fontsize) >= 0) {
                        // only write if existing in list (and not default)
                        options += params.fontsize;
                        options += "pt,";
@@ -1825,7 +1832,8 @@ void Buffer::makeLaTeXFile(string const & fname,
                        texrow.newline();
                }
 
-               if (tokenPos(tclass.opt_pagestyle(), '|', params.pagestyle) >= 0) {
+               if (tokenPos(tclass.opt_pagestyle(),
+                            '|', params.pagestyle) >= 0) {
                        if (params.pagestyle == "fancy") {
                                ofs << "\\usepackage{fancyhdr}\n";
                                texrow.newline();
@@ -1881,16 +1889,15 @@ void Buffer::makeLaTeXFile(string const & fname,
                }
 
                // Now insert the LyX specific LaTeX commands...
-               string preamble, tmppreamble;
 
                // The optional packages;
-               preamble = features.getPackages();
+               string preamble(features.getPackages());
 
                // this might be useful...
-               preamble += "\n\\makeatletter\n\n";
+               preamble += "\n\\makeatletter\n";
 
                // Some macros LyX will need
-               tmppreamble = features.getMacros();
+               string tmppreamble(features.getMacros());
 
                if (!tmppreamble.empty()) {
                        preamble += "\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
@@ -1913,7 +1920,7 @@ void Buffer::makeLaTeXFile(string const & fname,
                                + params.preamble + '\n';
                }
 
-               preamble += "\\makeatother\n\n";
+               preamble += "\\makeatother\n";
 
                // Itemize bullet settings need to be last in case the user
                // defines their own bullets that use a package included
@@ -1957,8 +1964,7 @@ void Buffer::makeLaTeXFile(string const & fname,
                ofs << preamble;
 
                // make the body.
-               ofs << "\\begin{document}\n\n";
-               texrow.newline();
+               ofs << "\\begin{document}\n";
                texrow.newline();
        } // only_body
        lyxerr.debug() << "preamble finished, now the body." << endl;
@@ -2009,11 +2015,12 @@ void Buffer::makeLaTeXFile(string const & fname,
        lyxerr.debug() << "Finished making latex file." << endl;
 }
 
+
 //
 // LaTeX all paragraphs from par to endpar, if endpar == 0 then to the end
 //
-void Buffer::latexParagraphs(ostream & ofs, LyXParagraph *par,
-                            LyXParagraph *endpar, TexRow & texrow) const
+void Buffer::latexParagraphs(ostream & ofs, LyXParagraph * par,
+                            LyXParagraph * endpar, TexRow & texrow) const
 {
        bool was_title = false;
        bool already_title = false;
@@ -2104,6 +2111,7 @@ void Buffer::latexParagraphs(ostream & ofs, LyXParagraph *par,
        }
 }
 
+
 bool Buffer::isLatex() const
 {
        return textclasslist.TextClass(params.textclass).outputType() == LATEX;
@@ -2149,10 +2157,12 @@ void Buffer::sgmlCloseTag(ostream & os, int depth,
 }
 
 
-void Buffer::makeLinuxDocFile(string const & fname, int column)
+void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
 {
        LyXParagraph * par = paragraph;
 
+       niceFile = nice; // this will be used by Insetincludes.
+
        string top_element = textclasslist.LatexnameOfClass(params.textclass);
        string environment_stack[10];
         string item_name;
@@ -2165,35 +2175,48 @@ void Buffer::makeLinuxDocFile(string const & fname, int column)
                WriteAlert(_("LYX_ERROR:"), _("Cannot write file"), fname);
                return;
        }
-   
-       tex_code_break_column = column; 
+
+        LyXTextClass const & tclass =
+               textclasslist.TextClass(params.textclass);
+
+       LaTeXFeatures features(params, tclass.numLayouts());
+       validate(features);
+
+       //if(nice)
+       tex_code_break_column = lyxrc.ascii_linelen;
+       //else
+       //tex_code_break_column = 0;
+
        texrow.reset();
-   
-       if (params.preamble.empty()) {
-               ofs << "<!doctype linuxdoc system>\n\n";
-       }
-       else {
-               ofs << "<!doctype linuxdoc system \n [ "
-                   << params.preamble << " \n]>\n\n";
+
+       if (!body_only) {
+               string sgml_includedfiles=features.getIncludedFiles();
+
+               if (params.preamble.empty() && sgml_includedfiles.empty()) {
+                       ofs << "<!doctype linuxdoc system>\n\n";
+               } else {
+                       ofs << "<!doctype linuxdoc system [ "
+                           << params.preamble << sgml_includedfiles << " \n]>\n\n";
+               }
+
+               if(params.options.empty())
+                       sgmlOpenTag(ofs, 0, top_element);
+               else {
+                       string top = top_element;
+                       top += " ";
+                       top += params.options;
+                       sgmlOpenTag(ofs, 0, top);
+               }
        }
 
        ofs << "<!-- "  << LYX_DOCVERSION 
            << " created this file. For more info see http://www.lyx.org/"
            << " -->\n";
 
-       if(params.options.empty())
-               sgmlOpenTag(ofs, 0, top_element);
-       else {
-               string top = top_element;
-               top += " ";
-               top += params.options;
-               sgmlOpenTag(ofs, 0, top);
-       }
-
        while (par) {
                int desc_on = 0; // description mode
                LyXLayout const & style =
-                       textclasslist.Style(users->buffer()->params.textclass,
+                       textclasslist.Style(params.textclass,
                                            par->layout);
 
                // treat <toc> as a special case for compatibility with old code
@@ -2314,8 +2337,10 @@ void Buffer::makeLinuxDocFile(string const & fname, int column)
        if(!environment_stack[depth].empty())
                sgmlCloseTag(ofs, depth, environment_stack[depth]);
 
-       ofs << "\n\n";
-       sgmlCloseTag(ofs, 0, top_element);
+       if (!body_only) {
+               ofs << "\n\n";
+               sgmlCloseTag(ofs, 0, top_element);
+       }
 
        ofs.close();
        // How to check for successful close
@@ -2572,31 +2597,29 @@ void Buffer::SimpleLinuxDocOnePar(ostream & os, LyXParagraph * par,
                        case 0:
                                if (font2.family() == LyXFont::TYPEWRITER_FAMILY) {
                                        push_tag(os, "tt", stack_num, stack);
-                                       family_type= 1;
+                                       family_type = 1;
                                }
                                else if (font2.family() == LyXFont::SANS_FAMILY) {
                                        push_tag(os, "sf", stack_num, stack);
-                                       family_type= 2;
+                                       family_type = 2;
                                }
                                break;
                        case 1:
                                pop_tag(os, "tt", stack_num, stack);
                                if (font2.family() == LyXFont::SANS_FAMILY) {
                                        push_tag(os, "sf", stack_num, stack);
-                                       family_type= 2;
-                               }
-                               else {
-                                       family_type= 0;
+                                       family_type = 2;
+                               } else {
+                                       family_type = 0;
                                }
                                break;
                        case 2:
                                pop_tag(os, "sf", stack_num, stack);
                                if (font2.family() == LyXFont::TYPEWRITER_FAMILY) {
                                        push_tag(os, "tt", stack_num, stack);
-                                       family_type= 1;
-                               }
-                               else {
-                                       family_type= 0;
+                                       family_type = 1;
+                               } else {
+                                       family_type = 0;
                                }
                        }
                }
@@ -2606,8 +2629,7 @@ void Buffer::SimpleLinuxDocOnePar(ostream & os, LyXParagraph * par,
                        if (font2.series() == LyXFont::BOLD_SERIES) {
                                push_tag(os, "bf", stack_num, stack);
                                is_bold = true;
-                       }
-                       else if (is_bold) {
+                       } else if (is_bold) {
                                pop_tag(os, "bf", stack_num, stack);
                                is_bold = false;
                        }
@@ -2619,31 +2641,28 @@ void Buffer::SimpleLinuxDocOnePar(ostream & os, LyXParagraph * par,
                        case 0:
                                if (font2.shape() == LyXFont::ITALIC_SHAPE) {
                                        push_tag(os, "it", stack_num, stack);
-                                       shape_type= 1;
-                               }
-                               else if (font2.shape() == LyXFont::SLANTED_SHAPE) {
+                                       shape_type = 1;
+                               } else if (font2.shape() == LyXFont::SLANTED_SHAPE) {
                                        push_tag(os, "sl", stack_num, stack);
-                                       shape_type= 2;
+                                       shape_type = 2;
                                }
                                break;
                        case 1:
                                pop_tag(os, "it", stack_num, stack);
                                if (font2.shape() == LyXFont::SLANTED_SHAPE) {
                                        push_tag(os, "sl", stack_num, stack);
-                                       shape_type= 2;
-                               }
-                               else {
-                                       shape_type= 0;
+                                       shape_type = 2;
+                               } else {
+                                       shape_type = 0;
                                }
                                break;
                        case 2:
                                pop_tag(os, "sl", stack_num, stack);
                                if (font2.shape() == LyXFont::ITALIC_SHAPE) {
                                        push_tag(os, "it", stack_num, stack);
-                                       shape_type= 1;
-                               }
-                               else {
-                                       shape_type= 0;
+                                       shape_type = 1;
+                               } else {
+                                       shape_type = 0;
                                }
                        }
                }
@@ -2659,15 +2678,17 @@ void Buffer::SimpleLinuxDocOnePar(ostream & os, LyXParagraph * par,
                }
 
                c = par->GetChar(i);
-      
+
+               if (c == LyXParagraph::META_INSET) {
+                       inset = par->GetInset(i);
+                       inset->Linuxdoc(this, os);
+               }
+
                if (font2.latex() == LyXFont::ON) {
                        // "TeX"-Mode on == > SGML-Mode on.
                        if (c != '\0')
                                os << c; // see LaTeX-Generation...
                        ++char_line_count;
-               } else if (c == LyXParagraph::META_INSET) {
-                       inset = par->GetInset(i);
-                       inset->Linuxdoc(this, os);
                } else {
                        string sgml_string;
                        if (par->linuxDocConvertChar(c, sgml_string)
@@ -2680,13 +2701,11 @@ void Buffer::SimpleLinuxDocOnePar(ostream & os, LyXParagraph * par,
                                        linux_doc_line_break(os, char_line_count, 6);
                                        os << "</tag>";
                                        desc_on = 2;
-                               }
-                               else  {
+                               } else  {
                                        linux_doc_line_break(os, char_line_count, 1);
                                        os << c;
                                }
-                       }
-                       else {
+                       } else {
                                os << sgml_string;
                                char_line_count += sgml_string.length();
                        }
@@ -2738,10 +2757,12 @@ void Buffer::LinuxDocError(LyXParagraph * par, int pos,
 
 enum { MAX_NEST_LEVEL = 25};
 
-void Buffer::makeDocBookFile(string const & fname, int column)
+void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
 {
        LyXParagraph * par = paragraph;
 
+       niceFile = nice; // this will be used by Insetincludes.
+
        string top_element= textclasslist.LatexnameOfClass(params.textclass);
        // Please use a real stack.
        string environment_stack[MAX_NEST_LEVEL];
@@ -2755,8 +2776,16 @@ void Buffer::makeDocBookFile(string const & fname, int column)
        string c_depth, c_params, tmps;
 
        int depth = 0; // paragraph depth
+        LyXTextClass const & tclass =
+               textclasslist.TextClass(params.textclass);
+
+       LaTeXFeatures features(params, tclass.numLayouts());
+       validate(features);
 
-       tex_code_break_column = column; 
+       //if(nice)
+       tex_code_break_column = lyxrc.ascii_linelen;
+       //else
+       //tex_code_break_column = 0;
 
        ofstream ofs(fname.c_str());
        if (!ofs) {
@@ -2766,30 +2795,35 @@ void Buffer::makeDocBookFile(string const & fname, int column)
    
        texrow.reset();
 
-       ofs << "<!doctype " << top_element
-           << " public \"-//OASIS//DTD DocBook V3.1//EN\"";
+       if(!only_body) {
+               string sgml_includedfiles=features.getIncludedFiles();
 
-       if (params.preamble.empty())
-               ofs << ">\n\n";
-       else
-               ofs << "\n [ " << params.preamble << " \n]>\n\n";
+               ofs << "<!doctype " << top_element
+                   << " public \"-//OASIS//DTD DocBook V3.1//EN\"";
 
-       ofs << "<!-- DocBook file was created by " << LYX_DOCVERSION 
-           << "\n  See http://www.lyx.org/ for more information -->\n";
+               if (params.preamble.empty() && sgml_includedfiles.empty())
+                       ofs << ">\n\n";
+               else
+                       ofs << "\n [ " << params.preamble 
+                           << sgml_includedfiles << " \n]>\n\n";
 
-       if(params.options.empty())
-               sgmlOpenTag(ofs, 0, top_element);
-       else {
-               string top = top_element;
-               top += " ";
-               top += params.options;
-               sgmlOpenTag(ofs, 0, top);
+               if(params.options.empty())
+                       sgmlOpenTag(ofs, 0, top_element);
+               else {
+                       string top = top_element;
+                       top += " ";
+                       top += params.options;
+                       sgmlOpenTag(ofs, 0, top);
+               }
        }
 
+       ofs << "<!-- DocBook file was created by " << LYX_DOCVERSION 
+           << "\n  See http://www.lyx.org/ for more information -->\n";
+
        while (par) {
                int desc_on = 0; // description mode
                LyXLayout const & style =
-                       textclasslist.Style(users->buffer()->params.textclass,
+                       textclasslist.Style(params.textclass,
                                            par->layout);
 
                // environment tag closing
@@ -2856,19 +2890,16 @@ void Buffer::makeDocBookFile(string const & fname, int column)
                                                if(!command_stack[j].empty())
                                                        sgmlCloseTag(ofs, j, command_stack[j]);
                                        command_depth= command_base= cmd_depth;
-                               }
-                               else if(cmd_depth <= command_depth) {
+                               } else if(cmd_depth <= command_depth) {
                                        for(int j = command_depth;
                                            j >= cmd_depth; --j)
 
                                                if(!command_stack[j].empty())
                                                        sgmlCloseTag(ofs, j, command_stack[j]);
                                        command_depth= cmd_depth;
-                               }
-                               else
+                               } else
                                        command_depth= cmd_depth;
-                       }
-                       else {
+                       } else {
                                command_depth = command_base = cmd_depth;
                                command_flag = true;
                        }
@@ -2938,8 +2969,7 @@ void Buffer::makeDocBookFile(string const & fname, int column)
                                item_name= "term";
                                sgmlOpenTag(ofs, depth + 1 + command_depth,
                                            item_name);
-                       }
-                       else {
+                       } else {
                                item_name= "para";
                                sgmlOpenTag(ofs, depth + 1 + command_depth,
                                            item_name);
@@ -3011,8 +3041,10 @@ void Buffer::makeDocBookFile(string const & fname, int column)
                if(!command_stack[j].empty())
                        sgmlCloseTag(ofs, j, command_stack[j]);
 
-       ofs << "\n\n";
-       sgmlCloseTag(ofs, 0, top_element);
+       if (!only_body) {
+               ofs << "\n\n";
+               sgmlCloseTag(ofs, 0, top_element);
+       }
 
        ofs.close();
        // How to check for successful close