X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.C;h=b0f732739d2bb95d91a78a14b722e243240b1498;hb=ee7037edbb0e4e8e78682baf02c1bc53da41d1fa;hp=26cdc9c87353f30c38ce925043eeac99f2186578;hpb=f8e05c680003b28c13d22deebd3763bdfb38f331;p=lyx.git diff --git a/src/buffer.C b/src/buffer.C index 26cdc9c873..b0f732739d 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -4,9 +4,9 @@ * LyX, The Document Processor * * Copyright 1995 Matthias Ettrich - * Copyright 1995-2000 The LyX Team. + * Copyright 1995-2001 The LyX Team. * - * This file is Copyright 1996-1999 + * This file is Copyright 1996-2001 * Lars Gullik Bjønnes * * ====================================================== @@ -16,6 +16,9 @@ #include #include +#include +#include +#include #include #include @@ -30,7 +33,7 @@ #endif #ifdef __GNUG__ -#pragma implementation "buffer.h" +#pragma implementation #endif #include "buffer.h" @@ -43,16 +46,16 @@ #include "tex-strings.h" #include "layout.h" #include "bufferview_funcs.h" -#include "minibuffer.h" #include "lyxfont.h" #include "version.h" #include "mathed/formulamacro.h" -#include "insets/lyxinset.h" +#include "mathed/formula.h" +#include "insets/inset.h" #include "insets/inseterror.h" #include "insets/insetlabel.h" #include "insets/insetref.h" #include "insets/inseturl.h" -#include "insets/insetinfo.h" +#include "insets/insetnote.h" #include "insets/insetquotes.h" #include "insets/insetlatexaccent.h" #include "insets/insetbib.h" @@ -71,12 +74,17 @@ #include "insets/insetmarginal.h" #include "insets/insetminipage.h" #include "insets/insetfloat.h" -#include "insets/insetlist.h" #include "insets/insettabular.h" +#if 0 #include "insets/insettheorem.h" +#include "insets/insetlist.h" +#endif #include "insets/insetcaption.h" +#include "insets/insetfloatlist.h" +#include "support/textutils.h" #include "support/filetools.h" #include "support/path.h" +#include "support/os.h" #include "LaTeX.h" #include "Chktex.h" #include "LyXView.h" @@ -94,6 +102,10 @@ #include "encoding.h" #include "exporter.h" #include "Lsstream.h" +#include "converter.h" +#include "BufferView.h" +#include "ParagraphParameters.h" +#include "iterators.h" using std::ostream; using std::ofstream; @@ -103,21 +115,24 @@ using std::ios; using std::setw; using std::endl; using std::pair; +using std::make_pair; using std::vector; +using std::map; using std::max; using std::set; +using std::stack; +using std::list; // all these externs should eventually be removed. extern BufferList bufferlist; extern LyXAction lyxaction; +namespace { -#if 0 -static const float LYX_FORMAT = 2.17; -#else -static const int LYX_FORMAT = 218; -#endif +const int LYX_FORMAT = 220; + +} // namespace anon extern int tex_code_break_column; @@ -156,10 +171,10 @@ Buffer::~Buffer() DestroyBufferTmpDir(tmppath); } - LyXParagraph * par = paragraph; - LyXParagraph * tmppar; + Paragraph * par = paragraph; + Paragraph * tmppar; while (par) { - tmppar = par->next; + tmppar = par->next(); delete par; par = tmppar; } @@ -169,12 +184,46 @@ Buffer::~Buffer() string const Buffer::getLatexName(bool no_path) const { + string name = ChangeExtension(MakeLatexName(filename), ".tex"); if (no_path) - return OnlyFilename(ChangeExtension(MakeLatexName(filename), - ".tex")); + return OnlyFilename(name); else - return ChangeExtension(MakeLatexName(filename), - ".tex"); + return name; +} + + +pair const Buffer::getLogName(void) const +{ + string const filename = getLatexName(false); + + if (filename.empty()) + return make_pair(Buffer::latexlog, string()); + + string path = OnlyPath(filename); + + if (lyxrc.use_tempdir || !IsDirWriteable(path)) + path = tmppath; + + string const fname = AddName(path, + OnlyFilename(ChangeExtension(filename, + ".log"))); + string const bname = + AddName(path, OnlyFilename( + ChangeExtension(filename, + formats.extension("literate") + ".out"))); + + // If no Latex log or Build log is newer, show Build log + + FileInfo const f_fi(fname); + FileInfo const b_fi(bname); + + if (b_fi.exist() && + (!f_fi.exist() || f_fi.getModificationTime() < b_fi.getModificationTime())) { + lyxerr[Debug::FILES] << "Log name calculated as : " << bname << endl; + return make_pair(Buffer::buildlog, bname); + } + lyxerr[Debug::FILES] << "Log name calculated as : " << fname << endl; + return make_pair(Buffer::latexlog, fname); } @@ -191,22 +240,6 @@ void Buffer::setReadonly(bool flag) } -bool Buffer::saveParamsAsDefaults() // const -{ - string const fname = AddName(AddPath(user_lyxdir, "templates/"), - "defaults.lyx"); - Buffer defaults = Buffer(fname); - - // Use the current buffer's parameters as default - defaults.params = params; - - // add an empty paragraph. Is this enough? - defaults.paragraph = new LyXParagraph; - - return defaults.writeFile(defaults.filename, false); -} - - /// Update window titles of all users // Should work on a list void Buffer::updateTitles() const @@ -232,6 +265,31 @@ void Buffer::setFileName(string const & newfile) } +// We'll remove this later. (Lgb) +namespace { + +string last_inset_read; + +#ifndef NO_COMPABILITY +struct ErtComp +{ + ErtComp() : active(false), in_tabular(false) { + } + string contents; + bool active; + bool in_tabular; +}; + +std::stack ert_stack; +ErtComp ert_comp; +#endif + +#warning And _why_ is this here? (Lgb) +int unknown_layouts; + +} // anon + + // candidate for move to BufferView // (at least some parts in the beginning of the func) // @@ -240,225 +298,317 @@ void Buffer::setFileName(string const & newfile) // if par = 0 normal behavior // else insert behavior // Returns false if "\the_end" is not read for formats >= 2.13. (Asger) -bool Buffer::readLyXformat2(LyXLex & lex, LyXParagraph * par) +bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par) { - int pos = 0; - char depth = 0; // signed or unsigned? -#ifndef NEW_INSETS - LyXParagraph::footnote_flag footnoteflag = LyXParagraph::NO_FOOTNOTE; - LyXParagraph::footnote_kind footnotekind = LyXParagraph::FOOTNOTE; + unknown_layouts = 0; +#ifndef NO_COMPABILITY + ert_comp.contents.erase(); + ert_comp.active = false; + ert_comp.in_tabular = false; #endif + int pos = 0; + Paragraph::depth_type depth = 0; bool the_end_read = false; - LyXParagraph * return_par = 0; + Paragraph * first_par = 0; LyXFont font(LyXFont::ALL_INHERIT, params.language); -#if 0 - if (format < 2.16 && params.language->lang() == "hebrew") - font.setLanguage(default_language); -#else if (file_format < 216 && params.language->lang() == "hebrew") font.setLanguage(default_language); -#endif - // If we are inserting, we cheat and get a token in advance - bool has_token = false; - string pretoken; if (!par) { - par = new LyXParagraph; + par = new Paragraph; } else { - users->text->BreakParagraph(users); - return_par = users->text->FirstParagraph(); + // We are inserting into an existing document + users->text->breakParagraph(users); + first_par = users->text->firstParagraph(); pos = 0; markDirty(); // We don't want to adopt the parameters from the // document we insert, so we skip until the text begins: - while (lex.IsOK()) { + while (lex.isOK()) { lex.nextToken(); - pretoken = lex.GetString(); + string const pretoken = lex.getString(); if (pretoken == "\\layout") { - has_token = true; + lex.pushToken(pretoken); break; } } } - while (lex.IsOK()) { - if (has_token) { - has_token = false; - } else { - lex.nextToken(); - pretoken = lex.GetString(); - } + while (lex.isOK()) { + lex.nextToken(); + string const token = lex.getString(); + + if (token.empty()) continue; - if (pretoken.empty()) continue; + lyxerr[Debug::PARSER] << "Handling token: `" + << token << "'" << endl; the_end_read = - parseSingleLyXformat2Token(lex, par, return_par, - pretoken, pos, depth, - font -#ifndef NEW_INSETS - , footnoteflag, - footnotekind -#endif - ); + parseSingleLyXformat2Token(lex, par, first_par, + token, pos, depth, + font); } - if (!return_par) - return_par = par; + if (!first_par) + first_par = par; + + paragraph = first_par; + + if (unknown_layouts > 0) { + string s = _("Couldn't set the layout for "); + if (unknown_layouts == 1) { + s += _("one paragraph"); + } else { + s += tostr(unknown_layouts); + s += _(" paragraphs"); + } + WriteAlert(_("Textclass Loading Error!"), s, + _("When reading " + fileName())); + } - paragraph = return_par; - return the_end_read; } -// We'll remove this later. (Lgb) -static string last_inset_read; +#ifndef NO_COMPABILITY +void Buffer::insertErtContents(Paragraph * par, int & pos, + LyXFont const & font, bool set_inactive) +{ + if (!ert_comp.contents.empty()) { + lyxerr[Debug::INSETS] << "ERT contents:\n" + << ert_comp.contents << endl; + Inset * inset = new InsetERT(ert_comp.contents, true); + par->insertInset(pos++, inset, font); + ert_comp.contents.erase(); + } + if (set_inactive) { + ert_comp.active = false; + } +} +#endif bool -Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par, - LyXParagraph *& return_par, +Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, + Paragraph *& first_par, string const & token, int & pos, - char & depth, LyXFont & font -#ifndef NEW_INSETS - , LyXParagraph::footnote_flag & footnoteflag, - LyXParagraph::footnote_kind & footnotekind -#endif + Paragraph::depth_type & depth, + LyXFont & font ) { bool the_end_read = false; - +#ifndef NO_COMPABILITY +#ifndef NO_PEXTRA_REALLY + // This is super temporary but is needed to get the compability + // mode for minipages work correctly together with new tabulars. + static int call_depth; + ++call_depth; + bool checkminipage = false; + static Paragraph * minipar; + static Paragraph * parBeforeMinipage; +#endif +#endif if (token[0] != '\\') { +#ifndef NO_COMPABILITY + if (ert_comp.active) { + ert_comp.contents += token; + } else { +#endif for (string::const_iterator cit = token.begin(); cit != token.end(); ++cit) { - par->InsertChar(pos, (*cit), font); + par->insertChar(pos, (*cit), font); ++pos; } +#ifndef NO_COMPABILITY + } +#endif } else if (token == "\\i") { Inset * inset = new InsetLatexAccent; - inset->Read(this, lex); - par->InsertInset(pos, inset, font); + inset->read(this, lex); + par->insertInset(pos, inset, font); ++pos; } else if (token == "\\layout") { - if (!return_par) - return_par = par; - else { - par->fitToSize(); - par = new LyXParagraph(par); - } - pos = 0; - lex.EatLine(); - string const layoutname = lex.GetString(); - pair pp - = textclasslist.NumberOfLayout(params.textclass, - layoutname); - if (pp.first) { - par->layout = pp.second; - } else { // layout not found - // use default layout "Standard" (0) - par->layout = 0; +#ifndef NO_COMPABILITY + ert_comp.in_tabular = false; + // Do the insetert. + insertErtContents(par, pos, font); +#endif + lex.eatLine(); + string const layoutname = lex.getString(); + pair pp + = textclasslist.NumberOfLayout(params.textclass, + layoutname); + +#ifndef NO_COMPABILITY + if (compare_no_case(layoutname, "latex") == 0) { + ert_comp.active = true; } - // Test whether the layout is obsolete. - LyXLayout const & layout = - textclasslist.Style(params.textclass, - par->layout); - if (!layout.obsoleted_by().empty()) - par->layout = - textclasslist.NumberOfLayout(params.textclass, - layout.obsoleted_by()).second; -#ifndef NEW_INSETS - par->footnoteflag = footnoteflag; - par->footnotekind = footnotekind; #endif - par->depth = depth; - font = LyXFont(LyXFont::ALL_INHERIT, params.language); -#if 0 - if (format < 2.16 && params.language->lang() == "hebrew") - font.setLanguage(default_language); -#else - if (file_format < 216 && params.language->lang() == "hebrew") - font.setLanguage(default_language); +#ifdef USE_CAPTION + // The is the compability reading of layout caption. + // It can be removed in LyX version 1.3.0. (Lgb) + if (compare_no_case(layoutname, "caption") == 0) { + // We expect that the par we are now working on is + // really inside a InsetText inside a InsetFloat. + // We also know that captions can only be + // one paragraph. (Lgb) + + // We should now read until the next "\layout" + // is reached. + // This is probably not good enough, what if the + // caption is the last par in the document (Lgb) + istream & ist = lex.getStream(); + stringstream ss; + string line; + int begin = 0; + while (true) { + getline(ist, line); + if (prefixIs(line, "\\layout")) { + lex.pushToken(line); + break; + } + if (prefixIs(line, "\\begin_inset")) + ++begin; + if (prefixIs(line, "\\end_inset")) { + if (begin) + --begin; + else { + lex.pushToken(line); + break; + } + } + + ss << line << '\n'; + } + // Now we should have the whole layout in ss + // we should now be able to give this to the + // caption inset. + ss << "\\end_inset\n"; + + // This seems like a bug in stringstream. + // We really should be able to use ss + // directly. (Lgb) + istringstream is(ss.str()); + LyXLex tmplex(0, 0); + tmplex.setStream(is); + Inset * inset = new InsetCaption; + inset->Read(this, tmplex); + par->InsertInset(pos, inset, font); + ++pos; + } else { #endif -#ifndef NEW_INSETS - } else if (token == "\\end_float") { - if (!return_par) - return_par = par; - else { - par->fitToSize(); - par = new LyXParagraph(par); - } - footnotekind = LyXParagraph::FOOTNOTE; - footnoteflag = LyXParagraph::NO_FOOTNOTE; - pos = 0; - lex.EatLine(); - par->layout = LYX_DUMMY_LAYOUT; - font = LyXFont(LyXFont::ALL_INHERIT, params.language); -#if 0 - if (format < 2.16 && params.language->lang() == "hebrew") - font.setLanguage(default_language); -#else - if (file_format < 216 && params.language->lang() == "hebrew") - font.setLanguage(default_language); + if (!first_par) + first_par = par; + else { + par = new Paragraph(par); + } + pos = 0; + if (pp.first) { + par->layout = pp.second; +#ifndef NO_COMPABILITY + } else if (ert_comp.active) { + par->layout = 0; #endif + } else { + // layout not found + // use default layout "Standard" (0) + par->layout = 0; + ++unknown_layouts; + string const s = _("Layout had to be changed from\n") + + layoutname + _(" to ") + + textclasslist.NameOfLayout(params.textclass, par->layout); + InsetError * new_inset = new InsetError(s); + par->insertInset(0, new_inset); + } + // Test whether the layout is obsolete. + LyXLayout const & layout = + textclasslist.Style(params.textclass, + par->layout); + if (!layout.obsoleted_by().empty()) + par->layout = textclasslist + .NumberOfLayout(params.textclass, + layout.obsoleted_by()) + .second; + par->params().depth(depth); + font = LyXFont(LyXFont::ALL_INHERIT, params.language); + if (file_format < 216 + && params.language->lang() == "hebrew") + font.setLanguage(default_language); +#if USE_CAPTION + } +#endif + +#ifndef NO_COMPABILITY } else if (token == "\\begin_float") { - int tmpret = lex.FindToken(string_footnotekinds); - if (tmpret == -1) ++tmpret; - if (tmpret != LYX_LAYOUT_DEFAULT) - footnotekind = static_cast(tmpret); // bad - if (footnotekind == LyXParagraph::FOOTNOTE - || footnotekind == LyXParagraph::MARGIN) - footnoteflag = LyXParagraph::CLOSED_FOOTNOTE; - else - footnoteflag = LyXParagraph::OPEN_FOOTNOTE; -#else - } else if (token == "\\begin_float") { - // This is the compability reader, unfinished but tested. - // (Lgb) + insertErtContents(par, pos, font); + //insertErtContents(par, pos, font, false); + //ert_stack.push(ert_comp); + //ert_comp = ErtComp(); + + // This is the compability reader. It can be removed in + // LyX version 1.3.0. (Lgb) lex.next(); - string const tmptok = lex.GetString(); + string const tmptok = lex.getString(); //lyxerr << "old float: " << tmptok << endl; Inset * inset = 0; - string old_float; + stringstream old_float; if (tmptok == "footnote") { inset = new InsetFoot; + old_float << "collapsed true\n"; } else if (tmptok == "margin") { inset = new InsetMarginal; + old_float << "collapsed true\n"; } else if (tmptok == "fig") { inset = new InsetFloat("figure"); - old_float += "placement htbp\n"; + old_float << "placement htbp\n" + << "wide false\n" + << "collapsed false\n"; } else if (tmptok == "tab") { inset = new InsetFloat("table"); - old_float += "placement htbp\n"; + old_float << "placement htbp\n" + << "wide false\n" + << "collapsed false\n"; } else if (tmptok == "alg") { inset = new InsetFloat("algorithm"); - old_float += "placement htbp\n"; + old_float << "placement htbp\n" + << "wide false\n" + << "collapsed false\n"; } else if (tmptok == "wide-fig") { - InsetFloat * tmp = new InsetFloat("figure"); - tmp->wide(true); - inset = tmp; - old_float += "placement htbp\n"; + inset = new InsetFloat("figure"); + //InsetFloat * tmp = new InsetFloat("figure"); + //tmp->wide(true); + //inset = tmp; + old_float << "placement htbp\n" + << "wide true\n" + << "collapsed false\n"; } else if (tmptok == "wide-tab") { - InsetFloat * tmp = new InsetFloat("table"); - tmp->wide(true); - inset = tmp; - old_float += "placement htbp\n"; + inset = new InsetFloat("table"); + //InsetFloat * tmp = new InsetFloat("table"); + //tmp->wide(true); + //inset = tmp; + old_float << "placement htbp\n" + << "wide true\n" + << "collapsed false\n"; } - if (!inset) return false; // no end read yet - - old_float += "collapsed true\n"; + if (!inset) { +#ifndef NO_PEXTRA_REALLY + --call_depth; +#endif + return false; // no end read yet + } // Here we need to check for \end_deeper and handle that // before we do the footnote parsing. // This _is_ a hack! (Lgb) - while(true) { + while (true) { lex.next(); - string const tmp = lex.GetString(); + string const tmp = lex.getString(); if (tmp == "\\end_deeper") { - lyxerr << "\\end_deeper caught!" << endl; + //lyxerr << "\\end_deeper caught!" << endl; if (!depth) { lex.printError("\\end_deeper: " "depth is already null"); @@ -466,24 +616,23 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par, --depth; } else { - old_float += tmp; - old_float += ' '; + old_float << tmp << ' '; break; } } - old_float += lex.getLongString("\\end_float"); - old_float += "\n\\end_inset\n"; - //lyxerr << "float body: " << old_float << endl; - - istringstream istr(old_float); - + old_float << lex.getLongString("\\end_float") + << "\n\\end_inset\n"; + //lyxerr << "Float Body:\n" << old_float.str() << endl; + // That this does not work seems like a bug + // in stringstream. (Lgb) + istringstream istr(old_float.str()); LyXLex nylex(0, 0); nylex.setStream(istr); - - inset->Read(this, nylex); - par->InsertInset(pos, inset, font); + inset->read(this, nylex); + par->insertInset(pos, inset, font); ++pos; + insertErtContents(par, pos, font); #endif } else if (token == "\\begin_deeper") { ++depth; @@ -497,15 +646,15 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par, } else if (token == "\\begin_preamble") { params.readPreamble(lex); } else if (token == "\\textclass") { - lex.EatLine(); + lex.eatLine(); pair pp = - textclasslist.NumberOfClass(lex.GetString()); + textclasslist.NumberOfClass(lex.getString()); if (pp.first) { params.textclass = pp.second; } else { WriteAlert(string(_("Textclass error")), string(_("The document uses an unknown textclass \"")) + - lex.GetString() + string("\"."), + lex.getString() + string("\"."), string(_("LyX will not be able to produce output correctly."))); params.textclass = 0; } @@ -522,52 +671,52 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par, params.textclass = 0; } } else if (token == "\\options") { - lex.EatLine(); - params.options = lex.GetString(); + lex.eatLine(); + params.options = lex.getString(); } else if (token == "\\language") { params.readLanguage(lex); } else if (token == "\\fontencoding") { - lex.EatLine(); + lex.eatLine(); } else if (token == "\\inputencoding") { - lex.EatLine(); - params.inputenc = lex.GetString(); + lex.eatLine(); + params.inputenc = lex.getString(); } else if (token == "\\graphics") { params.readGraphicsDriver(lex); } else if (token == "\\fontscheme") { - lex.EatLine(); - params.fonts = lex.GetString(); + lex.eatLine(); + params.fonts = lex.getString(); } else if (token == "\\noindent") { - par->noindent = true; + par->params().noindent(true); } else if (token == "\\fill_top") { - par->added_space_top = VSpace(VSpace::VFILL); + par->params().spaceTop(VSpace(VSpace::VFILL)); } else if (token == "\\fill_bottom") { - par->added_space_bottom = VSpace(VSpace::VFILL); + par->params().spaceBottom(VSpace(VSpace::VFILL)); } else if (token == "\\line_top") { - par->line_top = true; + par->params().lineTop(true); } else if (token == "\\line_bottom") { - par->line_bottom = true; + par->params().lineBottom(true); } else if (token == "\\pagebreak_top") { - par->pagebreak_top = true; + par->params().pagebreakTop(true); } else if (token == "\\pagebreak_bottom") { - par->pagebreak_bottom = true; + par->params().pagebreakBottom(true); } else if (token == "\\start_of_appendix") { - par->start_of_appendix = true; + par->params().startOfAppendix(true); } else if (token == "\\paragraph_separation") { - int tmpret = lex.FindToken(string_paragraph_separation); + int tmpret = lex.findToken(string_paragraph_separation); if (tmpret == -1) ++tmpret; if (tmpret != LYX_LAYOUT_DEFAULT) params.paragraph_separation = static_cast(tmpret); } else if (token == "\\defskip") { lex.nextToken(); - params.defskip = VSpace(lex.GetString()); + params.defskip = VSpace(lex.getString()); } else if (token == "\\epsfig") { // obsolete // Indeed it is obsolete, but we HAVE to be backwards // compatible until 0.14, because otherwise all figures // in existing documents are irretrivably lost. (Asger) params.readGraphicsDriver(lex); } else if (token == "\\quotes_language") { - int tmpret = lex.FindToken(string_quotes_language); + int tmpret = lex.findToken(string_quotes_language); if (tmpret == -1) ++tmpret; if (tmpret != LYX_LAYOUT_DEFAULT) { InsetQuotes::quote_language tmpl = @@ -596,7 +745,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par, } } else if (token == "\\quotes_times") { lex.nextToken(); - switch (lex.GetInteger()) { + switch (lex.getInteger()) { case 1: params.quotes_times = InsetQuotes::SingleQ; break; @@ -605,13 +754,13 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par, break; } } else if (token == "\\papersize") { - int tmpret = lex.FindToken(string_papersize); + int tmpret = lex.findToken(string_papersize); if (tmpret == -1) ++tmpret; else params.papersize2 = tmpret; } else if (token == "\\paperpackage") { - int tmpret = lex.FindToken(string_paperpackages); + int tmpret = lex.findToken(string_paperpackages); if (tmpret == -1) { ++tmpret; params.paperpackage = BufferParams::PACKAGE_NONE; @@ -619,75 +768,81 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par, params.paperpackage = tmpret; } else if (token == "\\use_geometry") { lex.nextToken(); - params.use_geometry = lex.GetInteger(); + params.use_geometry = lex.getInteger(); } else if (token == "\\use_amsmath") { lex.nextToken(); - params.use_amsmath = lex.GetInteger(); + params.use_amsmath = lex.getInteger(); + } else if (token == "\\use_natbib") { + lex.nextToken(); + params.use_natbib = lex.getInteger(); + } else if (token == "\\use_numerical_citations") { + lex.nextToken(); + params.use_numerical_citations = lex.getInteger(); } else if (token == "\\paperorientation") { - int tmpret = lex.FindToken(string_orientation); + int tmpret = lex.findToken(string_orientation); if (tmpret == -1) ++tmpret; if (tmpret != LYX_LAYOUT_DEFAULT) params.orientation = static_cast(tmpret); } else if (token == "\\paperwidth") { lex.next(); - params.paperwidth = lex.GetString(); + params.paperwidth = lex.getString(); } else if (token == "\\paperheight") { lex.next(); - params.paperheight = lex.GetString(); + params.paperheight = lex.getString(); } else if (token == "\\leftmargin") { lex.next(); - params.leftmargin = lex.GetString(); + params.leftmargin = lex.getString(); } else if (token == "\\topmargin") { lex.next(); - params.topmargin = lex.GetString(); + params.topmargin = lex.getString(); } else if (token == "\\rightmargin") { lex.next(); - params.rightmargin = lex.GetString(); + params.rightmargin = lex.getString(); } else if (token == "\\bottommargin") { lex.next(); - params.bottommargin = lex.GetString(); + params.bottommargin = lex.getString(); } else if (token == "\\headheight") { lex.next(); - params.headheight = lex.GetString(); + params.headheight = lex.getString(); } else if (token == "\\headsep") { lex.next(); - params.headsep = lex.GetString(); + params.headsep = lex.getString(); } else if (token == "\\footskip") { lex.next(); - params.footskip = lex.GetString(); + params.footskip = lex.getString(); } else if (token == "\\paperfontsize") { lex.nextToken(); - params.fontsize = strip(lex.GetString()); + params.fontsize = strip(lex.getString()); } else if (token == "\\papercolumns") { lex.nextToken(); - params.columns = lex.GetInteger(); + params.columns = lex.getInteger(); } else if (token == "\\papersides") { lex.nextToken(); - switch (lex.GetInteger()) { + switch (lex.getInteger()) { default: case 1: params.sides = LyXTextClass::OneSide; break; case 2: params.sides = LyXTextClass::TwoSides; break; } } else if (token == "\\paperpagestyle") { lex.nextToken(); - params.pagestyle = strip(lex.GetString()); + params.pagestyle = strip(lex.getString()); } else if (token == "\\bullet") { lex.nextToken(); - int const index = lex.GetInteger(); + int const index = lex.getInteger(); lex.nextToken(); - int temp_int = lex.GetInteger(); + int temp_int = lex.getInteger(); params.user_defined_bullets[index].setFont(temp_int); params.temp_bullets[index].setFont(temp_int); lex.nextToken(); - temp_int = lex.GetInteger(); + temp_int = lex.getInteger(); params.user_defined_bullets[index].setCharacter(temp_int); params.temp_bullets[index].setCharacter(temp_int); lex.nextToken(); - temp_int = lex.GetInteger(); + temp_int = lex.getInteger(); params.user_defined_bullets[index].setSize(temp_int); params.temp_bullets[index].setSize(temp_int); lex.nextToken(); - string const temp_str = lex.GetString(); + string const temp_str = lex.getString(); if (temp_str != "\\end_bullet") { // this element isn't really necessary for // parsing but is easier for humans @@ -698,9 +853,9 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par, } } else if (token == "\\bulletLaTeX") { lex.nextToken(); - int const index = lex.GetInteger(); + int const index = lex.getInteger(); lex.next(); - string temp_str = lex.GetString(); + string temp_str = lex.getString(); string sum_str; while (temp_str != "\\end_bullet") { // this loop structure is needed when user @@ -711,19 +866,19 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par, // therefore needs to be read in turn sum_str += temp_str; lex.next(); - temp_str = lex.GetString(); + temp_str = lex.getString(); } params.user_defined_bullets[index].setText(sum_str); params.temp_bullets[index].setText(sum_str); } else if (token == "\\secnumdepth") { lex.nextToken(); - params.secnumdepth = lex.GetInteger(); + params.secnumdepth = lex.getInteger(); } else if (token == "\\tocdepth") { lex.nextToken(); - params.tocdepth = lex.GetInteger(); + params.tocdepth = lex.getInteger(); } else if (token == "\\spacing") { lex.next(); - string const tmp = strip(lex.GetString()); + string const tmp = strip(lex.getString()); Spacing::Space tmp_space = Spacing::Default; float tmp_val = 0.0; if (tmp == "single") { @@ -735,64 +890,68 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par, } else if (tmp == "other") { lex.next(); tmp_space = Spacing::Other; - tmp_val = lex.GetFloat(); + tmp_val = lex.getFloat(); } else { lex.printError("Unknown spacing token: '$$Token'"); } // Small hack so that files written with klyx will be // parsed correctly. - if (return_par) { - par->spacing.set(tmp_space, tmp_val); + if (first_par) { + par->params().spacing(Spacing(tmp_space, tmp_val)); } else { params.spacing.set(tmp_space, tmp_val); } } else if (token == "\\paragraph_spacing") { lex.next(); - string const tmp = strip(lex.GetString()); + string const tmp = strip(lex.getString()); if (tmp == "single") { - par->spacing.set(Spacing::Single); + par->params().spacing(Spacing(Spacing::Single)); } else if (tmp == "onehalf") { - par->spacing.set(Spacing::Onehalf); + par->params().spacing(Spacing(Spacing::Onehalf)); } else if (tmp == "double") { - par->spacing.set(Spacing::Double); + par->params().spacing(Spacing(Spacing::Double)); } else if (tmp == "other") { lex.next(); - par->spacing.set(Spacing::Other, - lex.GetFloat()); + par->params().spacing(Spacing(Spacing::Other, + lex.getFloat())); } else { lex.printError("Unknown spacing token: '$$Token'"); } } else if (token == "\\float_placement") { lex.nextToken(); - params.float_placement = lex.GetString(); + params.float_placement = lex.getString(); } else if (token == "\\family") { lex.next(); - font.setLyXFamily(lex.GetString()); + font.setLyXFamily(lex.getString()); } else if (token == "\\series") { lex.next(); - font.setLyXSeries(lex.GetString()); + font.setLyXSeries(lex.getString()); } else if (token == "\\shape") { lex.next(); - font.setLyXShape(lex.GetString()); + font.setLyXShape(lex.getString()); } else if (token == "\\size") { lex.next(); - font.setLyXSize(lex.GetString()); + font.setLyXSize(lex.getString()); +#ifndef NO_COMPABILITY } else if (token == "\\latex") { lex.next(); - string const tok = lex.GetString(); - // This is dirty, but gone with LyX3. (Asger) - if (tok == "no_latex") - font.setLatex(LyXFont::OFF); - else if (tok == "latex") - font.setLatex(LyXFont::ON); - else if (tok == "default") - font.setLatex(LyXFont::INHERIT); - else + string const tok = lex.getString(); + if (tok == "no_latex") { + // Do the insetert. + insertErtContents(par, pos, font); + } else if (tok == "latex") { + ert_comp.active = true; + } else if (tok == "default") { + // Do the insetert. + insertErtContents(par, pos, font); + } else { lex.printError("Unknown LaTeX font flag " "`$$Token'"); + } +#endif } else if (token == "\\lang") { lex.next(); - string const tok = lex.GetString(); + string const tok = lex.getString(); Language const * lang = languages.getLanguage(tok); if (lang) { font.setLanguage(lang); @@ -802,13 +961,13 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par, } } else if (token == "\\numeric") { lex.next(); - font.setNumber(font.setLyXMisc(lex.GetString())); + font.setNumber(font.setLyXMisc(lex.getString())); } else if (token == "\\emph") { lex.next(); - font.setEmph(font.setLyXMisc(lex.GetString())); + font.setEmph(font.setLyXMisc(lex.getString())); } else if (token == "\\bar") { lex.next(); - string const tok = lex.GetString(); + string const tok = lex.getString(); // This is dirty, but gone with LyX3. (Asger) if (tok == "under") font.setUnderbar(LyXFont::ON); @@ -821,51 +980,49 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par, "`$$Token'"); } else if (token == "\\noun") { lex.next(); - font.setNoun(font.setLyXMisc(lex.GetString())); + font.setNoun(font.setLyXMisc(lex.getString())); } else if (token == "\\color") { lex.next(); - font.setLyXColor(lex.GetString()); + font.setLyXColor(lex.getString()); } else if (token == "\\align") { - int tmpret = lex.FindToken(string_align); + int tmpret = lex.findToken(string_align); if (tmpret == -1) ++tmpret; if (tmpret != LYX_LAYOUT_DEFAULT) { // tmpret != 99 ??? -#if 0 - int tmpret2 = 1; - for (; tmpret > 0; --tmpret) - tmpret2 = tmpret2 * 2; -#else int const tmpret2 = int(pow(2.0, tmpret)); -#endif //lyxerr << "Tmpret2 = " << tmpret2 << endl; - par->align = LyXAlignment(tmpret2); + par->params().align(LyXAlignment(tmpret2)); } } else if (token == "\\added_space_top") { lex.nextToken(); - par->added_space_top = VSpace(lex.GetString()); + par->params().spaceTop(VSpace(lex.getString())); } else if (token == "\\added_space_bottom") { lex.nextToken(); - par->added_space_bottom = VSpace(lex.GetString()); + par->params().spaceBottom(VSpace(lex.getString())); +#ifndef NO_COMPABILITY +#ifndef NO_PEXTRA_REALLY } else if (token == "\\pextra_type") { lex.nextToken(); - par->pextra_type = lex.GetInteger(); + par->params().pextraType(lex.getInteger()); } else if (token == "\\pextra_width") { lex.nextToken(); - par->pextra_width = lex.GetString(); + par->params().pextraWidth(lex.getString()); } else if (token == "\\pextra_widthp") { lex.nextToken(); - par->pextra_widthp = lex.GetString(); + par->params().pextraWidthp(lex.getString()); } else if (token == "\\pextra_alignment") { lex.nextToken(); - par->pextra_alignment = lex.GetInteger(); + par->params().pextraAlignment(lex.getInteger()); } else if (token == "\\pextra_hfill") { lex.nextToken(); - par->pextra_hfill = lex.GetInteger(); + par->params().pextraHfill(lex.getInteger()); } else if (token == "\\pextra_start_minipage") { lex.nextToken(); - par->pextra_start_minipage = lex.GetInteger(); + par->params().pextraStartMinipage(lex.getInteger()); +#endif +#endif } else if (token == "\\labelwidthstring") { - lex.EatLine(); - par->labelwidthstring = lex.GetString(); + lex.eatLine(); + par->params().labelWidthString(lex.getString()); // do not delete this token, it is still needed! } else if (token == "\\end_inset") { lyxerr << "Solitary \\end_inset. Missing \\begin_inset?.\n" @@ -876,22 +1033,32 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par, // But insets should read it, it is a part of // the inset isn't it? Lgb. } else if (token == "\\begin_inset") { +#ifndef NO_COMPABILITY + insertErtContents(par, pos, font, false); + ert_stack.push(ert_comp); + ert_comp = ErtComp(); +#endif readInset(lex, par, pos, font); +#ifndef NO_COMPABILITY + ert_comp = ert_stack.top(); + ert_stack.pop(); + insertErtContents(par, pos, font); +#endif } else if (token == "\\SpecialChar") { LyXLayout const & layout = textclasslist.Style(params.textclass, - par->GetLayout()); + par->getLayout()); // Insets don't make sense in a free-spacing context! ---Kayvan if (layout.free_spacing) { - if (lex.IsOK()) { + if (lex.isOK()) { lex.next(); - string next_token = lex.GetString(); + string next_token = lex.getString(); if (next_token == "\\-") { - par->InsertChar(pos, '-', font); + par->insertChar(pos, '-', font); } else if (next_token == "\\protected_separator" || next_token == "~") { - par->InsertChar(pos, ' ', font); + par->insertChar(pos, ' ', font); } else { lex.printError("Token `$$Token' " "is in free space " @@ -901,20 +1068,37 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par, } } else { Inset * inset = new InsetSpecialChar; - inset->Read(this, lex); - par->InsertInset(pos, inset, font); + inset->read(this, lex); + par->insertInset(pos, inset, font); } ++pos; } else if (token == "\\newline") { - par->InsertChar(pos, LyXParagraph::META_NEWLINE, font); +#ifndef NO_COMPABILITY + if (!ert_comp.in_tabular && ert_comp.active) { + ert_comp.contents += char(Paragraph::META_NEWLINE); + } else { + // Since we cannot know it this is only a regular + // newline or a tabular cell delimter we have to + // handle the ERT here. + insertErtContents(par, pos, font, false); + + par->insertChar(pos, Paragraph::META_NEWLINE, font); + ++pos; + } +#else + par->insertChar(pos, Paragraph::META_NEWLINE, font); ++pos; +#endif } else if (token == "\\LyXTable") { +#ifndef NO_COMPABILITY + ert_comp.in_tabular = true; +#endif Inset * inset = new InsetTabular(*this); - inset->Read(this, lex); - par->InsertInset(pos, inset, font); + inset->read(this, lex); + par->insertInset(pos, inset, font); ++pos; } else if (token == "\\hfill") { - par->InsertChar(pos, LyXParagraph::META_HFILL, font); + par->insertChar(pos, Paragraph::META_HFILL, font); ++pos; } else if (token == "\\protected_separator") { // obsolete // This is a backward compability thingie. (Lgb) @@ -922,13 +1106,13 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par, // 2.16. (Lgb) LyXLayout const & layout = textclasslist.Style(params.textclass, - par->GetLayout()); + par->getLayout()); if (layout.free_spacing) { - par->InsertChar(pos, ' ', font); + par->insertChar(pos, ' ', font); } else { Inset * inset = new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR); - par->InsertInset(pos, inset, font); + par->insertInset(pos, inset, font); } ++pos; } else if (token == "\\bibitem") { // ale970302 @@ -936,32 +1120,270 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par, InsetCommandParams p("bibitem", "dummy"); par->bibkey = new InsetBibKey(p); } - par->bibkey->Read(this, lex); + par->bibkey->read(this, lex); } else if (token == "\\backslash") { - par->InsertChar(pos, '\\', font); +#ifndef NO_COMPABILITY + if (ert_comp.active) { + ert_comp.contents += "\\"; + } else { +#endif + par->insertChar(pos, '\\', font); ++pos; +#ifndef NO_COMPABILITY + } +#endif } else if (token == "\\the_end") { +#ifndef NO_COMPABILITY + // If we still have some ert active here we have to insert + // it so we don't loose it. (Lgb) + insertErtContents(par, pos, font); +#endif the_end_read = true; +#ifndef NO_COMPABILITY +#ifndef NO_PEXTRA_REALLY + minipar = parBeforeMinipage = 0; +#endif +#endif } else { +#ifndef NO_COMPABILITY + if (ert_comp.active) { + ert_comp.contents += token; + } else { +#endif // This should be insurance for the future: (Asger) lex.printError("Unknown token `$$Token'. " "Inserting as text."); string::const_iterator cit = token.begin(); string::const_iterator end = token.end(); for (; cit != end; ++cit) { - par->InsertChar(pos, (*cit), font); + par->insertChar(pos, (*cit), font); ++pos; } +#ifndef NO_COMPABILITY + } +#endif + } + +#ifndef NO_COMPABILITY +#ifndef NO_PEXTRA_REALLY + // I wonder if we could use this blanket fix for all the + // checkminipage cases... + if (par && par->size()) { + // It is possible that this will check to often, + // but that should not be an correctness issue. + // Only a speed issue. + checkminipage = true; + } + + // now check if we have a minipage paragraph as at this + // point we already read all the necessary data! + // this cannot be done in layout because there we did + // not read yet the paragraph PEXTRA-params (Jug) + // + // BEGIN pextra_minipage compability + // This should be removed in 1.3.x (Lgb) + + // This compability code is not perfect. In a couple + // of rand cases it fails. When the minipage par is + // the first par in the document, and when there are + // none or only one regular paragraphs after the + // minipage. Currently I am not investing any effort + // in fixing those cases. + + //lyxerr << "Call depth: " << call_depth << endl; + if (checkminipage && (call_depth == 1)) { + checkminipage = false; + if (minipar && (minipar != par) && + (par->params().pextraType()==Paragraph::PEXTRA_MINIPAGE)) + { + lyxerr << "minipages in a row" << endl; + if (par->params().pextraStartMinipage()) { + lyxerr << "start new minipage" << endl; + // minipages in a row + par->previous()->next(0); + par->previous(0); + + Paragraph * tmp = minipar; + while (tmp) { + tmp->params().pextraType(0); + tmp->params().pextraWidth(string()); + tmp->params().pextraWidthp(string()); + tmp->params().pextraAlignment(0); + tmp->params().pextraHfill(false); + tmp->params().pextraStartMinipage(false); + tmp = tmp->next(); + } + // create a new paragraph to insert the + // minipages in the following case + if (par->params().pextraStartMinipage() && + !par->params().pextraHfill()) + { + Paragraph * p = new Paragraph; + p->layout = 0; + p->previous(parBeforeMinipage); + parBeforeMinipage->next(p); + p->next(0); + p->params().depth(parBeforeMinipage->params().depth()); + parBeforeMinipage = p; + } + InsetMinipage * mini = new InsetMinipage; + mini->pos(static_cast(par->params().pextraAlignment())); + mini->width(par->params().pextraWidth()); + if (!par->params().pextraWidthp().empty()) { + lyxerr << "WP:" << mini->width() << endl; + mini->width(tostr(par->params().pextraWidthp())+"%"); + } + mini->inset.paragraph(par); + // Insert the minipage last in the + // previous paragraph. + if (par->params().pextraHfill()) { + parBeforeMinipage->insertChar + (parBeforeMinipage->size(), Paragraph::META_HFILL); + } + parBeforeMinipage->insertInset + (parBeforeMinipage->size(), mini); + + minipar = par; + } else { + lyxerr << "new minipage par" << endl; + //nothing to do just continue reading + } + + } else if (minipar && (minipar != par)) { + lyxerr << "last minipage par read" << endl; + // The last paragraph read was not part of a + // minipage but the par linked list is... + // So we need to remove the last par from the + // rest + if (par->previous()) + par->previous()->next(0); + par->previous(parBeforeMinipage); + parBeforeMinipage->next(par); + Paragraph * tmp = minipar; + while (tmp) { + tmp->params().pextraType(0); + tmp->params().pextraWidth(string()); + tmp->params().pextraWidthp(string()); + tmp->params().pextraAlignment(0); + tmp->params().pextraHfill(false); + tmp->params().pextraStartMinipage(false); + tmp = tmp->next(); + } + depth = parBeforeMinipage->params().depth(); + minipar = parBeforeMinipage = 0; + } else if (!minipar && + (par->params().pextraType() == Paragraph::PEXTRA_MINIPAGE)) + { + // par is the first paragraph in a minipage + lyxerr << "begin minipage" << endl; + // To minimize problems for + // the users we will insert + // the first minipage in + // a sequence of minipages + // in its own paragraph. + Paragraph * p = new Paragraph; + p->layout = 0; + p->previous(par->previous()); + p->next(0); + p->params().depth(depth); + par->params().depth(0); + depth = 0; + if (par->previous()) + par->previous()->next(p); + par->previous(0); + parBeforeMinipage = p; + minipar = par; + if (!first_par || (first_par == par)) + first_par = p; + + InsetMinipage * mini = new InsetMinipage; + mini->pos(static_cast(minipar->params().pextraAlignment())); + mini->width(minipar->params().pextraWidth()); + if (!par->params().pextraWidthp().empty()) { + lyxerr << "WP:" << mini->width() << endl; + mini->width(tostr(par->params().pextraWidthp())+"%"); + } + mini->inset.paragraph(minipar); + + // Insert the minipage last in the + // previous paragraph. + if (minipar->params().pextraHfill()) { + parBeforeMinipage->insertChar + (parBeforeMinipage->size(),Paragraph::META_HFILL); + } + parBeforeMinipage->insertInset + (parBeforeMinipage->size(), mini); + } } + // End of pextra_minipage compability + --call_depth; +#endif +#endif return the_end_read; } +// needed to insert the selection +void Buffer::insertStringAsLines(Paragraph *& par, Paragraph::size_type & pos, + LyXFont const & fn,string const & str) const +{ + LyXLayout const & layout = textclasslist.Style(params.textclass, + par->getLayout()); + LyXFont font = fn; + + (void)par->checkInsertChar(font); + // insert the string, don't insert doublespace + bool space_inserted = true; + for(string::const_iterator cit = str.begin(); + cit != str.end(); ++cit) { + if (*cit == '\n') { + if (par->size() || layout.keepempty) { + par->breakParagraph(params, pos, + layout.isEnvironment()); + par = par->next(); + pos = 0; + space_inserted = true; + } else { + continue; + } + // do not insert consecutive spaces if !free_spacing + } else if ((*cit == ' ' || *cit == '\t') && + space_inserted && !layout.free_spacing) + { + continue; + } else if (*cit == '\t') { + if (!layout.free_spacing) { + // tabs are like spaces here + par->insertChar(pos, ' ', font); + ++pos; + space_inserted = true; + } else { + const Paragraph::size_type nb = 8 - pos % 8; + for (Paragraph::size_type a = 0; + a < nb ; ++a) { + par->insertChar(pos, ' ', font); + ++pos; + } + space_inserted = true; + } + } else if (!IsPrintable(*cit)) { + // Ignore unprintables + continue; + } else { + // just insert the character + par->insertChar(pos, *cit, font); + ++pos; + space_inserted = (*cit == ' '); + } + + } +} + -void Buffer::readInset(LyXLex & lex, LyXParagraph *& par, +void Buffer::readInset(LyXLex & lex, Paragraph *& par, int & pos, LyXFont & font) { // consistency check - if (lex.GetString() != "\\begin_inset") { + if (lex.getString() != "\\begin_inset") { lyxerr << "Buffer::readInset: Consistency check failed." << endl; } @@ -969,50 +1391,58 @@ void Buffer::readInset(LyXLex & lex, LyXParagraph *& par, Inset * inset = 0; lex.next(); - string const tmptok = lex.GetString(); + string const tmptok = lex.getString(); last_inset_read = tmptok; // test the different insets if (tmptok == "LatexCommand") { InsetCommandParams inscmd; - inscmd.Read(lex); + inscmd.read(lex); - if (inscmd.getCmdName() == "cite") { + string const cmdName = inscmd.getCmdName(); + + // This strange command allows LyX to recognize "natbib" style + // citations: citet, citep, Citet etc. + if (compare_no_case(cmdName, "cite", 4) == 0) { inset = new InsetCitation(inscmd); - } else if (inscmd.getCmdName() == "bibitem") { + } else if (cmdName == "bibitem") { lex.printError("Wrong place for bibitem"); inset = new InsetBibKey(inscmd); - } else if (inscmd.getCmdName() == "BibTeX") { + } else if (cmdName == "BibTeX") { inset = new InsetBibtex(inscmd); - } else if (inscmd.getCmdName() == "index") { + } else if (cmdName == "index") { inset = new InsetIndex(inscmd); - } else if (inscmd.getCmdName() == "include") { + } else if (cmdName == "include") { inset = new InsetInclude(inscmd, *this); - } else if (inscmd.getCmdName() == "label") { + } else if (cmdName == "label") { inset = new InsetLabel(inscmd); - } else if (inscmd.getCmdName() == "url" - || inscmd.getCmdName() == "htmlurl") { + } else if (cmdName == "url" + || cmdName == "htmlurl") { inset = new InsetUrl(inscmd); - } else if (inscmd.getCmdName() == "ref" - || inscmd.getCmdName() == "pageref" - || inscmd.getCmdName() == "vref" - || inscmd.getCmdName() == "vpageref" - || inscmd.getCmdName() == "prettyref") { + } else if (cmdName == "ref" + || cmdName == "pageref" + || cmdName == "vref" + || cmdName == "vpageref" + || cmdName == "prettyref") { if (!inscmd.getOptions().empty() || !inscmd.getContents().empty()) { inset = new InsetRef(inscmd, *this); } - } else if (inscmd.getCmdName() == "tableofcontents" - || inscmd.getCmdName() == "listofalgorithms" - || inscmd.getCmdName() == "listoffigures" - || inscmd.getCmdName() == "listoftables") { + } else if (cmdName == "tableofcontents") { inset = new InsetTOC(inscmd); - } else if (inscmd.getCmdName() == "printindex") { + } else if (cmdName == "listofalgorithms") { + inset = new InsetFloatList("algorithm"); + } else if (cmdName == "listoffigures") { + inset = new InsetFloatList("figure"); + } else if (cmdName == "listoftables") { + inset = new InsetFloatList("table"); + } else if (cmdName == "printindex") { inset = new InsetPrintIndex(inscmd); - } else if (inscmd.getCmdName() == "lyxparent") { + } else if (cmdName == "lyxparent") { inset = new InsetParent(inscmd, *this); } } else { + bool alreadyread = false; if (tmptok == "Quotes") { inset = new InsetQuotes; } else if (tmptok == "External") { @@ -1021,10 +1451,18 @@ void Buffer::readInset(LyXLex & lex, LyXParagraph *& par, inset = new InsetFormulaMacro; } else if (tmptok == "Formula") { inset = new InsetFormula; - } else if (tmptok == "Figure") { + } else if (tmptok == "Figure") { // Backward compatibility inset = new InsetFig(100, 100, *this); - } else if (tmptok == "Info") { - inset = new InsetInfo; + //inset = new InsetGraphics; + } else if (tmptok == "Graphics") { + inset = new InsetGraphics; + } else if (tmptok == "Info") {// backwards compatibility + inset = new InsetNote(this, + lex.getLongString("\\end_inset"), + true); + alreadyread = true; + } else if (tmptok == "Note") { + inset = new InsetNote; } else if (tmptok == "Include") { InsetCommandParams p( "Include" ); inset = new InsetInclude(p, *this); @@ -1042,70 +1480,38 @@ void Buffer::readInset(LyXLex & lex, LyXParagraph *& par, inset = new InsetMinipage; } else if (tmptok == "Float") { lex.next(); - string tmptok = lex.GetString(); + string tmptok = lex.getString(); inset = new InsetFloat(tmptok); +#if 0 } else if (tmptok == "List") { inset = new InsetList; } else if (tmptok == "Theorem") { inset = new InsetList; +#endif } else if (tmptok == "Caption") { inset = new InsetCaption; - } else if (tmptok == "GRAPHICS") { - inset = new InsetGraphics; + } else if (tmptok == "FloatList") { + inset = new InsetFloatList; } - if (inset) inset->Read(this, lex); + if (inset && !alreadyread) inset->read(this, lex); } if (inset) { - par->InsertInset(pos, inset, font); + par->insertInset(pos, inset, font); ++pos; } } -bool Buffer::readFile(LyXLex & lex, LyXParagraph * par) +bool Buffer::readFile(LyXLex & lex, Paragraph * par) { - if (lex.IsOK()) { + if (lex.isOK()) { lex.next(); - string const token(lex.GetString()); + string const token(lex.getString()); if (token == "\\lyxformat") { // the first token _must_ be... - lex.EatLine(); -#if 0 - format = lex.GetFloat(); - if (format > 1.0) { - if (LYX_FORMAT - format > 0.05) { - lyxerr << fmt(_("Warning: need lyxformat %.2f but found %.2f"), - LYX_FORMAT, format) << endl; - } - if (format - LYX_FORMAT > 0.05) { - lyxerr << fmt(_("ERROR: need lyxformat %.2f but found %.2f"), - LYX_FORMAT, format) << endl; - } - bool the_end = readLyXformat2(lex, par); - // Formats >= 2.13 support "\the_end" marker - if (format < 2.13) - the_end = true; - - setPaperStuff(); - - if (!the_end) - WriteAlert(_("Warning!"), - _("Reading of document is not complete"), - _("Maybe the document is truncated")); - // We simulate a safe reading anyways to allow - // users to take the chance... (Asger) - return true; - } // format < 1.0 - else { - WriteAlert(_("ERROR!"), - _("Old LyX file format found. " - "Use LyX 0.10.x to read this!")); - return false; - } - -#else - string tmp_format = lex.GetString(); + lex.eatLine(); + string tmp_format = lex.getString(); //lyxerr << "LyX Format: `" << tmp_format << "'" << endl; // if present remove ".," from string. string::size_type dot = tmp_format.find_first_of(".,"); @@ -1131,7 +1537,7 @@ bool Buffer::readFile(LyXLex & lex, LyXParagraph * par) } } bool the_end = readLyXformat2(lex, par); - setPaperStuff(); + params.setPaperStuff(); // the_end was added in 213 if (file_format < 213) the_end = true; @@ -1141,7 +1547,6 @@ bool Buffer::readFile(LyXLex & lex, LyXParagraph * par) _("Reading of document is not complete"), _("Maybe the document is truncated")); return true; -#endif } else { // "\\lyxformat" not found WriteAlert(_("ERROR!"), _("Not a LyX file!")); } @@ -1151,7 +1556,6 @@ bool Buffer::readFile(LyXLex & lex, LyXParagraph * par) } - // Should probably be moved to somewhere else: BufferView? LyXView? bool Buffer::save() const { @@ -1164,7 +1568,7 @@ bool Buffer::save() const s = fileName() + '~'; if (!lyxrc.backupdir_path.empty()) s = AddName(lyxrc.backupdir_path, - subst(CleanupPath(s),'/','!')); + subst(os::slashify_path(s),'/','!')); // Rename is the wrong way of making a backup, // this is the correct way. @@ -1185,7 +1589,7 @@ bool Buffer::save() const _exit(0) */ - // Should proabaly have some more error checking here. + // Should probably have some more error checking here. // Should be cleaned up in 0.13, at least a bit. // Doing it this way, also makes the inodes stay the same. // This is still not a very good solution, in particular we @@ -1210,7 +1614,7 @@ bool Buffer::save() const } } else { lyxerr << "LyX was not able to make " - "backupcopy. Beware." << endl; + "backup copy. Beware." << endl; } } } @@ -1280,30 +1684,18 @@ bool Buffer::writeFile(string const & fname, bool flag) const // The top of the file should not be written by params. // write out a comment in the top of the file - ofs << '#' << LYX_DOCVERSION - << " created this file. For more info see http://www.lyx.org/\n"; -#if 0 - ofs.setf(ios::showpoint|ios::fixed); - ofs.precision(2); -#ifndef HAVE_LOCALE - char dummy_format[512]; - sprintf(dummy_format, "%.2f", LYX_FORMAT); - ofs << "\\lyxformat " << dummy_format << "\n"; -#else - ofs << "\\lyxformat " << setw(4) << LYX_FORMAT << "\n"; -#endif -#else - ofs << "\\lyxformat " << LYX_FORMAT << "\n"; -#endif + ofs << '#' << lyx_docversion + << " created this file. For more info see http://www.lyx.org/\n" + << "\\lyxformat " << LYX_FORMAT << "\n"; + // now write out the buffer paramters. params.writeFile(ofs); - char footnoteflag = 0; - char depth = 0; + Paragraph::depth_type depth = 0; // this will write out all the paragraphs // using recursive descent. - paragraph->writeFile(this, ofs, params, footnoteflag, depth); + paragraph->writeFile(this, ofs, params, depth); // Write marker that shows file is complete ofs << "\n\\the_end" << endl; @@ -1335,83 +1727,49 @@ bool Buffer::writeFile(string const & fname, bool flag) const } -string const Buffer::asciiParagraph(LyXParagraph const * par, +string const Buffer::asciiParagraph(Paragraph const * par, unsigned int linelen) const { ostringstream buffer; - LyXFont font1; - LyXFont font2; - Inset const * inset; - char c; -#ifndef NEW_INSETS - LyXParagraph::footnote_flag footnoteflag = LyXParagraph::NO_FOOTNOTE; -#endif - char depth = 0; + Paragraph::depth_type depth = 0; int ltype = 0; - int ltype_depth = 0; - unsigned int currlinelen = 0; + Paragraph::depth_type ltype_depth = 0; + string::size_type currlinelen = 0; bool ref_printed = false; int noparbreak = 0; int islatex = 0; - if ( -#ifndef NEW_INSETS - par->footnoteflag != LyXParagraph::NO_FOOTNOTE || -#endif - !par->previous -#ifndef NEW_INSETS - || par->previous->footnoteflag == LyXParagraph::NO_FOOTNOTE -#endif - ){ -#ifndef NEW_INSETS - /* begins a footnote environment ? */ - if (footnoteflag != par->footnoteflag) { - footnoteflag = par->footnoteflag; - if (footnoteflag) { - size_t const j = strlen(string_footnotekinds[par->footnotekind]) + 4; - if ((linelen > 0) && - ((currlinelen + j) > linelen)) { - buffer << "\n"; - currlinelen = 0; - } - buffer << "([" - << string_footnotekinds[par->footnotekind] - << "] "; - currlinelen += j; - } - } -#endif - /* begins or ends a deeper area ?*/ - if (depth != par->depth) { - if (par->depth > depth) { - while (par->depth > depth) { + if (!par->previous()) { + // begins or ends a deeper area ? + if (depth != par->params().depth()) { + if (par->params().depth() > depth) { + while (par->params().depth() > depth) { ++depth; } - } - else { - while (par->depth < depth) { + } else { + while (par->params().depth() < depth) { --depth; } } } - /* First write the layout */ + // First write the layout string const tmp = textclasslist.NameOfLayout(params.textclass, par->layout); if (tmp == "Itemize") { ltype = 1; - ltype_depth = depth+1; + ltype_depth = depth + 1; } else if (tmp == "Enumerate") { ltype = 2; - ltype_depth = depth+1; - } else if (strstr(tmp.c_str(), "ection")) { + ltype_depth = depth + 1; + } else if (contains(tmp, "ection")) { ltype = 3; - ltype_depth = depth+1; - } else if (strstr(tmp.c_str(), "aragraph")) { + ltype_depth = depth + 1; + } else if (contains(tmp, "aragraph")) { ltype = 4; - ltype_depth = depth+1; + ltype_depth = depth + 1; } else if (tmp == "Description") { ltype = 5; - ltype_depth = depth+1; + ltype_depth = depth + 1; } else if (tmp == "Abstract") { ltype = 6; ltype_depth = 0; @@ -1435,40 +1793,28 @@ string const Buffer::asciiParagraph(LyXParagraph const * par, /* what about the alignment */ } else { -#ifndef NEW_INSETS - /* dummy layout, that means a footnote ended */ - footnoteflag = LyXParagraph::NO_FOOTNOTE; - buffer << ") "; - noparbreak = 1; -#else lyxerr << "Should this ever happen?" << endl; -#endif } - - font1 = LyXFont(LyXFont::ALL_INHERIT, params.language); - for (LyXParagraph::size_type i = 0; i < par->size(); ++i) { - if (!i && -#ifndef NEW_INSETS - !footnoteflag && -#endif - !noparbreak) { + + for (Paragraph::size_type i = 0; i < par->size(); ++i) { + if (!i && !noparbreak) { if (linelen > 0) buffer << "\n\n"; - for (char j = 0; j < depth; ++j) + for (Paragraph::depth_type j = 0; j < depth; ++j) buffer << " "; currlinelen = depth * 2; switch (ltype) { - case 0: /* Standard */ - case 4: /* (Sub)Paragraph */ - case 5: /* Description */ + case 0: // Standard + case 4: // (Sub)Paragraph + case 5: // Description break; - case 6: /* Abstract */ + case 6: // Abstract if (linelen > 0) buffer << "Abstract\n\n"; else buffer << "Abstract: "; break; - case 7: /* Bibliography */ + case 7: // Bibliography if (!ref_printed) { if (linelen > 0) buffer << "References\n\n"; @@ -1478,80 +1824,79 @@ string const Buffer::asciiParagraph(LyXParagraph const * par, } break; default: - buffer << par->labelstring << " "; + buffer << par->params().labelString() << " "; break; } if (ltype_depth > depth) { - for (char j = ltype_depth - 1; j > depth; --j) + for (Paragraph::depth_type j = ltype_depth - 1; + j > depth; --j) buffer << " "; currlinelen += (ltype_depth-depth)*2; } } - font2 = par->GetFontSettings(params, i); - if (font1.latex() != font2.latex()) { - if (font2.latex() == LyXFont::OFF) - islatex = 0; - else - islatex = 1; - } else { - islatex = 0; - } - c = par->GetChar(i); + + char c = par->getUChar(params, i); if (islatex) continue; switch (c) { - case LyXParagraph::META_INSET: - if ((inset = par->GetInset(i))) { - if (!inset->Ascii(this, buffer)) { + case Paragraph::META_INSET: + { + Inset const * inset = par->getInset(i); + if (inset) { + if (!inset->ascii(this, buffer)) { string dummy; - string s = rsplit(buffer.str().c_str(), - dummy, '\n'); + string const s = + rsplit(buffer.str().c_str(), + dummy, '\n'); currlinelen += s.length(); } else { // to be sure it breaks paragraph currlinelen += linelen; } } - break; - case LyXParagraph::META_NEWLINE: + } + break; + + case Paragraph::META_NEWLINE: if (linelen > 0) { buffer << "\n"; - for (char j = 0; j < depth; ++j) + for (Paragraph::depth_type j = 0; + j < depth; ++j) buffer << " "; } currlinelen = depth * 2; if (ltype_depth > depth) { - for (char j = ltype_depth; - j > depth; --j) + for (Paragraph::depth_type j = ltype_depth; + j > depth; --j) buffer << " "; currlinelen += (ltype_depth - depth) * 2; } break; - case LyXParagraph::META_HFILL: + + case Paragraph::META_HFILL: buffer << "\t"; break; - case '\\': - buffer << "\\"; - break; + default: if ((linelen > 0) && (currlinelen > (linelen - 10)) && (c == ' ') && ((i + 2) < par->size())) { buffer << "\n"; - for (char j = 0; j < depth; ++j) + for (Paragraph::depth_type j = 0; + j < depth; ++j) buffer << " "; currlinelen = depth * 2; if (ltype_depth > depth) { - for (char j = ltype_depth; + for (Paragraph::depth_type j = ltype_depth; j > depth; --j) buffer << " "; currlinelen += (ltype_depth-depth)*2; } - } else if (c != '\0') + } else if (c != '\0') { buffer << c; - else if (c == '\0') - lyxerr.debug() << "writeAsciiFile: NULL char in structure." << endl; - ++currlinelen; + ++currlinelen; + } else + lyxerr[Debug::INFO] << "writeAsciiFile: NULL char in structure." << endl; break; } } @@ -1572,14 +1917,15 @@ void Buffer::writeFileAscii(string const & fname, int linelen) void Buffer::writeFileAscii(ostream & ofs, int linelen) { - LyXParagraph * par = paragraph; + Paragraph * par = paragraph; while (par) { ofs << asciiParagraph(par, linelen); - par = par->next; + par = par->next(); } ofs << "\n"; } +bool use_babel; void Buffer::makeLaTeXFile(string const & fname, string const & original_path, @@ -1612,14 +1958,14 @@ void Buffer::makeLaTeXFile(string const & fname, texrow.start(paragraph, 0); if (!only_body && nice) { - ofs << "%% " LYX_DOCVERSION " created this file. " + ofs << "%% " << lyx_docversion << " created this file. " "For more info, see http://www.lyx.org/.\n" "%% Do not edit unless you really know what " "you are doing.\n"; texrow.newline(); texrow.newline(); } - lyxerr.debug() << "lyx header finished" << endl; + lyxerr[Debug::INFO] << "lyx header finished" << endl; // There are a few differences between nice LaTeX and usual files: // usual is \batchmode and has a // special input@path to allow the including of figures @@ -1639,7 +1985,7 @@ void Buffer::makeLaTeXFile(string const & fname, if (!original_path.empty()) { ofs << "\\makeatletter\n" << "\\def\\input@path{{" - << original_path << "/}}\n" + << os::external_path(original_path) << "/}}\n" << "\\makeatother\n"; texrow.newline(); texrow.newline(); @@ -1648,13 +1994,12 @@ void Buffer::makeLaTeXFile(string const & fname, ofs << "\\documentclass"; - string options; // the document class options. + ostringstream options; // the document class options. if (tokenPos(tclass.opt_fontsize(), '|', params.fontsize) >= 0) { // only write if existing in list (and not default) - options += params.fontsize; - options += "pt,"; + options << params.fontsize << "pt,"; } @@ -1662,22 +2007,22 @@ void Buffer::makeLaTeXFile(string const & fname, (params.paperpackage == BufferParams::PACKAGE_NONE)) { switch (params.papersize) { case BufferParams::PAPER_A4PAPER: - options += "a4paper,"; + options << "a4paper,"; break; case BufferParams::PAPER_USLETTER: - options += "letterpaper,"; + options << "letterpaper,"; break; case BufferParams::PAPER_A5PAPER: - options += "a5paper,"; + options << "a5paper,"; break; case BufferParams::PAPER_B5PAPER: - options += "b5paper,"; + options << "b5paper,"; break; case BufferParams::PAPER_EXECUTIVEPAPER: - options += "executivepaper,"; + options << "executivepaper,"; break; case BufferParams::PAPER_LEGALPAPER: - options += "legalpaper,"; + options << "legalpaper,"; break; } } @@ -1686,55 +2031,56 @@ void Buffer::makeLaTeXFile(string const & fname, if (params.sides != tclass.sides()) { switch (params.sides) { case LyXTextClass::OneSide: - options += "oneside,"; + options << "oneside,"; break; case LyXTextClass::TwoSides: - options += "twoside,"; + options << "twoside,"; break; } - } // if needed if (params.columns != tclass.columns()) { if (params.columns == 2) - options += "twocolumn,"; + options << "twocolumn,"; else - options += "onecolumn,"; + options << "onecolumn,"; } if (!params.use_geometry && params.orientation == BufferParams::ORIENTATION_LANDSCAPE) - options += "landscape,"; + options << "landscape,"; // language should be a parameter to \documentclass - bool use_babel = false; + use_babel = false; + ostringstream language_options; if (params.language->babel() == "hebrew" && default_language->babel() != "hebrew") // This seems necessary features.UsedLanguages.insert(default_language); -#ifdef DO_USE_DEFAULT_LANGUAGE - if (params.language->lang() != "default" || + + if (lyxrc.language_use_babel || + params.language->lang() != lyxrc.default_language || !features.UsedLanguages.empty()) { -#endif use_babel = true; for (LaTeXFeatures::LanguageList::const_iterator cit = features.UsedLanguages.begin(); cit != features.UsedLanguages.end(); ++cit) - options += (*cit)->babel() + ","; - options += params.language->babel() + ','; -#ifdef DO_USE_DEFAULT_LANGUAGE + language_options << (*cit)->babel() << ','; + language_options << params.language->babel(); + if (lyxrc.language_global_options) + options << language_options.str() << ','; } -#endif // the user-defined options if (!params.options.empty()) { - options += params.options + ','; + options << params.options << ','; } - - if (!options.empty()){ - options = strip(options, ','); - ofs << '[' << options << ']'; + + string strOptions(options.str().c_str()); + if (!strOptions.empty()){ + strOptions = strip(strOptions, ','); + ofs << '[' << strOptions << ']'; } ofs << '{' @@ -1888,7 +2234,7 @@ void Buffer::makeLaTeXFile(string const & fname, ofs << "}\n"; texrow.newline(); } - if (params.use_amsmath + if (features.amsstyle && !tclass.provides(LyXTextClass::amsmath)) { ofs << "\\usepackage{amsmath}\n"; texrow.newline(); @@ -1904,13 +2250,6 @@ void Buffer::makeLaTeXFile(string const & fname, texrow.newline(); } - // We try to load babel late, in case it interferes - // with other packages. - if (use_babel) { - ofs << lyxrc.language_package << endl; - texrow.newline(); - } - if (params.secnumdepth != tclass.secnumdepth()) { ofs << "\\setcounter{secnumdepth}{" << params.secnumdepth @@ -2025,16 +2364,26 @@ void Buffer::makeLaTeXFile(string const & fname, ofs << preamble; + // We try to load babel late, in case it interferes + // with other packages. + if (use_babel) { + string tmp = lyxrc.language_package; + if (!lyxrc.language_global_options + && tmp == "\\usepackage{babel}") + tmp = string("\\usepackage[") + + language_options.str().c_str() + + "]{babel}"; + ofs << tmp << "\n"; + texrow.newline(); + } + // make the body. ofs << "\\begin{document}\n"; texrow.newline(); } // only_body - lyxerr.debug() << "preamble finished, now the body." << endl; -#ifdef DO_USE_DEFAULT_LANGUAGE - if (!lyxrc.language_auto_begin && params.language->lang() != "default") { -#else + lyxerr[Debug::INFO] << "preamble finished, now the body." << endl; + if (!lyxrc.language_auto_begin) { -#endif ofs << subst(lyxrc.language_command_begin, "$$lang", params.language->babel()) << endl; @@ -2047,11 +2396,7 @@ void Buffer::makeLaTeXFile(string const & fname, ofs << endl; texrow.newline(); -#ifdef DO_USE_DEFAULT_LANGUAGE - if (!lyxrc.language_auto_end && params.language->lang() != "default") { -#else - if (!lyxrc.language_auto_end) { -#endif + if (!lyxrc.language_auto_end) { ofs << subst(lyxrc.language_command_end, "$$lang", params.language->babel()) << endl; @@ -2082,29 +2427,21 @@ void Buffer::makeLaTeXFile(string const & fname, lyxerr << "File was not closed properly." << endl; } - lyxerr.debug() << "Finished making latex file." << endl; + lyxerr[Debug::INFO] << "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, Paragraph * par, + Paragraph * endpar, TexRow & texrow) const { bool was_title = false; bool already_title = false; - std::ostringstream ftnote; - TexRow ft_texrow; - int ftcount = 0; // if only_body while (par != endpar) { -#ifndef NEW_INSETS - if (par->IsDummy()) - lyxerr[Debug::LATEX] << "Error in latexParagraphs." - << endl; -#endif LyXLayout const & layout = textclasslist.Style(params.textclass, par->layout); @@ -2122,41 +2459,11 @@ void Buffer::latexParagraphs(ostream & ofs, LyXParagraph * par, already_title = true; was_title = false; } - // We are at depth 0 so we can just use - // ordinary \footnote{} generation - // flag this with ftcount - ftcount = -1; - if (layout.isEnvironment() - || par->pextra_type != LyXParagraph::PEXTRA_NONE) { - par = par->TeXEnvironment(this, params, ofs, texrow -#ifndef NEW_INSETS - ,ftnote, ft_texrow, ftcount -#endif - ); + + if (layout.isEnvironment()) { + par = par->TeXEnvironment(this, params, ofs, texrow); } else { - par = par->TeXOnePar(this, params, ofs, texrow, false -#ifndef NEW_INSETS - , - ftnote, ft_texrow, ftcount -#endif - ); - } - - // Write out what we've generated... - if (ftcount >= 1) { - if (ftcount > 1) { - ofs << "\\addtocounter{footnote}{-" - << ftcount - 1 - << '}'; - } - ofs << ftnote.str(); - texrow += ft_texrow; - - // The extra .c_str() is needed when we use - // lyxstring instead of the STL string class. - ftnote.str(string().c_str()); - ft_texrow.reset(); - ftcount = 0; + par = par->TeXOnePar(this, params, ofs, texrow, false); } } // It might be that we only have a title in this document @@ -2198,34 +2505,26 @@ bool Buffer::isSGML() const } -void Buffer::sgmlOpenTag(ostream & os, int depth, +void Buffer::sgmlOpenTag(ostream & os, Paragraph::depth_type depth, string const & latexname) const { - if (latexname != "!-- --") + if (!latexname.empty() && latexname != "!-- --") + //os << "" << "<" << latexname << ">"; os << string(depth, ' ') << "<" << latexname << ">\n"; } -void Buffer::sgmlCloseTag(ostream & os, int depth, +void Buffer::sgmlCloseTag(ostream & os, Paragraph::depth_type depth, string const & latexname) const { - if (latexname != "!-- --") + if (!latexname.empty() && latexname != "!-- --") + //os << "" << "\n"; os << string(depth, ' ') << "\n"; } 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; - - int depth = 0; // paragraph depth - ofstream ofs(fname.c_str()); if (!ofs) { @@ -2233,28 +2532,29 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) return; } + niceFile = nice; // this will be used by included files. + 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(); + string top_element = textclasslist.LatexnameOfClass(params.textclass); + if (!body_only) { - string sgml_includedfiles=features.getIncludedFiles(fname); + ofs << "\n\n"; - } else { - ofs << "\n\n"; + string preamble = params.preamble; + preamble += features.getIncludedFiles(fname); + preamble += features.getLyXSGMLEntities(); + + if (!preamble.empty()) { + ofs << " [ " << preamble << " ]"; } + ofs << ">\n\n"; if (params.options.empty()) sgmlOpenTag(ofs, 0, top_element); @@ -2266,34 +2566,35 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) } } - ofs << "\n"; + Paragraph::depth_type depth = 0; // paragraph depth + Paragraph * par = paragraph; + string item_name; + vector environment_stack(5); + while (par) { - int desc_on = 0; // description mode LyXLayout const & style = textclasslist.Style(params.textclass, par->layout); // treat as a special case for compatibility with old code - if (par->GetChar(0) == LyXParagraph::META_INSET) { - Inset * inset = par->GetInset(0); - Inset::Code lyx_code = inset->LyxCode(); + if (par->getChar(0) == Paragraph::META_INSET) { + Inset * inset = par->getInset(0); + Inset::Code lyx_code = inset->lyxCode(); if (lyx_code == Inset::TOC_CODE){ string const temp = "toc"; sgmlOpenTag(ofs, depth, temp); - par = par->next; -#ifndef NEW_INSETS - linuxDocHandleFootnote(ofs, par, depth); -#endif + par = par->next(); continue; } } // environment tag closing - for (; depth > par->depth; --depth) { + for (; depth > par->params().depth(); --depth) { sgmlCloseTag(ofs, depth, environment_stack[depth]); environment_stack[depth].erase(); } @@ -2301,7 +2602,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) // write opening SGML tags switch (style.latextype) { case LATEX_PARAGRAPH: - if (depth == par->depth + if (depth == par->params().depth() && !environment_stack[depth].empty()) { sgmlCloseTag(ofs, depth, environment_stack[depth]); environment_stack[depth].erase(); @@ -2315,9 +2616,9 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) case LATEX_COMMAND: if (depth!= 0) - LinuxDocError(par, 0, - _("Error : Wrong depth for" - " LatexType Command.\n")); + sgmlError(par, 0, + _("Error : Wrong depth for" + " LatexType Command.\n")); if (!environment_stack[depth].empty()){ sgmlCloseTag(ofs, depth, @@ -2331,32 +2632,33 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) case LATEX_ENVIRONMENT: case LATEX_ITEM_ENVIRONMENT: - if (depth == par->depth - && environment_stack[depth] != style.latexname() - && !environment_stack[depth].empty()) { - + if (depth == par->params().depth() + && environment_stack[depth] != style.latexname()) { sgmlCloseTag(ofs, depth, environment_stack[depth]); environment_stack[depth].erase(); } - if (depth < par->depth) { - depth = par->depth; + if (depth < par->params().depth()) { + depth = par->params().depth(); environment_stack[depth].erase(); } if (environment_stack[depth] != style.latexname()) { if (depth == 0) { - string const temp = "p"; - sgmlOpenTag(ofs, depth, temp); + sgmlOpenTag(ofs, depth, "p"); } + sgmlOpenTag(ofs, depth, style.latexname()); + + if (environment_stack.size() == depth + 1) + environment_stack.push_back("!-- --"); environment_stack[depth] = style.latexname(); - sgmlOpenTag(ofs, depth, - environment_stack[depth]); } - if (style.latextype == LATEX_ENVIRONMENT) break; - desc_on = (style.labeltype == LABEL_MANUAL); + if (style.latexparam() == "CDATA") + ofs << "next; -#ifndef NEW_INSETS - linuxDocHandleFootnote(ofs, par, depth); - } - while(par && par->IsDummy()); -#endif + par = par->next(); ofs << "\n"; // write closing SGML tags switch (style.latextype) { case LATEX_COMMAND: + break; case LATEX_ENVIRONMENT: case LATEX_ITEM_ENVIRONMENT: + if (style.latexparam() == "CDATA") + ofs << "]]>"; break; default: sgmlCloseTag(ofs, depth, style.latexname()); @@ -2394,11 +2691,8 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) } // Close open tags - for (; depth > 0; --depth) - sgmlCloseTag(ofs, depth, environment_stack[depth]); - - if (!environment_stack[depth].empty()) - sgmlCloseTag(ofs, depth, environment_stack[depth]); + for (int i=depth; i >= 0; --i) + sgmlCloseTag(ofs, depth, environment_stack[i]); if (!body_only) { ofs << "\n\n"; @@ -2410,388 +2704,230 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) } -#ifndef NEW_INSETS -void Buffer::linuxDocHandleFootnote(ostream & os, LyXParagraph * & par, - int depth) -{ - string const tag = "footnote"; - - while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE) { - sgmlOpenTag(os, depth + 1, tag); - SimpleLinuxDocOnePar(os, par, 0, depth + 1); - sgmlCloseTag(os, depth + 1, tag); - par = par->next; - } -} -#endif - +// checks, if newcol chars should be put into this line +// writes newline, if necessary. +namespace { -void Buffer::DocBookHandleCaption(ostream & os, string & inner_tag, - int depth, int desc_on, - LyXParagraph * & par) +void sgmlLineBreak(ostream & os, string::size_type & colcount, + string::size_type newcol) { - LyXParagraph * tpar = par; - while (tpar -#ifndef NEW_INSETS - && (tpar->footnoteflag != LyXParagraph::NO_FOOTNOTE) -#endif - && (tpar->layout != textclasslist.NumberOfLayout(params.textclass, - "Caption").second)) - tpar = tpar->next; - if (tpar && - tpar->layout == textclasslist.NumberOfLayout(params.textclass, - "Caption").second) { - sgmlOpenTag(os, depth + 1, inner_tag); - string extra_par; - SimpleDocBookOnePar(os, extra_par, tpar, - desc_on, depth + 2); - sgmlCloseTag(os, depth+1, inner_tag); - if (!extra_par.empty()) - os << extra_par; + colcount += newcol; + if (colcount > lyxrc.ascii_linelen) { + os << "\n"; + colcount = newcol; // assume write after this call } } - -#ifndef NEW_INSETS -void Buffer::DocBookHandleFootnote(ostream & os, LyXParagraph * & par, - int depth) -{ - string tag, inner_tag; - string tmp_par, extra_par; - bool inner_span = false; - int desc_on = 4; - - // Someone should give this enum a proper name (Lgb) - enum SOME_ENUM { - NO_ONE, - FOOTNOTE_LIKE, - MARGIN_LIKE, - FIG_LIKE, - TAB_LIKE - }; - SOME_ENUM last = NO_ONE; - SOME_ENUM present = FOOTNOTE_LIKE; - - while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE) { - if (last == present) { - if (inner_span) { - if (!tmp_par.empty()) { - os << tmp_par; - tmp_par.erase(); - sgmlCloseTag(os, depth + 1, inner_tag); - sgmlOpenTag(os, depth + 1, inner_tag); - } - } else { - os << "\n"; - } - } else { - os << tmp_par; - if (!inner_tag.empty()) sgmlCloseTag(os, depth + 1, - inner_tag); - if (!extra_par.empty()) os << extra_par; - if (!tag.empty()) sgmlCloseTag(os, depth, tag); - extra_par.erase(); - - switch (par->footnotekind) { - case LyXParagraph::FOOTNOTE: - case LyXParagraph::ALGORITHM: - tag = "footnote"; - inner_tag = "para"; - present = FOOTNOTE_LIKE; - inner_span = true; - break; - case LyXParagraph::MARGIN: - tag = "sidebar"; - inner_tag = "para"; - present = MARGIN_LIKE; - inner_span = true; - break; - case LyXParagraph::FIG: - case LyXParagraph::WIDE_FIG: - tag = "figure"; - inner_tag = "title"; - present = FIG_LIKE; - inner_span = false; - break; - case LyXParagraph::TAB: - case LyXParagraph::WIDE_TAB: - tag = "table"; - inner_tag = "title"; - present = TAB_LIKE; - inner_span = false; - break; - } - sgmlOpenTag(os, depth, tag); - if ((present == TAB_LIKE) || (present == FIG_LIKE)) { - DocBookHandleCaption(os, inner_tag, depth, - desc_on, par); - inner_tag.erase(); - } else { - sgmlOpenTag(os, depth + 1, inner_tag); - } - } - // ignore all caption here, we processed them above!!! - if (par->layout != textclasslist - .NumberOfLayout(params.textclass, - "Caption").second) { - std::ostringstream ost; - SimpleDocBookOnePar(ost, extra_par, par, - desc_on, depth + 2); - tmp_par += ost.str().c_str(); - } - tmp_par = frontStrip(strip(tmp_par)); - - last = present; - par = par->next; - } - os << tmp_par; - if (!inner_tag.empty()) sgmlCloseTag(os, depth + 1, inner_tag); - if (!extra_par.empty()) os << extra_par; - if (!tag.empty()) sgmlCloseTag(os, depth, tag); +enum PAR_TAG { + NONE=0, + TT = 1, + SF = 2, + BF = 4, + IT = 8, + SL = 16, + EM = 32 +}; + + +string tag_name(PAR_TAG const & pt) { + switch (pt) { + case NONE: return "!-- --"; + case TT: return "tt"; + case SF: return "sf"; + case BF: return "bf"; + case IT: return "it"; + case SL: return "sl"; + case EM: return "em"; + } + return ""; } -#endif -// push a tag in a style stack -void Buffer::push_tag(ostream & os, string const & tag, - int & pos, char stack[5][3]) +inline +void operator|=(PAR_TAG & p1, PAR_TAG const & p2) { -#ifdef WITH_WARNINGS -#warning Use a real stack! (Lgb) -#endif - // pop all previous tags - for (int j = pos; j >= 0; --j) - os << ""; - - // add new tag - sprintf(stack[++pos], "%s", tag.c_str()); - - // push all tags - for (int i = 0; i <= pos; ++i) - os << "<" << stack[i] << ">"; + p1 = static_cast(p1 | p2); } -void Buffer::pop_tag(ostream & os, string const & tag, - int & pos, char stack[5][3]) +inline +void reset(PAR_TAG & p1, PAR_TAG const & p2) { -#ifdef WITH_WARNINGS -#warning Use a real stack! (Lgb) -#endif - // Please, Lars, do not remove the global variable. I already - // had to reintroduce it twice! (JMarc) - // but...but... I'll remove it anyway. (well not quite) (Lgb) -#if 0 - int j; - - // pop all tags till specified one - for (j = pos; (j >= 0) && (strcmp(stack[j], tag.c_str())); --j) - os << ""; - - // closes the tag - os << ""; - - // push all tags, but the specified one - for (j = j + 1; j <= pos; ++j) { - os << "<" << stack[j] << ">"; - strcpy(stack[j - 1], stack[j]); - } - --pos; -#else - // pop all tags till specified one - int j = pos; - for (int j = pos; (j >= 0) && (strcmp(stack[j], tag.c_str())); --j) - os << ""; - - // closes the tag - os << ""; - - // push all tags, but the specified one - for (int i = j + 1; i <= pos; ++i) { - os << "<" << stack[i] << ">"; - strcpy(stack[i - 1], stack[i]); - } - --pos; -#endif + p1 = static_cast( p1 & ~p2); } - -// Handle internal paragraph parsing -- layout already processed. - -// checks, if newcol chars should be put into this line -// writes newline, if necessary. -static -void linux_doc_line_break(ostream & os, string::size_type & colcount, - string::size_type newcol) -{ - colcount += newcol; - if (colcount > lyxrc.ascii_linelen) { - os << "\n"; - colcount = newcol; // assume write after this call - } -} +} // namespace anon -void Buffer::SimpleLinuxDocOnePar(ostream & os, LyXParagraph * par, - int desc_on, int /*depth*/) +// Handle internal paragraph parsing -- layout already processed. +void Buffer::simpleLinuxDocOnePar(ostream & os, + Paragraph * par, + Paragraph::depth_type /*depth*/) { - LyXFont font1; - char c; - Inset * inset; - LyXParagraph::size_type main_body; - int j; LyXLayout const & style = textclasslist.Style(params.textclass, - par->GetLayout()); - - char family_type = 0; // family font flag - bool is_bold = false; // series font flag - char shape_type = 0; // shape font flag - bool is_em = false; // emphasis (italic) font flag - - int stack_num = -1; // style stack position - // Can this be rewritten to use a std::stack, please. (Lgb) - char stack[5][3]; // style stack + par->getLayout()); string::size_type char_line_count = 5; // Heuristic choice ;-) - if (style.labeltype != LABEL_MANUAL) - main_body = 0; - else - main_body = par->BeginningOfMainBody(); - // gets paragraph main font - if (main_body > 0) - font1 = style.labelfont; - else - font1 = style.font; + LyXFont font_old; + bool desc_on; + if (style.labeltype == LABEL_MANUAL) { + font_old = style.labelfont; + desc_on = true; + } else { + font_old = style.font; + desc_on = false; + } - + LyXFont::FONT_FAMILY family_type = LyXFont::ROMAN_FAMILY; + LyXFont::FONT_SERIES series_type = LyXFont::MEDIUM_SERIES; + LyXFont::FONT_SHAPE shape_type = LyXFont::UP_SHAPE; + bool is_em = false; + + stack tag_state; // parsing main loop - for (LyXParagraph::size_type i = 0; - i < par->size(); ++i) { + for (Paragraph::size_type i = 0; i < par->size(); ++i) { - // handle quote tag - if (i == main_body -#ifndef NEW_INSETS - && !par->IsDummy() -#endif - ) { - if (main_body > 0) - font1 = style.font; - } + PAR_TAG tag_close = NONE; + list < PAR_TAG > tag_open; - LyXFont const font2 = par->getFont(params, i); + LyXFont const font = par->getFont(params, i); - if (font1.family() != font2.family()) { + if (font_old.family() != font.family()) { switch (family_type) { - case 0: - if (font2.family() == LyXFont::TYPEWRITER_FAMILY) { - push_tag(os, "tt", stack_num, stack); - family_type = 1; - } - else if (font2.family() == LyXFont::SANS_FAMILY) { - push_tag(os, "sf", stack_num, stack); - family_type = 2; - } + case LyXFont::SANS_FAMILY: + tag_close |= SF; 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; - } + case LyXFont::TYPEWRITER_FAMILY: + tag_close |= TT; + break; + default: + break; + } + + family_type = font.family(); + + switch (family_type) { + case LyXFont::SANS_FAMILY: + tag_open.push_back(SF); + break; + case LyXFont::TYPEWRITER_FAMILY: + tag_open.push_back(TT); + break; + default: 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; - } } } - // handle bold face - if (font1.series() != font2.series()) { - if (font2.series() == LyXFont::BOLD_SERIES) { - push_tag(os, "bf", stack_num, stack); - is_bold = true; - } else if (is_bold) { - pop_tag(os, "bf", stack_num, stack); - is_bold = false; + if (font_old.series() != font.series()) { + switch (series_type) { + case LyXFont::BOLD_SERIES: + tag_close |= BF; + break; + default: + break; + } + + series_type = font.series(); + + switch (series_type) { + case LyXFont::BOLD_SERIES: + tag_open.push_back(BF); + break; + default: + break; } + } - // handle italic and slanted fonts - if (font1.shape() != font2.shape()) { + if (font_old.shape() != font.shape()) { switch (shape_type) { - 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) { - push_tag(os, "sl", stack_num, stack); - shape_type = 2; - } + case LyXFont::ITALIC_SHAPE: + tag_close |= IT; 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; - } + case LyXFont::SLANTED_SHAPE: + tag_close |= SL; + break; + default: + break; + } + + shape_type = font.shape(); + + switch (shape_type) { + case LyXFont::ITALIC_SHAPE: + tag_open.push_back(IT); + break; + case LyXFont::SLANTED_SHAPE: + tag_open.push_back(SL); + break; + default: 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; - } } } // handle tag - if (font1.emph() != font2.emph()) { - if (font2.emph() == LyXFont::ON) { - push_tag(os, "em", stack_num, stack); + if (font_old.emph() != font.emph()) { + if (font.emph() == LyXFont::ON) { + tag_open.push_back(EM); is_em = true; - } else if (is_em) { - pop_tag(os, "em", stack_num, stack); + } + else if (is_em) { + tag_close |= EM; is_em = false; } } - c = par->GetChar(i); + list < PAR_TAG > temp; + while(!tag_state.empty() && tag_close ) { + PAR_TAG k = tag_state.top(); + tag_state.pop(); + os << ""; + if (tag_close & k) + reset(tag_close,k); + else + temp.push_back(k); + } + + for(list< PAR_TAG >::const_iterator j = temp.begin(); + j != temp.end(); ++j) { + tag_state.push(*j); + os << "<" << tag_name(*j) << ">"; + } + + for(list< PAR_TAG >::const_iterator j = tag_open.begin(); + j != tag_open.end(); ++j) { + tag_state.push(*j); + os << "<" << tag_name(*j) << ">"; + } + + char c = par->getChar(i); - if (c == LyXParagraph::META_INSET) { - inset = par->GetInset(i); - inset->Linuxdoc(this, os); + if (c == Paragraph::META_INSET) { + Inset * inset = par->getInset(i); + inset->linuxdoc(this, os); + font_old = font; + continue; } - if (font2.latex() == LyXFont::ON) { + if (style.latexparam() == "CDATA") { // "TeX"-Mode on == > SGML-Mode on. if (c != '\0') - os << c; // see LaTeX-Generation... + os << c; ++char_line_count; } else { string sgml_string; - if (par->linuxDocConvertChar(c, sgml_string) - && !style.free_spacing) { // in freespacing - // mode, spaces are - // non-breaking characters - // char is ' ' - if (desc_on == 1) { + if (par->sgmlConvertChar(c, sgml_string) + && !style.free_spacing) { + // in freespacing mode, spaces are + // non-breaking characters + if (desc_on) {// if char is ' ' then... + ++char_line_count; - linux_doc_line_break(os, char_line_count, 6); + sgmlLineBreak(os, char_line_count, 6); os << ""; - desc_on = 2; + desc_on = false; } else { - linux_doc_line_break(os, char_line_count, 1); + sgmlLineBreak(os, char_line_count, 1); os << c; } } else { @@ -2799,102 +2935,67 @@ void Buffer::SimpleLinuxDocOnePar(ostream & os, LyXParagraph * par, char_line_count += sgml_string.length(); } } - font1 = font2; + font_old = font; } - // needed if there is an optional argument but no contents - if (main_body > 0 && main_body == par->size()) { - font1 = style.font; - } - - // pop all defined Styles - for (j = stack_num; j >= 0; --j) { - linux_doc_line_break(os, - char_line_count, - 3 + strlen(stack[j])); - os << ""; + while (!tag_state.empty()) { + os << ""; + tag_state.pop(); } // resets description flag correctly - switch (desc_on){ - case 1: + if (desc_on) { // not closed... - linux_doc_line_break(os, char_line_count, 6); + sgmlLineBreak(os, char_line_count, 6); os << ""; - break; - case 2: - // fprintf(file, "

"); - break; } } // Print an error message. -void Buffer::LinuxDocError(LyXParagraph * par, int pos, - string const & message) +void Buffer::sgmlError(Paragraph * par, int pos, + string const & message) const { // insert an error marker in text InsetError * new_inset = new InsetError(message); - par->InsertInset(pos, new_inset); + par->insertInset(pos, new_inset); } -// This constant defines the maximum number of -// environment layouts that can be nesteded. -// The same applies for command layouts. -// These values should be more than enough. -// José Matos (1999/07/22) - -enum { MAX_NEST_LEVEL = 25}; void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) { - LyXParagraph * par = paragraph; - - niceFile = nice; // this will be used by Insetincludes. + ofstream ofs(fname.c_str()); + if (!ofs) { + WriteAlert(_("LYX_ERROR:"), _("Cannot write file"), fname); + return; + } - string top_element= textclasslist.LatexnameOfClass(params.textclass); - // Please use a real stack. - string environment_stack[MAX_NEST_LEVEL]; - string environment_inner[MAX_NEST_LEVEL]; - // Please use a real stack. - string command_stack[MAX_NEST_LEVEL]; - bool command_flag= false; - int command_depth= 0, command_base= 0, cmd_depth= 0; + Paragraph * par = paragraph; - string item_name, command_name; - string c_depth, c_params, tmps; + niceFile = nice; // this will be used by Insetincludes. - int depth = 0; // paragraph depth 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; - - ofstream ofs(fname.c_str()); - if (!ofs) { - WriteAlert(_("LYX_ERROR:"), _("Cannot write file"), fname); - return; - } texrow.reset(); + string top_element = textclasslist.LatexnameOfClass(params.textclass); + if (!only_body) { - string sgml_includedfiles=features.getIncludedFiles(fname); + ofs << "\n\n"; - else - ofs << "\n [ " << params.preamble - << sgml_includedfiles << " \n]>\n\n"; + if (!preamble.empty()) { + ofs << "\n [ " << preamble << " ]"; + } + ofs << ">\n\n"; } string top = top_element; @@ -2908,19 +3009,36 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) } sgmlOpenTag(ofs, 0, top); - ofs << "\n"; + vector environment_stack(10); + vector environment_inner(10); + vector command_stack(10); + + bool command_flag = false; + Paragraph::depth_type command_depth = 0; + Paragraph::depth_type command_base = 0; + Paragraph::depth_type cmd_depth = 0; + Paragraph::depth_type depth = 0; // paragraph depth + + string item_name; + string command_name; + while (par) { + string sgmlparam; + string c_depth; + string c_params; int desc_on = 0; // description mode + LyXLayout const & style = textclasslist.Style(params.textclass, par->layout); // environment tag closing - for (; depth > par->depth; --depth) { + for (; depth > par->params().depth(); --depth) { if (environment_inner[depth] != "!-- --") { - item_name= "listitem"; + item_name = "listitem"; sgmlCloseTag(ofs, command_depth + depth, item_name); if (environment_inner[depth] == "varlistentry") @@ -2933,7 +3051,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) environment_inner[depth].erase(); } - if (depth == par->depth + if (depth == par->params().depth() && environment_stack[depth] != style.latexname() && !environment_stack[depth].empty()) { if (environment_inner[depth] != "!-- --") { @@ -2956,49 +3074,47 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) // Write opening SGML tags. switch (style.latextype) { case LATEX_PARAGRAPH: - sgmlOpenTag(ofs, depth+command_depth, style.latexname()); + sgmlOpenTag(ofs, depth + command_depth, + style.latexname()); break; case LATEX_COMMAND: - if (depth!= 0) - LinuxDocError(par, 0, - _("Error : Wrong depth for " - "LatexType Command.\n")); + if (depth != 0) + sgmlError(par, 0, + _("Error : Wrong depth for " + "LatexType Command.\n")); command_name = style.latexname(); - tmps = style.latexparam(); - c_params = split(tmps, c_depth,'|'); + sgmlparam = style.latexparam(); + c_params = split(sgmlparam, c_depth,'|'); - cmd_depth= lyx::atoi(c_depth); + cmd_depth = lyx::atoi(c_depth); if (command_flag) { - if (cmd_depth= command_base; --j) - if (!command_stack[j].empty()) - sgmlCloseTag(ofs, j, command_stack[j]); - command_depth= command_base= cmd_depth; + if (cmd_depth < command_base) { + for (Paragraph::depth_type j = command_depth; j >= command_base; --j) + sgmlCloseTag(ofs, j, command_stack[j]); + command_depth = command_base = cmd_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; + for (int j = command_depth; j >= int(cmd_depth); --j) + sgmlCloseTag(ofs, j, command_stack[j]); + command_depth = cmd_depth; } else - command_depth= cmd_depth; + command_depth = cmd_depth; } else { command_depth = command_base = cmd_depth; command_flag = true; } - command_stack[command_depth]= command_name; + if (command_stack.size() == command_depth + 1) + command_stack.push_back(string()); + command_stack[command_depth] = command_name; // treat label as a special case for // more WYSIWYM handling. - if (par->GetChar(0) == LyXParagraph::META_INSET) { - Inset * inset = par->GetInset(0); - Inset::Code lyx_code = inset->LyxCode(); + if (par->getChar(0) == Paragraph::META_INSET) { + Inset * inset = par->getInset(0); + Inset::Code lyx_code = inset->lyxCode(); if (lyx_code == Inset::LABEL_CODE){ command_name += " id=\""; command_name += (static_cast(inset))->getContents(); @@ -3008,18 +3124,25 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) } sgmlOpenTag(ofs, depth + command_depth, command_name); - item_name = "title"; + if (c_params.empty()) + item_name = "title"; + else + item_name = c_params; sgmlOpenTag(ofs, depth + 1 + command_depth, item_name); break; case LATEX_ENVIRONMENT: case LATEX_ITEM_ENVIRONMENT: - if (depth < par->depth) { - depth = par->depth; + if (depth < par->params().depth()) { + depth = par->params().depth(); environment_stack[depth].erase(); } if (environment_stack[depth] != style.latexname()) { + if(environment_stack.size() == depth + 1) { + environment_stack.push_back("!-- --"); + environment_inner.push_back("!-- --"); + } environment_stack[depth] = style.latexname(); environment_inner[depth] = "!-- --"; sgmlOpenTag(ofs, depth + command_depth, @@ -3040,7 +3163,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) if (style.latextype == LATEX_ENVIRONMENT) { if (!style.latexparam().empty()) { if(style.latexparam() == "CDATA") - ofs << "next; -#ifndef NEW_INSETS - DocBookHandleFootnote(ofs, par, - depth + 1 + command_depth); - } - while(par && par->IsDummy()); -#endif + simpleDocBookOnePar(ofs, par, desc_on, depth+1+command_depth); + par = par->next(); + string end_tag; // write closing SGML tags switch (style.latextype) { case LATEX_COMMAND: - end_tag = "title"; + if (c_params.empty()) + end_tag = "title"; + else + end_tag = c_params; sgmlCloseTag(ofs, depth + command_depth, end_tag); break; case LATEX_ENVIRONMENT: @@ -3118,10 +3234,10 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) } // Close open tags - for (; depth >= 0; --depth) { + for (int d = depth; d >= 0; --d) { if (!environment_stack[depth].empty()) { if (environment_inner[depth] != "!-- --") { - item_name= "listitem"; + item_name = "listitem"; sgmlCloseTag(ofs, command_depth + depth, item_name); if (environment_inner[depth] == "varlistentry") @@ -3134,7 +3250,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) } } - for (int j = command_depth; j >= command_base; --j) + for (int j = command_depth; j >= 0 ; --j) if (!command_stack[j].empty()) sgmlCloseTag(ofs, j, command_stack[j]); @@ -3146,115 +3262,71 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) } -void Buffer::SimpleDocBookOnePar(ostream & os, string & extra, - LyXParagraph * par, int & desc_on, - int depth) const +void Buffer::simpleDocBookOnePar(ostream & os, + Paragraph * par, int & desc_on, + Paragraph::depth_type depth) const { bool emph_flag = false; LyXLayout const & style = textclasslist.Style(params.textclass, - par->GetLayout()); + par->getLayout()); - LyXParagraph::size_type main_body; - if (style.labeltype != LABEL_MANUAL) - main_body = 0; - else - main_body = par->BeginningOfMainBody(); + LyXFont font_old = style.labeltype == LABEL_MANUAL ? style.labelfont : style.font; - // gets paragraph main font - LyXFont font1 = main_body > 0 ? style.labelfont : style.font; - int char_line_count = depth; - if (!style.free_spacing) - for (int j = 0; j < depth; ++j) - os << ' '; + //if (!style.free_spacing) + // os << string(depth,' '); // parsing main loop - for (LyXParagraph::size_type i = 0; + for (Paragraph::size_type i = 0; i < par->size(); ++i) { - LyXFont font2 = par->getFont(params, i); + LyXFont font = par->getFont(params, i); // handle tag - if (font1.emph() != font2.emph() && i) { - if (font2.emph() == LyXFont::ON) { + if (font_old.emph() != font.emph()) { + if (font.emph() == LyXFont::ON) { os << ""; emph_flag = true; - }else { + }else if(i) { os << ""; emph_flag = false; } } - char c = par->GetChar(i); - - if (c == LyXParagraph::META_INSET) { - Inset * inset = par->GetInset(i); - std::ostringstream ost; - inset->DocBook(this, ost); - string tmp_out = ost.str().c_str(); - - // - // This code needs some explanation: - // Two insets are treated specially - // label if it is the first element in a command paragraph - // desc_on == 3 - // graphics inside tables or figure floats can't go on - // title (the equivalente in latex for this case is caption - // and title should come first - // desc_on == 4 - // - if (desc_on!= 3 || i!= 0) { - if (!tmp_out.empty() && tmp_out[0] == '@') { - if (desc_on == 4) - extra += frontStrip(tmp_out, '@'); - else - os << frontStrip(tmp_out, '@'); - } - else - os << tmp_out; - } - } else if (font2.latex() == LyXFont::ON) { - // "TeX"-Mode on ==> SGML-Mode on. - if (c != '\0') - os << c; - ++char_line_count; + char c = par->getChar(i); + + if (c == Paragraph::META_INSET) { + Inset * inset = par->getInset(i); + inset->docbook(this, os); } else { string sgml_string; - if (par->linuxDocConvertChar(c, sgml_string) - && !style.free_spacing) { // in freespacing - // mode, spaces are - // non-breaking characters - // char is ' ' - if (desc_on == 1) { - ++char_line_count; - os << "\n"; - desc_on = 2; - } else { - os << c; - } + par->sgmlConvertChar(c, sgml_string); + + if (style.pass_thru) { + os << c; + } else if(style.free_spacing || c != ' ') { + os << sgml_string; + } else if (desc_on ==1) { + ++char_line_count; + os << "\n"; + desc_on = 2; } else { - os << sgml_string; + os << ' '; } } - font1 = font2; + font_old = font; } - // needed if there is an optional argument but no contents - if (main_body > 0 && main_body == par->size()) { - font1 = style.font; - } if (emph_flag) { os << ""; } // resets description flag correctly - switch (desc_on){ - case 1: + if (desc_on == 1) { // not closed... os << ""; - break; } - os << '\n'; + if(style.free_spacing) os << '\n'; } @@ -3265,19 +3337,19 @@ int Buffer::runChktex() { if (!users->text) return 0; - ProhibitInput(users); + users->owner()->prohibitInput(); // get LaTeX-Filename string const name = getLatexName(); string path = OnlyPath(filename); string const org_path = path; - if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)) { + if (lyxrc.use_tempdir || !IsDirWriteable(path)) { path = tmppath; } Path p(path); // path to LaTeX file - users->owner()->getMiniBuffer()->Set(_("Running chktex...")); + users->owner()->message(_("Running chktex...")); // Remove all error insets bool const removedErrorInsets = users->removeAutoInsets(); @@ -3301,9 +3373,9 @@ int Buffer::runChktex() // error insets after we ran chktex, this must be run: if (removedErrorInsets || res){ users->redraw(); - users->fitCursor(users->text); + users->fitCursor(); } - AllowInput(users); + users->owner()->allowInput(); return res; } @@ -3311,12 +3383,11 @@ int Buffer::runChktex() void Buffer::validate(LaTeXFeatures & features) const { - LyXParagraph * par = paragraph; + Paragraph * par = paragraph; LyXTextClass const & tclass = textclasslist.TextClass(params.textclass); // AMS Style is at document level - features.amsstyle = (params.use_amsmath || tclass.provides(LyXTextClass::amsmath)); @@ -3330,7 +3401,7 @@ void Buffer::validate(LaTeXFeatures & features) const par->validate(features); // and then the next paragraph - par = par->next; + par = par->next(); } // the bullet shapes are buffer level not paragraph level @@ -3363,51 +3434,23 @@ void Buffer::validate(LaTeXFeatures & features) const } -void Buffer::setPaperStuff() -{ - params.papersize = BufferParams::PAPER_DEFAULT; - char const c1 = params.paperpackage; - if (c1 == BufferParams::PACKAGE_NONE) { - char const c2 = params.papersize2; - if (c2 == BufferParams::VM_PAPER_USLETTER) - params.papersize = BufferParams::PAPER_USLETTER; - else if (c2 == BufferParams::VM_PAPER_USLEGAL) - params.papersize = BufferParams::PAPER_LEGALPAPER; - else if (c2 == BufferParams::VM_PAPER_USEXECUTIVE) - params.papersize = BufferParams::PAPER_EXECUTIVEPAPER; - else if (c2 == BufferParams::VM_PAPER_A3) - params.papersize = BufferParams::PAPER_A3PAPER; - else if (c2 == BufferParams::VM_PAPER_A4) - params.papersize = BufferParams::PAPER_A4PAPER; - else if (c2 == BufferParams::VM_PAPER_A5) - params.papersize = BufferParams::PAPER_A5PAPER; - else if ((c2 == BufferParams::VM_PAPER_B3) || (c2 == BufferParams::VM_PAPER_B4) || - (c2 == BufferParams::VM_PAPER_B5)) - params.papersize = BufferParams::PAPER_B5PAPER; - } else if ((c1 == BufferParams::PACKAGE_A4) || (c1 == BufferParams::PACKAGE_A4WIDE) || - (c1 == BufferParams::PACKAGE_WIDEMARGINSA4)) - params.papersize = BufferParams::PAPER_A4PAPER; -} - - // This function should be in Buffer because it's a buffer's property (ale) string const Buffer::getIncludeonlyList(char delim) { string lst; for (inset_iterator it = inset_iterator_begin(); it != inset_iterator_end(); ++it) { - if ((*it)->LyxCode() == Inset::INCLUDE_CODE) { + if ((*it)->lyxCode() == Inset::INCLUDE_CODE) { InsetInclude * insetinc = static_cast(*it); - if (insetinc->isInclude() - && insetinc->isNoLoad()) { + if (insetinc->isIncludeOnly()) { if (!lst.empty()) lst += delim; - lst += OnlyFilename(ChangeExtension(insetinc->getContents(), string())); + lst += insetinc->getRelFileBaseName(); } } } - lyxerr.debug() << "Includeonly(" << lst << ')' << endl; + lyxerr[Debug::INFO] << "Includeonly(" << lst << ')' << endl; return lst; } @@ -3433,74 +3476,83 @@ vector const Buffer::getLabelList() } -vector > const Buffer::getTocList() const +Buffer::Lists const Buffer::getLists() const { - int figs = 0; - int tables = 0; - int algs = 0; - vector > l(4); - LyXParagraph * par = paragraph; - while (par) { -#ifndef NEW_INSETS - if (par->footnoteflag != LyXParagraph::NO_FOOTNOTE) { - if (textclasslist.Style(params.textclass, - par->GetLayout()).labeltype - == LABEL_SENSITIVE) { - TocItem tmp; - tmp.par = par; - tmp.depth = 0; - tmp.str = par->String(this, false); - switch (par->footnotekind) { - case LyXParagraph::FIG: - case LyXParagraph::WIDE_FIG: - tmp.str = tostr(++figs) + ". " - + tmp.str; - l[TOC_LOF].push_back(tmp); - break; - case LyXParagraph::TAB: - case LyXParagraph::WIDE_TAB: - tmp.str = tostr(++tables) + ". " - + tmp.str; - l[TOC_LOT].push_back(tmp); - break; - case LyXParagraph::ALGORITHM: - tmp.str = tostr(++algs) + ". " - + tmp.str; - l[TOC_LOA].push_back(tmp); - break; - case LyXParagraph::FOOTNOTE: - case LyXParagraph::MARGIN: - break; - } - } - } else if (!par->IsDummy()) { + Lists l; + Paragraph * par = paragraph; + +#if 1 + std::pair const tmp = + textclasslist.NumberOfLayout(params.textclass, "Caption"); + bool const found = tmp.first; + LyXTextClassList::size_type const cap = tmp.second; + +#else + // This is the prefered way to to this, but boost::tie can break + // some compilers + bool found; + LyXTextClassList::size_type cap; + boost::tie(found, cap) = textclasslist + .NumberOfLayout(params.textclass, "Caption"); #endif - char const labeltype = - textclasslist.Style(params.textclass, - par->GetLayout()).labeltype; - - if (labeltype >= LABEL_COUNTER_CHAPTER - && labeltype <= LABEL_COUNTER_CHAPTER + params.tocdepth) { + + while (par) { + char const labeltype = + textclasslist.Style(params.textclass, + par->getLayout()).labeltype; + + if (labeltype >= LABEL_COUNTER_CHAPTER + && labeltype <= LABEL_COUNTER_CHAPTER + params.tocdepth) { // insert this into the table of contents - TocItem tmp; - tmp.par = par; - tmp.depth = max(0, - labeltype - - textclasslist.TextClass(params.textclass).maxcounter()); - tmp.str = par->String(this, true); - l[TOC_TOC].push_back(tmp); + SingleList & item = l["TOC"]; + int depth = max(0, + labeltype - + textclasslist.TextClass(params.textclass).maxcounter()); + item.push_back(TocItem(par, depth, par->asString(this, true))); + } + // For each paragrph, traverse its insets and look for + // FLOAT_CODE + + if (found) { + Paragraph::inset_iterator it = + par->inset_iterator_begin(); + Paragraph::inset_iterator end = + par->inset_iterator_end(); + + for (; it != end; ++it) { + if ((*it)->lyxCode() == Inset::FLOAT_CODE) { + InsetFloat * il = + static_cast(*it); + + string const type = il->type(); + + // Now find the caption in the float... + // We now tranverse the paragraphs of + // the inset... + Paragraph * tmp = il->inset.paragraph(); + while (tmp) { + if (tmp->layout == cap) { + SingleList & item = l[type]; + string const str = + tostr(item.size()+1) + ". " + tmp->asString(this, false); + item.push_back(TocItem(tmp, 0 , str)); + } + tmp = tmp->next(); + } + } } -#ifndef NEW_INSETS + } else { + lyxerr << "caption not found" << endl; } -#endif - par = par->next; + + par = par->next(); } return l; } // This is also a buffer property (ale) -vector > const Buffer::getBibkeyList() +vector > const Buffer::getBibkeyList() { /// if this is a child document and the parent is already loaded /// Use the parent's list instead [ale990412] @@ -3511,12 +3563,12 @@ vector > const Buffer::getBibkeyList() } vector > keys; - LyXParagraph * par = paragraph; + Paragraph * par = paragraph; while (par) { if (par->bibkey) keys.push_back(pair(par->bibkey->getContents(), - par->String(this, false))); - par = par->next; + par->asString(this, false))); + par = par->next(); } // Might be either using bibtex or a child has bibliography @@ -3524,11 +3576,11 @@ vector > const Buffer::getBibkeyList() for (inset_iterator it = inset_iterator_begin(); it != inset_iterator_end(); ++it) { // Search for Bibtex or Include inset - if ((*it)->LyxCode() == Inset::BIBTEX_CODE) { + if ((*it)->lyxCode() == Inset::BIBTEX_CODE) { vector > tmp = static_cast(*it)->getKeys(this); keys.insert(keys.end(), tmp.begin(), tmp.end()); - } else if ((*it)->LyxCode() == Inset::INCLUDE_CODE) { + } else if ((*it)->lyxCode() == Inset::INCLUDE_CODE) { vector > const tmp = static_cast(*it)->getKeys(); keys.insert(keys.end(), tmp.begin(), tmp.end()); @@ -3573,18 +3625,18 @@ void Buffer::markDepClean(string const & name) } -bool Buffer::Dispatch(string const & command) +bool Buffer::dispatch(string const & command) { // Split command string into command and argument string cmd; string line = frontStrip(command); string const arg = strip(frontStrip(split(line, cmd, ' '))); - return Dispatch(lyxaction.LookupFunc(cmd), arg); + return dispatch(lyxaction.LookupFunc(cmd), arg); } -bool Buffer::Dispatch(int action, string const & argument) +bool Buffer::dispatch(int action, string const & argument) { bool dispatched = true; switch (action) { @@ -3599,66 +3651,108 @@ bool Buffer::Dispatch(int action, string const & argument) } -void Buffer::resize() -{ - /// resize the BufferViews! - if (users) - users->resize(); -} - - void Buffer::resizeInsets(BufferView * bv) { /// then remove all LyXText in text-insets - LyXParagraph * par = paragraph; - for (; par; par = par->next) { + Paragraph * par = paragraph; + for (; par; par = par->next()) { par->resizeInsetsLyXText(bv); } } -void Buffer::ChangeLanguage(Language const * from, Language const * to) + +void Buffer::redraw() { + users->redraw(); + users->fitCursor(); +} - LyXParagraph * par = paragraph; - while (par) { - par->ChangeLanguage(params, from, to); - par = par->next; - } + +void Buffer::changeLanguage(Language const * from, Language const * to) +{ + + ParIterator end = par_iterator_end(); + for (ParIterator it = par_iterator_begin(); it != end; ++it) + (*it)->changeLanguage(params, from, to); } bool Buffer::isMultiLingual() { - LyXParagraph * par = paragraph; - while (par) { - if (par->isMultiLingual(params)) + ParIterator end = par_iterator_end(); + for (ParIterator it = par_iterator_begin(); it != end; ++it) + if ((*it)->isMultiLingual(params)) return true; - par = par->next; - } + return false; } -Buffer::inset_iterator::inset_iterator(LyXParagraph * paragraph, - LyXParagraph::size_type pos) +Buffer::inset_iterator::inset_iterator(Paragraph * paragraph, + Paragraph::size_type pos) : par(paragraph) { it = par->InsetIterator(pos); if (it == par->inset_iterator_end()) { - par = par->next; - SetParagraph(); + par = par->next(); + setParagraph(); } } -void Buffer::inset_iterator::SetParagraph() +void Buffer::inset_iterator::setParagraph() { while (par) { it = par->inset_iterator_begin(); if (it != par->inset_iterator_end()) return; - par = par->next; + par = par->next(); } //it = 0; // We maintain an invariant that whenever par = 0 then it = 0 } + + +Inset * Buffer::getInsetFromID(int id_arg) const +{ + for (inset_iterator it = inset_const_iterator_begin(); + it != inset_const_iterator_end(); ++it) + { + if ((*it)->id() == id_arg) + return *it; + Inset * in = (*it)->getInsetFromID(id_arg); + if (in) + return in; + } + return 0; +} + + +Paragraph * Buffer::getParFromID(int id) const +{ + if (id < 0) return 0; + Paragraph * par = paragraph; + while (par) { + if (par->id() == id) { + return par; + } + Paragraph * tmp = par->getParFromID(id); + if (tmp) { + return tmp; + } + par = par->next(); + } + return 0; +} + + +ParIterator Buffer::par_iterator_begin() +{ + return ParIterator(paragraph); +} + + +ParIterator Buffer::par_iterator_end() +{ + return ParIterator(); +}