X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.C;h=5c07e74c5670af0ccdb2fc37800ec3f9dcd0cd16;hb=b0babedcb7a9f4c737540d8ac7007b12ff5d979b;hp=0cc738b0ae648a42778cb1968563c57b2aa8007e;hpb=754d59b4a167b9cbf39473189b335fcc89baaca6;p=lyx.git diff --git a/src/buffer.C b/src/buffer.C index 0cc738b0ae..5c07e74c56 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 @@ -20,8 +20,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" @@ -32,7 +30,6 @@ #include "version.h" #include "LaTeX.h" #include "Chktex.h" -#include "LyXView.h" #include "debug.h" #include "LaTeXFeatures.h" #include "lyxtext.h" @@ -46,6 +43,10 @@ #include "ParagraphParameters.h" #include "iterators.h" #include "lyxtextclasslist.h" +#include "sgml.h" +#include "paragraph_funcs.h" + +#include "frontends/LyXView.h" #include "mathed/formulamacro.h" #include "mathed/formula.h" @@ -58,22 +59,23 @@ #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" #include "insets/insetfoot.h" #include "insets/insetmarginal.h" +#include "insets/insetoptarg.h" #include "insets/insetminipage.h" #include "insets/insetfloat.h" +#include "insets/insetwrap.h" #include "insets/insettabular.h" #if 0 #include "insets/insettheorem.h" @@ -85,16 +87,20 @@ #include "frontends/Dialogs.h" #include "frontends/Alert.h" +#include "graphics/Previews.h" + #include "support/textutils.h" #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" #include "support/lyxalgo.h" // for lyx::count +#include +#include + #include #include #include @@ -108,11 +114,13 @@ #include #include - #ifdef HAVE_LOCALE #include #endif +#ifndef CXX_GLOBAL_CSTD +using std::pow; +#endif using std::ostream; using std::ofstream; @@ -129,40 +137,27 @@ using std::max; using std::set; using std::stack; using std::list; +using std::for_each; using lyx::pos_type; -using lyx::layout_type; using lyx::textclass_type; // all these externs should eventually be removed. extern BufferList bufferlist; -extern LyXAction lyxaction; - namespace { -const int LYX_FORMAT = 220; +const int LYX_FORMAT = 221; } // namespace anon -extern int tex_code_break_column; - - Buffer::Buffer(string const & file, bool ronly) - : paragraph(0), lyx_clean(true), bak_clean(true), + : 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); -// paragraph = 0; -// lyx_clean = true; -// bak_clean = true; -// dep_clean = 0; -// read_only = ronly; -// unnamed = false; -// users = 0; + filepath_ = OnlyPath(file); lyxvc.buffer(this); if (read_only || lyxrc.use_tempdir) { tmppath = CreateBufferTmpDir(); @@ -182,25 +177,21 @@ Buffer::~Buffer() // forgets it. if (users) users->buffer(0); - + if (!tmppath.empty()) { DestroyBufferTmpDir(tmppath); } - - Paragraph * par = paragraph; - Paragraph * tmppar; - while (par) { - tmppar = par->next(); - delete par; - par = tmppar; - } - paragraph = 0; + + paragraphs.clear(); + + // Remove any previewed LaTeX snippets assocoated with this buffer. + grfx::Previews::get().removeLoader(this); } 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 @@ -208,7 +199,7 @@ string const Buffer::getLatexName(bool no_path) const } -pair const Buffer::getLogName(void) const +pair const Buffer::getLogName() const { string const filename = getLatexName(false); @@ -246,9 +237,9 @@ 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); + users->owner()->getDialogs().updateBufferDependent(false); } } @@ -273,9 +264,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(); } @@ -285,22 +276,9 @@ namespace { string last_inset_read; -#ifndef NO_COMPABILITY -struct ErtComp -{ - ErtComp() : active(false), in_tabular(false) { - } - string contents; - bool active; - bool in_tabular; - LyXFont font; -}; - -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; @@ -319,22 +297,22 @@ bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par) { unknown_layouts = 0; unknown_tokens = 0; -#ifndef NO_COMPABILITY - ert_comp.contents.erase(); - ert_comp.active = false; - ert_comp.in_tabular = false; -#endif + int pos = 0; - Paragraph::depth_type depth = 0; + Paragraph::depth_type depth = 0; bool the_end_read = false; Paragraph * first_par = 0; LyXFont font(LyXFont::ALL_INHERIT, params.language); + +#if 0 if (file_format < 216 && params.language->lang() == "hebrew") font.setLanguage(default_language); +#endif if (!par) { par = new Paragraph; + par->layout(params.getLyXTextClass().defaultLayout()); } else { // We are inserting into an existing document users->text->breakParagraph(users); @@ -361,17 +339,17 @@ 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; - paragraph = first_par; + paragraphs.set(first_par); if (unknown_layouts > 0) { string s = _("Couldn't set the layout for "); @@ -401,93 +379,65 @@ bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par) } -#ifndef NO_COMPABILITY -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); - par->insertInset(pos++, inset, ert_comp.font); - ert_comp.contents.erase(); - } - if (set_inactive) { - ert_comp.active = false; - } -} -#endif - - 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 ) { bool the_end_read = false; -#ifndef NO_COMPABILITY -#ifndef NO_PEXTRA_REALLY - // This is super temporary but is needed to get the compability - // mode for minipages work correctly together with new tabulars. - static int call_depth; - ++call_depth; - bool checkminipage = false; - static Paragraph * minipar; - static Paragraph * parBeforeMinipage; -#endif -#endif + + // The order of the tags tested may seem unnatural, but this + // has been done in order to reduce the number of string + // comparisons needed to recognize a given token. This leads + // on large documents like UserGuide to a reduction of a + // factor 5! (JMarc) if (token[0] != '\\') { -#ifndef NO_COMPABILITY - if (ert_comp.active) { - ert_comp.contents += token; - } else { -#endif for (string::const_iterator cit = token.begin(); cit != token.end(); ++cit) { par->insertChar(pos, (*cit), font); ++pos; } -#ifndef NO_COMPABILITY - } -#endif - } else if (token == "\\i") { - Inset * inset = new InsetLatexAccent; - inset->read(this, lex); - par->insertInset(pos, inset, font); - ++pos; } else if (token == "\\layout") { -#ifndef NO_COMPABILITY - ert_comp.in_tabular = false; - // Do the insetert. - insertErtContents(par, pos); + // reset the font as we start a new layout and if the font is + // not ALL_INHERIT,document_language then it will be set to the + // right values after this tag (Jug 20020420) + font = LyXFont(LyXFont::ALL_INHERIT, params.language); + +#if 0 + if (file_format < 216 && params.language->lang() == "hebrew") + font.setLanguage(default_language); #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; - -#ifndef NO_COMPABILITY - if (compare_no_case(layoutname, "latex") == 0) { - ert_comp.active = true; - ert_comp.font = font; + string layoutname = lex.getString(); + + LyXTextClass const & tclass = params.getLyXTextClass(); + + if (layoutname.empty()) { + layoutname = tclass.defaultLayoutName(); } -#endif + 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(); + } + #ifdef USE_CAPTION // The is the compability reading of layout caption. // It can be removed in LyX version 1.3.0. (Lgb) - if (compare_no_case(layoutname, "caption") == 0) { + if (compare_ascii_no_case(layoutname, "caption") == 0) { // We expect that the par we are now working on is // really inside a InsetText inside a InsetFloat. // We also know that captions can only be // one paragraph. (Lgb) - + // We should now read until the next "\layout" // is reached. // This is probably not good enough, what if the @@ -512,14 +462,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,143 +486,109 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, first_par = par; else { par = new Paragraph(par); + par->layout(params.getLyXTextClass().defaultLayout()); } 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(params.getLyXTextClass()[layoutname]); // Test whether the layout is obsolete. - LyXLayout const & layout = - textclasslist.Style(params.textclass, - par->layout); - if (!layout.obsoleted_by().empty()) - par->layout = textclasslist - .NumberOfLayout(params.textclass, - layout.obsoleted_by()) - .second; + LyXLayout_ptr const & layout = par->layout(); + if (!layout->obsoleted_by().empty()) + par->layout(params.getLyXTextClass()[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 - } else if (token == "\\begin_float") { - insertErtContents(par, pos); - //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) + } else if (token == "\\end_inset") { + lyxerr << "Solitary \\end_inset. Missing \\begin_inset?.\n" + << "Last inset read was: " << last_inset_read + << endl; + // Simply ignore this. The insets do not have + // to read this. + // But insets should read it, it is a part of + // the inset isn't it? Lgb. + } else if (token == "\\begin_inset") { + readInset(lex, par, pos, font); + } else if (token == "\\family") { lex.next(); - string const tmptok = lex.getString(); - //lyxerr << "old float: " << tmptok << endl; - - Inset * inset = 0; - stringstream old_float; - - if (tmptok == "footnote") { - inset = new InsetFoot; - old_float << "collapsed true\n"; - } else if (tmptok == "margin") { - inset = new InsetMarginal; - old_float << "collapsed true\n"; - } else if (tmptok == "fig") { - inset = new InsetFloat("figure"); - old_float << "placement htbp\n" - << "wide false\n" - << "collapsed false\n"; - } else if (tmptok == "tab") { - inset = new InsetFloat("table"); - old_float << "placement htbp\n" - << "wide false\n" - << "collapsed false\n"; - } else if (tmptok == "alg") { - inset = new InsetFloat("algorithm"); - old_float << "placement htbp\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" - << "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" - << "collapsed false\n"; - } - - if (!inset) { -#ifndef NO_PEXTRA_REALLY - --call_depth; -#endif - return false; // no end read yet + font.setLyXFamily(lex.getString()); + } else if (token == "\\series") { + lex.next(); + font.setLyXSeries(lex.getString()); + } else if (token == "\\shape") { + lex.next(); + font.setLyXShape(lex.getString()); + } else if (token == "\\size") { + lex.next(); + font.setLyXSize(lex.getString()); + } else if (token == "\\lang") { + lex.next(); + string const tok = lex.getString(); + Language const * lang = languages.getLanguage(tok); + if (lang) { + font.setLanguage(lang); + } else { + font.setLanguage(params.language); + lex.printError("Unknown language `$$Token'"); } + } else if (token == "\\numeric") { + lex.next(); + font.setNumber(font.setLyXMisc(lex.getString())); + } else if (token == "\\emph") { + lex.next(); + font.setEmph(font.setLyXMisc(lex.getString())); + } else if (token == "\\bar") { + lex.next(); + string const tok = lex.getString(); + // This is dirty, but gone with LyX3. (Asger) + if (tok == "under") + font.setUnderbar(LyXFont::ON); + else if (tok == "no") + font.setUnderbar(LyXFont::OFF); + else if (tok == "default") + font.setUnderbar(LyXFont::INHERIT); + else + lex.printError("Unknown bar font flag " + "`$$Token'"); + } else if (token == "\\noun") { + lex.next(); + font.setNoun(font.setLyXMisc(lex.getString())); + } else if (token == "\\color") { + lex.next(); + font.setLyXColor(lex.getString()); + } else if (token == "\\SpecialChar") { + LyXLayout_ptr const & layout = par->layout(); - // 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(); - if (tmp == "\\end_deeper") { - //lyxerr << "\\end_deeper caught!" << endl; - if (!depth) { - lex.printError("\\end_deeper: " - "depth is already null"); - } else - --depth; - - } else { - old_float << tmp << ' '; - break; + // Insets don't make sense in a free-spacing context! ---Kayvan + if (layout->free_spacing || par->isFreeSpacing()) { + if (lex.isOK()) { + lex.next(); + string next_token = lex.getString(); + if (next_token == "\\-") { + par->insertChar(pos, '-', font); + } else if (next_token == "~") { + par->insertChar(pos, ' ', font); + } else { + lex.printError("Token `$$Token' " + "is in free space " + "paragraph layout!"); + --pos; + } } + } else { + Inset * inset = new InsetSpecialChar; + inset->read(this, lex); + par->insertInset(pos, inset, font); } - - old_float << lex.getLongString("\\end_float") - << "\n\\end_inset\n"; - //lyxerr << "Float Body:\n" << old_float.str() << endl; - // That this does not work seems like a bug - // in stringstream. (Lgb) - istringstream istr(old_float.str()); - LyXLex nylex(0, 0); - nylex.setStream(istr); - inset->read(this, nylex); + ++pos; + } else if (token == "\\i") { + Inset * inset = new InsetLatexAccent; + inset->read(this, lex); par->insertInset(pos, inset, font); ++pos; - insertErtContents(par, pos); -#endif + } else if (token == "\\backslash") { + par->insertChar(pos, '\\', font); + ++pos; } else if (token == "\\begin_deeper") { ++depth; } else if (token == "\\end_deeper") { @@ -686,18 +602,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 (!params.getLyXTextClass().load()) { // if the textclass wasn't loaded properly // we need to either substitute another // or stop loading the file. @@ -705,7 +621,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), + params.getLyXTextClass().name(), _("-- substituting default")); params.textclass = 0; } @@ -713,7 +629,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") { @@ -726,6 +642,10 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, params.fonts = lex.getString(); } else if (token == "\\noindent") { par->params().noindent(true); + } else if (token == "\\leftindent") { + lex.nextToken(); + LyXLength value(lex.getString()); + par->params().leftIndent(value); } else if (token == "\\fill_top") { par->params().spaceTop(VSpace(VSpace::VFILL)); } else if (token == "\\fill_bottom") { @@ -744,56 +664,46 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, int tmpret = lex.findToken(string_paragraph_separation); if (tmpret == -1) ++tmpret; - if (tmpret != LYX_LAYOUT_DEFAULT) - params.paragraph_separation = - static_cast(tmpret); + params.paragraph_separation = + static_cast(tmpret); } else if (token == "\\defskip") { lex.nextToken(); params.defskip = VSpace(lex.getString()); -#ifndef NO_COMPABILITY - } 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); -#endif } else if (token == "\\quotes_language") { int tmpret = lex.findToken(string_quotes_language); if (tmpret == -1) ++tmpret; - if (tmpret != LYX_LAYOUT_DEFAULT) { - InsetQuotes::quote_language tmpl = - InsetQuotes::EnglishQ; - switch (tmpret) { - case 0: - tmpl = InsetQuotes::EnglishQ; - break; - case 1: - tmpl = InsetQuotes::SwedishQ; - break; - case 2: - tmpl = InsetQuotes::GermanQ; - break; - case 3: - tmpl = InsetQuotes::PolishQ; - break; - case 4: - tmpl = InsetQuotes::FrenchQ; - break; - case 5: - tmpl = InsetQuotes::DanishQ; - break; - } - params.quotes_language = tmpl; + InsetQuotes::quote_language tmpl = + InsetQuotes::EnglishQ; + switch (tmpret) { + case 0: + tmpl = InsetQuotes::EnglishQ; + break; + case 1: + tmpl = InsetQuotes::SwedishQ; + break; + case 2: + tmpl = InsetQuotes::GermanQ; + break; + case 3: + tmpl = InsetQuotes::PolishQ; + break; + case 4: + tmpl = InsetQuotes::FrenchQ; + break; + case 5: + tmpl = InsetQuotes::DanishQ; + 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,8 +735,8 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, int tmpret = lex.findToken(string_orientation); if (tmpret == -1) ++tmpret; - if (tmpret != LYX_LAYOUT_DEFAULT) - params.orientation = static_cast(tmpret); + params.orientation = + static_cast(tmpret); } else if (token == "\\paperwidth") { lex.next(); params.paperwidth = lex.getString(); @@ -856,7 +766,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, params.footskip = lex.getString(); } else if (token == "\\paperfontsize") { lex.nextToken(); - params.fontsize = strip(lex.getString()); + params.fontsize = rtrim(lex.getString()); } else if (token == "\\papercolumns") { lex.nextToken(); params.columns = lex.getInteger(); @@ -869,7 +779,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, } } else if (token == "\\paperpagestyle") { lex.nextToken(); - params.pagestyle = strip(lex.getString()); + params.pagestyle = rtrim(lex.getString()); } else if (token == "\\bullet") { lex.nextToken(); int const index = lex.getInteger(); @@ -924,7 +834,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, params.tocdepth = lex.getInteger(); } else if (token == "\\spacing") { lex.next(); - string const tmp = strip(lex.getString()); + string const tmp = rtrim(lex.getString()); Spacing::Space tmp_space = Spacing::Default; float tmp_val = 0.0; if (tmp == "single") { @@ -949,7 +859,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, } } else if (token == "\\paragraph_spacing") { lex.next(); - string const tmp = strip(lex.getString()); + string const tmp = rtrim(lex.getString()); if (tmp == "single") { par->params().spacing(Spacing(Spacing::Single)); } else if (tmp == "onehalf") { @@ -966,180 +876,37 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, } else if (token == "\\float_placement") { lex.nextToken(); params.float_placement = lex.getString(); - } else if (token == "\\family") { - lex.next(); - font.setLyXFamily(lex.getString()); - } else if (token == "\\series") { - lex.next(); - font.setLyXSeries(lex.getString()); - } else if (token == "\\shape") { - lex.next(); - font.setLyXShape(lex.getString()); - } else if (token == "\\size") { - lex.next(); - font.setLyXSize(lex.getString()); -#ifndef NO_COMPABILITY - } else if (token == "\\latex") { - lex.next(); - string const tok = lex.getString(); - if (tok == "no_latex") { - // Do the insetert. - insertErtContents(par, pos); - } else if (tok == "latex") { - ert_comp.active = true; - ert_comp.font = font; - } else if (tok == "default") { - // Do the insetert. - insertErtContents(par, pos); - } else { - lex.printError("Unknown LaTeX font flag " - "`$$Token'"); - } -#endif - } else if (token == "\\lang") { - lex.next(); - string const tok = lex.getString(); - Language const * lang = languages.getLanguage(tok); - if (lang) { - font.setLanguage(lang); - } else { - font.setLanguage(params.language); - lex.printError("Unknown language `$$Token'"); - } - } else if (token == "\\numeric") { - lex.next(); - font.setNumber(font.setLyXMisc(lex.getString())); - } else if (token == "\\emph") { - lex.next(); - font.setEmph(font.setLyXMisc(lex.getString())); - } else if (token == "\\bar") { - lex.next(); - string const tok = lex.getString(); - // This is dirty, but gone with LyX3. (Asger) - if (tok == "under") - font.setUnderbar(LyXFont::ON); - else if (tok == "no") - font.setUnderbar(LyXFont::OFF); - else if (tok == "default") - font.setUnderbar(LyXFont::INHERIT); - else - lex.printError("Unknown bar font flag " - "`$$Token'"); - } else if (token == "\\noun") { - lex.next(); - font.setNoun(font.setLyXMisc(lex.getString())); - } else if (token == "\\color") { - lex.next(); - font.setLyXColor(lex.getString()); } else if (token == "\\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)); - //lyxerr << "Tmpret2 = " << tmpret2 << endl; - par->params().align(LyXAlignment(tmpret2)); - } + int const tmpret2 = int(pow(2.0, tmpret)); + par->params().align(LyXAlignment(tmpret2)); } else if (token == "\\added_space_top") { lex.nextToken(); - par->params().spaceTop(VSpace(lex.getString())); + VSpace value = VSpace(lex.getString()); + // only add the length when value > 0 or + // with option keep + if ((value.length().len().value() != 0) || + value.keep() || + (value.kind() != VSpace::LENGTH)) + par->params().spaceTop(value); } else if (token == "\\added_space_bottom") { lex.nextToken(); - 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()); - } else if (token == "\\pextra_width") { - lex.nextToken(); - par->params().pextraWidth(lex.getString()); - } else if (token == "\\pextra_widthp") { - lex.nextToken(); - par->params().pextraWidthp(lex.getString()); - } else if (token == "\\pextra_alignment") { - lex.nextToken(); - par->params().pextraAlignment(lex.getInteger()); - } else if (token == "\\pextra_hfill") { - lex.nextToken(); - par->params().pextraHfill(lex.getInteger()); - } else if (token == "\\pextra_start_minipage") { - lex.nextToken(); - par->params().pextraStartMinipage(lex.getInteger()); -#endif -#endif + VSpace value = VSpace(lex.getString()); + // only add the length when value > 0 or + // with option keep + if ((value.length().len().value() != 0) || + value.keep() || + (value.kind() != VSpace::LENGTH)) + par->params().spaceBottom(value); } else if (token == "\\labelwidthstring") { 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" - << "Last inset read was: " << last_inset_read - << endl; - // Simply ignore this. The insets do not have - // to read this. - // But insets should read it, it is a part of - // the inset isn't it? Lgb. - } else if (token == "\\begin_inset") { -#ifndef NO_COMPABILITY - insertErtContents(par, pos, false); - ert_stack.push(ert_comp); - ert_comp = ErtComp(); -#endif - readInset(lex, par, pos, font); -#ifndef NO_COMPABILITY - ert_comp = ert_stack.top(); - ert_stack.pop(); - insertErtContents(par, pos); -#endif - } else if (token == "\\SpecialChar") { - LyXLayout const & layout = - textclasslist.Style(params.textclass, - par->getLayout()); - - // Insets don't make sense in a free-spacing context! ---Kayvan - if (layout.free_spacing || par->isFreeSpacing()) { - if (lex.isOK()) { - lex.next(); - string next_token = lex.getString(); - if (next_token == "\\-") { - par->insertChar(pos, '-', font); - } else if (next_token == "\\protected_separator" - || next_token == "~") { - par->insertChar(pos, ' ', font); - } else { - lex.printError("Token `$$Token' " - "is in free space " - "paragraph layout!"); - --pos; - } - } - } else { - Inset * inset = new InsetSpecialChar; - inset->read(this, lex); - par->insertInset(pos, inset, font); - } - ++pos; } else if (token == "\\newline") { -#ifndef NO_COMPABILITY - if (!ert_comp.in_tabular && ert_comp.active) { - ert_comp.contents += char(Paragraph::META_NEWLINE); - } else { - // Since we cannot know it this is only a regular - // newline or a tabular cell delimter we have to - // handle the ERT here. - insertErtContents(par, pos, false); - - par->insertChar(pos, Paragraph::META_NEWLINE, font); - ++pos; - } -#else par->insertChar(pos, Paragraph::META_NEWLINE, font); ++pos; -#endif } else if (token == "\\LyXTable") { -#ifndef NO_COMPABILITY - ert_comp.in_tabular = true; -#endif Inset * inset = new InsetTabular(*this); inset->read(this, lex); par->insertInset(pos, inset, font); @@ -1147,259 +914,50 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, } else if (token == "\\hfill") { par->insertChar(pos, Paragraph::META_HFILL, font); ++pos; - } else if (token == "\\protected_separator") { // obsolete - // This is a backward compability thingie. (Lgb) - // Remove it later some time...introduced with fileformat - // 2.16. (Lgb) - LyXLayout const & layout = - textclasslist.Style(params.textclass, - par->getLayout()); - - if (layout.free_spacing || par->isFreeSpacing()) { - par->insertChar(pos, ' ', font); - } else { - Inset * inset = new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR); - par->insertInset(pos, inset, font); - } - ++pos; } else if (token == "\\bibitem") { // ale970302 if (!par->bibkey) { InsetCommandParams p("bibitem", "dummy"); par->bibkey = new InsetBibKey(p); } - par->bibkey->read(this, lex); - } else if (token == "\\backslash") { -#ifndef NO_COMPABILITY - if (ert_comp.active) { - ert_comp.contents += "\\"; - } else { -#endif - par->insertChar(pos, '\\', font); - ++pos; -#ifndef NO_COMPABILITY - } -#endif + par->bibkey->read(this, lex); } else if (token == "\\the_end") { -#ifndef NO_COMPABILITY - // If we still have some ert active here we have to insert - // it so we don't loose it. (Lgb) - insertErtContents(par, pos); -#endif the_end_read = true; -#ifndef NO_COMPABILITY -#ifndef NO_PEXTRA_REALLY - minipar = parBeforeMinipage = 0; -#endif -#endif } else { -#ifndef NO_COMPABILITY - if (ert_comp.active) { - ert_comp.contents += token; - } else { -#endif // This should be insurance for the future: (Asger) ++unknown_tokens; 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 - } -#endif } -#ifndef NO_COMPABILITY -#ifndef NO_PEXTRA_REALLY - // I wonder if we could use this blanket fix for all the - // checkminipage cases... - // don't forget about ert paragraphs and compatibility read for'em - if (par && (par->size() || !ert_comp.contents.empty())) { - // It is possible that this will check to often, - // but that should not be an correctness issue. - // Only a speed issue. - checkminipage = true; - } - - // now check if we have a minipage paragraph as at this - // point we already read all the necessary data! - // this cannot be done in layout because there we did - // not read yet the paragraph PEXTRA-params (Jug) - // - // BEGIN pextra_minipage compability - // This should be removed in 1.3.x (Lgb) - // 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 - // none or only one regular paragraphs after the - // minipage. Currently I am not investing any effort - // in fixing those cases. - - //lyxerr << "Call depth: " << call_depth << endl; - if (checkminipage && (call_depth == 1)) { - checkminipage = false; - if (minipar && (minipar != par) && - (par->params().pextraType()==Paragraph::PEXTRA_MINIPAGE)) - { - lyxerr << "minipages in a row" << endl; - if (par->params().pextraStartMinipage()) { - lyxerr << "start new minipage" << endl; - // minipages in a row - par->previous()->next(0); - par->previous(0); - - Paragraph * tmp = minipar; - while (tmp) { - tmp->params().pextraType(0); - tmp->params().pextraWidth(string()); - tmp->params().pextraWidthp(string()); - tmp->params().pextraAlignment(0); - tmp->params().pextraHfill(false); - tmp->params().pextraStartMinipage(false); - tmp = tmp->next(); - } - // create a new paragraph to insert the - // minipages in the following case - if (par->params().pextraStartMinipage() && - !par->params().pextraHfill()) - { - Paragraph * p = new Paragraph; - p->layout = 0; - p->previous(parBeforeMinipage); - parBeforeMinipage->next(p); - p->next(0); - p->params().depth(parBeforeMinipage->params().depth()); - parBeforeMinipage = p; - } - InsetMinipage * mini = new InsetMinipage; - mini->pos(static_cast(par->params().pextraAlignment())); - mini->width(par->params().pextraWidth()); - if (!par->params().pextraWidthp().empty()) { - lyxerr << "WP:" << mini->width() << endl; - mini->width(tostr(par->params().pextraWidthp())+"%"); - } - Paragraph * op = mini->firstParagraph(); - mini->inset.paragraph(par); - // - // and free the old ones! - // - while(op) { - Paragraph * pp = op->next(); - delete op; - op = pp; - } - // Insert the minipage last in the - // previous paragraph. - if (par->params().pextraHfill()) { - parBeforeMinipage->insertChar - (parBeforeMinipage->size(), Paragraph::META_HFILL); - } - parBeforeMinipage->insertInset - (parBeforeMinipage->size(), mini); - - minipar = par; - } else { - lyxerr << "new minipage par" << endl; - //nothing to do just continue reading - } - - } else if (minipar && (minipar != par)) { - lyxerr << "last minipage par read" << endl; - // The last paragraph read was not part of a - // minipage but the par linked list is... - // So we need to remove the last par from the - // rest - if (par->previous()) - par->previous()->next(0); - par->previous(parBeforeMinipage); - parBeforeMinipage->next(par); - Paragraph * tmp = minipar; - while (tmp) { - tmp->params().pextraType(0); - tmp->params().pextraWidth(string()); - tmp->params().pextraWidthp(string()); - tmp->params().pextraAlignment(0); - tmp->params().pextraHfill(false); - tmp->params().pextraStartMinipage(false); - tmp = tmp->next(); - } - depth = parBeforeMinipage->params().depth(); - // and set this depth on the par as it has not been set already - par->params().depth(depth); - minipar = parBeforeMinipage = 0; - } else if (!minipar && - (par->params().pextraType() == Paragraph::PEXTRA_MINIPAGE)) - { - // par is the first paragraph in a minipage - lyxerr << "begin minipage" << endl; - // To minimize problems for - // the users we will insert - // the first minipage in - // a sequence of minipages - // in its own paragraph. - Paragraph * p = new Paragraph; - p->layout = 0; - p->previous(par->previous()); - p->next(0); - p->params().depth(depth); - par->params().depth(0); - depth = 0; - if (par->previous()) - par->previous()->next(p); - par->previous(0); - parBeforeMinipage = p; - minipar = par; - if (!first_par || (first_par == par)) - first_par = p; - - InsetMinipage * mini = new InsetMinipage; - mini->pos(static_cast(minipar->params().pextraAlignment())); - mini->width(minipar->params().pextraWidth()); - if (!par->params().pextraWidthp().empty()) { - lyxerr << "WP:" << mini->width() << endl; - mini->width(tostr(par->params().pextraWidthp())+"%"); - } - mini->inset.paragraph(minipar); - - // Insert the minipage last in the - // previous paragraph. - if (minipar->params().pextraHfill()) { - parBeforeMinipage->insertChar - (parBeforeMinipage->size(),Paragraph::META_HFILL); - } - parBeforeMinipage->insertInset - (parBeforeMinipage->size(), mini); - } - } - // End of pextra_minipage compability - --call_depth; -#endif -#endif return the_end_read; } // needed to insert the selection void Buffer::insertStringAsLines(Paragraph *& par, 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_ptr const & layout = 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(); + bool autobreakrows = !par->inInset() || + static_cast(par->inInset())->getAutoBreakRows(); + 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 (autobreakrows && (!par->empty() || layout->keepempty)) { + breakParagraph(params, par, pos, + layout->isEnvironment()); par = par->next(); pos = 0; space_inserted = true; @@ -1408,12 +966,12 @@ 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; } else if (*cit == '\t') { - if (!layout.free_spacing && !par->isFreeSpacing()) { + if (!layout->free_spacing && !par->isFreeSpacing()) { // tabs are like spaces here par->insertChar(pos, ' ', font); ++pos; @@ -1436,7 +994,7 @@ void Buffer::insertStringAsLines(Paragraph *& par, pos_type & pos, space_inserted = (*cit == ' '); } - } + } } @@ -1448,7 +1006,7 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par, lyxerr << "Buffer::readInset: Consistency check failed." << endl; } - + Inset * inset = 0; lex.next(); @@ -1461,10 +1019,10 @@ 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) { + if (compare_ascii_no_case(cmdName.substr(0,4), "cite") == 0) { inset = new InsetCitation(inscmd); } else if (cmdName == "bibitem") { lex.printError("Wrong place for bibitem"); @@ -1513,8 +1071,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 +1081,32 @@ 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 == "OptArg") { + inset = new InsetOptArg(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); + } else if (tmptok == "Wrap") { + lex.next(); + string tmptok = lex.getString(); + inset = new InsetWrap(params, tmptok); #if 0 } else if (tmptok == "List") { inset = new InsetList; @@ -1550,14 +1114,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; @@ -1565,7 +1129,7 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par, } -bool Buffer::readFile(LyXLex & lex, Paragraph * par) +bool Buffer::readFile(LyXLex & lex, string const & filename, Paragraph * par) { if (lex.isOK()) { lex.next(); @@ -1580,14 +1144,15 @@ bool Buffer::readFile(LyXLex & lex, Paragraph * par) if (dot != string::npos) tmp_format.erase(dot, 1); file_format = strToInt(tmp_format); + //lyxerr << "format: " << file_format << endl; if (file_format == LYX_FORMAT) { // current format } else if (file_format > LYX_FORMAT) { // future format Alert::alert(_("Warning!"), - _("LyX file format is newer that what"), - _("is supported in this LyX version. Expect some problems.")); - + _("The file was created with a newer version of" + "LyX. This is likely to cause problems.")); + } else if (file_format < LYX_FORMAT) { // old formats if (file_format < 200) { @@ -1595,13 +1160,46 @@ bool Buffer::readFile(LyXLex & lex, Paragraph * par) _("Old LyX file format found. " "Use LyX 0.10.x to read this!")); return false; + } else if (!filename.empty()) { + string command = + LibFileSearch("lyx2lyx", "lyx2lyx"); + if (command.empty()) { + Alert::alert(_("ERROR!"), + _("Can't find conversion script.")); + return false; + } + command += " -t" + +tostr(LYX_FORMAT)+" " + + QuoteName(filename); + lyxerr[Debug::INFO] << "Running '" + << command << "'" << endl; + cmd_ret const ret = RunCommand(command); + if (ret.first) { + Alert::alert(_("ERROR!"), + _("An error occured while " + "running the conversion script.")); + return false; + } + istringstream is(STRCONV(ret.second)); + LyXLex tmplex(0, 0); + tmplex.setStream(is); + return readFile(tmplex, string()); + } else { + // This code is reached if lyx2lyx failed (for + // some reason) to change the file format of + // the file. + lyx::Assert(false); + return false; } } bool the_end = readLyXformat2(lex, par); params.setPaperStuff(); + +#if 0 // the_end was added in 213 if (file_format < 213) the_end = true; +#endif if (!the_end) { Alert::alert(_("Warning!"), @@ -1616,7 +1214,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 @@ -1652,7 +1250,6 @@ bool Buffer::save() const */ // Should probably have some more error checking here. - // Should be cleaned up in 0.13, at least a bit. // Doing it this way, also makes the inodes stay the same. // This is still not a very good solution, in particular we // might loose the owner of the backup. @@ -1670,7 +1267,7 @@ bool Buffer::save() const ifs.close(); ofs.close(); ::chmod(s.c_str(), fmode); - + if (::utime(s.c_str(), ×)) { lyxerr << "utime error." << endl; } @@ -1680,9 +1277,9 @@ bool Buffer::save() const } } } - - if (writeFile(fileName(), false)) { - markLyxClean(); + + if (writeFile(fileName())) { + markClean(); removeAutosaveFile(fileName()); } else { // Saving failed, so backup is not backup @@ -1695,46 +1292,19 @@ bool Buffer::save() const } -// Returns false if unsuccesful -bool Buffer::writeFile(string const & fname, bool flag) const +bool Buffer::writeFile(string const & fname) const { - // if flag is false writeFile will not create any GUI - // warnings, only cerr. - // Needed for autosave in background or panic save (Matthias 120496) - - if (read_only && (fname == filename)) { - // Here we should come with a question if we should - // perform the write anyway. - if (flag) - lyxerr << _("Error! Document is read-only: ") - << fname << endl; - else - Alert::alert(_("Error! Document is read-only: "), - fname); + if (read_only && (fname == fileName())) { return false; } FileInfo finfo(fname); if (finfo.exist() && !finfo.writable()) { - // Here we should come with a question if we should - // try to do the save anyway. (i.e. do a chmod first) - if (flag) - lyxerr << _("Error! Cannot write file: ") - << fname << endl; - else - Alert::err_alert(_("Error! Cannot write file: "), - fname); return false; } ofstream ofs(fname.c_str()); if (!ofs) { - if (flag) - lyxerr << _("Error! Cannot open file: ") - << fname << endl; - else - Alert::err_alert(_("Error! Cannot open file: "), - fname); return false; } @@ -1746,7 +1316,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"; @@ -1757,7 +1327,10 @@ bool Buffer::writeFile(string const & fname, bool flag) const // this will write out all the paragraphs // using recursive descent. - paragraph->writeFile(this, ofs, params, depth); + ParagraphList::iterator pit = paragraphs.begin(); + ParagraphList::iterator pend = paragraphs.end(); + for (; pit != pend; ++pit) + pit->write(this, ofs, params, depth); // Write marker that shows file is complete ofs << "\n\\the_end" << endl; @@ -1766,7 +1339,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 +1357,32 @@ bool Buffer::writeFile(string const & fname, bool flag) const } #endif } - + return status; } -string const Buffer::asciiParagraph(Paragraph const * par, - unsigned int linelen, - bool noparbreak) const +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 { 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 @@ -1815,199 +1399,200 @@ string const Buffer::asciiParagraph(Paragraph const * par, } } #else - depth = par->params().depth(); + 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()->name(); + if (compare_no_case(tmp, "itemize") == 0) { ltype = 1; ltype_depth = depth + 1; - } else if (tmp == "Enumerate") { + } else if (compare_ascii_no_case(tmp, "enumerate") == 0) { ltype = 2; ltype_depth = depth + 1; - } else if (contains(tmp, "ection")) { + } else if (contains(ascii_lowercase(tmp), "ection")) { ltype = 3; ltype_depth = depth + 1; - } else if (contains(tmp, "aragraph")) { + } else if (contains(ascii_lowercase(tmp), "aragraph")) { ltype = 4; ltype_depth = depth + 1; - } else if (tmp == "Description") { + } else if (compare_ascii_no_case(tmp, "description") == 0) { ltype = 5; ltype_depth = depth + 1; - } else if (tmp == "Abstract") { + } else if (compare_ascii_no_case(tmp, "abstract") == 0) { ltype = 6; ltype_depth = 0; - } else if (tmp == "Bibliography") { + } else if (compare_ascii_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 + // linelen <= 0 is special and means we don't have paragraph 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) - for (pos_type i = 0; i < par->size(); ++i) { - char c = par->getUChar(params, i); + + // 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) { case Paragraph::META_INSET: { - Inset const * inset = par->getInset(i); + 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(); - return buffer.str().c_str(); + buffer << word; + return STRCONV(buffer.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,52 +1603,61 @@ void Buffer::writeFileAscii(string const & fname, int linelen) } -void Buffer::writeFileAscii(ostream & ofs, int linelen) +void Buffer::writeFileAscii(ostream & os, int linelen) { - Paragraph * par = paragraph; - while (par) { - ofs << asciiParagraph(par, linelen, par->previous() == 0); - par = par->next(); + ParagraphList::iterator beg = paragraphs.begin(); + ParagraphList::iterator end = paragraphs.end(); + ParagraphList::iterator it = beg; + for (; it != end; ++it) { + os << asciiParagraph(*it, linelen, it == beg); } - ofs << "\n"; + os << "\n"; } bool use_babel; -void Buffer::makeLaTeXFile(string const & fname, +void Buffer::makeLaTeXFile(string const & fname, string const & original_path, - bool nice, bool only_body) + bool nice, bool only_body, bool only_preamble) { lyxerr[Debug::LATEX] << "makeLaTeXFile..." << endl; - + + ofstream ofs(fname.c_str()); + if (!ofs) { + Alert::err_alert(_("Error: Cannot open file: "), fname); + return; + } + + makeLaTeXFile(ofs, original_path, nice, only_body, only_preamble); + + ofs.close(); + if (ofs.fail()) { + lyxerr << "File was not closed properly." << endl; + } +} + + +void Buffer::makeLaTeXFile(ostream & os, + string const & original_path, + bool nice, bool only_body, bool only_preamble) +{ 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; - } - // 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); + texrow.start(&*(paragraphs.begin()), 0); if (!only_body && nice) { - ofs << "%% " << lyx_docversion << " created this file. " + os << "%% " << 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"; @@ -2072,42 +1666,44 @@ 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. - // In this case somebody is interested in the generated LaTeX, - // so this is OK. input@path is set when the actual parameter + // input@path is set when the actual parameter // 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 + os << "\\batchmode\n"; // changed // from \nonstopmode texrow.newline(); } if (!original_path.empty()) { - ofs << "\\makeatletter\n" + string inputpath = os::external_path(original_path); + subst(inputpath, "~", "\\string~"); + os << "\\makeatletter\n" << "\\def\\input@path{{" - << os::external_path(original_path) << "/}}\n" + << inputpath << "/}}\n" << "\\makeatother\n"; texrow.newline(); texrow.newline(); texrow.newline(); } - - ofs << "\\documentclass"; - + + os << "\\documentclass"; + + LyXTextClass const & tclass = params.getLyXTextClass(); + 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 +1748,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; @@ -2166,7 +1762,7 @@ void Buffer::makeLaTeXFile(string const & fname, if (lyxrc.language_use_babel || params.language->lang() != lyxrc.default_language || - !features.hasLanguages()) { + features.hasLanguages()) { use_babel = true; language_options << features.getLanguages(); language_options << params.language->babel(); @@ -2179,32 +1775,30 @@ void Buffer::makeLaTeXFile(string const & fname, options << params.options << ','; } - string strOptions(options.str().c_str()); - if (!strOptions.empty()){ - strOptions = strip(strOptions, ','); - ofs << '[' << strOptions << ']'; + string strOptions(STRCONV(options.str())); + if (!strOptions.empty()) { + strOptions = rtrim(strOptions, ","); + os << '[' << strOptions << ']'; } - - ofs << '{' - << textclasslist.LatexnameOfClass(params.textclass) - << "}\n"; + + os << '{' << 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" && (params.fonts != "ae" || lyxrc.fontenc != "default")) { - ofs << "\\usepackage{" << params.fonts << "}\n"; + os << "\\usepackage{" << params.fonts << "}\n"; texrow.newline(); if (params.fonts == "ae") { - ofs << "\\usepackage{aecompl}\n"; + os << "\\usepackage{aecompl}\n"; texrow.newline(); } } // this one is not per buffer if (lyxrc.fontenc != "default") { - ofs << "\\usepackage[" << lyxrc.fontenc + os << "\\usepackage[" << lyxrc.fontenc << "]{fontenc}\n"; texrow.newline(); } @@ -2213,17 +1807,17 @@ 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); - ofs << "\\usepackage["; + os << "\\usepackage["; std::copy(encodings.begin(), encodings.end(), - std::ostream_iterator(ofs, ",")); - ofs << doc_encoding << "]{inputenc}\n"; + std::ostream_iterator(os, ",")); + os << doc_encoding << "]{inputenc}\n"; texrow.newline(); } else if (params.inputenc != "default") { - ofs << "\\usepackage[" << params.inputenc + os << "\\usepackage[" << params.inputenc << "]{inputenc}\n"; texrow.newline(); } @@ -2232,152 +1826,152 @@ void Buffer::makeLaTeXFile(string const & fname, if (params.paperpackage != BufferParams::PACKAGE_NONE) { switch (params.paperpackage) { case BufferParams::PACKAGE_A4: - ofs << "\\usepackage{a4}\n"; + os << "\\usepackage{a4}\n"; texrow.newline(); break; case BufferParams::PACKAGE_A4WIDE: - ofs << "\\usepackage{a4wide}\n"; + os << "\\usepackage{a4wide}\n"; texrow.newline(); break; case BufferParams::PACKAGE_WIDEMARGINSA4: - ofs << "\\usepackage[widemargins]{a4}\n"; + os << "\\usepackage[widemargins]{a4}\n"; texrow.newline(); break; } } if (params.use_geometry) { - ofs << "\\usepackage{geometry}\n"; + os << "\\usepackage{geometry}\n"; texrow.newline(); - ofs << "\\geometry{verbose"; + os << "\\geometry{verbose"; if (params.orientation == BufferParams::ORIENTATION_LANDSCAPE) - ofs << ",landscape"; + os << ",landscape"; switch (params.papersize2) { case BufferParams::VM_PAPER_CUSTOM: if (!params.paperwidth.empty()) - ofs << ",paperwidth=" + os << ",paperwidth=" << params.paperwidth; if (!params.paperheight.empty()) - ofs << ",paperheight=" + os << ",paperheight=" << params.paperheight; break; case BufferParams::VM_PAPER_USLETTER: - ofs << ",letterpaper"; + os << ",letterpaper"; break; case BufferParams::VM_PAPER_USLEGAL: - ofs << ",legalpaper"; + os << ",legalpaper"; break; case BufferParams::VM_PAPER_USEXECUTIVE: - ofs << ",executivepaper"; + os << ",executivepaper"; break; case BufferParams::VM_PAPER_A3: - ofs << ",a3paper"; + os << ",a3paper"; break; case BufferParams::VM_PAPER_A4: - ofs << ",a4paper"; + os << ",a4paper"; break; case BufferParams::VM_PAPER_A5: - ofs << ",a5paper"; + os << ",a5paper"; break; case BufferParams::VM_PAPER_B3: - ofs << ",b3paper"; + os << ",b3paper"; break; case BufferParams::VM_PAPER_B4: - ofs << ",b4paper"; + os << ",b4paper"; break; case BufferParams::VM_PAPER_B5: - ofs << ",b5paper"; + os << ",b5paper"; break; default: // default papersize ie BufferParams::VM_PAPER_DEFAULT switch (lyxrc.default_papersize) { case BufferParams::PAPER_DEFAULT: // keep compiler happy case BufferParams::PAPER_USLETTER: - ofs << ",letterpaper"; + os << ",letterpaper"; break; case BufferParams::PAPER_LEGALPAPER: - ofs << ",legalpaper"; + os << ",legalpaper"; break; case BufferParams::PAPER_EXECUTIVEPAPER: - ofs << ",executivepaper"; + os << ",executivepaper"; break; case BufferParams::PAPER_A3PAPER: - ofs << ",a3paper"; + os << ",a3paper"; break; case BufferParams::PAPER_A4PAPER: - ofs << ",a4paper"; + os << ",a4paper"; break; case BufferParams::PAPER_A5PAPER: - ofs << ",a5paper"; + os << ",a5paper"; break; case BufferParams::PAPER_B5PAPER: - ofs << ",b5paper"; + os << ",b5paper"; break; } } if (!params.topmargin.empty()) - ofs << ",tmargin=" << params.topmargin; + os << ",tmargin=" << params.topmargin; if (!params.bottommargin.empty()) - ofs << ",bmargin=" << params.bottommargin; + os << ",bmargin=" << params.bottommargin; if (!params.leftmargin.empty()) - ofs << ",lmargin=" << params.leftmargin; + os << ",lmargin=" << params.leftmargin; if (!params.rightmargin.empty()) - ofs << ",rmargin=" << params.rightmargin; + os << ",rmargin=" << params.rightmargin; if (!params.headheight.empty()) - ofs << ",headheight=" << params.headheight; + os << ",headheight=" << params.headheight; if (!params.headsep.empty()) - ofs << ",headsep=" << params.headsep; + os << ",headsep=" << params.headsep; if (!params.footskip.empty()) - ofs << ",footskip=" << params.footskip; - ofs << "}\n"; + os << ",footskip=" << params.footskip; + os << "}\n"; texrow.newline(); } if (tokenPos(tclass.opt_pagestyle(), '|', params.pagestyle) >= 0) { if (params.pagestyle == "fancy") { - ofs << "\\usepackage{fancyhdr}\n"; + os << "\\usepackage{fancyhdr}\n"; texrow.newline(); } - ofs << "\\pagestyle{" << params.pagestyle << "}\n"; + os << "\\pagestyle{" << params.pagestyle << "}\n"; texrow.newline(); } if (params.secnumdepth != tclass.secnumdepth()) { - ofs << "\\setcounter{secnumdepth}{" + os << "\\setcounter{secnumdepth}{" << params.secnumdepth << "}\n"; texrow.newline(); } if (params.tocdepth != tclass.tocdepth()) { - ofs << "\\setcounter{tocdepth}{" + os << "\\setcounter{tocdepth}{" << params.tocdepth << "}\n"; texrow.newline(); } - + if (params.paragraph_separation) { switch (params.defskip.kind()) { - case VSpace::SMALLSKIP: - ofs << "\\setlength\\parskip{\\smallskipamount}\n"; + case VSpace::SMALLSKIP: + os << "\\setlength\\parskip{\\smallskipamount}\n"; break; case VSpace::MEDSKIP: - ofs << "\\setlength\\parskip{\\medskipamount}\n"; + os << "\\setlength\\parskip{\\medskipamount}\n"; break; case VSpace::BIGSKIP: - ofs << "\\setlength\\parskip{\\bigskipamount}\n"; + os << "\\setlength\\parskip{\\bigskipamount}\n"; break; case VSpace::LENGTH: - ofs << "\\setlength\\parskip{" + os << "\\setlength\\parskip{" << params.defskip.length().asLatexString() << "}\n"; break; default: // should never happen // Then delete it. - ofs << "\\setlength\\parskip{\\medskipamount}\n"; + os << "\\setlength\\parskip{\\medskipamount}\n"; break; } texrow.newline(); - - ofs << "\\setlength\\parindent{0pt}\n"; + + os << "\\setlength\\parindent{0pt}\n"; texrow.newline(); } @@ -2398,7 +1992,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 += "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% " @@ -2413,14 +2007,12 @@ void Buffer::makeLaTeXFile(string const & fname, + params.preamble + '\n'; } - preamble += "\\makeatother\n"; - // Itemize bullet settings need to be last in case the user // defines their own bullets that use a package included // 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 +2033,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"; } } @@ -2456,8 +2048,6 @@ void Buffer::makeLaTeXFile(string const & fname, texrow.newline(); } - ofs << preamble; - // We try to load babel late, in case it interferes // with other packages. if (use_babel) { @@ -2465,42 +2055,49 @@ void Buffer::makeLaTeXFile(string const & fname, if (!lyxrc.language_global_options && tmp == "\\usepackage{babel}") tmp = string("\\usepackage[") + - language_options.str().c_str() + + STRCONV(language_options.str()) + "]{babel}"; - ofs << tmp << "\n"; - texrow.newline(); + preamble += tmp + "\n"; + preamble += features.getBabelOptions(); } + preamble += "\\makeatother\n"; + + os << preamble; + + if (only_preamble) + return; + // make the body. - ofs << "\\begin{document}\n"; + os << "\\begin{document}\n"; texrow.newline(); } // only_body lyxerr[Debug::INFO] << "preamble finished, now the body." << endl; if (!lyxrc.language_auto_begin) { - ofs << subst(lyxrc.language_command_begin, "$$lang", + os << subst(lyxrc.language_command_begin, "$$lang", params.language->babel()) << endl; texrow.newline(); } - - latexParagraphs(ofs, paragraph, 0, texrow); + + latexParagraphs(os, &*(paragraphs.begin()), 0, texrow); // add this just in case after all the paragraphs - ofs << endl; + os << endl; texrow.newline(); if (!lyxrc.language_auto_end) { - ofs << subst(lyxrc.language_command_end, "$$lang", + os << subst(lyxrc.language_command_end, "$$lang", params.language->babel()) << endl; texrow.newline(); } if (!only_body) { - ofs << "\\end{document}\n"; + os << "\\end{document}\n"; texrow.newline(); - + lyxerr[Debug::LATEX] << "makeLaTeXFile...done" << endl; } else { lyxerr[Debug::LATEX] << "LaTeXFile for inclusion made." @@ -2510,19 +2107,11 @@ void Buffer::makeLaTeXFile(string const & fname, // Just to be sure. (Asger) texrow.newline(); - // tex_code_break_column's value is used to decide - // if we are in batchmode or not (within mathed_write() - // in math_write.C) so we must set it to a non-zero - // value when we leave otherwise we save incorrect .lyx files. - tex_code_break_column = lyxrc.ascii_linelen; - - ofs.close(); - 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 +2119,8 @@ 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, + bool moving_arg) const { bool was_title = false; bool already_title = false; @@ -2539,34 +2129,35 @@ void Buffer::latexParagraphs(ostream & ofs, Paragraph * par, while (par != endpar) { Inset * in = par->inInset(); // well we have to check if we are in an inset with unlimited - // lenght (all in one row) if that is true then we don't allow + // length (all in one row) if that is true then we don't allow // any special options in the paragraph and also we don't allow // 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) { + LyXLayout_ptr const & layout = 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()) { + + if (layout->isEnvironment() || + !par->params().leftIndent().zero()) + { par = par->TeXEnvironment(this, params, ofs, texrow); } else { - par = par->TeXOnePar(this, params, ofs, texrow, false); + par = par->TeXOnePar(this, params, ofs, texrow, moving_arg); } } else { - par = par->TeXOnePar(this, params, ofs, texrow, false); + par = par->TeXOnePar(this, params, ofs, texrow, moving_arg); } } // It might be that we only have a title in this document @@ -2579,50 +2170,34 @@ void Buffer::latexParagraphs(ostream & ofs, Paragraph * par, bool Buffer::isLatex() const { - return textclasslist.TextClass(params.textclass).outputType() == LATEX; + return params.getLyXTextClass().outputType() == LATEX; } bool Buffer::isLinuxDoc() const { - return textclasslist.TextClass(params.textclass).outputType() == LINUXDOC; + return params.getLyXTextClass().outputType() == LINUXDOC; } bool Buffer::isLiterate() const { - return textclasslist.TextClass(params.textclass).outputType() == LITERATE; + return params.getLyXTextClass().outputType() == LITERATE; } bool Buffer::isDocBook() const { - return textclasslist.TextClass(params.textclass).outputType() == DOCBOOK; + return params.getLyXTextClass().outputType() == DOCBOOK; } bool Buffer::isSGML() const { - return textclasslist.TextClass(params.textclass).outputType() == LINUXDOC || - textclasslist.TextClass(params.textclass).outputType() == DOCBOOK; -} - - -void Buffer::sgmlOpenTag(ostream & os, Paragraph::depth_type depth, - string const & latexname) const -{ - if (!latexname.empty() && latexname != "!-- --") - //os << "" << "<" << latexname << ">"; - os << string(depth, ' ') << "<" << latexname << ">\n"; -} + LyXTextClass const & tclass = params.getLyXTextClass(); - -void Buffer::sgmlCloseTag(ostream & os, Paragraph::depth_type depth, - string const & latexname) const -{ - if (!latexname.empty() && latexname != "!-- --") - //os << "" << "\n"; - os << string(depth, ' ') << "\n"; + return tclass.outputType() == LINUXDOC || + tclass.outputType() == DOCBOOK; } @@ -2637,21 +2212,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 = params.getLyXTextClass(); + + string top_element = tclass.latexname(); if (!body_only) { ofs << "\n\n"; if (params.options.empty()) - sgmlOpenTag(ofs, 0, top_element); + sgml::openTag(ofs, 0, false, top_element); else { string top = top_element; top += " "; top += params.options; - sgmlOpenTag(ofs, 0, top); + sgml::openTag(ofs, 0, false, top); } } @@ -2674,22 +2251,19 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) << " -->\n"; Paragraph::depth_type depth = 0; // paragraph depth - Paragraph * par = paragraph; - string item_name; + Paragraph * par = &*(paragraphs.begin()); + string item_name; vector environment_stack(5); while (par) { - LyXLayout const & style = - textclasslist.Style(params.textclass, - par->layout); - + LyXLayout_ptr const & style = 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); + sgml::openTag(ofs, depth, false, temp); par = par->next(); continue; @@ -2698,23 +2272,23 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) // environment tag closing for (; depth > par->params().depth(); --depth) { - sgmlCloseTag(ofs, depth, environment_stack[depth]); + sgml::closeTag(ofs, depth, false, environment_stack[depth]); environment_stack[depth].erase(); } // write opening SGML tags - switch (style.latextype) { + 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]); + sgml::closeTag(ofs, depth, false, environment_stack[depth]); environment_stack[depth].erase(); - if (depth) + if (depth) --depth; else - ofs << "

"; + ofs << "

"; } - sgmlOpenTag(ofs, depth, style.latexname()); + sgml::openTag(ofs, depth, false, style->latexname()); break; case LATEX_COMMAND: @@ -2723,21 +2297,23 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) _("Error : Wrong depth for" " LatexType Command.\n")); - if (!environment_stack[depth].empty()){ - sgmlCloseTag(ofs, depth, - environment_stack[depth]); + if (!environment_stack[depth].empty()) { + sgml::closeTag(ofs, depth, false, environment_stack[depth]); ofs << "

"; } environment_stack[depth].erase(); - sgmlOpenTag(ofs, depth, style.latexname()); + sgml::openTag(ofs, depth, false, style->latexname()); break; case LATEX_ENVIRONMENT: case LATEX_ITEM_ENVIRONMENT: - if (depth == par->params().depth() - && environment_stack[depth] != style.latexname()) { - sgmlCloseTag(ofs, depth, + { + string const & latexname = style->latexname(); + + if (depth == par->params().depth() + && environment_stack[depth] != latexname) { + sgml::closeTag(ofs, depth, false, environment_stack[depth]); environment_stack[depth].erase(); } @@ -2745,31 +2321,33 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) depth = par->params().depth(); environment_stack[depth].erase(); } - if (environment_stack[depth] != style.latexname()) { + if (environment_stack[depth] != latexname) { if (depth == 0) { - sgmlOpenTag(ofs, depth, "p"); + sgml::openTag(ofs, depth, false, "p"); } - sgmlOpenTag(ofs, depth, style.latexname()); + sgml::openTag(ofs, depth, false, latexname); if (environment_stack.size() == depth + 1) environment_stack.push_back("!-- --"); - environment_stack[depth] = style.latexname(); + environment_stack[depth] = latexname; } - if (style.latexparam() == "CDATA") + if (style->latexparam() == "CDATA") ofs << "latextype == LATEX_ENVIRONMENT) break; - if (style.labeltype == LABEL_MANUAL) + if (style->labeltype == LABEL_MANUAL) item_name = "tag"; else item_name = "item"; - sgmlOpenTag(ofs, depth + 1, item_name); - break; + sgml::openTag(ofs, depth + 1, false, item_name); + } + break; + default: - sgmlOpenTag(ofs, depth, style.latexname()); + sgml::openTag(ofs, depth, false, style->latexname()); break; } @@ -2779,31 +2357,34 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) ofs << "\n"; // write closing SGML tags - switch (style.latextype) { + switch (style->latextype) { case LATEX_COMMAND: break; case LATEX_ENVIRONMENT: case LATEX_ITEM_ENVIRONMENT: - if (style.latexparam() == "CDATA") + if (style->latexparam() == "CDATA") ofs << "]]>"; break; default: - sgmlCloseTag(ofs, depth, style.latexname()); + sgml::closeTag(ofs, depth, false, style->latexname()); break; } } - + // Close open tags - for (int i=depth; i >= 0; --i) - sgmlCloseTag(ofs, depth, environment_stack[i]); + for (int i = depth; i >= 0; --i) + sgml::closeTag(ofs, depth, false, environment_stack[i]); if (!body_only) { ofs << "\n\n"; - sgmlCloseTag(ofs, 0, top_element); + sgml::closeTag(ofs, 0, false, top_element); } ofs.close(); // How to check for successful close + + // we want this to be true outside previews (for insetexternal) + niceFile = true; } @@ -2849,36 +2430,36 @@ 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_ptr const & style = par->layout(); + + string::size_type char_line_count = 5; // Heuristic choice ;-) // gets paragraph main font LyXFont font_old; bool desc_on; - if (style.labeltype == LABEL_MANUAL) { - font_old = style.labelfont; + if (style->labeltype == LABEL_MANUAL) { + font_old = style->labelfont; desc_on = true; } else { - font_old = style.font; + font_old = style->font; desc_on = false; } @@ -2981,7 +2562,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 << ""; @@ -3012,16 +2593,16 @@ void Buffer::simpleLinuxDocOnePar(ostream & os, continue; } - if (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->sgmlConvertChar(c, sgml_string) - && !style.free_spacing && !par->isFreeSpacing()) - { + bool ws; + string str; + boost::tie(ws, str) = sgml::escapeChar(c); + if (ws && !style->free_spacing && !par->isFreeSpacing()) { // in freespacing mode, spaces are // non-breaking characters if (desc_on) {// if char is ' ' then... @@ -3035,8 +2616,8 @@ void Buffer::simpleLinuxDocOnePar(ostream & os, os << c; } } else { - os << sgml_string; - char_line_count += sgml_string.length(); + os << str; + char_line_count += str.length(); } } font_old = font; @@ -3057,13 +2638,23 @@ 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 { +#ifdef WITH_WARNINGS +#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) +#endif +#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 } @@ -3075,26 +2666,26 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) return; } - Paragraph * par = paragraph; + Paragraph * par = &*(paragraphs.begin()); 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 = params.getLyXTextClass(); + 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 += "\""; @@ -3112,7 +2703,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) top += " "; top += params.options; } - sgmlOpenTag(ofs, 0, top); + sgml::openTag(ofs, 0, false, top); ofs << "\n"; @@ -3127,7 +2718,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,51 +2727,42 @@ 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_ptr const & style = par->layout(); // environment tag closing for (; depth > par->params().depth(); --depth) { if (environment_inner[depth] != "!-- --") { item_name = "listitem"; - sgmlCloseTag(ofs, command_depth + depth, - item_name); + sgml::closeTag(ofs, command_depth + depth, false, item_name); if (environment_inner[depth] == "varlistentry") - sgmlCloseTag(ofs, depth+command_depth, - environment_inner[depth]); + sgml::closeTag(ofs, depth+command_depth, false, environment_inner[depth]); } - sgmlCloseTag(ofs, depth + command_depth, - environment_stack[depth]); + sgml::closeTag(ofs, depth + command_depth, false, environment_stack[depth]); environment_stack[depth].erase(); environment_inner[depth].erase(); } if (depth == par->params().depth() - && environment_stack[depth] != style.latexname() + && environment_stack[depth] != style->latexname() && !environment_stack[depth].empty()) { if (environment_inner[depth] != "!-- --") { item_name= "listitem"; - sgmlCloseTag(ofs, command_depth+depth, - item_name); + sgml::closeTag(ofs, command_depth+depth, false, item_name); if (environment_inner[depth] == "varlistentry") - sgmlCloseTag(ofs, - depth + command_depth, - environment_inner[depth]); + sgml::closeTag(ofs, depth + command_depth, false, environment_inner[depth]); } - - sgmlCloseTag(ofs, depth + command_depth, - environment_stack[depth]); - + + sgml::closeTag(ofs, depth + command_depth, false, environment_stack[depth]); + environment_stack[depth].erase(); environment_inner[depth].erase(); - } + } // Write opening SGML tags. - switch (style.latextype) { + switch (style->latextype) { case LATEX_PARAGRAPH: - sgmlOpenTag(ofs, depth + command_depth, - style.latexname()); + sgml::openTag(ofs, depth + command_depth, + false, style->latexname()); break; case LATEX_COMMAND: @@ -3188,22 +2770,28 @@ 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(); + + 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) - sgmlCloseTag(ofs, j, command_stack[j]); + for (Paragraph::depth_type j = command_depth; + j >= command_base; --j) { + sgml::closeTag(ofs, j, false, command_stack[j]); + ofs << endl; + } command_depth = command_base = cmd_depth; } else if (cmd_depth <= command_depth) { - for (int j = command_depth; j >= int(cmd_depth); --j) - sgmlCloseTag(ofs, j, command_stack[j]); + for (int j = command_depth; + j >= int(cmd_depth); --j) { + sgml::closeTag(ofs, j, false, command_stack[j]); + ofs << endl; + } command_depth = cmd_depth; } else command_depth = cmd_depth; @@ -3220,9 +2808,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 += "\""; @@ -3230,12 +2818,10 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) } } - sgmlOpenTag(ofs, depth + command_depth, command_name); - if (c_params.empty()) - item_name = "title"; - else - item_name = c_params; - sgmlOpenTag(ofs, depth + 1 + command_depth, item_name); + sgml::openTag(ofs, depth + command_depth, false, command_name); + + item_name = c_params.empty()?"title":c_params; + sgml::openTag(ofs, depth + 1 + command_depth, false, item_name); break; case LATEX_ENVIRONMENT: @@ -3245,97 +2831,79 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) environment_stack[depth].erase(); } - if (environment_stack[depth] != style.latexname()) { - if(environment_stack.size() == depth + 1) { + if (environment_stack[depth] != style->latexname()) { + if (environment_stack.size() == depth + 1) { environment_stack.push_back("!-- --"); environment_inner.push_back("!-- --"); } - environment_stack[depth] = style.latexname(); + environment_stack[depth] = style->latexname(); environment_inner[depth] = "!-- --"; - sgmlOpenTag(ofs, depth + command_depth, - environment_stack[depth]); + sgml::openTag(ofs, depth + command_depth, false, environment_stack[depth]); } else { if (environment_inner[depth] != "!-- --") { item_name= "listitem"; - sgmlCloseTag(ofs, - command_depth + depth, - item_name); + sgml::closeTag(ofs, command_depth + depth, false, item_name); if (environment_inner[depth] == "varlistentry") - sgmlCloseTag(ofs, - depth + command_depth, - environment_inner[depth]); + sgml::closeTag(ofs, depth + command_depth, false, environment_inner[depth]); } } - - if (style.latextype == LATEX_ENVIRONMENT) { - if (!style.latexparam().empty()) { - if(style.latexparam() == "CDATA") + + if (style->latextype == LATEX_ENVIRONMENT) { + if (!style->latexparam().empty()) { + if (style->latexparam() == "CDATA") ofs << "latexparam()); } break; } - desc_on = (style.labeltype == LABEL_MANUAL); - - if (desc_on) - environment_inner[depth]= "varlistentry"; - else - environment_inner[depth]= "listitem"; + desc_on = (style->labeltype == LABEL_MANUAL); - sgmlOpenTag(ofs, depth + 1 + command_depth, - environment_inner[depth]); + environment_inner[depth] = desc_on ? "varlistentry" : "listitem"; + sgml::openTag(ofs, depth + 1 + command_depth, + false, environment_inner[depth]); - if (desc_on) { - item_name= "term"; - sgmlOpenTag(ofs, depth + 1 + command_depth, - item_name); - } else { - item_name= "para"; - sgmlOpenTag(ofs, depth + 1 + command_depth, - item_name); - } + item_name = desc_on ? "term" : "para"; + sgml::openTag(ofs, depth + 1 + command_depth, + false, item_name); break; default: - sgmlOpenTag(ofs, depth + command_depth, - style.latexname()); + sgml::openTag(ofs, depth + command_depth, + false, style->latexname()); break; } - simpleDocBookOnePar(ofs, par, desc_on, depth+1+command_depth); + simpleDocBookOnePar(ofs, par, desc_on, + depth + 1 + command_depth); par = par->next(); string end_tag; // write closing SGML tags - switch (style.latextype) { + switch (style->latextype) { case LATEX_COMMAND: - if (c_params.empty()) - end_tag = "title"; - else - end_tag = c_params; - sgmlCloseTag(ofs, depth + command_depth, end_tag); + end_tag = c_params.empty() ? "title" : c_params; + sgml::closeTag(ofs, depth + command_depth, + false, end_tag); break; case LATEX_ENVIRONMENT: - if (!style.latexparam().empty()) { - if(style.latexparam() == "CDATA") + if (!style->latexparam().empty()) { + if (style->latexparam() == "CDATA") ofs << "]]>"; else - sgmlCloseTag(ofs, depth + command_depth, - style.latexparam()); + sgml::closeTag(ofs, depth + command_depth, false, style->latexparam()); } break; case LATEX_ITEM_ENVIRONMENT: if (desc_on == 1) break; end_tag= "para"; - sgmlCloseTag(ofs, depth + 1 + command_depth, end_tag); + sgml::closeTag(ofs, depth + 1 + command_depth, false, end_tag); break; case LATEX_PARAGRAPH: - sgmlCloseTag(ofs, depth + command_depth, style.latexname()); + sgml::closeTag(ofs, depth + command_depth, false, style->latexname()); break; default: - sgmlCloseTag(ofs, depth + command_depth, style.latexname()); + sgml::closeTag(ofs, depth + command_depth, false, style->latexname()); break; } } @@ -3345,27 +2913,29 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) if (!environment_stack[depth].empty()) { if (environment_inner[depth] != "!-- --") { item_name = "listitem"; - sgmlCloseTag(ofs, command_depth + depth, - item_name); - if (environment_inner[depth] == "varlistentry") - sgmlCloseTag(ofs, depth + command_depth, - environment_inner[depth]); + sgml::closeTag(ofs, command_depth + depth, false, item_name); + if (environment_inner[depth] == "varlistentry") + sgml::closeTag(ofs, depth + command_depth, false, environment_inner[depth]); } - - sgmlCloseTag(ofs, depth + command_depth, - environment_stack[depth]); + + sgml::closeTag(ofs, depth + command_depth, false, environment_stack[depth]); } } - + for (int j = command_depth; j >= 0 ; --j) - if (!command_stack[j].empty()) - sgmlCloseTag(ofs, j, command_stack[j]); + if (!command_stack[j].empty()) { + sgml::closeTag(ofs, j, false, command_stack[j]); + ofs << endl; + } ofs << "\n\n"; - sgmlCloseTag(ofs, 0, top_element); + sgml::closeTag(ofs, 0, false, top_element); ofs.close(); // How to check for successful close + + // we want this to be true outside previews (for insetexternal) + niceFile = true; } @@ -3375,10 +2945,9 @@ void Buffer::simpleDocBookOnePar(ostream & os, { bool emph_flag = false; - LyXLayout const & style = textclasslist.Style(params.textclass, - par->getLayout()); + LyXLayout_ptr const & style = par->layout(); - LyXFont font_old = style.labeltype == LABEL_MANUAL ? style.labelfont : style.font; + LyXFont font_old = (style->labeltype == LABEL_MANUAL ? style->labelfont : style->font); int char_line_count = depth; //if (!style.free_spacing) @@ -3391,29 +2960,43 @@ void Buffer::simpleDocBookOnePar(ostream & os, // handle tag if (font_old.emph() != font.emph()) { if (font.emph() == LyXFont::ON) { + if (style->latexparam() == "CDATA") + os << "]]>"; os << ""; + if (style->latexparam() == "CDATA") + os << "latexparam() == "CDATA") + os << "]]>"; os << ""; + if (style->latexparam() == "CDATA") + os << "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) - inset->docbook(this, os); + if (i || desc_on != 3) { + if (style->latexparam() == "CDATA") + os << "]]>"; + inset->docbook(this, os, false); + if (style->latexparam() == "CDATA") + os << "getChar(i); - string sgml_string; - par->sgmlConvertChar(c, sgml_string); + bool ws; + string str; + boost::tie(ws, str) = sgml::escapeChar(c); - if (style.pass_thru) { + if (style->pass_thru) { os << c; - } else if(style.free_spacing || par->isFreeSpacing() || c != ' ') { - os << sgml_string; + } else if (style->free_spacing || par->isFreeSpacing() || c != ' ') { + os << str; } else if (desc_on ==1) { ++char_line_count; os << "\n"; @@ -3426,19 +3009,23 @@ void Buffer::simpleDocBookOnePar(ostream & os, } if (emph_flag) { + if (style->latexparam() == "CDATA") + os << "]]>"; os << ""; + if (style->latexparam() == "CDATA") + os << " not closed... - os << ""; + os << "\n "; } - if(style.free_spacing) os << '\n'; + if (style->free_spacing) + os << '\n'; } -// This should be enabled when the Chktex class is implemented. (Asger) // chktex should be run with these flags disabled: 3, 22, 25, 30, 38(?) // Other flags: -wall -v0 -x int Buffer::runChktex() @@ -3449,11 +3036,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 +3053,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,8 +3066,9 @@ 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){ - users->redraw(); + if (removedErrorInsets || res) { +#warning repaint needed here, or do you mean update() ? + users->repaint(); users->fitCursor(); } users->owner()->allowInput(); @@ -3491,26 +3079,14 @@ 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)) - features.require("amsmath"); - - while (par) { - // We don't use "lyxerr.debug" because of speed. (Asger) - if (lyxerr.debugging(Debug::LATEX)) - lyxerr << "Paragraph: " << par << endl; + LyXTextClass const & tclass = params.getLyXTextClass(); - // Now just follow the list of paragraphs and run - // validate on each of them. - par->validate(features); + // AMS Style is at document level + if (params.use_amsmath || tclass.provides(LyXTextClass::amsmath)) + features.require("amsmath"); - // and then the next paragraph - par = par->next(); - } + for_each(paragraphs.begin(), paragraphs.end(), + boost::bind(&Paragraph::validate, _1, boost::ref(features))); // the bullet shapes are buffer level not paragraph level // so they are tested here @@ -3535,167 +3111,78 @@ void Buffer::validate(LaTeXFeatures & features) const } } } - + if (lyxerr.debugging(Debug::LATEX)) { features.showStruct(); } } -// This function should be in Buffer because it's a buffer's property (ale) -string const Buffer::getIncludeonlyList(char delim) -{ - string lst; - for (inset_iterator it = inset_iterator_begin(); - it != inset_iterator_end(); ++it) { - if ((*it)->lyxCode() == Inset::INCLUDE_CODE) { - InsetInclude * insetinc = - static_cast(*it); - if (insetinc->isIncludeOnly()) { - if (!lst.empty()) - lst += delim; - lst += insetinc->getRelFileBaseName(); - } - } - } - lyxerr[Debug::INFO] << "Includeonly(" << lst << ')' << endl; - return lst; -} - - -vector const Buffer::getLabelList() +vector const Buffer::getLabelList() const { /// if this is a child document and the parent is already loaded /// Use the parent's list instead [ale990407] if (!params.parentname.empty() && bufferlist.exists(params.parentname)) { - Buffer * tmp = bufferlist.getBuffer(params.parentname); + Buffer const * tmp = bufferlist.getBuffer(params.parentname); if (tmp) return tmp->getLabelList(); } vector label_list; - for (inset_iterator it = inset_iterator_begin(); - it != inset_iterator_end(); ++it) { - vector const l = (*it)->getLabelList(); + for (inset_iterator it = inset_const_iterator_begin(); + it != inset_const_iterator_end(); ++it) { + vector const l = it->getLabelList(); label_list.insert(label_list.end(), l.begin(), l.end()); } return label_list; } -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 - - while (par) { - char const labeltype = - textclasslist.Style(params.textclass, - par->getLayout()).labeltype; - - if (labeltype >= LABEL_COUNTER_CHAPTER - && labeltype <= LABEL_COUNTER_CHAPTER + params.tocdepth) { - // insert this into the table of contents - SingleList & item = l["TOC"]; - int depth = max(0, - labeltype - - textclasslist.TextClass(params.textclass).maxcounter()); - item.push_back(TocItem(par, depth, par->asString(this, true))); - } - // For each paragrph, traverse its insets and look for - // FLOAT_CODE - - if (found) { - Paragraph::inset_iterator it = - par->inset_iterator_begin(); - Paragraph::inset_iterator end = - par->inset_iterator_end(); - - for (; it != end; ++it) { - if ((*it)->lyxCode() == Inset::FLOAT_CODE) { - InsetFloat * il = - static_cast(*it); - - string const type = il->type(); - - // Now find the caption in the float... - // We now tranverse the paragraphs of - // the inset... - Paragraph * tmp = il->inset.paragraph(); - while (tmp) { - if (tmp->layout == cap) { - SingleList & item = l[type]; - string const str = - tostr(item.size()+1) + ". " + tmp->asString(this, false); - item.push_back(TocItem(tmp, 0 , str)); - } - tmp = tmp->next(); - } - } - } - } else { - lyxerr << "caption not found" << endl; - } - - par = par->next(); - } - return l; -} - - // This is also a buffer property (ale) -vector > const Buffer::getBibkeyList() +vector > const Buffer::getBibkeyList() const { + typedef pair StringPair; /// 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)) { - Buffer * tmp = bufferlist.getBuffer(params.parentname); + if (!params.parentname.empty() && bufferlist.exists(params.parentname)) { + Buffer const * tmp = bufferlist.getBuffer(params.parentname); if (tmp) return tmp->getBibkeyList(); } - vector > keys; - Paragraph * par = paragraph; - while (par) { - if (par->bibkey) - keys.push_back(pair(par->bibkey->getContents(), - par->asString(this, false))); - par = par->next(); + vector keys; + ParagraphList::iterator pit = paragraphs.begin(); + ParagraphList::iterator pend = paragraphs.end(); + for (; pit != pend; ++pit) { + if (pit->bibkey) { + string const key = pit->bibkey->getContents(); + string const opt = pit->bibkey->getOptions(); + string const ref = pit->asString(this, false); + string const info = opt + "TheBibliographyRef" + ref; + + keys.push_back(StringPair(key, info)); + } } + if (!keys.empty()) + return keys; + // Might be either using bibtex or a child has bibliography - if (keys.empty()) { - for (inset_iterator it = inset_iterator_begin(); - it != inset_iterator_end(); ++it) { - // Search for Bibtex or Include inset - if ((*it)->lyxCode() == Inset::BIBTEX_CODE) { - vector > tmp = - static_cast(*it)->getKeys(this); - keys.insert(keys.end(), tmp.begin(), tmp.end()); - } else if ((*it)->lyxCode() == Inset::INCLUDE_CODE) { - vector > const tmp = - static_cast(*it)->getKeys(); - keys.insert(keys.end(), tmp.begin(), tmp.end()); - } + for (inset_iterator it = inset_const_iterator_begin(); + it != inset_const_iterator_end(); ++it) { + // Search for Bibtex or Include inset + if (it->lyxCode() == Inset::BIBTEX_CODE) { + vector tmp = + static_cast(*it).getKeys(this); + keys.insert(keys.end(), tmp.begin(), tmp.end()); + } else if (it->lyxCode() == Inset::INCLUDE_CODE) { + vector const tmp = + static_cast(*it).getKeys(); + keys.insert(keys.end(), tmp.begin(), tmp.end()); } } - + return keys; } @@ -3733,24 +3220,28 @@ void Buffer::markDepClean(string const & name) } -bool Buffer::dispatch(string const & command) +bool Buffer::dispatch(string const & command, bool * result) { // Split command string into command and argument string cmd; - string line = frontStrip(command); - string const arg = strip(frontStrip(split(line, cmd, ' '))); + string line = ltrim(command); + string const arg = trim(split(line, cmd, ' ')); - return dispatch(lyxaction.LookupFunc(cmd), arg); + return dispatch(lyxaction.LookupFunc(cmd), arg, result); } -bool Buffer::dispatch(int action, string const & argument) +bool Buffer::dispatch(int action, string const & argument, bool * result) { bool dispatched = true; + switch (action) { - case LFUN_EXPORT: - Exporter::Export(this, argument, false); + case LFUN_EXPORT: { + bool const tmp = Exporter::Export(this, argument, false); + if (result) + *result = tmp; break; + } default: dispatched = false; @@ -3762,17 +3253,16 @@ bool Buffer::dispatch(int action, string const & argument) void Buffer::resizeInsets(BufferView * bv) { /// then remove all LyXText in text-insets - Paragraph * par = paragraph; - for (; par; par = par->next()) { - par->resizeInsetsLyXText(bv); - } + for_each(paragraphs.begin(), paragraphs.end(), + boost::bind(&Paragraph::resizeInsetsLyXText, _1, bv)); } void Buffer::redraw() { - users->redraw(); - users->fitCursor(); +#warning repaint needed here, or do you mean update() ? + users->repaint(); + users->fitCursor(); } @@ -3796,27 +3286,14 @@ bool Buffer::isMultiLingual() } -Buffer::inset_iterator::inset_iterator(Paragraph * paragraph, pos_type pos) - : par(paragraph) -{ - it = par->InsetIterator(pos); - if (it == par->inset_iterator_end()) { - par = par->next(); - setParagraph(); - } -} - - void Buffer::inset_iterator::setParagraph() { - while (par) { - it = par->inset_iterator_begin(); - if (it != par->inset_iterator_end()) + while (pit != pend) { + it = pit->insetlist.begin(); + if (it != pit->insetlist.end()) return; - par = par->next(); + ++pit; } - //it = 0; - // We maintain an invariant that whenever par = 0 then it = 0 } @@ -3825,9 +3302,9 @@ Inset * Buffer::getInsetFromID(int id_arg) const for (inset_iterator it = inset_const_iterator_begin(); it != inset_const_iterator_end(); ++it) { - if ((*it)->id() == id_arg) - return *it; - Inset * in = (*it)->getInsetFromID(id_arg); + if (it->id() == id_arg) + return &(*it); + Inset * in = it->getInsetFromID(id_arg); if (in) return in; } @@ -3837,17 +3314,19 @@ Inset * Buffer::getInsetFromID(int id_arg) const Paragraph * Buffer::getParFromID(int id) const { - if (id < 0) return 0; - Paragraph * par = paragraph; - while (par) { - if (par->id() == id) { - return par; + if (id < 0) + return 0; + + ParagraphList::iterator it = paragraphs.begin(); + ParagraphList::iterator end = paragraphs.end(); + for (; it != end; ++it) { + if (it->id() == id) { + return &*it; } - Paragraph * tmp = par->getParFromID(id); + Paragraph * tmp = it->getParFromID(id); if (tmp) { return tmp; } - par = par->next(); } return 0; } @@ -3855,11 +3334,200 @@ Paragraph * Buffer::getParFromID(int id) const ParIterator Buffer::par_iterator_begin() { - return ParIterator(paragraph); + return ParIterator(&*(paragraphs.begin())); } ParIterator Buffer::par_iterator_end() { - return ParIterator(); + return ParIterator(); +} + +ParConstIterator Buffer::par_iterator_begin() const +{ + return ParConstIterator(&*(paragraphs.begin())); +} + + +ParConstIterator Buffer::par_iterator_end() const +{ + return ParConstIterator(); +} + + + +void Buffer::addUser(BufferView * u) +{ + users = u; +} + + +void Buffer::delUser(BufferView *) +{ + users = 0; +} + + +Language const * Buffer::getLanguage() const +{ + return params.language; +} + + +bool Buffer::isClean() const +{ + return lyx_clean; +} + + +bool Buffer::isBakClean() const +{ + return bak_clean; +} + + +void Buffer::markClean() const +{ + if (!lyx_clean) { + lyx_clean = true; + updateTitles(); + } + // if the .lyx file has been saved, we don't need an + // autosave + bak_clean = true; +} + + +void Buffer::markBakClean() +{ + bak_clean = true; +} + + +void Buffer::setUnnamed(bool flag) +{ + unnamed = flag; +} + + +bool Buffer::isUnnamed() +{ + return unnamed; +} + + +void Buffer::markDirty() +{ + if (lyx_clean) { + lyx_clean = false; + updateTitles(); + } + bak_clean = false; + DEPCLEAN * tmp = dep_clean; + while (tmp) { + tmp->clean = false; + tmp = tmp->next; + } +} + + +string const & Buffer::fileName() const +{ + return filename_; +} + + +string const & Buffer::filePath() const +{ + return filepath_; +} + + +bool Buffer::isReadonly() const +{ + return read_only; +} + + +BufferView * Buffer::getUser() const +{ + return users; +} + + +void Buffer::setParentName(string const & name) +{ + params.parentname = name; +} + + +Buffer::inset_iterator::inset_iterator() + : pit(0), pend(0) +{} + + +Buffer::inset_iterator::inset_iterator(base_type p, base_type e) + : pit(p), pend(e) +{ + setParagraph(); +} + + +Buffer::inset_iterator & Buffer::inset_iterator::operator++() +{ + if (pit != pend) { + ++it; + if (it == pit->insetlist.end()) { + ++pit; + setParagraph(); + } + } + return *this; +} + + +Buffer::inset_iterator Buffer::inset_iterator::operator++(int) +{ + inset_iterator tmp = *this; + ++*this; + return tmp; +} + + +Buffer::inset_iterator::reference Buffer::inset_iterator::operator*() +{ + return *it.getInset(); +} + + +Buffer::inset_iterator::pointer Buffer::inset_iterator::operator->() +{ + return it.getInset(); +} + + +Paragraph * Buffer::inset_iterator::getPar() +{ + return &(*pit); +} + + +lyx::pos_type Buffer::inset_iterator::getPos() const +{ + return it.getPos(); +} + + +bool operator==(Buffer::inset_iterator const & iter1, + Buffer::inset_iterator const & iter2) +{ + return iter1.pit == iter2.pit + && (iter1.pit == iter1.pend || iter1.it == iter2.it); +} + + +bool operator!=(Buffer::inset_iterator const & iter1, + Buffer::inset_iterator const & iter2) +{ + return !(iter1 == iter2); }