X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.C;h=67ddc7672e3990fc07672b5c4c44491a1a8254db;hb=98c966c64594611e469313314abd1e59524adb4a;hp=0cc738b0ae648a42778cb1968563c57b2aa8007e;hpb=754d59b4a167b9cbf39473189b335fcc89baaca6;p=lyx.git diff --git a/src/buffer.C b/src/buffer.C index 0cc738b0ae..67ddc7672e 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -1,6 +1,6 @@ /* This file is part of - * ====================================================== - * + * ====================================================== + * * LyX, The Document Processor * * Copyright 1995 Matthias Ettrich @@ -9,7 +9,7 @@ * This file is Copyright 1996-2001 * Lars Gullik Bjønnes * - * ====================================================== + * ====================================================== */ #include @@ -21,7 +21,6 @@ #include "buffer.h" #include "bufferlist.h" #include "lyx_main.h" -#include "lyx_gui_misc.h" #include "LyXAction.h" #include "lyxrc.h" #include "lyxlex.h" @@ -58,15 +57,14 @@ #include "insets/insetnote.h" #include "insets/insetquotes.h" #include "insets/insetlatexaccent.h" -#include "insets/insetbib.h" -#include "insets/insetcite.h" +#include "insets/insetbib.h" +#include "insets/insetcite.h" #include "insets/insetexternal.h" -#include "insets/insetindex.h" +#include "insets/insetindex.h" #include "insets/insetinclude.h" #include "insets/insettoc.h" #include "insets/insetparent.h" #include "insets/insetspecialchar.h" -#include "insets/figinset.h" #include "insets/insettext.h" #include "insets/insetert.h" #include "insets/insetgraphics.h" @@ -89,7 +87,6 @@ #include "support/filetools.h" #include "support/path.h" #include "support/os.h" -#include "support/syscall.h" #include "support/lyxlib.h" #include "support/FileInfo.h" #include "support/lyxmanip.h" @@ -131,7 +128,6 @@ using std::stack; using std::list; using lyx::pos_type; -using lyx::layout_type; using lyx::textclass_type; // all these externs should eventually be removed. @@ -149,13 +145,13 @@ extern int tex_code_break_column; Buffer::Buffer(string const & file, bool ronly) - : paragraph(0), lyx_clean(true), bak_clean(true), + : paragraph(0), niceFile(true), lyx_clean(true), bak_clean(true), unnamed(false), dep_clean(0), read_only(ronly), - filename(file), users(0) + filename_(file), users(0) { lyxerr[Debug::INFO] << "Buffer::Buffer()" << endl; // filename = file; - filepath = OnlyPath(file); + filepath_ = OnlyPath(file); // paragraph = 0; // lyx_clean = true; // bak_clean = true; @@ -182,11 +178,11 @@ Buffer::~Buffer() // forgets it. if (users) users->buffer(0); - + if (!tmppath.empty()) { DestroyBufferTmpDir(tmppath); } - + Paragraph * par = paragraph; Paragraph * tmppar; while (par) { @@ -200,7 +196,7 @@ Buffer::~Buffer() string const Buffer::getLatexName(bool no_path) const { - string const name = ChangeExtension(MakeLatexName(filename), ".tex"); + string const name = ChangeExtension(MakeLatexName(fileName()), ".tex"); if (no_path) return OnlyFilename(name); else @@ -246,7 +242,7 @@ pair const Buffer::getLogName(void) const void Buffer::setReadonly(bool flag) { if (read_only != flag) { - read_only = flag; + read_only = flag; updateTitles(); users->owner()->getDialogs()->updateBufferDependent(false); } @@ -273,9 +269,9 @@ void Buffer::resetAutosaveTimers() const void Buffer::setFileName(string const & newfile) { - filename = MakeAbsPath(newfile); - filepath = OnlyPath(filename); - setReadonly(IsFileWriteable(filename) == 0); + filename_ = MakeAbsPath(newfile); + filepath_ = OnlyPath(filename_); + setReadonly(IsFileWriteable(filename_) == 0); updateTitles(); } @@ -286,7 +282,7 @@ namespace { string last_inset_read; #ifndef NO_COMPABILITY -struct ErtComp +struct ErtComp { ErtComp() : active(false), in_tabular(false) { } @@ -300,7 +296,9 @@ std::stack ert_stack; ErtComp ert_comp; #endif +#ifdef WITH_WARNINGS #warning And _why_ is this here? (Lgb) +#endif int unknown_layouts; int unknown_tokens; @@ -325,7 +323,7 @@ bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par) ert_comp.in_tabular = false; #endif int pos = 0; - Paragraph::depth_type depth = 0; + Paragraph::depth_type depth = 0; bool the_end_read = false; Paragraph * first_par = 0; @@ -335,6 +333,7 @@ bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par) if (!par) { par = new Paragraph; + par->layout(textclasslist[params.textclass].defaultLayoutName()); } else { // We are inserting into an existing document users->text->breakParagraph(users); @@ -361,13 +360,13 @@ bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par) lyxerr[Debug::PARSER] << "Handling token: `" << token << "'" << endl; - + the_end_read = parseSingleLyXformat2Token(lex, par, first_par, token, pos, depth, font); } - + if (!first_par) first_par = par; @@ -402,12 +401,13 @@ bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par) #ifndef NO_COMPABILITY -void Buffer::insertErtContents(Paragraph * par, int & pos, bool set_inactive) +void Buffer::insertErtContents(Paragraph * par, int & pos, 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); + Inset * inset = new InsetERT(params, params.language, + ert_comp.contents, true); par->insertInset(pos++, inset, ert_comp.font); ert_comp.contents.erase(); } @@ -422,7 +422,7 @@ bool Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, Paragraph *& first_par, string const & token, int & pos, - Paragraph::depth_type & depth, + Paragraph::depth_type & depth, LyXFont & font ) { @@ -434,7 +434,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, static int call_depth; ++call_depth; bool checkminipage = false; - static Paragraph * minipar; + static Paragraph * minipar = 0; static Paragraph * parBeforeMinipage; #endif #endif @@ -464,15 +464,24 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, insertErtContents(par, pos); #endif lex.eatLine(); - string const layoutname = lex.getString(); - //lyxerr << "Looking for layout '" - // << layoutname << "'!" << endl; - - pair pp - = textclasslist.NumberOfLayout(params.textclass, layoutname); - - //lyxerr << "Result: " << pp.first << "/" << pp.second << endl; - + string layoutname = lex.getString(); + + LyXTextClass const & tclass = textclasslist[params.textclass]; + + if (layoutname.empty()) { + layoutname = tclass.defaultLayoutName(); + } + + bool hasLayout = tclass.hasLayout(layoutname); + if (!hasLayout) { + lyxerr << "Layout '" << layoutname << "' does not" + << " exist in textclass '" << tclass.name() + << "'." << endl; + lyxerr << "Trying to use default layout instead." + << endl; + layoutname = tclass.defaultLayoutName(); + } + #ifndef NO_COMPABILITY if (compare_no_case(layoutname, "latex") == 0) { ert_comp.active = true; @@ -487,7 +496,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, // 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 @@ -512,14 +521,14 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, 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) @@ -536,46 +545,22 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, first_par = par; else { par = new Paragraph(par); + par->layout(textclasslist[params.textclass].defaultLayoutName()); } 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) - //lyxerr << "Layout '" << layoutname - // << "' was not found!" << endl; - - 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, - LyXFont(LyXFont::ALL_INHERIT, - params.language)); - } + par->layout(layoutname); // Test whether the layout is obsolete. LyXLayout const & layout = - textclasslist.Style(params.textclass, - par->layout); + textclasslist[params.textclass][par->layout()]; if (!layout.obsoleted_by().empty()) - par->layout = textclasslist - .NumberOfLayout(params.textclass, - layout.obsoleted_by()) - .second; + par->layout(layout.obsoleted_by()); 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 @@ -584,39 +569,39 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, //insertErtContents(par, pos, 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(); //lyxerr << "old float: " << tmptok << endl; - + Inset * inset = 0; stringstream old_float; - + if (tmptok == "footnote") { - inset = new InsetFoot; + inset = new InsetFoot(params); old_float << "collapsed true\n"; } else if (tmptok == "margin") { - inset = new InsetMarginal; + inset = new InsetMarginal(params); old_float << "collapsed true\n"; } else if (tmptok == "fig") { - inset = new InsetFloat("figure"); + inset = new InsetFloat(params, "figure"); old_float << "placement htbp\n" << "wide false\n" << "collapsed false\n"; } else if (tmptok == "tab") { - inset = new InsetFloat("table"); + inset = new InsetFloat(params, "table"); old_float << "placement htbp\n" << "wide false\n" << "collapsed false\n"; } else if (tmptok == "alg") { - inset = new InsetFloat("algorithm"); + inset = new InsetFloat(params, "algorithm"); old_float << "placement htbp\n" << "wide false\n" << "collapsed false\n"; } else if (tmptok == "wide-fig") { - inset = new InsetFloat("figure"); + inset = new InsetFloat(params, "figure"); //InsetFloat * tmp = new InsetFloat("figure"); //tmp->wide(true); //inset = tmp; @@ -624,7 +609,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, << "wide true\n" << "collapsed false\n"; } else if (tmptok == "wide-tab") { - inset = new InsetFloat("table"); + inset = new InsetFloat(params, "table"); //InsetFloat * tmp = new InsetFloat("table"); //tmp->wide(true); //inset = tmp; @@ -653,13 +638,13 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, "depth is already null"); } else --depth; - + } else { old_float << tmp << ' '; break; } } - + old_float << lex.getLongString("\\end_float") << "\n\\end_inset\n"; //lyxerr << "Float Body:\n" << old_float.str() << endl; @@ -686,18 +671,18 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, params.readPreamble(lex); } else if (token == "\\textclass") { lex.eatLine(); - pair pp = + pair pp = textclasslist.NumberOfClass(lex.getString()); if (pp.first) { params.textclass = pp.second; } else { - Alert::alert(string(_("Textclass error")), - string(_("The document uses an unknown textclass \"")) + + Alert::alert(string(_("Textclass error")), + string(_("The document uses an unknown textclass \"")) + lex.getString() + string("\"."), string(_("LyX will not be able to produce output correctly."))); params.textclass = 0; } - if (!textclasslist.Load(params.textclass)) { + if (!textclasslist[params.textclass].load()) { // if the textclass wasn't loaded properly // we need to either substitute another // or stop loading the file. @@ -705,7 +690,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, // stop loading... ideas?? ARRae980418 Alert::alert(_("Textclass Loading Error!"), string(_("Can't load textclass ")) + - textclasslist.NameOfClass(params.textclass), + textclasslist[params.textclass].name(), _("-- substituting default")); params.textclass = 0; } @@ -713,7 +698,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, lex.eatLine(); params.options = lex.getString(); } else if (token == "\\language") { - params.readLanguage(lex); + params.readLanguage(lex); } else if (token == "\\fontencoding") { lex.eatLine(); } else if (token == "\\inputencoding") { @@ -744,7 +729,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, int tmpret = lex.findToken(string_paragraph_separation); if (tmpret == -1) ++tmpret; - if (tmpret != LYX_LAYOUT_DEFAULT) + if (tmpret != LYX_LAYOUT_DEFAULT) params.paragraph_separation = static_cast(tmpret); } else if (token == "\\defskip") { @@ -762,7 +747,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, if (tmpret == -1) ++tmpret; if (tmpret != LYX_LAYOUT_DEFAULT) { - InsetQuotes::quote_language tmpl = + InsetQuotes::quote_language tmpl = InsetQuotes::EnglishQ; switch (tmpret) { case 0: @@ -782,18 +767,18 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, break; case 5: tmpl = InsetQuotes::DanishQ; - break; + break; } params.quotes_language = tmpl; } } else if (token == "\\quotes_times") { lex.nextToken(); switch (lex.getInteger()) { - case 1: - params.quotes_times = InsetQuotes::SingleQ; + case 1: + params.quotes_times = InsetQuotes::SingleQ; break; - case 2: - params.quotes_times = InsetQuotes::DoubleQ; + case 2: + params.quotes_times = InsetQuotes::DoubleQ; break; } } else if (token == "\\papersize") { @@ -825,7 +810,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, int tmpret = lex.findToken(string_orientation); if (tmpret == -1) ++tmpret; - if (tmpret != LYX_LAYOUT_DEFAULT) + if (tmpret != LYX_LAYOUT_DEFAULT) params.orientation = static_cast(tmpret); } else if (token == "\\paperwidth") { lex.next(); @@ -966,7 +951,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, } else if (token == "\\float_placement") { lex.nextToken(); params.float_placement = lex.getString(); - } else if (token == "\\family") { + } else if (token == "\\family") { lex.next(); font.setLyXFamily(lex.getString()); } else if (token == "\\series") { @@ -1041,10 +1026,16 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, } } else if (token == "\\added_space_top") { lex.nextToken(); - par->params().spaceTop(VSpace(lex.getString())); + VSpace value = VSpace(lex.getString()); + if ((value.length().len().value() != 0) || + (value.kind() != VSpace::LENGTH)) + par->params().spaceTop(value); } else if (token == "\\added_space_bottom") { lex.nextToken(); - par->params().spaceBottom(VSpace(lex.getString())); + VSpace value = VSpace(lex.getString()); + if ((value.length().len().value() != 0) || + (value.kind() != VSpace::LENGTH)) + par->params().spaceBottom(value); #ifndef NO_COMPABILITY #ifndef NO_PEXTRA_REALLY } else if (token == "\\pextra_type") { @@ -1093,8 +1084,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, #endif } else if (token == "\\SpecialChar") { LyXLayout const & layout = - textclasslist.Style(params.textclass, - par->getLayout()); + textclasslist[params.textclass][par->layout()]; // Insets don't make sense in a free-spacing context! ---Kayvan if (layout.free_spacing || par->isFreeSpacing()) { @@ -1152,8 +1142,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, // Remove it later some time...introduced with fileformat // 2.16. (Lgb) LyXLayout const & layout = - textclasslist.Style(params.textclass, - par->getLayout()); + textclasslist[params.textclass][par->layout()]; if (layout.free_spacing || par->isFreeSpacing()) { par->insertChar(pos, ' ', font); @@ -1167,7 +1156,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, InsetCommandParams p("bibitem", "dummy"); par->bibkey = new InsetBibKey(p); } - par->bibkey->read(this, lex); + par->bibkey->read(this, lex); } else if (token == "\\backslash") { #ifndef NO_COMPABILITY if (ert_comp.active) { @@ -1188,6 +1177,8 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, the_end_read = true; #ifndef NO_COMPABILITY #ifndef NO_PEXTRA_REALLY + if (minipar == par) + par = 0; minipar = parBeforeMinipage = 0; #endif #endif @@ -1202,10 +1193,11 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, lex.eatLine(); string const s = _("Unknown token: ") + token + " " + lex.text() + "\n"; - + // we can do this here this way because we're actually reading + // the buffer and don't care about LyXText right now. InsetError * new_inset = new InsetError(s); par->insertInset(pos, new_inset, LyXFont(LyXFont::ALL_INHERIT, - params.language)); + params.language)); #ifndef NO_COMPABILITY } @@ -1223,7 +1215,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, // 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 @@ -1232,7 +1224,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, // BEGIN pextra_minipage compability // This should be removed in 1.3.x (Lgb) // I don't think we should remove this so fast (Jug) - + // 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 @@ -1244,7 +1236,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, if (checkminipage && (call_depth == 1)) { checkminipage = false; if (minipar && (minipar != par) && - (par->params().pextraType()==Paragraph::PEXTRA_MINIPAGE)) + (par->params().pextraType() == Paragraph::PEXTRA_MINIPAGE)) { lyxerr << "minipages in a row" << endl; if (par->params().pextraStartMinipage()) { @@ -1252,7 +1244,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, // minipages in a row par->previous()->next(0); par->previous(0); - + Paragraph * tmp = minipar; while (tmp) { tmp->params().pextraType(0); @@ -1266,22 +1258,22 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, // create a new paragraph to insert the // minipages in the following case if (par->params().pextraStartMinipage() && - !par->params().pextraHfill()) - { + !par->params().pextraHfill()) { Paragraph * p = new Paragraph; - p->layout = 0; + p->layout(textclasslist[params.textclass].defaultLayoutName()); + p->previous(parBeforeMinipage); parBeforeMinipage->next(p); p->next(0); p->params().depth(parBeforeMinipage->params().depth()); parBeforeMinipage = p; } - InsetMinipage * mini = new InsetMinipage; + InsetMinipage * mini = new InsetMinipage(params); mini->pos(static_cast(par->params().pextraAlignment())); - mini->width(par->params().pextraWidth()); + mini->pageWidth(LyXLength(par->params().pextraWidth())); if (!par->params().pextraWidthp().empty()) { - lyxerr << "WP:" << mini->width() << endl; - mini->width(tostr(par->params().pextraWidthp())+"%"); + lyxerr << "WP:" << mini->pageWidth().asString() << endl; + mini->pageWidth(LyXLength((par->params().pextraWidthp())+"p%")); } Paragraph * op = mini->firstParagraph(); mini->inset.paragraph(par); @@ -1301,13 +1293,13 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, } 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 @@ -1343,7 +1335,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, // a sequence of minipages // in its own paragraph. Paragraph * p = new Paragraph; - p->layout = 0; + p->layout(textclasslist[params.textclass].defaultLayoutName()); p->previous(par->previous()); p->next(0); p->params().depth(depth); @@ -1357,15 +1349,25 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, if (!first_par || (first_par == par)) first_par = p; - InsetMinipage * mini = new InsetMinipage; + InsetMinipage * mini = new InsetMinipage(params); mini->pos(static_cast(minipar->params().pextraAlignment())); - mini->width(minipar->params().pextraWidth()); + mini->pageWidth(LyXLength(minipar->params().pextraWidth())); if (!par->params().pextraWidthp().empty()) { - lyxerr << "WP:" << mini->width() << endl; - mini->width(tostr(par->params().pextraWidthp())+"%"); + lyxerr << "WP:" << mini->pageWidth().asString() << endl; + mini->pageWidth(LyXLength((par->params().pextraWidthp())+"p%")); } + + Paragraph * op = mini->firstParagraph(); mini->inset.paragraph(minipar); - + // + // and free the old ones! + // + while(op) { + Paragraph * pp = op->next(); + delete op; + op = pp; + } + // Insert the minipage last in the // previous paragraph. if (minipar->params().pextraHfill()) { @@ -1385,21 +1387,21 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, // needed to insert the selection void Buffer::insertStringAsLines(Paragraph *& par, pos_type & pos, - LyXFont const & fn,string const & str) const + LyXFont const & fn,string const & str) const { - LyXLayout const & layout = textclasslist.Style(params.textclass, - par->getLayout()); + LyXLayout const & layout = + textclasslist[params.textclass][par->layout()]; LyXFont font = fn; - - (void)par->checkInsertChar(font); + + par->checkInsertChar(font); // insert the string, don't insert doublespace bool space_inserted = true; - for(string::const_iterator cit = str.begin(); + 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()); + if (par->size() || layout.keepempty) { + par->breakParagraph(params, pos, + layout.isEnvironment()); par = par->next(); pos = 0; space_inserted = true; @@ -1408,7 +1410,7 @@ void Buffer::insertStringAsLines(Paragraph *& par, pos_type & pos, } // do not insert consecutive spaces if !free_spacing } else if ((*cit == ' ' || *cit == '\t') && - space_inserted && !layout.free_spacing && + space_inserted && !layout.free_spacing && !par->isFreeSpacing()) { continue; @@ -1436,7 +1438,7 @@ void Buffer::insertStringAsLines(Paragraph *& par, pos_type & pos, space_inserted = (*cit == ' '); } - } + } } @@ -1448,7 +1450,7 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par, lyxerr << "Buffer::readInset: Consistency check failed." << endl; } - + Inset * inset = 0; lex.next(); @@ -1461,7 +1463,7 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par, inscmd.read(lex); 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) { @@ -1513,8 +1515,8 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par, } else if (tmptok == "Formula") { inset = new InsetFormula; } else if (tmptok == "Figure") { // Backward compatibility - inset = new InsetFig(100, 100, *this); - //inset = new InsetGraphics; +// inset = new InsetFig(100, 100, *this); + inset = new InsetGraphics; } else if (tmptok == "Graphics") { inset = new InsetGraphics; } else if (tmptok == "Info") {// backwards compatibility @@ -1523,26 +1525,26 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par, true); alreadyread = true; } else if (tmptok == "Note") { - inset = new InsetNote; + inset = new InsetNote(params); } else if (tmptok == "Include") { - InsetCommandParams p( "Include" ); + InsetCommandParams p("Include"); inset = new InsetInclude(p, *this); } else if (tmptok == "ERT") { - inset = new InsetERT; + inset = new InsetERT(params); } else if (tmptok == "Tabular") { inset = new InsetTabular(*this); } else if (tmptok == "Text") { - inset = new InsetText; + inset = new InsetText(params); } else if (tmptok == "Foot") { - inset = new InsetFoot; + inset = new InsetFoot(params); } else if (tmptok == "Marginal") { - inset = new InsetMarginal; + inset = new InsetMarginal(params); } else if (tmptok == "Minipage") { - inset = new InsetMinipage; + inset = new InsetMinipage(params); } else if (tmptok == "Float") { lex.next(); string tmptok = lex.getString(); - inset = new InsetFloat(tmptok); + inset = new InsetFloat(params, tmptok); #if 0 } else if (tmptok == "List") { inset = new InsetList; @@ -1550,14 +1552,14 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par, inset = new InsetList; #endif } else if (tmptok == "Caption") { - inset = new InsetCaption; + inset = new InsetCaption(params); } else if (tmptok == "FloatList") { inset = new InsetFloatList; } - + if (inset && !alreadyread) inset->read(this, lex); } - + if (inset) { par->insertInset(pos, inset, font); ++pos; @@ -1587,7 +1589,7 @@ bool Buffer::readFile(LyXLex & lex, Paragraph * par) Alert::alert(_("Warning!"), _("LyX file format is newer that what"), _("is supported in this LyX version. Expect some problems.")); - + } else if (file_format < LYX_FORMAT) { // old formats if (file_format < 200) { @@ -1616,7 +1618,7 @@ bool Buffer::readFile(LyXLex & lex, Paragraph * par) Alert::alert(_("ERROR!"), _("Unable to read file!")); return false; } - + // Should probably be moved to somewhere else: BufferView? LyXView? bool Buffer::save() const @@ -1670,7 +1672,7 @@ bool Buffer::save() const ifs.close(); ofs.close(); ::chmod(s.c_str(), fmode); - + if (::utime(s.c_str(), ×)) { lyxerr << "utime error." << endl; } @@ -1680,7 +1682,7 @@ bool Buffer::save() const } } } - + if (writeFile(fileName(), false)) { markLyxClean(); removeAutosaveFile(fileName()); @@ -1702,7 +1704,7 @@ bool Buffer::writeFile(string const & fname, bool flag) const // warnings, only cerr. // Needed for autosave in background or panic save (Matthias 120496) - if (read_only && (fname == filename)) { + if (read_only && (fname == fileName())) { // Here we should come with a question if we should // perform the write anyway. if (flag) @@ -1746,7 +1748,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"; @@ -1766,7 +1768,7 @@ bool Buffer::writeFile(string const & fname, bool flag) const // how to check if close went ok? // Following is an attempt... (BE 20001011) - + // good() returns false if any error occured, including some // formatting error. // bad() returns true if something bad happened in the buffer, @@ -1784,21 +1786,32 @@ bool Buffer::writeFile(string const & fname, bool flag) const } #endif } - + return status; } +namespace { + +pair const addDepth(int depth, int ldepth) +{ + int d = depth * 2; + if (ldepth > depth) + d += (ldepth - depth) * 2; + return make_pair(d, string(d, ' ')); +} + +} + + string const Buffer::asciiParagraph(Paragraph const * par, - unsigned int linelen, - bool noparbreak) const + unsigned int linelen, + bool noparbreak) const { ostringstream buffer; - ostringstream word; Paragraph::depth_type depth = 0; int ltype = 0; Paragraph::depth_type ltype_depth = 0; - string::size_type currlinelen = 0; bool ref_printed = false; // if (!par->previous()) { #if 0 @@ -1817,108 +1830,118 @@ string const Buffer::asciiParagraph(Paragraph const * par, #else depth = par->params().depth(); #endif - + // First write the layout - string const tmp = textclasslist.NameOfLayout(params.textclass, par->layout); - if (tmp == "Itemize") { + string const & tmp = par->layout(); + if (compare_no_case(tmp, "itemize") == 0) { ltype = 1; ltype_depth = depth + 1; - } else if (tmp == "Enumerate") { + } else if (compare_no_case(tmp, "enumerate") == 0) { ltype = 2; ltype_depth = depth + 1; - } else if (contains(tmp, "ection")) { + } else if (contains(lowercase(tmp), "ection")) { ltype = 3; ltype_depth = depth + 1; - } else if (contains(tmp, "aragraph")) { + } else if (contains(lowercase(tmp), "aragraph")) { ltype = 4; ltype_depth = depth + 1; - } else if (tmp == "Description") { + } else if (compare_no_case(tmp, "description") == 0) { ltype = 5; ltype_depth = depth + 1; - } else if (tmp == "Abstract") { + } else if (compare_no_case(tmp, "abstract") == 0) { ltype = 6; ltype_depth = 0; - } else if (tmp == "Bibliography") { + } else if (compare_no_case(tmp, "bibliography") == 0) { ltype = 7; ltype_depth = 0; } else { ltype = 0; ltype_depth = 0; } - - /* maybe some vertical spaces */ - - /* the labelwidthstring used in lists */ - - /* some lines? */ - - /* some pagebreaks? */ - - /* noindent ? */ - - /* what about the alignment */ + + /* maybe some vertical spaces */ + + /* the labelwidthstring used in lists */ + + /* some lines? */ + + /* some pagebreaks? */ + + /* noindent ? */ + + /* what about the alignment */ // } else { // lyxerr << "Should this ever happen?" << endl; // } // linelen <= 0 is special and means we don't have pargraph breaks + + string::size_type currlinelen = 0; + if (!noparbreak) { if (linelen > 0) buffer << "\n\n"; - for (Paragraph::depth_type j = 0; j < depth; ++j) - buffer << " "; - currlinelen = depth * 2; + + buffer << string(depth * 2, ' '); + currlinelen += depth * 2; + //-- // we should probably change to the paragraph language in the // gettext here (if possible) so that strings are outputted in // the correct language! (20012712 Jug) - //-- + //-- switch (ltype) { case 0: // Standard case 4: // (Sub)Paragraph case 5: // Description break; case 6: // Abstract - if (linelen > 0) + if (linelen > 0) { buffer << _("Abstract") << "\n\n"; - else - buffer << _("Abstract: "); + currlinelen = 0; + } else { + string const abst = _("Abstract: "); + buffer << abst; + currlinelen += abst.length(); + } break; case 7: // Bibliography if (!ref_printed) { - if (linelen > 0) + if (linelen > 0) { buffer << _("References") << "\n\n"; - else - buffer << _("References: "); + currlinelen = 0; + } else { + string const refs = _("References: "); + buffer << refs; + currlinelen += refs.length(); + } + ref_printed = true; } break; default: - buffer << par->params().labelString() << " "; - break; + { + string const parlab = par->params().labelString(); + buffer << parlab << " "; + currlinelen += parlab.length() + 1; + } + break; + } } - string s = buffer.str(); - if (s.rfind('\n') != string::npos) { - string dummy; - s = rsplit(buffer.str().c_str(), dummy, '\n'); - } - currlinelen = s.length(); + if (!currlinelen) { - for (Paragraph::depth_type j = 0; j < depth; ++j) - buffer << " "; - currlinelen = depth * 2; - if (ltype_depth > depth) { - for (Paragraph::depth_type j = ltype_depth; - j > depth; --j) - { - buffer << " "; - } - currlinelen += (ltype_depth-depth)*2; - } + pair p = addDepth(depth, ltype_depth); + buffer << p.second; + currlinelen += p.first; } - // this is to change the linebreak to do it by word a bit more intelligent - // hopefully! (only in the case where we have a max linelenght!) (Jug) + + // this is to change the linebreak to do it by word a bit more + // intelligent hopefully! (only in the case where we have a + // max linelenght!) (Jug) + + string word; + for (pos_type i = 0; i < par->size(); ++i) { char c = par->getUChar(params, i); switch (c) { @@ -1927,87 +1950,78 @@ string const Buffer::asciiParagraph(Paragraph const * par, Inset const * inset = par->getInset(i); if (inset) { if (linelen > 0) { - buffer << word.str(); - word.str(""); + buffer << word; + currlinelen += word.length(); + word.erase(); } if (inset->ascii(this, buffer, linelen)) { // to be sure it breaks paragraph currlinelen += linelen; } -#if 0 - else { - string dummy; - string const s = - rsplit(buffer.str().c_str(), - dummy, '\n'); - currlinelen = s.length(); - } -#endif } } break; - + case Paragraph::META_NEWLINE: if (linelen > 0) { - buffer << word.str() << "\n"; - word.str(""); - for (Paragraph::depth_type j = 0; - j < depth; ++j) - buffer << " "; - currlinelen = depth * 2; - if (ltype_depth > depth) { - for (Paragraph::depth_type j = ltype_depth; - j > depth; --j) - buffer << " "; - currlinelen += (ltype_depth - depth) * 2; - } + buffer << word << "\n"; + word.erase(); + + pair p = addDepth(depth, + ltype_depth); + buffer << p.second; + currlinelen = p.first; } break; - + case Paragraph::META_HFILL: - buffer << word.str() << "\t"; - currlinelen += word.str().length() + 1; - word.str(""); + buffer << word << "\t"; + currlinelen += word.length() + 1; + word.erase(); break; default: if (c == ' ') { - buffer << word.str() << ' '; - currlinelen += word.str().length() + 1; - word.str(""); + if (linelen > 0 && + currlinelen + word.length() > linelen - 10) { + buffer << "\n"; + pair p = + addDepth(depth, ltype_depth); + buffer << p.second; + currlinelen = p.first; + } + + buffer << word << ' '; + currlinelen += word.length() + 1; + word.erase(); + } else { if (c != '\0') { - word << c; + word += c; } else { lyxerr[Debug::INFO] << "writeAsciiFile: NULL char in structure." << endl; } if ((linelen > 0) && - (currlinelen+word.str().length()) > linelen) + (currlinelen + word.length()) > linelen) { buffer << "\n"; - for (Paragraph::depth_type j = 0; j < depth; ++j) - buffer << " "; - currlinelen = depth * 2; - if (ltype_depth > depth) { - for (Paragraph::depth_type j = ltype_depth; - j > depth; --j) - { - buffer << " "; - } - currlinelen += (ltype_depth-depth)*2; - } + + pair p = + addDepth(depth, ltype_depth); + buffer << p.second; + currlinelen = p.first; } } break; } } - buffer << word.str(); + buffer << word; return buffer.str().c_str(); } -void Buffer::writeFileAscii(string const & fname, int linelen) +void Buffer::writeFileAscii(string const & fname, int linelen) { ofstream ofs(fname.c_str()); if (!ofs) { @@ -2018,7 +2032,7 @@ void Buffer::writeFileAscii(string const & fname, int linelen) } -void Buffer::writeFileAscii(ostream & ofs, int linelen) +void Buffer::writeFileAscii(ostream & ofs, int linelen) { Paragraph * par = paragraph; while (par) { @@ -2032,33 +2046,30 @@ void Buffer::writeFileAscii(ostream & ofs, int linelen) bool use_babel; -void Buffer::makeLaTeXFile(string const & fname, +void Buffer::makeLaTeXFile(string const & fname, string const & original_path, bool nice, bool only_body) { lyxerr[Debug::LATEX] << "makeLaTeXFile..." << endl; - - niceFile = nice; // this will be used by Insetincludes. - - tex_code_break_column = lyxrc.ascii_linelen; - - LyXTextClass const & tclass = - textclasslist.TextClass(params.textclass); ofstream ofs(fname.c_str()); if (!ofs) { Alert::err_alert(_("Error: Cannot open file: "), fname); return; } - + + niceFile = nice; // this will be used by Insetincludes. + + tex_code_break_column = lyxrc.ascii_linelen; + // validate the buffer. lyxerr[Debug::LATEX] << " Validating buffer..." << endl; - LaTeXFeatures features(params, tclass.numLayouts()); + LaTeXFeatures features(params); validate(features); lyxerr[Debug::LATEX] << " Buffer validation done." << endl; - + texrow.reset(); - // The starting paragraph of the coming rows is the + // The starting paragraph of the coming rows is the // first paragraph of the document. (Asger) texrow.start(paragraph, 0); @@ -2072,7 +2083,7 @@ void Buffer::makeLaTeXFile(string const & fname, } lyxerr[Debug::INFO] << "lyx header finished" << endl; // There are a few differences between nice LaTeX and usual files: - // usual is \batchmode and has a + // usual is \batchmode and has a // special input@path to allow the including of figures // with either \input or \includegraphics (what figinsets do). // batchmode is not set if there is a tex_code_break_column. @@ -2081,33 +2092,37 @@ void Buffer::makeLaTeXFile(string const & fname, // original_path is set. This is done for usual tex-file, but not // for nice-latex-file. (Matthias 250696) if (!only_body) { - if (!nice){ + if (!nice) { // code for usual, NOT nice-latex-file ofs << "\\batchmode\n"; // changed // from \nonstopmode texrow.newline(); } if (!original_path.empty()) { + string inputpath = os::external_path(original_path); + subst(inputpath, "~", "\\string~"); ofs << "\\makeatletter\n" << "\\def\\input@path{{" - << os::external_path(original_path) << "/}}\n" + << inputpath << "/}}\n" << "\\makeatother\n"; texrow.newline(); texrow.newline(); texrow.newline(); } - + ofs << "\\documentclass"; - + + LyXTextClass const & tclass = textclasslist[params.textclass]; + 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 << "pt,"; } - - + + if (!params.use_geometry && (params.paperpackage == BufferParams::PACKAGE_NONE)) { switch (params.papersize) { @@ -2152,10 +2167,10 @@ void Buffer::makeLaTeXFile(string const & fname, options << "onecolumn,"; } - if (!params.use_geometry + if (!params.use_geometry && params.orientation == BufferParams::ORIENTATION_LANDSCAPE) options << "landscape,"; - + // language should be a parameter to \documentclass use_babel = false; ostringstream language_options; @@ -2180,17 +2195,15 @@ void Buffer::makeLaTeXFile(string const & fname, } string strOptions(options.str().c_str()); - if (!strOptions.empty()){ + if (!strOptions.empty()) { strOptions = strip(strOptions, ','); ofs << '[' << strOptions << ']'; } - - ofs << '{' - << textclasslist.LatexnameOfClass(params.textclass) - << "}\n"; + + ofs << '{' << tclass.latexname() << "}\n"; texrow.newline(); // end of \documentclass defs - + // font selection must be done before loading fontenc.sty // The ae package is not needed when using OT1 font encoding. if (params.fonts != "default" && @@ -2213,7 +2226,7 @@ void Buffer::makeLaTeXFile(string const & fname, string const doc_encoding = params.language->encoding()->LatexName(); - // Create a list with all the input encodings used + // Create a list with all the input encodings used // in the document set encodings = features.getEncodingSet(doc_encoding); @@ -2354,10 +2367,10 @@ void Buffer::makeLaTeXFile(string const & fname, << "}\n"; texrow.newline(); } - + if (params.paragraph_separation) { switch (params.defskip.kind()) { - case VSpace::SMALLSKIP: + case VSpace::SMALLSKIP: ofs << "\\setlength\\parskip{\\smallskipamount}\n"; break; case VSpace::MEDSKIP: @@ -2376,7 +2389,7 @@ void Buffer::makeLaTeXFile(string const & fname, break; } texrow.newline(); - + ofs << "\\setlength\\parindent{0pt}\n"; texrow.newline(); } @@ -2398,7 +2411,7 @@ void Buffer::makeLaTeXFile(string const & fname, + tmppreamble + '\n'; } - // the text class specific preamble + // the text class specific preamble tmppreamble = features.getTClassPreamble(); if (!tmppreamble.empty()) { preamble += "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% " @@ -2420,7 +2433,7 @@ void Buffer::makeLaTeXFile(string const & fname, // in the user-defined preamble -- ARRae // Actually it has to be done much later than that // since some packages like frenchb make modifications - // at \begin{document} time -- JMarc + // at \begin{document} time -- JMarc string bullets_def; for (int i = 0; i < 4; ++i) { if (params.user_defined_bullets[i] != ITEMIZE_DEFAULTS[i]) { @@ -2441,8 +2454,8 @@ void Buffer::makeLaTeXFile(string const & fname, bullets_def += 'v'; break; } - bullets_def += "}{" + - params.user_defined_bullets[i].getText() + bullets_def += "}{" + + params.user_defined_bullets[i].getText() + "}\n"; } } @@ -2483,7 +2496,7 @@ void Buffer::makeLaTeXFile(string const & fname, << endl; texrow.newline(); } - + latexParagraphs(ofs, paragraph, 0, texrow); // add this just in case after all the paragraphs @@ -2500,7 +2513,7 @@ void Buffer::makeLaTeXFile(string const & fname, if (!only_body) { ofs << "\\end{document}\n"; texrow.newline(); - + lyxerr[Debug::LATEX] << "makeLaTeXFile...done" << endl; } else { lyxerr[Debug::LATEX] << "LaTeXFile for inclusion made." @@ -2520,9 +2533,12 @@ void Buffer::makeLaTeXFile(string const & fname, if (ofs.fail()) { lyxerr << "File was not closed properly." << endl; } - + lyxerr[Debug::INFO] << "Finished making latex file." << endl; lyxerr[Debug::INFO] << "Row count was " << texrow.rows()-1 << "." << endl; + + // we want this to be true outside previews (for insetexternal) + niceFile = true; } @@ -2530,7 +2546,7 @@ void Buffer::makeLaTeXFile(string const & fname, // LaTeX all paragraphs from par to endpar, if endpar == 0 then to the end // void Buffer::latexParagraphs(ostream & ofs, Paragraph * par, - Paragraph * endpar, TexRow & texrow) const + Paragraph * endpar, TexRow & texrow) const { bool was_title = false; bool already_title = false; @@ -2544,22 +2560,22 @@ void Buffer::latexParagraphs(ostream & ofs, Paragraph * par, // any environment other then "Standard" to be valid! if ((in == 0) || !in->forceDefaultParagraphs(in)) { LyXLayout const & layout = - textclasslist.Style(params.textclass, par->layout); - - if (layout.intitle) { + textclasslist[params.textclass][par->layout()]; + + if (layout.intitle) { if (already_title) { lyxerr <<"Error in latexParagraphs: You" " should not mix title layouts" " with normal ones." << endl; } else was_title = true; - } else if (was_title && !already_title) { + } else if (was_title && !already_title) { ofs << "\\maketitle\n"; texrow.newline(); already_title = true; - was_title = false; + was_title = false; } - + if (layout.isEnvironment()) { par = par->TeXEnvironment(this, params, ofs, texrow); } else { @@ -2579,50 +2595,52 @@ void Buffer::latexParagraphs(ostream & ofs, Paragraph * par, bool Buffer::isLatex() const { - return textclasslist.TextClass(params.textclass).outputType() == LATEX; + return textclasslist[params.textclass].outputType() == LATEX; } bool Buffer::isLinuxDoc() const { - return textclasslist.TextClass(params.textclass).outputType() == LINUXDOC; + return textclasslist[params.textclass].outputType() == LINUXDOC; } bool Buffer::isLiterate() const { - return textclasslist.TextClass(params.textclass).outputType() == LITERATE; + return textclasslist[params.textclass].outputType() == LITERATE; } bool Buffer::isDocBook() const { - return textclasslist.TextClass(params.textclass).outputType() == DOCBOOK; + return textclasslist[params.textclass].outputType() == DOCBOOK; } bool Buffer::isSGML() const { - return textclasslist.TextClass(params.textclass).outputType() == LINUXDOC || - textclasslist.TextClass(params.textclass).outputType() == DOCBOOK; + LyXTextClass const & tclass = textclasslist[params.textclass]; + + return tclass.outputType() == LINUXDOC || + tclass.outputType() == DOCBOOK; } -void Buffer::sgmlOpenTag(ostream & os, Paragraph::depth_type depth, +void Buffer::sgmlOpenTag(ostream & os, Paragraph::depth_type, string const & latexname) const { if (!latexname.empty() && latexname != "!-- --") //os << "" << "<" << latexname << ">"; - os << string(depth, ' ') << "<" << latexname << ">\n"; + os << "<" << latexname << ">"; } -void Buffer::sgmlCloseTag(ostream & os, Paragraph::depth_type depth, +void Buffer::sgmlCloseTag(ostream & os, Paragraph::depth_type, string const & latexname) const { if (!latexname.empty() && latexname != "!-- --") //os << "" << "\n"; - os << string(depth, ' ') << "\n"; + os << ""; } @@ -2637,21 +2655,23 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) niceFile = nice; // this will be used by included files. - LyXTextClass const & tclass = - textclasslist.TextClass(params.textclass); + LaTeXFeatures features(params); - LaTeXFeatures features(params, tclass.numLayouts()); validate(features); texrow.reset(); - string top_element = textclasslist.LatexnameOfClass(params.textclass); + LyXTextClass const & tclass = textclasslist[params.textclass]; + + string top_element = tclass.latexname(); if (!body_only) { ofs << " environment_stack(5); while (par) { - LyXLayout const & style = - textclasslist.Style(params.textclass, - par->layout); + LyXLayout const & style = tclass[par->layout()]; // treat as a special case for compatibility with old code if (par->isInset(0)) { - Inset * inset = par->getInset(0); + Inset * inset = par->getInset(0); Inset::Code lyx_code = inset->lyxCode(); - if (lyx_code == Inset::TOC_CODE){ + if (lyx_code == Inset::TOC_CODE) { string const temp = "toc"; sgmlOpenTag(ofs, depth, temp); @@ -2705,14 +2723,14 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) // write opening SGML tags switch (style.latextype) { case LATEX_PARAGRAPH: - if (depth == par->params().depth() + if (depth == par->params().depth() && !environment_stack[depth].empty()) { sgmlCloseTag(ofs, depth, environment_stack[depth]); environment_stack[depth].erase(); - if (depth) + if (depth) --depth; else - ofs << "

"; + ofs << "

"; } sgmlOpenTag(ofs, depth, style.latexname()); break; @@ -2723,7 +2741,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) _("Error : Wrong depth for" " LatexType Command.\n")); - if (!environment_stack[depth].empty()){ + if (!environment_stack[depth].empty()) { sgmlCloseTag(ofs, depth, environment_stack[depth]); ofs << "

"; @@ -2735,7 +2753,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) case LATEX_ENVIRONMENT: case LATEX_ITEM_ENVIRONMENT: - if (depth == par->params().depth() + if (depth == par->params().depth() && environment_stack[depth] != style.latexname()) { sgmlCloseTag(ofs, depth, environment_stack[depth]); @@ -2792,10 +2810,10 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) break; } } - + // Close open tags for (int i=depth; i >= 0; --i) - sgmlCloseTag(ofs, depth, environment_stack[i]); + sgmlCloseTag(ofs, depth, environment_stack[i]); if (!body_only) { ofs << "\n\n"; @@ -2804,6 +2822,9 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) ofs.close(); // How to check for successful close + + // we want this to be true outside previews (for insetexternal) + niceFile = true; } @@ -2849,27 +2870,27 @@ string tag_name(PAR_TAG const & pt) { inline void operator|=(PAR_TAG & p1, PAR_TAG const & p2) { - p1 = static_cast(p1 | p2); + p1 = static_cast(p1 | p2); } inline void reset(PAR_TAG & p1, PAR_TAG const & p2) { - p1 = static_cast( p1 & ~p2); + p1 = static_cast(p1 & ~p2); } -} // namespace anon +} // anon // Handle internal paragraph parsing -- layout already processed. void Buffer::simpleLinuxDocOnePar(ostream & os, - Paragraph * par, - Paragraph::depth_type /*depth*/) + Paragraph * par, + Paragraph::depth_type /*depth*/) { - LyXLayout const & style = textclasslist.Style(params.textclass, - par->getLayout()); - string::size_type char_line_count = 5; // Heuristic choice ;-) + LyXLayout const & style = + textclasslist[params.textclass][par->layout()]; + string::size_type char_line_count = 5; // Heuristic choice ;-) // gets paragraph main font LyXFont font_old; @@ -2981,7 +3002,7 @@ void Buffer::simpleLinuxDocOnePar(ostream & os, } list < PAR_TAG > temp; - while (!tag_state.empty() && tag_close ) { + while (!tag_state.empty() && tag_close) { PAR_TAG k = tag_state.top(); tag_state.pop(); os << ""; @@ -3021,7 +3042,7 @@ void Buffer::simpleLinuxDocOnePar(ostream & os, string sgml_string; if (par->sgmlConvertChar(c, sgml_string) && !style.free_spacing && !par->isFreeSpacing()) - { + { // in freespacing mode, spaces are // non-breaking characters if (desc_on) {// if char is ' ' then... @@ -3057,13 +3078,21 @@ void Buffer::simpleLinuxDocOnePar(ostream & os, // Print an error message. -void Buffer::sgmlError(Paragraph * par, int pos, - string const & message) const +void Buffer::sgmlError(Paragraph * /*par*/, int /*pos*/, + string const & /*message*/) const { +#warning This is wrong we cannot insert an inset like this!!! + // I guess this was Jose' so I explain you more or less why this + // is wrong. This way you insert something in the paragraph and + // don't tell it to LyXText (row rebreaking and undo handling!!!) + // I deactivate this code, have a look at BufferView::insertErrors + // how you should do this correctly! (Jug 20020315) +#if 0 // insert an error marker in text InsetError * new_inset = new InsetError(message); - par->insertInset(pos, new_inset, LyXFont(LyXFont::ALL_INHERIT, - params.language)); + par->insertInset(pos, new_inset, LyXFont(LyXFont::ALL_INHERIT, + params.language)); +#endif } @@ -3079,22 +3108,22 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) niceFile = nice; // this will be used by Insetincludes. - LyXTextClass const & tclass = - textclasslist.TextClass(params.textclass); - - LaTeXFeatures features(params, tclass.numLayouts()); + LaTeXFeatures features(params); validate(features); - + texrow.reset(); - string top_element = textclasslist.LatexnameOfClass(params.textclass); + LyXTextClass const & tclass = textclasslist[params.textclass]; + string top_element = tclass.latexname(); if (!only_body) { ofs << "\n\n"; } - string top = top_element; + string top = top_element; top += " lang=\""; top += params.language->code(); top += "\""; @@ -3127,7 +3156,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) Paragraph::depth_type cmd_depth = 0; Paragraph::depth_type depth = 0; // paragraph depth - string item_name; + string item_name; string command_name; while (par) { @@ -3136,9 +3165,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) string c_params; int desc_on = 0; // description mode - LyXLayout const & style = - textclasslist.Style(params.textclass, - par->layout); + LyXLayout const & style = tclass[par->layout()]; // environment tag closing for (; depth > par->params().depth(); --depth) { @@ -3168,13 +3195,13 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) depth + command_depth, environment_inner[depth]); } - + sgmlCloseTag(ofs, depth + command_depth, environment_stack[depth]); - + environment_stack[depth].erase(); environment_inner[depth].erase(); - } + } // Write opening SGML tags. switch (style.latextype) { @@ -3188,14 +3215,14 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) sgmlError(par, 0, _("Error : Wrong depth for " "LatexType Command.\n")); - + command_name = style.latexname(); - + sgmlparam = style.latexparam(); c_params = split(sgmlparam, c_depth,'|'); - + cmd_depth = lyx::atoi(c_depth); - + if (command_flag) { if (cmd_depth < command_base) { for (Paragraph::depth_type j = command_depth; j >= command_base; --j) @@ -3220,9 +3247,9 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) // This is a hack while paragraphs can't have // attributes, like id in this case. if (par->isInset(0)) { - Inset * inset = par->getInset(0); + Inset * inset = par->getInset(0); Inset::Code lyx_code = inset->lyxCode(); - if (lyx_code == Inset::LABEL_CODE){ + if (lyx_code == Inset::LABEL_CODE) { command_name += " id=\""; command_name += (static_cast(inset))->getContents(); command_name += "\""; @@ -3246,7 +3273,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) } if (environment_stack[depth] != style.latexname()) { - if(environment_stack.size() == depth + 1) { + if (environment_stack.size() == depth + 1) { environment_stack.push_back("!-- --"); environment_inner.push_back("!-- --"); } @@ -3266,10 +3293,10 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) environment_inner[depth]); } } - + if (style.latextype == LATEX_ENVIRONMENT) { if (!style.latexparam().empty()) { - if(style.latexparam() == "CDATA") + if (style.latexparam() == "CDATA") ofs << ""; else sgmlCloseTag(ofs, depth + command_depth, @@ -3347,16 +3374,16 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) item_name = "listitem"; sgmlCloseTag(ofs, command_depth + depth, item_name); - if (environment_inner[depth] == "varlistentry") + if (environment_inner[depth] == "varlistentry") sgmlCloseTag(ofs, depth + command_depth, environment_inner[depth]); } - + sgmlCloseTag(ofs, depth + command_depth, environment_stack[depth]); } } - + for (int j = command_depth; j >= 0 ; --j) if (!command_stack[j].empty()) sgmlCloseTag(ofs, j, command_stack[j]); @@ -3366,6 +3393,9 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) ofs.close(); // How to check for successful close + + // we want this to be true outside previews (for insetexternal) + niceFile = true; } @@ -3375,8 +3405,8 @@ void Buffer::simpleDocBookOnePar(ostream & os, { bool emph_flag = false; - LyXLayout const & style = textclasslist.Style(params.textclass, - par->getLayout()); + LyXLayout const & style = + textclasslist[params.textclass][par->layout()]; LyXFont font_old = style.labeltype == LABEL_MANUAL ? style.labelfont : style.font; @@ -3393,18 +3423,23 @@ void Buffer::simpleDocBookOnePar(ostream & os, if (font.emph() == LyXFont::ON) { os << ""; emph_flag = true; - }else if(i) { + } else if (i) { os << ""; emph_flag = false; } } - - if ( par->isInset(i) ) { + + if (par->isInset(i)) { Inset * inset = par->getInset(i); // don't print the inset in position 0 if desc_on == 3 (label) - if ( i || desc_on != 3) + if ( i || desc_on != 3) { + if(style.latexparam() == "CDATA") + os << "]]>"; inset->docbook(this, os); + if(style.latexparam() == "CDATA") + os << "getChar(i); string sgml_string; @@ -3412,7 +3447,7 @@ void Buffer::simpleDocBookOnePar(ostream & os, if (style.pass_thru) { os << c; - } else if(style.free_spacing || par->isFreeSpacing() || c != ' ') { + } else if (style.free_spacing || par->isFreeSpacing() || c != ' ') { os << sgml_string; } else if (desc_on ==1) { ++char_line_count; @@ -3428,13 +3463,13 @@ void Buffer::simpleDocBookOnePar(ostream & os, if (emph_flag) { os << ""; } - + // resets description flag correctly if (desc_on == 1) { // not closed... - os << ""; + os << "\n "; } - if(style.free_spacing) os << '\n'; + if (style.free_spacing) os << '\n'; } @@ -3449,11 +3484,11 @@ int Buffer::runChktex() // get LaTeX-Filename string const name = getLatexName(); - string path = OnlyPath(filename); + string path = filePath(); string const org_path = path; if (lyxrc.use_tempdir || !IsDirWriteable(path)) { - path = tmppath; + path = tmppath; } Path p(path); // path to LaTeX file @@ -3466,7 +3501,7 @@ int Buffer::runChktex() makeLaTeXFile(name, org_path, false); TeXErrors terr; - Chktex chktex(lyxrc.chktex_command, name, filepath); + Chktex chktex(lyxrc.chktex_command, name, filePath()); int res = chktex.run(terr); // run chktex if (res == -1) { @@ -3479,7 +3514,7 @@ int Buffer::runChktex() // if we removed error insets before we ran chktex or if we inserted // error insets after we ran chktex, this must be run: - if (removedErrorInsets || res){ + if (removedErrorInsets || res) { users->redraw(); users->fitCursor(); } @@ -3492,13 +3527,12 @@ int Buffer::runChktex() void Buffer::validate(LaTeXFeatures & features) const { Paragraph * par = paragraph; - LyXTextClass const & tclass = - textclasslist.TextClass(params.textclass); - - // AMS Style is at document level - if (params.use_amsmath || tclass.provides(LyXTextClass::amsmath)) + LyXTextClass const & tclass = textclasslist[params.textclass]; + + // AMS Style is at document level + if (params.use_amsmath || tclass.provides(LyXTextClass::amsmath)) features.require("amsmath"); - + while (par) { // We don't use "lyxerr.debug" because of speed. (Asger) if (lyxerr.debugging(Debug::LATEX)) @@ -3535,7 +3569,7 @@ void Buffer::validate(LaTeXFeatures & features) const } } } - + if (lyxerr.debugging(Debug::LATEX)) { features.showStruct(); } @@ -3549,7 +3583,7 @@ string const Buffer::getIncludeonlyList(char delim) for (inset_iterator it = inset_iterator_begin(); it != inset_iterator_end(); ++it) { if ((*it)->lyxCode() == Inset::INCLUDE_CODE) { - InsetInclude * insetinc = + InsetInclude * insetinc = static_cast(*it); if (insetinc->isIncludeOnly()) { if (!lst.empty()) @@ -3589,57 +3623,44 @@ 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; - textclass_type const cap = tmp.second; - -#else - // This is the prefered way to to this, but boost::tie can break - // some compilers - bool found; - textclass_type cap; - boost::tie(found, cap) = textclasslist - .NumberOfLayout(params.textclass, "Caption"); -#endif + LyXTextClass const & textclass = textclasslist[params.textclass]; + bool found = textclass.hasLayout("Caption"); + string const layout("Caption"); while (par) { - char const labeltype = - textclasslist.Style(params.textclass, - par->getLayout()).labeltype; - + char const labeltype = textclass[par->layout()].labeltype; + if (labeltype >= LABEL_COUNTER_CHAPTER && labeltype <= LABEL_COUNTER_CHAPTER + params.tocdepth) { // insert this into the table of contents SingleList & item = l["TOC"]; int depth = max(0, - labeltype - - textclasslist.TextClass(params.textclass).maxcounter()); + labeltype - + 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) { + if (tmp->layout() == layout) { SingleList & item = l[type]; string const str = tostr(item.size()+1) + ". " + tmp->asString(this, false); @@ -3650,9 +3671,9 @@ Buffer::Lists const Buffer::getLists() const } } } else { - lyxerr << "caption not found" << endl; + lyxerr << "Caption not found" << endl; } - + par = par->next(); } return l; @@ -3664,7 +3685,7 @@ vector > const Buffer::getBibkeyList() { /// if this is a child document and the parent is already loaded /// Use the parent's list instead [ale990412] - if (!params.parentname.empty() && bufferlist.exists(params.parentname)) { + if (!params.parentname.empty() && bufferlist.exists(params.parentname)) { Buffer * tmp = bufferlist.getBuffer(params.parentname); if (tmp) return tmp->getBibkeyList(); @@ -3695,7 +3716,7 @@ vector > const Buffer::getBibkeyList() } } } - + return keys; } @@ -3748,7 +3769,7 @@ bool Buffer::dispatch(int action, string const & argument) { bool dispatched = true; switch (action) { - case LFUN_EXPORT: + case LFUN_EXPORT: Exporter::Export(this, argument, false); break; @@ -3771,8 +3792,8 @@ void Buffer::resizeInsets(BufferView * bv) void Buffer::redraw() { - users->redraw(); - users->fitCursor(); + users->redraw(); + users->fitCursor(); } @@ -3855,11 +3876,11 @@ Paragraph * Buffer::getParFromID(int id) const ParIterator Buffer::par_iterator_begin() { - return ParIterator(paragraph); + return ParIterator(paragraph); } ParIterator Buffer::par_iterator_end() { - return ParIterator(); + return ParIterator(); }