X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbuffer.C;h=b0f732739d2bb95d91a78a14b722e243240b1498;hb=ee7037edbb0e4e8e78682baf02c1bc53da41d1fa;hp=7c1ff1b4063a5ca9fccb941a1593ce775041bee9;hpb=0a10c6461677519f5856310653d83fca9276fcdf;p=lyx.git diff --git a/src/buffer.C b/src/buffer.C index 7c1ff1b406..b0f732739d 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -55,7 +55,7 @@ #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" @@ -74,11 +74,14 @@ #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" @@ -102,6 +105,7 @@ #include "converter.h" #include "BufferView.h" #include "ParagraphParameters.h" +#include "iterators.h" using std::ostream; using std::ofstream; @@ -197,7 +201,7 @@ pair const Buffer::getLogName(void) const string path = OnlyPath(filename); - if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)) + if (lyxrc.use_tempdir || !IsDirWriteable(path)) path = tmppath; string const fname = AddName(path, @@ -206,7 +210,7 @@ pair const Buffer::getLogName(void) const string const bname = AddName(path, OnlyFilename( ChangeExtension(filename, - formats.Extension("literate") + ".out"))); + formats.extension("literate") + ".out"))); // If no Latex log or Build log is newer, show Build log @@ -236,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 Paragraph; - - return defaults.writeFile(defaults.filename, false); -} - - /// Update window titles of all users // Should work on a list void Buffer::updateTitles() const @@ -282,6 +270,7 @@ namespace { string last_inset_read; +#ifndef NO_COMPABILITY struct ErtComp { ErtComp() : active(false), in_tabular(false) { @@ -293,13 +282,14 @@ struct ErtComp std::stack ert_stack; ErtComp ert_comp; +#endif +#warning And _why_ is this here? (Lgb) +int unknown_layouts; } // anon -int unknown_layouts; - // candidate for move to BufferView // (at least some parts in the beginning of the func) // @@ -311,12 +301,11 @@ int unknown_layouts; bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par) { unknown_layouts = 0; -#ifdef NO_LATEX +#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; @@ -336,9 +325,9 @@ bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par) 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(); - string const pretoken = lex.GetString(); + string const pretoken = lex.getString(); if (pretoken == "\\layout") { lex.pushToken(pretoken); break; @@ -346,9 +335,9 @@ bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par) } } - while (lex.IsOK()) { + while (lex.isOK()) { lex.nextToken(); - string const token = lex.GetString(); + string const token = lex.getString(); if (token.empty()) continue; @@ -374,20 +363,22 @@ bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par) s += tostr(unknown_layouts); s += _(" paragraphs"); } - WriteAlert(_("Textclass Loading Error!"),s); + WriteAlert(_("Textclass Loading Error!"), s, + _("When reading " + fileName())); } return the_end_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); + Inset * inset = new InsetERT(ert_comp.contents, true); par->insertInset(pos++, inset, font); ert_comp.contents.erase(); } @@ -395,6 +386,7 @@ void Buffer::insertErtContents(Paragraph * par, int & pos, ert_comp.active = false; } } +#endif bool @@ -406,6 +398,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, ) { 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. @@ -415,9 +408,9 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, static Paragraph * minipar; static Paragraph * parBeforeMinipage; #endif - +#endif if (token[0] != '\\') { -#ifdef NO_LATEX +#ifndef NO_COMPABILITY if (ert_comp.active) { ert_comp.contents += token; } else { @@ -427,8 +420,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, par->insertChar(pos, (*cit), font); ++pos; } - checkminipage = true; -#ifdef NO_LATEX +#ifndef NO_COMPABILITY } #endif } else if (token == "\\i") { @@ -437,18 +429,18 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, par->insertInset(pos, inset, font); ++pos; } else if (token == "\\layout") { -#ifdef NO_LATEX +#ifndef NO_COMPABILITY ert_comp.in_tabular = false; // Do the insetert. insertErtContents(par, pos, font); #endif - lex.EatLine(); - string const layoutname = lex.GetString(); + lex.eatLine(); + string const layoutname = lex.getString(); pair pp = textclasslist.NumberOfLayout(params.textclass, layoutname); -#ifdef NO_LATEX +#ifndef NO_COMPABILITY if (compare_no_case(layoutname, "latex") == 0) { ert_comp.active = true; } @@ -514,6 +506,10 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, 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) @@ -543,11 +539,17 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, } #endif +#ifndef NO_COMPABILITY } else if (token == "\\begin_float") { + 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; @@ -555,49 +557,56 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, 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" - << "wide false\n"; + << "wide false\n" + << "collapsed false\n"; } else if (tmptok == "tab") { inset = new InsetFloat("table"); old_float << "placement htbp\n" - << "wide false\n"; + << "wide false\n" + << "collapsed false\n"; } else if (tmptok == "alg") { inset = new InsetFloat("algorithm"); old_float << "placement htbp\n" - << "wide false\n"; + << "wide false\n" + << "collapsed false\n"; } else if (tmptok == "wide-fig") { inset = new InsetFloat("figure"); //InsetFloat * tmp = new InsetFloat("figure"); //tmp->wide(true); //inset = tmp; old_float << "placement htbp\n" - << "wide true\n"; + << "wide true\n" + << "collapsed false\n"; } else if (tmptok == "wide-tab") { inset = new InsetFloat("table"); //InsetFloat * tmp = new InsetFloat("table"); //tmp->wide(true); //inset = tmp; old_float << "placement htbp\n" - << "wide true\n"; + << "wide true\n" + << "collapsed false\n"; } if (!inset) { +#ifndef NO_PEXTRA_REALLY --call_depth; +#endif return false; // no end read yet } - - old_float << "collapsed true\n"; // Here we need to check for \end_deeper and handle that // before we do the footnote parsing. // This _is_ a hack! (Lgb) while (true) { lex.next(); - string const tmp = lex.GetString(); + string const tmp = lex.getString(); if (tmp == "\\end_deeper") { //lyxerr << "\\end_deeper caught!" << endl; if (!depth) { @@ -623,6 +632,8 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, inset->read(this, nylex); par->insertInset(pos, inset, font); ++pos; + insertErtContents(par, pos, font); +#endif } else if (token == "\\begin_deeper") { ++depth; } else if (token == "\\end_deeper") { @@ -635,15 +646,15 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& 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; } @@ -660,20 +671,20 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& 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->params().noindent(true); } else if (token == "\\fill_top") { @@ -691,21 +702,21 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, } else if (token == "\\start_of_appendix") { 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 = @@ -734,7 +745,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, } } else if (token == "\\quotes_times") { lex.nextToken(); - switch (lex.GetInteger()) { + switch (lex.getInteger()) { case 1: params.quotes_times = InsetQuotes::SingleQ; break; @@ -743,13 +754,13 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& 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; @@ -757,75 +768,81 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& 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 @@ -836,9 +853,9 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& 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 @@ -849,19 +866,19 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& 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") { @@ -873,7 +890,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& 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'"); } @@ -886,7 +903,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, } } else if (token == "\\paragraph_spacing") { lex.next(); - string const tmp = strip(lex.GetString()); + string const tmp = strip(lex.getString()); if (tmp == "single") { par->params().spacing(Spacing(Spacing::Single)); } else if (tmp == "onehalf") { @@ -896,46 +913,29 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, } else if (tmp == "other") { lex.next(); par->params().spacing(Spacing(Spacing::Other, - lex.GetFloat())); + 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()); -#ifndef NO_LATEX -#ifdef WITH_WARNINGS -#warning compatability hack needed -#endif + 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 - lex.printError("Unknown LaTeX font flag " - "`$$Token'"); -#else - } else if (token == "\\latex") { - lex.next(); - string const tok = lex.GetString(); + string const tok = lex.getString(); if (tok == "no_latex") { // Do the insetert. insertErtContents(par, pos, font); @@ -951,7 +951,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, #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); @@ -961,13 +961,13 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& 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); @@ -980,12 +980,12 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& 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 ??? int const tmpret2 = int(pow(2.0, tmpret)); @@ -994,33 +994,35 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, } } else if (token == "\\added_space_top") { lex.nextToken(); - par->params().spaceTop(VSpace(lex.GetString())); + par->params().spaceTop(VSpace(lex.getString())); } else if (token == "\\added_space_bottom") { lex.nextToken(); - par->params().spaceBottom(VSpace(lex.GetString())); + par->params().spaceBottom(VSpace(lex.getString())); +#ifndef NO_COMPABILITY #ifndef NO_PEXTRA_REALLY } else if (token == "\\pextra_type") { lex.nextToken(); - par->params().pextraType(lex.GetInteger()); + par->params().pextraType(lex.getInteger()); } else if (token == "\\pextra_width") { lex.nextToken(); - par->params().pextraWidth(lex.GetString()); + par->params().pextraWidth(lex.getString()); } else if (token == "\\pextra_widthp") { lex.nextToken(); - par->params().pextraWidthp(lex.GetString()); + par->params().pextraWidthp(lex.getString()); } else if (token == "\\pextra_alignment") { lex.nextToken(); - par->params().pextraAlignment(lex.GetInteger()); + par->params().pextraAlignment(lex.getInteger()); } else if (token == "\\pextra_hfill") { lex.nextToken(); - par->params().pextraHfill(lex.GetInteger()); + par->params().pextraHfill(lex.getInteger()); } else if (token == "\\pextra_start_minipage") { lex.nextToken(); - par->params().pextraStartMinipage(lex.GetInteger()); + par->params().pextraStartMinipage(lex.getInteger()); +#endif #endif } else if (token == "\\labelwidthstring") { - lex.EatLine(); - par->params().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" @@ -1031,15 +1033,16 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, // But insets should read it, it is a part of // the inset isn't it? Lgb. } else if (token == "\\begin_inset") { -#ifdef NO_LATEX +#ifndef NO_COMPABILITY insertErtContents(par, pos, font, false); ert_stack.push(ert_comp); ert_comp = ErtComp(); #endif readInset(lex, par, pos, font); -#ifdef NO_LATEX +#ifndef NO_COMPABILITY ert_comp = ert_stack.top(); ert_stack.pop(); + insertErtContents(par, pos, font); #endif } else if (token == "\\SpecialChar") { LyXLayout const & layout = @@ -1048,9 +1051,9 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, // 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); } else if (next_token == "\\protected_separator" @@ -1070,8 +1073,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, } ++pos; } else if (token == "\\newline") { -#ifdef NO_LATEX - +#ifndef NO_COMPABILITY if (!ert_comp.in_tabular && ert_comp.active) { ert_comp.contents += char(Paragraph::META_NEWLINE); } else { @@ -1088,16 +1090,13 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, ++pos; #endif } else if (token == "\\LyXTable") { -#ifdef NO_LATEX +#ifndef NO_COMPABILITY ert_comp.in_tabular = true; #endif Inset * inset = new InsetTabular(*this); inset->read(this, lex); par->insertInset(pos, inset, font); ++pos; - // because of OLD_TABULAR_READ where tabulars have been - // one paragraph. - checkminipage = true; } else if (token == "\\hfill") { par->insertChar(pos, Paragraph::META_HFILL, font); ++pos; @@ -1123,26 +1122,30 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, } par->bibkey->read(this, lex); } else if (token == "\\backslash") { -#ifdef NO_LATEX +#ifndef NO_COMPABILITY if (ert_comp.active) { ert_comp.contents += "\\"; } else { #endif par->insertChar(pos, '\\', font); ++pos; -#ifdef NO_LATEX +#ifndef NO_COMPABILITY } #endif } else if (token == "\\the_end") { -#ifdef NO_LATEX +#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 { -#ifdef NO_LATEX +#ifndef NO_COMPABILITY if (ert_comp.active) { ert_comp.contents += token; } else { @@ -1156,11 +1159,22 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, par->insertChar(pos, (*cit), font); ++pos; } -#ifdef NO_LATEX +#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 @@ -1302,17 +1316,74 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, } } // End of pextra_minipage compability -#endif --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, 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; } @@ -1320,7 +1391,7 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par, Inset * inset = 0; lex.next(); - string const tmptok = lex.GetString(); + string const tmptok = lex.getString(); last_inset_read = tmptok; // test the different insets @@ -1330,7 +1401,9 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par, string const cmdName = inscmd.getCmdName(); - if (cmdName == "cite") { + // 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 (cmdName == "bibitem") { lex.printError("Wrong place for bibitem"); @@ -1369,6 +1442,7 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par, inset = new InsetParent(inscmd, *this); } } else { + bool alreadyread = false; if (tmptok == "Quotes") { inset = new InsetQuotes; } else if (tmptok == "External") { @@ -1377,10 +1451,18 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& 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); @@ -1398,21 +1480,21 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& 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) { @@ -1424,12 +1506,12 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& 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(); - 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(".,"); @@ -1455,7 +1537,7 @@ bool Buffer::readFile(LyXLex & lex, Paragraph * par) } } bool the_end = readLyXformat2(lex, par); - setPaperStuff(); + params.setPaperStuff(); // the_end was added in 213 if (file_format < 213) the_end = true; @@ -1602,7 +1684,7 @@ 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 + ofs << '#' << lyx_docversion << " created this file. For more info see http://www.lyx.org/\n" << "\\lyxformat " << LYX_FORMAT << "\n"; @@ -1652,7 +1734,7 @@ string const Buffer::asciiParagraph(Paragraph const * par, Paragraph::depth_type depth = 0; int ltype = 0; Paragraph::depth_type ltype_depth = 0; - unsigned int currlinelen = 0; + string::size_type currlinelen = 0; bool ref_printed = false; int noparbreak = 0; @@ -1714,9 +1796,6 @@ string const Buffer::asciiParagraph(Paragraph const * par, lyxerr << "Should this ever happen?" << endl; } -#ifndef NO_LATEX - LyXFont const font1 = LyXFont(LyXFont::ALL_INHERIT, params.language); -#endif for (Paragraph::size_type i = 0; i < par->size(); ++i) { if (!i && !noparbreak) { if (linelen > 0) @@ -1755,17 +1834,6 @@ string const Buffer::asciiParagraph(Paragraph const * par, currlinelen += (ltype_depth-depth)*2; } } -#ifndef NO_LATEX - LyXFont const font2 = par->getFontSettings(params, i); - if (font1.latex() != font2.latex()) { - if (font2.latex() == LyXFont::OFF) - islatex = 0; - else - islatex = 1; - } else { - islatex = 0; - } -#endif char c = par->getUChar(params, i); if (islatex) @@ -1808,11 +1876,7 @@ string const Buffer::asciiParagraph(Paragraph const * par, case Paragraph::META_HFILL: buffer << "\t"; break; - - case '\\': - buffer << "\\"; - break; - + default: if ((linelen > 0) && (currlinelen > (linelen - 10)) && (c == ' ') && ((i + 2) < par->size())) @@ -1828,11 +1892,11 @@ string const Buffer::asciiParagraph(Paragraph const * par, buffer << " "; currlinelen += (ltype_depth-depth)*2; } - } else if (c != '\0') + } else if (c != '\0') { buffer << c; - else if (c == '\0') + ++currlinelen; + } else lyxerr[Debug::INFO] << "writeAsciiFile: NULL char in structure." << endl; - ++currlinelen; break; } } @@ -1894,7 +1958,7 @@ 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"; @@ -2186,19 +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) { - 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(); - } - if (params.secnumdepth != tclass.secnumdepth()) { ofs << "\\setcounter{secnumdepth}{" << params.secnumdepth @@ -2313,6 +2364,19 @@ 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(); @@ -2445,8 +2509,8 @@ void Buffer::sgmlOpenTag(ostream & os, Paragraph::depth_type depth, string const & latexname) const { if (!latexname.empty() && latexname != "!-- --") - os << "" << "<" << latexname << ">"; - //os << string(depth, ' ') << "<" << latexname << ">\n"; + //os << "" << "<" << latexname << ">"; + os << string(depth, ' ') << "<" << latexname << ">\n"; } @@ -2454,8 +2518,8 @@ void Buffer::sgmlCloseTag(ostream & os, Paragraph::depth_type depth, string const & latexname) const { if (!latexname.empty() && latexname != "!-- --") - os << "" << "\n"; - //os << string(depth, ' ') << "\n"; + //os << "" << "\n"; + os << string(depth, ' ') << "\n"; } @@ -2481,14 +2545,16 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) 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); @@ -2500,7 +2566,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) } } - ofs << "\n"; @@ -2550,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, @@ -2638,35 +2704,11 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) } -void Buffer::docBookHandleCaption(ostream & os, string & inner_tag, - Paragraph::depth_type depth, int desc_on, - Paragraph * & par) -{ - Paragraph * tpar = par; - while (tpar - && (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; - } -} - - // checks, if newcol chars should be put into this line // writes newline, if necessary. namespace { -void linux_doc_line_break(ostream & os, string::size_type & colcount, +void sgmlLineBreak(ostream & os, string::size_type & colcount, string::size_type newcol) { colcount += newcol; @@ -2717,8 +2759,6 @@ void reset(PAR_TAG & p1, PAR_TAG const & p2) } // namespace anon - - // Handle internal paragraph parsing -- layout already processed. void Buffer::simpleLinuxDocOnePar(ostream & os, Paragraph * par, @@ -2744,7 +2784,7 @@ void Buffer::simpleLinuxDocOnePar(ostream & os, LyXFont::FONT_SHAPE shape_type = LyXFont::UP_SHAPE; bool is_em = false; - stack < PAR_TAG > tag_state; + stack tag_state; // parsing main loop for (Paragraph::size_type i = 0; i < par->size(); ++i) { @@ -2869,29 +2909,25 @@ void Buffer::simpleLinuxDocOnePar(ostream & os, continue; } - if ( -#ifndef NO_LATEX - font.latex() == LyXFont::ON || -#endif - style.latexparam() == "CDATA") { + if (style.latexparam() == "CDATA") { // "TeX"-Mode on == > SGML-Mode on. if (c != '\0') os << c; ++char_line_count; } else { string sgml_string; - if (par->linuxDocConvertChar(c, sgml_string) + 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 = false; } else { - linux_doc_line_break(os, char_line_count, 1); + sgmlLineBreak(os, char_line_count, 1); os << c; } } else { @@ -2910,15 +2946,15 @@ void Buffer::simpleLinuxDocOnePar(ostream & os, // resets description flag correctly if (desc_on) { // not closed... - linux_doc_line_break(os, char_line_count, 6); + sgmlLineBreak(os, char_line_count, 6); os << ""; } } // Print an error message. -void Buffer::linuxDocError(Paragraph * 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); @@ -2949,16 +2985,17 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) 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; @@ -2972,7 +3009,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) } sgmlOpenTag(ofs, 0, top); - ofs << "\n"; vector environment_stack(10); @@ -3043,9 +3080,9 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) 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")); command_name = style.latexname(); @@ -3160,9 +3197,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) break; } - string extra_par; - simpleDocBookOnePar(ofs, extra_par, par, desc_on, - depth + 1 + command_depth); + simpleDocBookOnePar(ofs, par, desc_on, depth+1+command_depth); par = par->next(); string end_tag; @@ -3227,7 +3262,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) } -void Buffer::simpleDocBookOnePar(ostream & os, string & extra, +void Buffer::simpleDocBookOnePar(ostream & os, Paragraph * par, int & desc_on, Paragraph::depth_type depth) const { @@ -3262,53 +3297,21 @@ void Buffer::simpleDocBookOnePar(ostream & os, string & extra, if (c == Paragraph::META_INSET) { Inset * inset = par->getInset(i); - 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; - } -#ifndef NO_LATEX - } else if (font.latex() == LyXFont::ON) { - // "TeX"-Mode on ==> SGML-Mode on. - if (c != '\0') - os << c; - ++char_line_count; -#endif + 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 << ' '; } } font_old = font; @@ -3341,7 +3344,7 @@ int Buffer::runChktex() string path = OnlyPath(filename); string const org_path = path; - if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)) { + if (lyxrc.use_tempdir || !IsDirWriteable(path)) { path = tmppath; } @@ -3370,7 +3373,7 @@ int Buffer::runChktex() // error insets after we ran chktex, this must be run: if (removedErrorInsets || res){ users->redraw(); - users->fitCursor(users->text); + users->fitCursor(); } users->owner()->allowInput(); @@ -3385,7 +3388,6 @@ void Buffer::validate(LaTeXFeatures & features) const textclasslist.TextClass(params.textclass); // AMS Style is at document level - features.amsstyle = (params.use_amsmath || tclass.provides(LyXTextClass::amsmath)); @@ -3432,33 +3434,6 @@ 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) { @@ -3505,10 +3480,21 @@ Buffer::Lists const Buffer::getLists() const { 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 while (par) { char const labeltype = @@ -3678,29 +3664,26 @@ void Buffer::resizeInsets(BufferView * bv) void Buffer::redraw() { users->redraw(); - users->fitCursor(users->text); + users->fitCursor(); } void Buffer::changeLanguage(Language const * from, Language const * to) { - Paragraph * par = paragraph; - while (par) { - par->changeLanguage(params, from, to); - par = par->next(); - } + ParIterator end = par_iterator_end(); + for (ParIterator it = par_iterator_begin(); it != end; ++it) + (*it)->changeLanguage(params, from, to); } bool Buffer::isMultiLingual() { - Paragraph * 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; } @@ -3761,3 +3744,15 @@ Paragraph * Buffer::getParFromID(int id) const } return 0; } + + +ParIterator Buffer::par_iterator_begin() +{ + return ParIterator(paragraph); +} + + +ParIterator Buffer::par_iterator_end() +{ + return ParIterator(); +}