X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.C;h=e0953cf145bdde710a6fad6f78f0acb7232a5fe5;hb=53b464c5e95ed708e9464db0499826894be450fd;hp=117b1d3e06e16968087875484b2fb8446db26649;hpb=65e9b99a59e4e3ebc1fc6b688239faac5007b88e;p=features.git diff --git a/src/buffer.C b/src/buffer.C index 117b1d3e06..e0953cf145 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -1,5 +1,5 @@ /* This file is part of - * ====================================================== + * ====================================================== * * LyX, The Document Processor * @@ -9,11 +9,11 @@ * This file is Copyright 1996-1999 * Lars Gullik Bjønnes * - * ====================================================== + * ====================================================== */ // Change Log: -// =========== +// =========== // 23/03/98 Heinrich Bauer (heinrich.bauer@t-mobil.de) // Spots marked "changed Heinrich Bauer, 23/03/98" modified due to the // following bug: dvi file export did not work after printing (or previewing) @@ -23,6 +23,15 @@ #include +#include +#include +using std::ofstream; +using std::ifstream; +using std::fstream; +using std::ios; +using std::setw; + + #include #include @@ -30,11 +39,11 @@ #pragma implementation "buffer.h" #endif -#include "definitions.h" #include "buffer.h" #include "bufferlist.h" #include "lyx_main.h" #include "lyx_gui_misc.h" +#include "LyXAction.h" #include "lyxrc.h" #include "lyxlex.h" #include "tex-strings.h" @@ -42,6 +51,7 @@ #include "lyx_cb.h" #include "minibuffer.h" #include "lyxfont.h" +#include "version.h" #include "mathed/formulamacro.h" #include "insets/lyxinset.h" #include "insets/inseterror.h" @@ -50,7 +60,9 @@ #include "insets/inseturl.h" #include "insets/insetinfo.h" #include "insets/insetquotes.h" +#if 0 #include "insets/insetlatex.h" +#endif #include "insets/insetlatexaccent.h" #include "insets/insetbib.h" #include "insets/insetindex.h" @@ -89,9 +101,10 @@ // all these externs should eventually be removed. extern BufferList bufferlist; -extern void SmallUpdate(signed char); -extern unsigned char GetCurrentTextClass(); -extern void BeforeChange(); + +extern void MenuExport(Buffer *, string const &); +extern LyXAction lyxaction; + static const float LYX_FORMAT = 2.15; @@ -100,23 +113,20 @@ extern int tex_code_break_column; extern void FreeUpdateTimer(); -Buffer::Buffer(string const & file, LyXRC *lyxrc, bool ronly) +Buffer::Buffer(string const & file, LyXRC * lyxrc, bool ronly) { + lyxerr[Debug::INFO] << "Buffer::Buffer()" << endl; filename = file; filepath = OnlyPath(file); paragraph = 0; - text = 0; - the_locking_inset = 0; lyx_clean = true; bak_clean = true; dvi_clean_orgd = false; // Heinrich Bauer, 23/03/98 dvi_clean_tmpd = false; // Heinrich Bauer, 23/03/98 dep_clean = 0; read_only = ronly; - inset_slept = false; users = 0; - lyxvc.setBuffer(this); - lyxerr.debug() << "Buffer::Buffer()" << endl; + lyxvc.buffer(this); if (read_only || (lyxrc && lyxrc->use_tempdir)) { tmppath = CreateBufferTmpDir(); } else tmppath.clear(); @@ -125,14 +135,14 @@ Buffer::Buffer(string const & file, LyXRC *lyxrc, bool ronly) Buffer::~Buffer() { - lyxerr.debug() << "Buffer::~Buffer()" << endl; + lyxerr[Debug::INFO] << "Buffer::~Buffer()" << endl; // here the buffer should take care that it is // saved properly, before it goes into the void. // make sure that views using this buffer // forgets it. if (users) - users->setBuffer(0); + users->buffer(0); if (!tmppath.empty()) { DestroyBufferTmpDir(tmppath); @@ -146,7 +156,6 @@ Buffer::~Buffer() par = tmppar; } paragraph = 0; - delete text; } @@ -157,11 +166,12 @@ bool Buffer::saveParamsAsDefaults() Buffer defaults = Buffer(fname); // Use the current buffer's parameters as default - defaults.params.Copy(params); + defaults.params = params; + // add an empty paragraph. Is this enough? defaults.paragraph = new LyXParagraph; - return defaults.writeFile(defaults.filename,false); + return defaults.writeFile(defaults.filename, false); } @@ -169,7 +179,7 @@ bool Buffer::saveParamsAsDefaults() // Should work on a list void Buffer::updateTitles() { - if (users) users->getOwner()->updateWindowTitle(); + if (users) users->owner()->updateWindowTitle(); } @@ -177,11 +187,11 @@ void Buffer::updateTitles() // Should work on a list void Buffer::resetAutosaveTimers() { - if (users) users->getOwner()->resetAutosaveTimer(); + if (users) users->owner()->resetAutosaveTimer(); } -void Buffer::setFileName(string const & newfile) +void Buffer::fileName(string const & newfile) { filename = MakeAbsPath(newfile); filepath = OnlyPath(filename); @@ -189,19 +199,9 @@ void Buffer::setFileName(string const & newfile) updateTitles(); } -void Buffer::InsetUnlock() -{ - if (the_locking_inset) { - if (!inset_slept) the_locking_inset->InsetUnlock(); - the_locking_inset = 0; - text->FinishUndo(); - inset_slept = false; - } -} - // Inserts a file into current document -bool Buffer::insertLyXFile(string const & filen) +bool BufferView::insertLyXFile(string const & filen) // // (c) CHT Software Service GmbH // Uwe C. Schroeder @@ -212,53 +212,56 @@ bool Buffer::insertLyXFile(string const & filen) { if (filen.empty()) return false; - string filename = MakeAbsPath(filen); + string fname = MakeAbsPath(filen); // check if file exist - FileInfo fi(filename); + FileInfo fi(fname); - if (!fi.exist() || !fi.readable()) { + if (!fi.readable()) { WriteAlert(_("Error!"), - _("Cannot open specified file:"), - MakeDisplayPath(filename,50)); + _("Specified file is unreadable: "), + MakeDisplayPath(fname, 50)); return false; } - BeforeChange(); + beforeChange(); - FilePtr myfile(filename, FilePtr::read); - if (!myfile()) { + ifstream ifs(fname.c_str()); + if (!ifs) { WriteAlert(_("Error!"), - _("Cannot open specified file:"), - MakeDisplayPath(filename,50)); + _("Cannot open specified file: "), + MakeDisplayPath(fname, 50)); return false; } LyXLex lex(0, 0); - lex.setFile(myfile); - int c = fgetc(myfile()); - ungetc(c, myfile); + lex.setStream(ifs); + char c; ifs.get(c); + ifs.putback(c); bool res = true; if (c == '#') { lyxerr.debug() << "Will insert file with header" << endl; - res = readFile(lex, text->cursor.par); + res = buffer()->readFile(lex, text->cursor.par); } else { lyxerr.debug() << "Will insert file without header" << endl; - res = readLyXformat2(lex, text->cursor.par); + res = buffer()->readLyXformat2(lex, text->cursor.par); } + resize(); return res; } +// candidate for move to BufferView +// (at least some parts in the beginning of the func) // // Uwe C. Schroeder // changed to be public and have one parameter // if par = 0 normal behavior // else insert behavior // Returns false if "\the_end" is not read for formats >= 2.13. (Asger) -bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) +bool Buffer::readLyXformat2(LyXLex & lex, LyXParagraph * par) { string tmptok; Inset * inset = 0; @@ -269,7 +272,7 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) LyXParagraph::footnote_kind footnotekind = LyXParagraph::FOOTNOTE; bool the_end_read = false; - LyXParagraph *return_par = 0; + LyXParagraph * return_par = 0; LyXFont font = LyXFont(LyXFont::ALL_INHERIT); // If we are inserting, we cheat and get a token in advance @@ -278,13 +281,10 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) if(!par) { par = new LyXParagraph; -#ifdef NEW_TEXT - par->text.reserve(500); -#endif } else { - text->BreakParagraph(); - return_par = text->FirstParagraph(); - pos=0; + users->text->BreakParagraph(); + return_par = users->text->FirstParagraph(); + pos = 0; markDirty(); // We don't want to adopt the parameters from the // document we insert, so we skip until the text begins: @@ -313,15 +313,15 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) continue; else if (token[0] != '\\') { int n = token.length(); - for (int i=0; i < n; i++) { + for (int i = 0; i < n; ++i) { par->InsertChar(pos, token[i]); par->SetFont(pos, font); - pos++; + ++pos; } } else if (token == "\\i") { inset = new InsetLatexAccent; inset->Read(lex); - par->InsertChar(pos, LYX_META_INSET); + par->InsertChar(pos, LyXParagraph::META_INSET); par->InsertInset(pos, inset); par->SetFont(pos, font); @@ -330,13 +330,8 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) if (!return_par) return_par = par; else { -#ifdef NEW_TEXT par->text.resize(par->text.size()); -#endif par = new LyXParagraph(par); -#ifdef NEW_TEXT - par->text.reserve(500); -#endif } pos = 0; lex.EatLine(); @@ -365,13 +360,8 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) if (!return_par) return_par = par; else { -#ifdef NEW_TEXT par->text.resize(par->text.size()); -#endif par = new LyXParagraph(par); -#ifdef NEW_TEXT - par->text.reserve(500); -#endif } footnotekind = LyXParagraph::FOOTNOTE; footnoteflag = LyXParagraph::NO_FOOTNOTE; @@ -381,28 +371,28 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) font = LyXFont(LyXFont::ALL_INHERIT); } else if (token == "\\begin_float") { tmpret = lex.FindToken(string_footnotekinds); - if (tmpret == -1) tmpret++; + if (tmpret == -1) ++tmpret; if (tmpret != LYX_LAYOUT_DEFAULT) - footnotekind = (LyXParagraph::footnote_kind)tmpret; // bad + footnotekind = static_cast(tmpret); // bad if (footnotekind == LyXParagraph::FOOTNOTE || footnotekind == LyXParagraph::MARGIN) footnoteflag = LyXParagraph::CLOSED_FOOTNOTE; else footnoteflag = LyXParagraph::OPEN_FOOTNOTE; } else if (token == "\\begin_deeper") { - depth++; + ++depth; } else if (token == "\\end_deeper") { if (!depth) { lex.printError("\\end_deeper: " "depth is already null"); } else - depth--; + --depth; } else if (token == "\\begin_preamble") { params.readPreamble(lex); } else if (token == "\\textclass") { lex.EatLine(); - pair pp = + pair pp = textclasslist.NumberOfClass(lex.GetString()); if (pp.first) { params.textclass = pp.second; @@ -426,7 +416,7 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * 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") { @@ -457,15 +447,16 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) tmpret = lex.FindToken(string_paragraph_separation); if (tmpret == -1) tmpret++; if (tmpret != LYX_LAYOUT_DEFAULT) - params.paragraph_separation = tmpret; + params.paragraph_separation = + static_cast(tmpret); } else if (token == "\\defskip") { lex.nextToken(); params.defskip = VSpace(lex.GetString()); - } else if (token == "\\no_isolatin1") { + } else if (token == "\\no_isolatin1") { // obsolete lex.nextToken(); - } else if (token == "\\no_babel") { + } else if (token == "\\no_babel") { // obsolete lex.nextToken(); - } else if (token == "\\no_epsfig") { + } else if (token == "\\no_epsfig") { // obsolete lex.nextToken(); } else if (token == "\\epsfig") { // obsolete // Indeed it is obsolete, but we HAVE to be backwards @@ -476,7 +467,7 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) tmpret = lex.FindToken(string_quotes_language); if (tmpret == -1) tmpret++; if (tmpret != LYX_LAYOUT_DEFAULT) { - InsetQuotes::quote_language tmpl = + InsetQuotes::quote_language tmpl = InsetQuotes::EnglishQ; switch(tmpret) { case 0: @@ -511,10 +502,14 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) break; } } else if (token == "\\papersize") { +#if 0 if (format > 2.13) +#endif tmpret = lex.FindToken(string_papersize); +#if 0 else tmpret = lex.FindToken(string_oldpapersize); +#endif if (tmpret == -1) tmpret++; else @@ -523,7 +518,7 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) tmpret = lex.FindToken(string_paperpackages); if (tmpret == -1) { tmpret++; - params.paperpackage = PACKAGE_NONE; + params.paperpackage = BufferParams::PACKAGE_NONE; } else params.paperpackage = tmpret; } else if (token == "\\use_geometry") { @@ -536,7 +531,7 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) tmpret = lex.FindToken(string_orientation); if (tmpret == -1) tmpret++; if (tmpret != LYX_LAYOUT_DEFAULT) - params.orientation = tmpret; + params.orientation = static_cast(tmpret); } else if (token == "\\paperwidth") { lex.next(); params.paperwidth = lex.GetString(); @@ -629,7 +624,7 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) } else if (token == "\\tocdepth") { lex.nextToken(); params.tocdepth = lex.GetInteger(); - } else if (token == "\\baselinestretch") { // now obsolete + } else if (token == "\\baselinestretch") { // obsolete lex.nextToken(); // should not be used directly // anymore. // Will probably keep a kind of support just for @@ -654,7 +649,7 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) } else if (token == "\\float_placement") { lex.nextToken(); params.float_placement = lex.GetString(); - } else if (token == "\\cursor") { + } else if (token == "\\cursor") { // obsolete // this is obsolete, so we just skip it. lex.nextToken(); } else if (token == "\\family") { @@ -707,13 +702,13 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) } else if (token == "\\align") { tmpret = lex.FindToken(string_align); if (tmpret == -1) tmpret++; - if (tmpret != LYX_LAYOUT_DEFAULT) { + if (tmpret != LYX_LAYOUT_DEFAULT) { // tmpret != 99 ??? tmpret2 = 1; - for (; tmpret>0; tmpret--) + for (; tmpret > 0; --tmpret) tmpret2 = tmpret2 * 2; par->align = LyXAlignment(tmpret2); } - } else if (token == "\\added_space_top"){ + } else if (token == "\\added_space_top") { lex.nextToken(); par->added_space_top = lex.GetString(); } else if (token == "\\added_space_bottom") { @@ -753,10 +748,11 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) if (tmptok == "Quotes") { inset = new InsetQuotes; inset->Read(lex); - par->InsertChar(pos, LYX_META_INSET); + par->InsertChar(pos, LyXParagraph::META_INSET); par->InsertInset(pos, inset); par->SetFont(pos, font); pos++; +#if 0 // should not be used any more } else if (tmptok == "Latex") { // This one is on its way out lex.EatLine(); @@ -765,7 +761,7 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) if (tmptok[0] == '\\') { // then this latex is a // latex command - InsetCommand *tmpinset = + InsetCommand *tmpinset = new InsetCommand(); tmpinset->scanCommand(tmptok); inset = tmpinset; @@ -775,10 +771,12 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) // the paragraph and mark it as tex. inset = new InsetLatex(tmptok); } - par->InsertChar(pos, LYX_META_INSET); + par->InsertChar(pos, LyXParagraph::META_INSET); par->InsertInset(pos, inset); par->SetFont(pos, font); pos++; +#endif +#if 0 // should not be used any more } else if (tmptok == "LatexDel") { // This one is on its way out... lex.EatLine(); @@ -797,14 +795,14 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) inset = new InsetRef(tmptok, this); } else if (contains(tmptok, "\\url{") || contains(tmptok, "\\htmlurl{")) { - string cont,opt,tmptmptok,cmdname; + string cont, opt, tmptmptok, cmdname; lex.next(); while(lex.IsOK() && lex.GetString() != "\\end_inset" ) { lex.next(); } lex.next(); while(lex.IsOK()) { - tmptmptok=lex.GetString(); + tmptmptok = lex.GetString(); if(tmptmptok[0] == '\\') { if( tmptmptok == "\\backslash") opt += '\\'; @@ -821,7 +819,7 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) } lex.next(); while(lex.IsOK()) { - tmptmptok=lex.GetString(); + tmptmptok = lex.GetString(); if(tmptmptok[0] == '\\') { if( tmptmptok == "\\backslash") cont += '\\'; @@ -842,47 +840,49 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) cmdname = string("htmlurl"); cont = strip(cont); opt = strip(opt); - inset = new InsetUrl(cmdname,cont,opt); + inset = new InsetUrl(cmdname, cont, opt); } else if (tmptok[0] == '\\') { // then this latex del is a // latex command - InsetCommand *tmpinset = + InsetCommand * tmpinset = new InsetCommand(); tmpinset->scanCommand(tmptok); inset = tmpinset; } - par->InsertChar(pos, LYX_META_INSET); + par->InsertChar(pos, LyXParagraph::META_INSET); par->InsertInset(pos, inset); par->SetFont(pos, font); pos++; +#endif } else if (tmptok == "\\i") { inset = new InsetLatexAccent; inset->Read(lex); - par->InsertChar(pos, LYX_META_INSET); + par->InsertChar(pos, LyXParagraph::META_INSET); par->InsertInset(pos, inset); par->SetFont(pos, font); pos++; } else if (tmptok == "FormulaMacro") { inset = new InsetFormulaMacro; inset->Read(lex); - par->InsertChar(pos, LYX_META_INSET); + par->InsertChar(pos, LyXParagraph::META_INSET); par->InsertInset(pos, inset); par->SetFont(pos, font); pos++; } else if (tmptok == "Formula") { inset = new InsetFormula; inset->Read(lex); - par->InsertChar(pos, LYX_META_INSET); + par->InsertChar(pos, LyXParagraph::META_INSET); par->InsertInset(pos, inset); par->SetFont(pos, font); pos++; } else if (tmptok == "Figure") { - inset = new InsetFig(100,100, this); + inset = new InsetFig(100, 100, this); inset->Read(lex); - par->InsertChar(pos, LYX_META_INSET); + par->InsertChar(pos, LyXParagraph::META_INSET); par->InsertInset(pos, inset); par->SetFont(pos, font); pos++; +#if 0 } else if (tmptok == "Label") { // Kept for compability. Remove in 0.13. if (lex.EatLine()) { @@ -890,61 +890,64 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) tmp += lex.GetString(); tmp += '}'; inset = new InsetLabel(tmp); - par->InsertChar(pos, LYX_META_INSET); + par->InsertChar(pos, LyXParagraph::META_INSET); par->InsertInset(pos, inset); par->SetFont(pos, font); pos++; } +#endif } else if (tmptok == "Info") { inset = new InsetInfo; inset->Read(lex); - par->InsertChar(pos, LYX_META_INSET); + par->InsertChar(pos, LyXParagraph::META_INSET); par->InsertInset(pos, inset); par->SetFont(pos, font); pos++; } else if (tmptok == "Include") { inset = new InsetInclude(string(), this); inset->Read(lex); - par->InsertChar(pos, LYX_META_INSET); + par->InsertChar(pos, LyXParagraph::META_INSET); par->InsertInset(pos, inset); par->SetFont(pos, font); pos++; } else if (tmptok == "LatexCommand") { InsetCommand inscmd; inscmd.Read(lex); - if (inscmd.getCmdName()=="cite") { + if (inscmd.getCmdName() == "cite") { inset = new InsetCitation(inscmd.getContents(), inscmd.getOptions()); - } else if (inscmd.getCmdName()=="bibitem") { + } else if (inscmd.getCmdName() == "bibitem") { lex.printError("Wrong place for bibitem"); inset = inscmd.Clone(); - } else if (inscmd.getCmdName()=="BibTeX") { + } else if (inscmd.getCmdName() == "BibTeX") { inset = new InsetBibtex(inscmd.getContents(), inscmd.getOptions(), this); - } else if (inscmd.getCmdName()=="index") { + } else if (inscmd.getCmdName() == "index") { inset = new InsetIndex(inscmd.getContents()); - } else if (inscmd.getCmdName()=="include") { + } else if (inscmd.getCmdName() == "include") { inset = new InsetInclude(inscmd.getContents(), this); - } else if (inscmd.getCmdName()=="label") { + } else if (inscmd.getCmdName() == "label") { inset = new InsetLabel(inscmd.getCommand()); - } else if (inscmd.getCmdName()=="url" - || inscmd.getCmdName()=="htmlurl") { + } else if (inscmd.getCmdName() == "url" + || inscmd.getCmdName() == "htmlurl") { inset = new InsetUrl(inscmd.getCommand()); } else if (inscmd.getCmdName() == "ref" || inscmd.getCmdName() == "pageref") { if (!inscmd.getOptions().empty() || !inscmd.getContents().empty()) { inset = new InsetRef(inscmd, this); } - /* This condition comes from a temporary solution - to the latexdel ref inset that was transformed to an empty ref - inset plus the body surronded by latexdel insets */ + // This condition comes from a + // temporary solution to the latexdel + // ref inset that was transformed to + // an empty ref inset plus the body + // surronded by latexdel insets else { - string cont,opt,tmptmptok,cmdname; + string cont, opt, tmptmptok, cmdname; lex.next(); while(lex.IsOK() && lex.GetString() != "\\end_inset" ) { lex.next(); } lex.next(); while(lex.IsOK()) { - tmptmptok=lex.GetString(); + tmptmptok = lex.GetString(); if(tmptmptok[0] == '\\') { if( tmptmptok == "\\backslash") opt += '\\'; @@ -961,7 +964,7 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) } lex.next(); while(lex.IsOK()) { - tmptmptok=lex.GetString(); + tmptmptok = lex.GetString(); if(tmptmptok[0] == '\\') { if( tmptmptok == "\\backslash") cont += '\\'; @@ -982,89 +985,95 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) cmdname = "\\" + inscmd.getCmdName(); cmdname += "[" + cont + "]"; cmdname += "{" + opt + "}"; - inset = new InsetRef(cmdname,this); + inset = new InsetRef(cmdname, this); } - } else if (inscmd.getCmdName()=="tableofcontents") { + } else if (inscmd.getCmdName() == "tableofcontents") { inset = new InsetTOC(this); - } else if (inscmd.getCmdName()=="listoffigures") { + } else if (inscmd.getCmdName() == "listoffigures") { inset = new InsetLOF(this); - } else if (inscmd.getCmdName()=="listofalgorithms") { + } else if (inscmd.getCmdName() == "listofalgorithms") { inset = new InsetLOA(this); - } else if (inscmd.getCmdName()=="listoftables") { + } else if (inscmd.getCmdName() == "listoftables") { inset = new InsetLOT(this); - } else if (inscmd.getCmdName()=="printindex") { + } else if (inscmd.getCmdName() == "printindex") { inset = new InsetPrintIndex(this); - } else if (inscmd.getCmdName()=="lyxparent") { - inset = new InsetParent(inscmd.getContents(),this); - } else + } else if (inscmd.getCmdName() == "lyxparent") { + inset = new InsetParent(inscmd.getContents(), this); + } +#if 0 + // Do we need this at all now? + else // The following three are only for compatibility - if (inscmd.getCmdName()=="-") { + if (inscmd.getCmdName() == "-") { inset = new InsetSpecialChar(InsetSpecialChar::HYPHENATION); - } else if (inscmd.getCmdName()=="@.") { + } else if (inscmd.getCmdName() == "@.") { inset = new InsetSpecialChar(InsetSpecialChar::END_OF_SENTENCE); - } else if (inscmd.getCmdName()=="ldots") { + } else if (inscmd.getCmdName() == "ldots") { inset = new InsetSpecialChar(InsetSpecialChar::LDOTS); } else inset = inscmd.Clone(); +#endif if (inset) { - par->InsertChar(pos, LYX_META_INSET); + par->InsertChar(pos, LyXParagraph::META_INSET); par->InsertInset(pos, inset); par->SetFont(pos, font); - pos++; + ++pos; } } } else if (token == "\\InsetQuotes") { inset = new InsetQuotes; inset->Read(lex); - par->InsertChar(pos, LYX_META_INSET); + par->InsertChar(pos, LyXParagraph::META_INSET); par->InsertInset(pos, inset); par->SetFont(pos, font); - pos++; + ++pos; +#if 0 } else if (token == "\\InsetLatex") { inset = new InsetLatex; inset->Read(lex); - par->InsertChar(pos, LYX_META_INSET); + par->InsertChar(pos, LyXParagraph::META_INSET); par->InsertInset(pos, inset); par->SetFont(pos, font); - pos++; + ++pos; } else if (token == "\\InsetLatexDel") { lex.printError(_("Warning: Ignoring Old Inset")); +#endif } else if (token == "\\InsetFormula") { inset = new InsetFormula; inset->Read(lex); - par->InsertChar(pos, LYX_META_INSET); + par->InsertChar(pos, LyXParagraph::META_INSET); par->InsertInset(pos, inset); par->SetFont(pos, font); - pos++; + ++pos; } else if (token == "\\SpecialChar") { inset = new InsetSpecialChar; inset->Read(lex); - par->InsertChar(pos, LYX_META_INSET); + par->InsertChar(pos, LyXParagraph::META_INSET); par->InsertInset(pos, inset); par->SetFont(pos, font); - pos++; + ++pos; } else if (token == "\\Figure") { - inset = new InsetFig(100,100, this); + inset = new InsetFig(100, 100, this); inset->Read(lex); - par->InsertChar(pos, LYX_META_INSET); + par->InsertChar(pos, LyXParagraph::META_INSET); par->InsertInset(pos, inset); par->SetFont(pos, font); - pos++; + ++pos; } else if (token == "\\newline") { - par->InsertChar(pos, LYX_META_NEWLINE); + par->InsertChar(pos, LyXParagraph::META_NEWLINE); par->SetFont(pos, font); - pos++; + ++pos; } else if (token == "\\LyXTable") { par->table = new LyXTable(lex); } else if (token == "\\hfill") { - par->InsertChar(pos, LYX_META_HFILL); + par->InsertChar(pos, LyXParagraph::META_HFILL); par->SetFont(pos, font); - pos++; + ++pos; } else if (token == "\\protected_separator") { - par->InsertChar(pos, LYX_META_PROTECTED_SEPARATOR); + par->InsertChar(pos, LyXParagraph::META_PROTECTED_SEPARATOR); par->SetFont(pos, font); - pos++; + ++pos; } else if (token == "\\bibitem") { // ale970302 if (!par->bibkey) par->bibkey = new InsetBibKey; @@ -1072,7 +1081,7 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) }else if (token == "\\backslash") { par->InsertChar(pos, '\\'); par->SetFont(pos, font); - pos++; + ++pos; }else if (token == "\\the_end") { the_end_read = true; } else { @@ -1080,10 +1089,10 @@ bool Buffer::readLyXformat2(LyXLex &lex, LyXParagraph * par) lex.printError("Unknown token `$$Token'. " "Inserting as text."); int n = token.length(); - for (int i=0; i < n; i++) { + for (int i = 0; i < n; ++i) { par->InsertChar(pos, token[i]); par->SetFont(pos, font); - pos++; + ++pos; } } } @@ -1120,12 +1129,16 @@ bool Buffer::readFile(LyXLex & lex, LyXParagraph * par) // Formats >= 2.13 support "\the_end" marker if (format < 2.13) the_end = true; +#if 0 // Formats >= 2.14 changed papersize stuff if (format < 2.14) { setOldPaperStuff(); } else { +#endif setPaperStuff(); +#if 0 } +#endif if (!the_end) WriteAlert(_("Warning!"), _("Reading of document is not complete"), @@ -1151,131 +1164,98 @@ bool Buffer::readFile(LyXLex & lex, LyXParagraph * par) // Returns false if unsuccesful -bool Buffer::writeFile(string const & filename, bool flag) +bool Buffer::writeFile(string const & fname, bool flag) { // 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 && (filename == this->filename)) { + 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: ") - << filename << endl; + << fname << endl; else - WriteAlert(_("Error! Document is read-only: "), filename); + WriteAlert(_("Error! Document is read-only: "), + fname); return false; } - FileInfo finfo(filename); + 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: ") - << filename << endl; + << fname << endl; else - WriteFSAlert(_("Error! Cannot write file: "), filename); + WriteFSAlert(_("Error! Cannot write file: "), + fname); return false; } - FilePtr file(filename, FilePtr::truncate); - if (!file()) { + ofstream ofs(fname.c_str()); + if (!ofs) { if (flag) - lyxerr << _("Error! Cannot write file: ") - << filename << endl; + lyxerr << _("Error! Cannot open file: ") + << fname << endl; else - WriteFSAlert(_("Error! Cannot write file: "), filename); + WriteFSAlert(_("Error! Cannot open file: "), + fname); return false; } // The top of the file should not be written by params. - // collect some very important information - string userName(getUserName()) ; // write out a comment in the top of the file - fprintf(file, - "#This file was created by <%s> %s", - userName.c_str(),(char*)date()); - fprintf(file, - "#LyX 1.0 (C) 1995-1999 Matthias Ettrich" - " and the LyX Team\n"); - - // at the very beginning the used lyx format - fprintf(file, "\\lyxformat %.2f\n", LYX_FORMAT); + ofs << '#' << LYX_DOCVERSION + << " created this file. For more info see http://www.lyx.org/\n"; + ofs.setf(ios::showpoint|ios::fixed); + ofs.precision(2); + ofs << "\\lyxformat " << setw(4) << LYX_FORMAT << "\n"; - // now write out the buffer parameters. - params.writeFile(file); + // now write out the buffer paramters. + params.writeFile(ofs); char footnoteflag = 0; char depth = 0; // this will write out all the paragraphs // using recursive descent. - paragraph->writeFile(file, params, footnoteflag, depth); + paragraph->writeFile(ofs, params, footnoteflag, depth); // Write marker that shows file is complete - fprintf(file, "\n\\the_end\n"); - if (file.close()) { - if (flag) - lyxerr << _("Error! Could not close file properly: ") - << filename << endl; - else - WriteFSAlert(_("Error! Could not close file properly: "), - filename); - return false; - } + ofs << "\n\\the_end" << endl; + ofs.close(); + // how to check if close went ok? return true; } -void Buffer::writeFileAscii(string const & filename, int linelen) +void Buffer::writeFileAscii(string const & fname, int linelen) { - FilePtr file(filename, FilePtr::write); - LyXFont - font1, font2; + LyXFont font1, font2; Inset * inset; - LyXParagraph * par = paragraph; - char - c, - footnoteflag = 0, - depth = 0; - - string - fname1, - tmp; - -#ifdef NEW_TEXT + char c, footnoteflag = 0, depth = 0; + string tmp; LyXParagraph::size_type i; -#else - int i; -#endif - int - j,h, - ltype=0, - ltype_depth=0, - noparbreak=0, - islatex=0, - *clen=0, - actcell=0, - actpos=0, - cell=0, - cells=0, - currlinelen=0; - long - fpos=0; - bool - ref_printed = false; - - - if (!file()) { - WriteFSAlert(_("Error: Cannot write file:"), filename); + int j, h, ltype = 0, ltype_depth = 0, + * clen = 0, actcell = 0, actpos = 0, cell = 0, cells = 0, + currlinelen = 0; + long fpos = 0; + bool ref_printed = false; + + ofstream ofs(fname.c_str()); + if (!ofs) { + WriteFSAlert(_("Error: Cannot write file:"), fname); return; } - fname1=TmpFileName(); + + string fname1 = TmpFileName(); + LyXParagraph * par = paragraph; while (par) { - noparbreak = 0; - islatex = 0; + int noparbreak = 0; + int islatex = 0; if (par->footnoteflag != LyXParagraph::NO_FOOTNOTE || !par->previous || par->previous->footnoteflag == LyXParagraph::NO_FOOTNOTE){ @@ -1284,11 +1264,11 @@ void Buffer::writeFileAscii(string const & filename, int linelen) if (footnoteflag != par->footnoteflag) { footnoteflag = par->footnoteflag; if (footnoteflag) { - j=strlen(string_footnotekinds[par->footnotekind])+4; - if (currlinelen+j > linelen) - fprintf(file,"\n"); - fprintf(file, "([%s] ", - string_footnotekinds[par->footnotekind]); + j = strlen(string_footnotekinds[par->footnotekind])+4; + if (currlinelen + j > linelen) + ofs << "\n"; + ofs << "([" + << string_footnotekinds[par->footnotekind] << "] "; currlinelen += j; } } @@ -1308,17 +1288,17 @@ void Buffer::writeFileAscii(string const & filename, int linelen) } /* First write the layout */ - tmp = textclasslist.NameOfLayout(params.textclass,par->layout); + tmp = textclasslist.NameOfLayout(params.textclass, par->layout); if (tmp == "Itemize") { ltype = 1; ltype_depth = depth+1; - } else if (tmp =="Enumerate") { + } else if (tmp == "Enumerate") { ltype = 2; ltype_depth = depth+1; - } else if (strstr(tmp.c_str(),"ection")) { + } else if (strstr(tmp.c_str(), "ection")) { ltype = 3; ltype_depth = depth+1; - } else if (strstr(tmp.c_str(),"aragraph")) { + } else if (strstr(tmp.c_str(), "aragraph")) { ltype = 4; ltype_depth = depth+1; } else if (tmp == "Description") { @@ -1350,7 +1330,7 @@ void Buffer::writeFileAscii(string const & filename, int linelen) else { /* dummy layout, that means a footnote ended */ footnoteflag = LyXParagraph::NO_FOOTNOTE; - fprintf(file, ") "); + ofs << ") "; noparbreak = 1; } @@ -1358,7 +1338,7 @@ void Buffer::writeFileAscii(string const & filename, int linelen) if (par->table){ if (!lyxrc->ascii_roff_command.empty() && lyxrc->ascii_roff_command != "none") { - RoffAsciiTable(file,par); + RoffAsciiTable(ofs, par); par = par->next; continue; } @@ -1366,31 +1346,26 @@ void Buffer::writeFileAscii(string const & filename, int linelen) actcell = 0; cells = par->table->columns; clen = new int [cells]; - memset(clen,0,sizeof(int)*cells); -#ifdef NEW_TEXT + memset(clen, 0, sizeof(int) * cells); for (i = 0, j = 0, h = 1; i < par->size(); ++i, ++h) { -#else - for (i = 0, j = 0, h=1; i < par->last; i++, h++) { -#endif c = par->GetChar(i); - if (c == LYX_META_INSET) { + if (c == LyXParagraph::META_INSET) { if ((inset = par->GetInset(i))) { - FilePtr fp(fname1, - FilePtr::write); - if (!fp()) { + ofstream fs(fname1.c_str()); + if (!fs) { WriteFSAlert(_("Error: Cannot open temporary file:"), fname1); return; } - inset->Latex(fp,-1); - h += ftell(fp) - 1; + inset->Latex(fs, -1); + h += fs.tellp() - 1; remove(fname1.c_str()); } - } else if (c == LYX_META_NEWLINE) { + } else if (c == LyXParagraph::META_NEWLINE) { if (clen[j] < h) clen[j] = h; h = 0; j = (++j) % par->table->NumberOfCellsInRow(actcell); - actcell++; + ++actcell; } } if (clen[j] < h) @@ -1398,56 +1373,54 @@ void Buffer::writeFileAscii(string const & filename, int linelen) } font1 = LyXFont(LyXFont::ALL_INHERIT); - actcell=0; -#ifdef NEW_TEXT + actcell = 0; for (i = 0, actpos = 1; i < par->size(); ++i, ++actpos) { -#else - for (i = 0,actpos=1; i < par->last; i++, actpos++) { -#endif if (!i && !footnoteflag && !noparbreak){ - fprintf(file, "\n\n"); - for(j=0; jlabelstring.c_str()); + ofs << par->labelstring << " "; break; } if (ltype_depth > depth) { - for(j=ltype_depth-1; j>depth; j--) - fprintf(file, " "); + for(j = ltype_depth - 1; j > depth; --j) + ofs << " "; currlinelen += (ltype_depth-depth)*2; } if (par->table) { - for(j=0;j depth) { - for(j=ltype_depth; j>depth; j--) - fprintf(file, " "); + for(j = ltype_depth; + j > depth; --j) + ofs << " "; currlinelen += (ltype_depth-depth)*2; } - fprintf(file,"| "); + ofs << "| "; } } font2 = par->GetFontSettings(i); @@ -1464,144 +1437,146 @@ void Buffer::writeFileAscii(string const & filename, int linelen) if (islatex) continue; switch (c) { - case LYX_META_INSET: + case LyXParagraph::META_INSET: if ((inset = par->GetInset(i))) { - fpos = ftell(file); - inset->Latex(file,-1); - currlinelen += (ftell(file) - fpos); - actpos += (ftell(file) - fpos) - 1; + fpos = ofs.tellp(); + inset->Latex(ofs, -1); + currlinelen += (ofs.tellp() - fpos); + actpos += (ofs.tellp() - fpos) - 1; } break; - case LYX_META_NEWLINE: + case LyXParagraph::META_NEWLINE: if (par->table) { if (par->table->NumberOfCellsInRow(actcell) <= cell) { - for(j=actpos;j depth) { - for(j=ltype_depth; j>depth; j--) - fprintf(file, " "); - currlinelen += (ltype_depth-depth)*2; + for(j = ltype_depth; j > depth; --j) + ofs << " "; + currlinelen += (ltype_depth-depth) * 2; } - for(j=0;j depth) { - for(j=ltype_depth; j>depth; j--) - fprintf(file, " "); + for(j = ltype_depth; + j > depth; --j) + ofs << " "; currlinelen += (ltype_depth-depth)*2; } - fprintf(file,"| "); + ofs << "| "; cell = 1; } else { - for(j=actpos; j depth) { - for(j=ltype_depth; j>depth; j--) - fprintf(file, " "); - currlinelen += (ltype_depth-depth)*2; + for(j = ltype_depth; + j > depth; --j) + ofs << " "; + currlinelen += (ltype_depth - depth) * 2; } } break; - case LYX_META_HFILL: - fprintf(file, "\t"); + case LyXParagraph::META_HFILL: + ofs << "\t"; break; - case LYX_META_PROTECTED_SEPARATOR: - fprintf(file, " "); + case LyXParagraph::META_PROTECTED_SEPARATOR: + ofs << " "; break; - case '\\': - fprintf(file, "\\"); + case '\\': + ofs << "\\"; break; default: -#ifdef NEW_TEXT if (currlinelen > linelen - 10 && c == ' ' && i + 2 < par->size()) { -#else - if (currlinelen > (linelen-10) \ - && c==' ' && (i+2 < par->last)) { -#endif - fprintf(file, "\n"); + ofs << "\n"; for(j = 0; j < depth; ++j) - fprintf(file, " "); + ofs << " "; currlinelen = depth * 2; if (ltype_depth > depth) { for(j = ltype_depth; j > depth; --j) - fprintf(file, " "); + ofs << " "; currlinelen += (ltype_depth-depth)*2; } } else if (c != '\0') - fprintf(file, "%c", c); + ofs << c; else if (c == '\0') lyxerr.debug() << "writeAsciiFile: NULL char in structure." << endl; - currlinelen++; + ++currlinelen; break; } } if (par->table) { - for(j=actpos;j depth) { - for(j=ltype_depth; j>depth; j--) - fprintf(file, " "); - currlinelen += (ltype_depth-depth)*2; + for(j = ltype_depth; j > depth; --j) + ofs << " "; + currlinelen += (ltype_depth - depth) * 2; } - for(j=0;jnext; } - fprintf(file, "\n"); + ofs << "\n"; } -void Buffer::makeLaTeXFile(string const & filename, +void Buffer::makeLaTeXFile(string const & fname, string const & original_path, bool nice, bool only_body) { lyxerr[Debug::LATEX] << "makeLaTeXFile..." << endl; - params.textclass = GetCurrentTextClass(); + + // How the **** can this be needed? + //params.textclass = current_view->buffer()->params.textclass; + niceFile = nice; // this will be used by Insetincludes. tex_code_break_column = lyxrc->ascii_linelen; - LyXTextClass const & tclass = textclasslist.TextClass(params.textclass); - - FilePtr file(filename, FilePtr::write); - if (!file()) { - WriteFSAlert(_("Error: Cannot write file:"),filename); + LyXTextClass const & tclass = + textclasslist.TextClass(params.textclass); + + ofstream ofs(fname.c_str()); + if (!ofs) { + WriteFSAlert(_("Error: Cannot open file: "), fname); return; } - + // validate the buffer. lyxerr[Debug::LATEX] << " Validating buffer..." << endl; LaTeXFeatures features(tclass.numLayouts()); @@ -1617,18 +1592,15 @@ void Buffer::makeLaTeXFile(string const & filename, string LFile; if (!only_body && nice) { - LFile += "%% This LaTeX-file was created by <"; - LFile += userName + "> " + (char*)date(); - LFile += "%% LyX 1.0 (C) 1995-1999 by Matthias Ettrich and the LyX Team\n"; - LFile += "\n%% Do not edit this file unless you know what you are doing.\n"; - texrow.newline(); - texrow.newline(); + LFile += "%% " LYX_DOCVERSION " created this file. " + "For more info, see http://www.lyx.org/.\n"; + LFile += "%% Do not edit unless you really know what you are doing.\n"; texrow.newline(); texrow.newline(); } lyxerr.debug() << "lyx header finished" << endl; // There are a few differences between nice LaTeX and usual files: - // usual is \batchmode, uses \listfiles 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. @@ -1642,9 +1614,6 @@ void Buffer::makeLaTeXFile(string const & filename, LFile += "\\batchmode\n"; // changed // from \nonstopmode texrow.newline(); - // We don't need listfiles anymore - //LFile += "\\listfiles\n"; - //texrow.newline(); } if (!original_path.empty()) { LFile += "\\makeatletter\n"; @@ -1660,7 +1629,7 @@ void Buffer::makeLaTeXFile(string const & filename, string options; // the document class options. - if (tokenPos(tclass.opt_fontsize(), '|',params.fontsize) >= 0) { + if (tokenPos(tclass.opt_fontsize(), '|', params.fontsize) >= 0) { // only write if existing in list (and not default) options += params.fontsize; options += "pt,"; @@ -1668,24 +1637,24 @@ void Buffer::makeLaTeXFile(string const & filename, if (!params.use_geometry && - (params.paperpackage == PACKAGE_NONE)) { + (params.paperpackage == BufferParams::PACKAGE_NONE)) { switch (params.papersize) { - case PAPER_A4PAPER: + case BufferParams::PAPER_A4PAPER: options += "a4paper,"; break; - case PAPER_USLETTER: + case BufferParams::PAPER_USLETTER: options += "letterpaper,"; break; - case PAPER_A5PAPER: + case BufferParams::PAPER_A5PAPER: options += "a5paper,"; break; - case PAPER_B5PAPER: + case BufferParams::PAPER_B5PAPER: options += "b5paper,"; break; - case PAPER_EXECUTIVEPAPER: + case BufferParams::PAPER_EXECUTIVEPAPER: options += "executivepaper,"; break; - case PAPER_LEGALPAPER: + case BufferParams::PAPER_LEGALPAPER: options += "legalpaper,"; break; } @@ -1707,7 +1676,8 @@ void Buffer::makeLaTeXFile(string const & filename, options += "onecolumn,"; } - if (!params.use_geometry && params.orientation == ORIENTATION_LANDSCAPE) + if (!params.use_geometry + && params.orientation == BufferParams::ORIENTATION_LANDSCAPE) options += "landscape,"; // language should be a parameter to \documentclass @@ -1751,17 +1721,17 @@ void Buffer::makeLaTeXFile(string const & filename, } /* at the very beginning the text parameters */ - if (params.paperpackage != PACKAGE_NONE) { + if (params.paperpackage != BufferParams::PACKAGE_NONE) { switch (params.paperpackage) { - case PACKAGE_A4: + case BufferParams::PACKAGE_A4: LFile += "\\usepackage{a4}\n"; texrow.newline(); break; - case PACKAGE_A4WIDE: + case BufferParams::PACKAGE_A4WIDE: LFile += "\\usepackage{a4wide}\n"; texrow.newline(); break; - case PACKAGE_WIDEMARGINSA4: + case BufferParams::PACKAGE_WIDEMARGINSA4: LFile += "\\usepackage[widemargins]{a4}\n"; texrow.newline(); break; @@ -1771,10 +1741,10 @@ void Buffer::makeLaTeXFile(string const & filename, LFile += "\\usepackage{geometry}\n"; texrow.newline(); LFile += "\\geometry{verbose"; - if (params.orientation == ORIENTATION_LANDSCAPE) + if (params.orientation == BufferParams::ORIENTATION_LANDSCAPE) LFile += ",landscape"; switch (params.papersize2) { - case VM_PAPER_CUSTOM: + case BufferParams::VM_PAPER_CUSTOM: if (!params.paperwidth.empty()) LFile += ",paperwidth=" + params.paperwidth; @@ -1782,56 +1752,56 @@ void Buffer::makeLaTeXFile(string const & filename, LFile += ",paperheight=" + params.paperheight; break; - case VM_PAPER_USLETTER: + case BufferParams::VM_PAPER_USLETTER: LFile += ",letterpaper"; break; - case VM_PAPER_USLEGAL: + case BufferParams::VM_PAPER_USLEGAL: LFile += ",legalpaper"; break; - case VM_PAPER_USEXECUTIVE: + case BufferParams::VM_PAPER_USEXECUTIVE: LFile += ",executivepaper"; break; - case VM_PAPER_A3: + case BufferParams::VM_PAPER_A3: LFile += ",a3paper"; break; - case VM_PAPER_A4: + case BufferParams::VM_PAPER_A4: LFile += ",a4paper"; break; - case VM_PAPER_A5: + case BufferParams::VM_PAPER_A5: LFile += ",a5paper"; break; - case VM_PAPER_B3: + case BufferParams::VM_PAPER_B3: LFile += ",b3paper"; break; - case VM_PAPER_B4: + case BufferParams::VM_PAPER_B4: LFile += ",b4paper"; break; - case VM_PAPER_B5: + case BufferParams::VM_PAPER_B5: LFile += ",b5paper"; break; default: - // default papersize ie VM_PAPER_DEFAULT + // default papersize ie BufferParams::VM_PAPER_DEFAULT switch (lyxrc->default_papersize) { - case PAPER_DEFAULT: // keep compiler happy - case PAPER_USLETTER: + case BufferParams::PAPER_DEFAULT: // keep compiler happy + case BufferParams::PAPER_USLETTER: LFile += ",letterpaper"; break; - case PAPER_LEGALPAPER: + case BufferParams::PAPER_LEGALPAPER: LFile += ",legalpaper"; break; - case PAPER_EXECUTIVEPAPER: + case BufferParams::PAPER_EXECUTIVEPAPER: LFile += ",executivepaper"; break; - case PAPER_A3PAPER: + case BufferParams::PAPER_A3PAPER: LFile += ",a3paper"; break; - case PAPER_A4PAPER: + case BufferParams::PAPER_A4PAPER: LFile += ",a4paper"; break; - case PAPER_A5PAPER: + case BufferParams::PAPER_A5PAPER: LFile += ",a5paper"; break; - case PAPER_B5PAPER: + case BufferParams::PAPER_B5PAPER: LFile += ",b5paper"; break; } @@ -1858,7 +1828,7 @@ void Buffer::makeLaTeXFile(string const & filename, LFile += "\\usepackage{amsmath}\n"; } - if (tokenPos(tclass.opt_pagestyle(), '|',params.pagestyle) >= 0) { + if (tokenPos(tclass.opt_pagestyle(), '|', params.pagestyle) >= 0) { if (params.pagestyle == "fancy") { LFile += "\\usepackage{fancyhdr}\n"; texrow.newline(); @@ -1914,7 +1884,7 @@ void Buffer::makeLaTeXFile(string const & filename, } // Write out what we've generated so far...and reset LFile - fwrite(LFile.c_str(), sizeof(char), LFile.length(), file); + ofs << LFile; LFile.clear(); // Now insert the LyX specific LaTeX commands... @@ -1955,34 +1925,43 @@ void Buffer::makeLaTeXFile(string const & filename, // 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 + string bullets_def; for (int i = 0; i < 4; ++i) { if (params.user_defined_bullets[i] != ITEMIZE_DEFAULTS[i]) { - preamble += "\\renewcommand\\labelitemi"; + if (bullets_def.empty()) + bullets_def="\\AtBeginDocument{\n"; + bullets_def += " \\renewcommand{\\labelitemi"; switch (i) { - // `i' is one less than the item to modify + // `i' is one less than the item to modify case 0: break; case 1: - preamble += 'i'; + bullets_def += 'i'; break; case 2: - preamble += "ii"; + bullets_def += "ii"; break; case 3: - preamble += 'v'; + bullets_def += 'v'; break; } - preamble += "[0]{" + params.user_defined_bullets[i].getText() + "}\n"; + bullets_def += "}{" + + params.user_defined_bullets[i].getText() + + "}\n"; } } + if (!bullets_def.empty()) + preamble += bullets_def + "}\n\n"; + for (int j = countChar(preamble, '\n'); j-- ;) { texrow.newline(); } - // A bit faster than printing a char at a time I think. - fwrite(preamble.c_str(), sizeof(char), - preamble.length(), file); + ofs << preamble; // make the body. LFile += "\\begin{document}\n\n"; @@ -2027,7 +2006,7 @@ void Buffer::makeLaTeXFile(string const & filename, // flag this with ftcount ftcount = -1; if (layout.isEnvironment() - || par->pextra_type != PEXTRA_NONE) { + || par->pextra_type != LyXParagraph::PEXTRA_NONE) { par = par->TeXEnvironment(LFile, texrow, ftnote, ft_texrow, ftcount); } else { @@ -2053,8 +2032,7 @@ void Buffer::makeLaTeXFile(string const & filename, // gains a few extra % of speed; going higher than // 2 will slow things down again. I'll look at // LFile.length() in a future revision. ARRae - fwrite(LFile.c_str(), sizeof(char), - LFile.length(), file); + ofs << LFile; LFile.clear(); loop_count = 0; } @@ -2080,7 +2058,7 @@ void Buffer::makeLaTeXFile(string const & filename, texrow.newline(); // Write out what we've generated...and reset LFile - fwrite(LFile.c_str(), sizeof(char), LFile.length(), file); + ofs << LFile; LFile.clear(); // tex_code_break_column's value is used to decide @@ -2089,155 +2067,152 @@ void Buffer::makeLaTeXFile(string const & filename, // value when we leave otherwise we save incorrect .lyx files. tex_code_break_column = lyxrc->ascii_linelen; - if (file.close()) { - WriteFSAlert(_("Error! Could not close file properly:"), filename); - } + // How to check if the close went ok when using fstreams + ofs.close(); lyxerr.debug() << "Finished making latex file." << endl; } -bool Buffer::isLatex() +bool Buffer::isLatex() const { return textclasslist.TextClass(params.textclass).outputType() == LATEX; } -bool Buffer::isLinuxDoc() +bool Buffer::isLinuxDoc() const { return textclasslist.TextClass(params.textclass).outputType() == LINUXDOC; } -bool Buffer::isLiterate() +bool Buffer::isLiterate() const { return textclasslist.TextClass(params.textclass).outputType() == LITERATE; } -bool Buffer::isDocBook() +bool Buffer::isDocBook() const { return textclasslist.TextClass(params.textclass).outputType() == DOCBOOK; } -bool Buffer::isSGML() +bool Buffer::isSGML() const { return textclasslist.TextClass(params.textclass).outputType() == LINUXDOC || textclasslist.TextClass(params.textclass).outputType() == DOCBOOK; } -void Buffer::sgmlOpenTag(FILE * file, int depth, string const & latexname) const +void Buffer::sgmlOpenTag(ostream & os, int depth, + string const & latexname) const { - static char *space[] = {" "," "," "," "," "," "," ", - " "," "," "," "}; - - fprintf(file, "%s<%s>\n", space[depth], latexname.c_str()); + os << string(depth, ' ') << "<" << latexname << ">\n"; } -void Buffer::sgmlCloseTag(FILE * file, int depth, string const & latexname) const +void Buffer::sgmlCloseTag(ostream & os, int depth, + string const & latexname) const { - static char *space[] = {" "," "," "," "," "," "," ", - " "," "," "," "}; - - fprintf(file, "%s\n", space[depth], latexname.c_str()); + os << string(depth, ' ') << "\n"; } -void Buffer::makeLinuxDocFile(string const & filename, int column) +void Buffer::makeLinuxDocFile(string const & fname, int column) { LyXParagraph * par = paragraph; - string top_element=textclasslist.LatexnameOfClass(params.textclass); + string top_element = textclasslist.LatexnameOfClass(params.textclass); string environment_stack[10]; string item_name; int depth = 0; /* paragraph depth */ - FilePtr file(filename, FilePtr::write); - tex_code_break_column = column; + ofstream ofs(fname.c_str()); - if (!file()) { - WriteAlert(_("LYX_ERROR:"), _("Cannot write file"), filename); + if (!ofs) { + WriteAlert(_("LYX_ERROR:"), _("Cannot write file"), fname); return; } - //ResetTexRow(); + tex_code_break_column = column; texrow.reset(); if (params.preamble.empty()) { - fprintf(file, "\n\n"); + ofs << "\n\n"; } else { - fprintf(file, "\n\n", - params.preamble.c_str() ); + ofs << "\n\n"; } string userName(getUserName()); - fprintf(file, "\n", userName.c_str(), (char *)date()); + ofs << "\n"; if(params.options.empty()) - sgmlOpenTag(file,0,top_element); + sgmlOpenTag(ofs, 0, top_element); else { string top = top_element; top += " "; top += params.options; - sgmlOpenTag(file,0,top); + sgmlOpenTag(ofs, 0, top); } while (par) { - int desc_on=0; /* description mode*/ - LyXLayout const & style=textclasslist.Style(GetCurrentTextClass(), par->layout); + int desc_on = 0; /* description mode*/ + LyXLayout const & style = + textclasslist.Style(users->buffer()->params.textclass, + par->layout); par->AutoDeleteInsets(); /* treat as a special case for compatibility with old code */ - if (par->GetChar(0) == LYX_META_INSET) { - Inset *inset = par->GetInset(0); + if (par->GetChar(0) == LyXParagraph::META_INSET) { + Inset * inset = par->GetInset(0); char lyx_code = inset->LyxCode(); - if (lyx_code ==Inset::TOC_CODE){ - string temp= "toc"; - sgmlOpenTag(file, depth, temp); + if (lyx_code == Inset::TOC_CODE){ + string temp = "toc"; + sgmlOpenTag(ofs, depth, temp); par = par->next; - linuxDocHandleFootnote(file, par, depth); + linuxDocHandleFootnote(ofs, par, depth); continue; } } - /* environment tag closing */ - for( ;depth > par->depth; depth--) { - sgmlCloseTag(file,depth,environment_stack[depth]); + // environment tag closing + for( ; depth > par->depth; --depth) { + sgmlCloseTag(ofs, depth, environment_stack[depth]); environment_stack[depth].clear(); } - /* write opening SGML tags */ + // write opening SGML tags switch(style.latextype) { case LATEX_PARAGRAPH: if(depth == par->depth && !environment_stack[depth].empty()) { - sgmlCloseTag(file,depth,environment_stack[depth]); + sgmlCloseTag(ofs, depth, environment_stack[depth]); environment_stack[depth].clear(); if(depth) - depth--; + --depth; else - fprintf(file,"

"); + ofs << "

"; } - sgmlOpenTag(file,depth,style.latexname()); + sgmlOpenTag(ofs, depth, style.latexname()); break; case LATEX_COMMAND: - if (depth!=0) + if (depth!= 0) LinuxDocError(par, 0, _("Error : Wrong depth for LatexType Command.\n")); if (!environment_stack[depth].empty()){ - sgmlCloseTag(file,depth,environment_stack[depth]); - fprintf(file, "

"); + sgmlCloseTag(ofs, depth, + environment_stack[depth]); + ofs << "

"; } environment_stack[depth].clear(); - sgmlOpenTag(file,depth, style.latexname()); + sgmlOpenTag(ofs, depth, style.latexname()); break; case LATEX_ENVIRONMENT: @@ -2246,7 +2221,8 @@ void Buffer::makeLinuxDocFile(string const & filename, int column) && environment_stack[depth] != style.latexname() && !environment_stack[depth].empty()) { - sgmlCloseTag(file,depth,environment_stack[depth]); + sgmlCloseTag(ofs, depth, + environment_stack[depth]); environment_stack[depth].clear(); } if (depth < par->depth) { @@ -2254,38 +2230,38 @@ void Buffer::makeLinuxDocFile(string const & filename, int column) environment_stack[depth].clear(); } if (environment_stack[depth] != style.latexname()) { - if(depth==0) { - string temp="p"; - sgmlOpenTag(file,depth,temp); + if(depth == 0) { + string temp = "p"; + sgmlOpenTag(ofs, depth, temp); } environment_stack[depth] = style.latexname(); - sgmlOpenTag(file,depth,environment_stack[depth]); + sgmlOpenTag(ofs, depth, environment_stack[depth]); } if(style.latextype == LATEX_ENVIRONMENT) break; - desc_on =(style.labeltype == LABEL_MANUAL); + desc_on = (style.labeltype == LABEL_MANUAL); if(desc_on) - item_name="tag"; + item_name = "tag"; else - item_name="item"; + item_name = "item"; - sgmlOpenTag(file,depth+1,item_name); + sgmlOpenTag(ofs, depth + 1, item_name); break; default: - sgmlOpenTag(file, depth, style.latexname()); + sgmlOpenTag(ofs, depth, style.latexname()); break; } do { - SimpleLinuxDocOnePar(file, par, desc_on, depth); + SimpleLinuxDocOnePar(ofs, par, desc_on, depth); par = par->next; - linuxDocHandleFootnote(file,par,depth); + linuxDocHandleFootnote(ofs, par, depth); } while(par && par->IsDummy()); - fprintf(file,"\n"); + ofs << "\n"; /* write closing SGML tags */ switch(style.latextype) { case LATEX_COMMAND: @@ -2293,71 +2269,73 @@ void Buffer::makeLinuxDocFile(string const & filename, int column) case LATEX_ITEM_ENVIRONMENT: break; default: - sgmlCloseTag(file, depth, style.latexname()); + sgmlCloseTag(ofs, depth, style.latexname()); break; } - - } - /* Close open tags */ - for(;depth>0;depth--) - sgmlCloseTag(file,depth,environment_stack[depth]); + for(; depth > 0; --depth) + sgmlCloseTag(ofs, depth, environment_stack[depth]); if(!environment_stack[depth].empty()) - sgmlCloseTag(file,depth,environment_stack[depth]); + sgmlCloseTag(ofs, depth, environment_stack[depth]); - fprintf(file, "\n\n"); - sgmlCloseTag(file,0,top_element); + ofs << "\n\n"; + sgmlCloseTag(ofs, 0, top_element); - if (file.close()) { - WriteFSAlert(_("Error! Could not close file properly:"), - filename); - } + ofs.close(); + // How to check for successful close } -void Buffer::linuxDocHandleFootnote(FILE *file,LyXParagraph* &par, int const depth) +void Buffer::linuxDocHandleFootnote(ostream & os, LyXParagraph * & par, + int const depth) { - string tag="footnote"; + string tag = "footnote"; while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE) { - sgmlOpenTag(file,depth+1,tag); - SimpleLinuxDocOnePar(file, par, 0,depth+1); - sgmlCloseTag(file,depth+1,tag); + sgmlOpenTag(os, depth + 1, tag); + SimpleLinuxDocOnePar(os, par, 0, depth + 1); + sgmlCloseTag(os, depth + 1, tag); par = par->next; } } -void Buffer::DocBookHandleCaption(FILE *file, string &inner_tag, + +void Buffer::DocBookHandleCaption(ostream & os, string & inner_tag, int const depth, int desc_on, - LyXParagraph* &par) + LyXParagraph * & par) { - LyXParagraph *tpar = par; + LyXParagraph * tpar = par; string tmp_par, extra_par; while (tpar && (tpar->footnoteflag != LyXParagraph::NO_FOOTNOTE) && - (tpar->layout != textclasslist.NumberOfLayout(params.textclass,"Caption").second)) + (tpar->layout != textclasslist.NumberOfLayout(params.textclass, + "Caption").second)) tpar = tpar->next; if (tpar && - tpar->layout==textclasslist.NumberOfLayout(params.textclass,"Caption").second) { - sgmlOpenTag(file,depth+1,inner_tag); - SimpleDocBookOnePar(tmp_par,extra_par,tpar,desc_on,depth+2); - tmp_par = strip(tmp_par); - tmp_par = frontStrip(tmp_par); - fprintf(file,"%s",tmp_par.c_str()); - sgmlCloseTag(file,depth+1,inner_tag); - if(!extra_par.empty()) - fprintf(file,"%s",extra_par.c_str()); - } + tpar->layout == textclasslist.NumberOfLayout(params.textclass, + "Caption").second) { + sgmlOpenTag(os, depth + 1, inner_tag); + SimpleDocBookOnePar(tmp_par, extra_par, tpar, + desc_on, depth + 2); + tmp_par = strip(tmp_par); + tmp_par = frontStrip(tmp_par); + os << tmp_par; + sgmlCloseTag(os, depth+1, inner_tag); + if(!extra_par.empty()) + os << extra_par; + } } -void Buffer::DocBookHandleFootnote(FILE *file,LyXParagraph* &par, int const depth) + +void Buffer::DocBookHandleFootnote(ostream & os, LyXParagraph * & par, + int const depth) { - string tag,inner_tag; - string tmp_par,extra_par; + string tag, inner_tag; + string tmp_par, extra_par; bool inner_span = false; - int desc_on=4; + int desc_on = 4; // This is not how I like to see enums. They should not be anonymous // and variables of its type should not be declared right after the @@ -2368,122 +2346,117 @@ void Buffer::DocBookHandleFootnote(FILE *file,LyXParagraph* &par, int const dept MARGIN_LIKE, FIG_LIKE, TAB_LIKE - } last=NO_ONE, present=FOOTNOTE_LIKE; + } last = NO_ONE, present = FOOTNOTE_LIKE; while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE) { - if(last==present) { + if(last == present) { if(inner_span) { if(!tmp_par.empty()) { - fprintf(file,"%s",tmp_par.c_str()); + os << tmp_par; tmp_par.clear(); - sgmlCloseTag(file,depth+1,inner_tag); - sgmlOpenTag(file,depth+1,inner_tag); + sgmlCloseTag(os, depth+1, inner_tag); + sgmlOpenTag(os, depth+1, inner_tag); } } else - fprintf(file,"\n"); + os << "\n"; } else { - fprintf(file,"%s",tmp_par.c_str()); - if(!inner_tag.empty()) sgmlCloseTag(file,depth+1,inner_tag); - if(!extra_par.empty()) fprintf(file,"%s",extra_par.c_str()); - if(!tag.empty()) sgmlCloseTag(file,depth,tag); + os << tmp_par; + if(!inner_tag.empty()) sgmlCloseTag(os, depth+1, inner_tag); + if(!extra_par.empty()) os << extra_par; + if(!tag.empty()) sgmlCloseTag(os, depth, tag); extra_par.clear(); switch (par->footnotekind) { case LyXParagraph::FOOTNOTE: case LyXParagraph::ALGORITHM: - tag="footnote"; - inner_tag="para"; - present=FOOTNOTE_LIKE; - inner_span=true; + tag = "footnote"; + inner_tag = "para"; + present = FOOTNOTE_LIKE; + inner_span = true; break; case LyXParagraph::MARGIN: - tag="sidebar"; - inner_tag="para"; - present=MARGIN_LIKE; - inner_span=true; + tag = "sidebar"; + inner_tag = "para"; + present = MARGIN_LIKE; + inner_span = true; break; case LyXParagraph::FIG: case LyXParagraph::WIDE_FIG: - tag="figure"; - inner_tag="title"; - present=FIG_LIKE; - inner_span=false; + tag = "figure"; + inner_tag = "title"; + present = FIG_LIKE; + inner_span = false; break; case LyXParagraph::TAB: case LyXParagraph::WIDE_TAB: - tag="table"; - inner_tag="title"; - present=TAB_LIKE; - inner_span=false; + tag = "table"; + inner_tag = "title"; + present = TAB_LIKE; + inner_span = false; break; } - sgmlOpenTag(file,depth,tag); + sgmlOpenTag(os, depth, tag); if ((present == TAB_LIKE) || (present == FIG_LIKE)) { - DocBookHandleCaption(file, inner_tag, depth, + DocBookHandleCaption(os, inner_tag, depth, desc_on, par); inner_tag.clear(); } else { - sgmlOpenTag(file,depth+1,inner_tag); + sgmlOpenTag(os, depth + 1, inner_tag); } } // ignore all caption here, we processed them above!!! if (par->layout != textclasslist.NumberOfLayout(params.textclass, "Caption").second) { - SimpleDocBookOnePar(tmp_par,extra_par,par, - desc_on,depth+2); + SimpleDocBookOnePar(tmp_par, extra_par, par, + desc_on, depth + 2); } tmp_par = frontStrip(strip(tmp_par)); - last=present; + last = present; par = par->next; } - fprintf(file,"%s",tmp_par.c_str()); - if(!inner_tag.empty()) sgmlCloseTag(file,depth+1,inner_tag); - if(!extra_par.empty()) fprintf(file,"%s",extra_par.c_str()); - if(!tag.empty()) sgmlCloseTag(file,depth,tag); - + os << tmp_par; + if(!inner_tag.empty()) sgmlCloseTag(os, depth+1, inner_tag); + if(!extra_par.empty()) os << extra_par; + if(!tag.empty()) sgmlCloseTag(os, depth, tag); } /* push a tag in a style stack */ -void Buffer::push_tag(FILE *file, char const *tag, - int& pos, char stack[5][3]) +void Buffer::push_tag(ostream & os, char const * tag, + int & pos, char stack[5][3]) { - int j; - /* pop all previous tags */ - for (j=pos; j>=0; j--) - fprintf(file, "", stack[j]); + for (int j = pos; j >= 0; --j) + os << ""; /* add new tag */ sprintf(stack[++pos], "%s", tag); /* push all tags */ - for (j=0; j<=pos; j++) - fprintf(file, "<%s>", stack[j]); + for (int i = 0; i <= pos; ++i) + os << "<" << stack[i] << ">"; } // pop a tag from a style stack -void Buffer::pop_tag(FILE *file, char const * tag, - int& pos, char stack[5][3]) +void Buffer::pop_tag(ostream & os, char const * tag, + int & pos, char stack[5][3]) { - int j; - // pop all tags till specified one - for (j=pos; (j>=0) && (strcmp(stack[j], tag)); j--) - fprintf(file, "", stack[j]); + for (int j = pos; (j >= 0) && (strcmp(stack[j], tag)); --j) + os << ""; // closes the tag - fprintf(file, "", tag); + os << ""; // push all tags, but the specified one - for (j=j+1; j<=pos; j++) { - fprintf(file, "<%s>", stack[j]); - strcpy(stack[j-1], stack[j]); + for (int i = 0; i <= pos; ++i) { + os << "<" << stack[i] << ">"; + strcpy(stack[i - 1], stack[i]); } - pos --; + --pos; } @@ -2492,28 +2465,27 @@ void Buffer::pop_tag(FILE *file, char const * tag, // checks, if newcol chars should be put into this line // writes newline, if necessary. static -void linux_doc_line_break(FILE *file, unsigned int &colcount, const unsigned int newcol) +void linux_doc_line_break(ostream & os, unsigned int & colcount, + const unsigned int newcol) { colcount += newcol; if (colcount > lyxrc->ascii_linelen) { - fprintf(file, "\n"); + os << "\n"; colcount = newcol; // assume write after this call } } -void Buffer::SimpleLinuxDocOnePar(FILE *file, LyXParagraph *par, int desc_on, int const depth) +void Buffer::SimpleLinuxDocOnePar(ostream & os, LyXParagraph * par, + int desc_on, int const /*depth*/) { - LyXFont font1,font2; + LyXFont font1, font2; char c; Inset * inset; -#ifdef NEW_TEXT LyXParagraph::size_type main_body; int j; -#else - int main_body, j; -#endif - LyXLayout const & style = textclasslist.Style(params.textclass, par->GetLayout()); + LyXLayout const & style = textclasslist.Style(params.textclass, + par->GetLayout()); char family_type = 0; // family font flag bool is_bold = false; // series font flag @@ -2537,12 +2509,8 @@ void Buffer::SimpleLinuxDocOnePar(FILE *file, LyXParagraph *par, int desc_on, in /* parsing main loop */ -#ifdef NEW_TEXT for (LyXParagraph::size_type i = 0; i < par->size(); ++i) { -#else - for (int i = 0; i < par->last; i++) { -#endif /* handle quote tag */ if (i == main_body && !par->IsDummy()) { @@ -2556,32 +2524,32 @@ void Buffer::SimpleLinuxDocOnePar(FILE *file, LyXParagraph *par, int desc_on, in switch(family_type) { case 0: if (font2.family() == LyXFont::TYPEWRITER_FAMILY) { - push_tag(file, "tt", stack_num, stack); - family_type=1; + push_tag(os, "tt", stack_num, stack); + family_type= 1; } else if (font2.family() == LyXFont::SANS_FAMILY) { - push_tag(file, "sf", stack_num, stack); - family_type=2; + push_tag(os, "sf", stack_num, stack); + family_type= 2; } break; case 1: - pop_tag(file, "tt", stack_num, stack); + pop_tag(os, "tt", stack_num, stack); if (font2.family() == LyXFont::SANS_FAMILY) { - push_tag(file, "sf", stack_num, stack); - family_type=2; + push_tag(os, "sf", stack_num, stack); + family_type= 2; } else { - family_type=0; + family_type= 0; } break; case 2: - pop_tag(file, "sf", stack_num, stack); + pop_tag(os, "sf", stack_num, stack); if (font2.family() == LyXFont::TYPEWRITER_FAMILY) { - push_tag(file, "tt", stack_num, stack); - family_type=1; + push_tag(os, "tt", stack_num, stack); + family_type= 1; } else { - family_type=0; + family_type= 0; } } } @@ -2589,11 +2557,11 @@ void Buffer::SimpleLinuxDocOnePar(FILE *file, LyXParagraph *par, int desc_on, in /* handle bold face */ if (font1.series() != font2.series()) { if (font2.series() == LyXFont::BOLD_SERIES) { - push_tag(file, "bf", stack_num, stack); + push_tag(os, "bf", stack_num, stack); is_bold = true; } else if (is_bold) { - pop_tag(file, "bf", stack_num, stack); + pop_tag(os, "bf", stack_num, stack); is_bold = false; } } @@ -2603,42 +2571,42 @@ void Buffer::SimpleLinuxDocOnePar(FILE *file, LyXParagraph *par, int desc_on, in switch(shape_type) { case 0: if (font2.shape() == LyXFont::ITALIC_SHAPE) { - push_tag(file, "it", stack_num, stack); - shape_type=1; + push_tag(os, "it", stack_num, stack); + shape_type= 1; } else if (font2.shape() == LyXFont::SLANTED_SHAPE) { - push_tag(file, "sl", stack_num, stack); - shape_type=2; + push_tag(os, "sl", stack_num, stack); + shape_type= 2; } break; case 1: - pop_tag(file, "it", stack_num, stack); + pop_tag(os, "it", stack_num, stack); if (font2.shape() == LyXFont::SLANTED_SHAPE) { - push_tag(file, "sl", stack_num, stack); - shape_type=2; + push_tag(os, "sl", stack_num, stack); + shape_type= 2; } else { - shape_type=0; + shape_type= 0; } break; case 2: - pop_tag(file, "sl", stack_num, stack); + pop_tag(os, "sl", stack_num, stack); if (font2.shape() == LyXFont::ITALIC_SHAPE) { - push_tag(file, "it", stack_num, stack); - shape_type=1; + push_tag(os, "it", stack_num, stack); + shape_type= 1; } else { - shape_type=0; + shape_type= 0; } } } /* handle tag */ if (font1.emph() != font2.emph()) { if (font2.emph() == LyXFont::ON) { - push_tag(file, "em", stack_num, stack); + push_tag(os, "em", stack_num, stack); is_em = true; } else if (is_em) { - pop_tag(file, "em", stack_num, stack); + pop_tag(os, "em", stack_num, stack); is_em = false; } } @@ -2646,15 +2614,15 @@ void Buffer::SimpleLinuxDocOnePar(FILE *file, LyXParagraph *par, int desc_on, in c = par->GetChar(i); if (font2.latex() == LyXFont::ON) { - // "TeX"-Mode on ==> SGML-Mode on. - if (c!='\0') - fprintf(file, "%c", c); // see LaTeX-Generation... + // "TeX"-Mode on == > SGML-Mode on. + if (c!= '\0') + os << c; // see LaTeX-Generation... char_line_count++; - } else if (c == LYX_META_INSET) { + } else if (c == LyXParagraph::META_INSET) { inset = par->GetInset(i); string tmp_out; inset->Linuxdoc(tmp_out); - fprintf(file,"%s",tmp_out.c_str()); + os << tmp_out; } else { string sgml_string; @@ -2665,17 +2633,17 @@ void Buffer::SimpleLinuxDocOnePar(FILE *file, LyXParagraph *par, int desc_on, in // char is ' ' if (desc_on == 1) { char_line_count++; - linux_doc_line_break(file, char_line_count, 6); - fprintf(file, ""); + linux_doc_line_break(os, char_line_count, 6); + os << ""; desc_on = 2; } else { - linux_doc_line_break(file, char_line_count, 1); - fprintf(file, "%c", c); + linux_doc_line_break(os, char_line_count, 1); + os << c; } } else { - fprintf(file, "%s", sgml_string.c_str()); + os << sgml_string; char_line_count += sgml_string.length(); } } @@ -2683,29 +2651,24 @@ void Buffer::SimpleLinuxDocOnePar(FILE *file, LyXParagraph *par, int desc_on, in } /* needed if there is an optional argument but no contents */ -#ifdef NEW_TEXT if (main_body > 0 && main_body == par->size()) { font1 = style.font; } -#else - if (main_body > 0 && main_body == par->last) { - font1 = style.font; - } -#endif + /* pop all defined Styles */ - for (j = stack_num; j >= 0; j--) { - linux_doc_line_break(file, + for (j = stack_num; j >= 0; --j) { + linux_doc_line_break(os, char_line_count, - 3+strlen(stack[j])); - fprintf(file, "", stack[j]); + 3 + strlen(stack[j])); + os << ""; } /* resets description flag correctly */ switch(desc_on){ case 1: /* not closed... */ - linux_doc_line_break(file, char_line_count, 6); - fprintf(file, ""); + linux_doc_line_break(os, char_line_count, 6); + os << ""; break; case 2: /* fprintf(file, "

");*/ @@ -2722,7 +2685,7 @@ void Buffer::LinuxDocError(LyXParagraph * par, int pos, /* insert an error marker in text */ new_inset = new InsetError(message); - par->InsertChar(pos, LYX_META_INSET); + par->InsertChar(pos, LyXParagraph::META_INSET); par->InsertInset(pos, new_inset); } @@ -2734,73 +2697,69 @@ void Buffer::LinuxDocError(LyXParagraph * par, int pos, enum { MAX_NEST_LEVEL = 25}; -void Buffer::makeDocBookFile(string const & filename, int column) +void Buffer::makeDocBookFile(string const & fname, int column) { LyXParagraph * par = paragraph; - string top_element=textclasslist.LatexnameOfClass(params.textclass); + string top_element= textclasslist.LatexnameOfClass(params.textclass); string environment_stack[MAX_NEST_LEVEL]; string environment_inner[MAX_NEST_LEVEL]; string command_stack[MAX_NEST_LEVEL]; - bool command_flag=false; - int command_depth=0,command_base=0,cmd_depth=0; + bool command_flag= false; + int command_depth= 0, command_base= 0, cmd_depth= 0; - string item_name,command_name; - string c_depth,c_params,tmps; + string item_name, command_name; + string c_depth, c_params, tmps; - int depth=0; /* paragraph depth */ + int depth= 0; /* paragraph depth */ - FilePtr file(filename, FilePtr::write); tex_code_break_column = column; - if (!file()) { - WriteAlert(_("LYX_ERROR:"), _("Cannot write file"), filename); + ofstream ofs(fname.c_str()); + if (!ofs) { + WriteAlert(_("LYX_ERROR:"), _("Cannot write file"), fname); return; } - //ResetTexRow(); texrow.reset(); - fprintf(file, - "\n\n"); + ofs << ">\n\n"; else - fprintf(file, "\n [ %s \n]>\n\n",params.preamble.c_str() ); + ofs << "\n [ " << params.preamble << " \n]>\n\n"; - string userName(getUserName()); - fprintf(file, - "\n", userName.c_str(), (char *)date()); + ofs << "\n"; if(params.options.empty()) - sgmlOpenTag(file,0,top_element); + sgmlOpenTag(ofs, 0, top_element); else { string top = top_element; top += " "; top += params.options; - sgmlOpenTag(file,0,top); + sgmlOpenTag(ofs, 0, top); } while (par) { - int desc_on=0; /* description mode*/ - LyXLayout const & style = textclasslist.Style(GetCurrentTextClass(), + int desc_on= 0; /* description mode*/ + LyXLayout const & style = textclasslist.Style(users->buffer()->params.textclass, par->layout); par->AutoDeleteInsets(); /* environment tag closing */ - for( ;depth > par->depth; depth--) { + for( ; depth > par->depth; --depth) { if(environment_inner[depth] != "!-- --") { - item_name="listitem"; - sgmlCloseTag(file,command_depth+depth, + item_name= "listitem"; + sgmlCloseTag(ofs, command_depth + depth, item_name); if( environment_inner[depth] == "varlistentry") - sgmlCloseTag(file,depth+command_depth, + sgmlCloseTag(ofs, depth+command_depth, environment_inner[depth]); } - sgmlCloseTag(file,depth+command_depth, + sgmlCloseTag(ofs, depth + command_depth, environment_stack[depth]); environment_stack[depth].clear(); environment_inner[depth].clear(); @@ -2810,15 +2769,16 @@ void Buffer::makeDocBookFile(string const & filename, int column) && environment_stack[depth] != style.latexname() && !environment_stack[depth].empty()) { if(environment_inner[depth] != "!-- --") { - item_name="listitem"; - sgmlCloseTag(file,command_depth+depth, + item_name= "listitem"; + sgmlCloseTag(ofs, command_depth+depth, item_name); if( environment_inner[depth] == "varlistentry") - sgmlCloseTag(file,depth+command_depth, + sgmlCloseTag(ofs, + depth + command_depth, environment_inner[depth]); } - sgmlCloseTag(file,depth+command_depth, + sgmlCloseTag(ofs, depth + command_depth, environment_stack[depth]); environment_stack[depth].clear(); @@ -2829,12 +2789,12 @@ void Buffer::makeDocBookFile(string const & filename, int column) switch(style.latextype) { case LATEX_PARAGRAPH: if(style.latexname() != "dummy") - sgmlOpenTag(file, depth+command_depth, + sgmlOpenTag(ofs, depth+command_depth, style.latexname()); break; case LATEX_COMMAND: - if (depth!=0) + if (depth!= 0) LinuxDocError(par, 0, _("Error : Wrong depth for " "LatexType Command.\n")); @@ -2844,49 +2804,49 @@ void Buffer::makeDocBookFile(string const & filename, int column) tmps = style.latexparam(); c_params = split(tmps, c_depth,'|'); - cmd_depth=atoi(c_depth.c_str()); + cmd_depth= atoi(c_depth.c_str()); if(command_flag) { if(cmd_depth= command_base; j--) + j >= command_base; --j) if(!command_stack[j].empty()) - sgmlCloseTag(file,j,command_stack[j]); - command_depth=command_base=cmd_depth; + sgmlCloseTag(ofs, j, command_stack[j]); + command_depth= command_base= cmd_depth; } - else if(cmd_depth<=command_depth) { - for(int j= command_depth; - j >= cmd_depth; j--) + else if(cmd_depth <= command_depth) { + for(int j = command_depth; + j >= cmd_depth; --j) if(!command_stack[j].empty()) - sgmlCloseTag(file,j,command_stack[j]); - command_depth=cmd_depth; + sgmlCloseTag(ofs, j, command_stack[j]); + command_depth= cmd_depth; } else - command_depth=cmd_depth; + command_depth= cmd_depth; } else { command_depth = command_base = cmd_depth; command_flag = true; } - command_stack[command_depth]=command_name; + command_stack[command_depth]= command_name; // treat label as a special case for // more WYSIWYM handling. - if (par->GetChar(0) == LYX_META_INSET) { - Inset *inset = par->GetInset(0); + if (par->GetChar(0) == LyXParagraph::META_INSET) { + Inset * inset = par->GetInset(0); char lyx_code = inset->LyxCode(); - if (lyx_code ==Inset::LABEL_CODE){ - command_name+= " id=\""; - command_name+=((InsetCommand *) inset)->getContents(); - command_name+="\""; - desc_on=3; + if (lyx_code == Inset::LABEL_CODE){ + command_name += " id=\""; + command_name += (static_cast(inset))->getContents(); + command_name += "\""; + desc_on = 3; } } - sgmlOpenTag(file,depth+command_depth, command_name); - item_name="title"; - sgmlOpenTag(file,depth+1+command_depth,item_name); + sgmlOpenTag(ofs, depth+command_depth, command_name); + item_name = "title"; + sgmlOpenTag(ofs, depth + 1 + command_depth, item_name); break; case LATEX_ENVIRONMENT: @@ -2897,66 +2857,67 @@ void Buffer::makeDocBookFile(string const & filename, int column) } if (environment_stack[depth] != style.latexname()) { - environment_stack[depth]= style.latexname(); - environment_inner[depth]= "!-- --"; - sgmlOpenTag(file, depth + command_depth, + environment_stack[depth] = style.latexname(); + environment_inner[depth] = "!-- --"; + sgmlOpenTag(ofs, depth + command_depth, environment_stack[depth]); } else { if(environment_inner[depth] != "!-- --") { - item_name="listitem"; - sgmlCloseTag(file, + item_name= "listitem"; + sgmlCloseTag(ofs, command_depth + depth, item_name); if (environment_inner[depth] == "varlistentry") - sgmlCloseTag(file, - depth+command_depth, + sgmlCloseTag(ofs, + depth + command_depth, environment_inner[depth]); } } if(style.latextype == LATEX_ENVIRONMENT) { if(!style.latexparam().empty()) - sgmlOpenTag(file, depth+command_depth, + sgmlOpenTag(ofs, depth + command_depth, style.latexparam()); break; } - desc_on =(style.labeltype == LABEL_MANUAL); + desc_on = (style.labeltype == LABEL_MANUAL); if(desc_on) - environment_inner[depth]="varlistentry"; + environment_inner[depth]= "varlistentry"; else - environment_inner[depth]="listitem"; + environment_inner[depth]= "listitem"; - sgmlOpenTag(file,depth+1+command_depth, + sgmlOpenTag(ofs, depth + 1 + command_depth, environment_inner[depth]); if(desc_on) { - item_name="term"; - sgmlOpenTag(file,depth+1+command_depth, + item_name= "term"; + sgmlOpenTag(ofs, depth + 1 + command_depth, item_name); } else { - item_name="para"; - sgmlOpenTag(file,depth+1+command_depth, + item_name= "para"; + sgmlOpenTag(ofs, depth + 1 + command_depth, item_name); } break; default: - sgmlOpenTag(file, depth + command_depth, + sgmlOpenTag(ofs, depth + command_depth, style.latexname()); break; } do { - string tmp_par,extra_par; + string tmp_par, extra_par; - SimpleDocBookOnePar(tmp_par,extra_par, par, desc_on, - depth+1+command_depth); - fprintf(file,"%s",tmp_par.c_str()); + SimpleDocBookOnePar(tmp_par, extra_par, par, desc_on, + depth + 1 + command_depth); + ofs << tmp_par; par = par->next; - DocBookHandleFootnote(file,par, depth+1+command_depth); + DocBookHandleFootnote(ofs, par, + depth + 1 + command_depth); } while(par && par->IsDummy()); @@ -2965,58 +2926,56 @@ void Buffer::makeDocBookFile(string const & filename, int column) switch(style.latextype) { case LATEX_COMMAND: end_tag = "title"; - sgmlCloseTag(file, depth + command_depth, end_tag); + sgmlCloseTag(ofs, depth + command_depth, end_tag); break; case LATEX_ENVIRONMENT: if(!style.latexparam().empty()) - sgmlCloseTag(file, depth + command_depth, + sgmlCloseTag(ofs, depth + command_depth, style.latexparam()); break; case LATEX_ITEM_ENVIRONMENT: - if(desc_on==1) break; - end_tag="para"; - sgmlCloseTag(file,depth+1+command_depth,end_tag); + if(desc_on == 1) break; + end_tag= "para"; + sgmlCloseTag(ofs, depth + 1 + command_depth, end_tag); break; case LATEX_PARAGRAPH: if(style.latexname() != "dummy") - sgmlCloseTag(file, depth + command_depth, + sgmlCloseTag(ofs, depth + command_depth, style.latexname()); break; default: - sgmlCloseTag(file,depth+command_depth, + sgmlCloseTag(ofs, depth + command_depth, style.latexname()); break; } } // Close open tags - for(;depth>=0;depth--) { + for(; depth >= 0; --depth) { if(!environment_stack[depth].empty()) { if(environment_inner[depth] != "!-- --") { - item_name="listitem"; - sgmlCloseTag(file,command_depth+depth, + item_name= "listitem"; + sgmlCloseTag(ofs, command_depth + depth, item_name); if( environment_inner[depth] == "varlistentry") - sgmlCloseTag(file,depth+command_depth, + sgmlCloseTag(ofs, depth + command_depth, environment_inner[depth]); } - sgmlCloseTag(file,depth+command_depth, + sgmlCloseTag(ofs, depth + command_depth, environment_stack[depth]); } } - for(int j=command_depth;j>=command_base;j--) + for(int j = command_depth; j >= command_base; --j) if(!command_stack[j].empty()) - sgmlCloseTag(file,j,command_stack[j]); + sgmlCloseTag(ofs, j, command_stack[j]); - fprintf(file, "\n\n"); - sgmlCloseTag(file,0,top_element); + ofs << "\n\n"; + sgmlCloseTag(ofs, 0, top_element); - if (file.close()) { - WriteFSAlert(_("Error! Could not close file properly:"), - filename); - } + ofs.close(); + // How to check for successful close } @@ -3028,20 +2987,17 @@ void Buffer::SimpleDocBookOnePar(string & file, string & extra, par->SimpleDocBookOneTablePar(file, extra, desc_on, depth); return; } - LyXFont font1,font2; + LyXFont font1, font2; char c; Inset *inset; -#ifdef NEW_TEXT LyXParagraph::size_type main_body; int j; -#else - int main_body, j; -#endif - string emph="emphasis"; - bool emph_flag=false; - int char_line_count=0; + string emph= "emphasis"; + bool emph_flag= false; + int char_line_count= 0; - LyXLayout const & style = textclasslist.Style(params.textclass, par->GetLayout()); + LyXLayout const & style = textclasslist.Style(params.textclass, + par->GetLayout()); if (style.labeltype != LABEL_MANUAL) main_body = 0; @@ -3056,32 +3012,28 @@ void Buffer::SimpleDocBookOnePar(string & file, string & extra, char_line_count = depth; if(!style.free_spacing) - for (j=0;j< depth;j++) + for (j= 0;j< depth;j++) file += ' '; /* parsing main loop */ -#ifdef NEW_TEXT for (LyXParagraph::size_type i = 0; i < par->size(); ++i) { -#else - for (int i = 0; i < par->last; i++) { -#endif font2 = par->getFont(i); /* handle tag */ if (font1.emph() != font2.emph() && i) { if (font2.emph() == LyXFont::ON) { file += ""; - emph_flag=true; + emph_flag= true; }else { file += ""; - emph_flag=false; + emph_flag= false; } } c = par->GetChar(i); - if (c == LYX_META_INSET) { + if (c == LyXParagraph::META_INSET) { inset = par->GetInset(i); string tmp_out; inset->DocBook(tmp_out); @@ -3089,15 +3041,15 @@ void Buffer::SimpleDocBookOnePar(string & file, string & extra, // This code needs some explanation: // Two insets are treated specially // label if it is the first element in a command paragraph - // desc_on==3 + // desc_on == 3 // graphics inside tables or figure floats can't go on // title (the equivalente in latex for this case is caption // and title should come first - // desc_on==4 + // desc_on == 4 // - if(desc_on!=3 || i!=0) { - if(tmp_out[0]=='@') { - if(desc_on==4) + if(desc_on!= 3 || i!= 0) { + if(!tmp_out.empty() && tmp_out[0] == '@') { + if(desc_on == 4) extra += frontStrip(tmp_out, '@'); else file += frontStrip(tmp_out, '@'); @@ -3107,7 +3059,7 @@ void Buffer::SimpleDocBookOnePar(string & file, string & extra, } } else if (font2.latex() == LyXFont::ON) { // "TeX"-Mode on ==> SGML-Mode on. - if (c!='\0') + if (c!= '\0') file += c; char_line_count++; } @@ -3136,15 +3088,9 @@ void Buffer::SimpleDocBookOnePar(string & file, string & extra, } /* needed if there is an optional argument but no contents */ -#ifdef NEW_TEXT if (main_body > 0 && main_body == par->size()) { font1 = style.font; } -#else - if (main_body > 0 && main_body == par->last) { - font1 = style.font; - } -#endif if (emph_flag) { file += ""; } @@ -3160,9 +3106,9 @@ void Buffer::SimpleDocBookOnePar(string & file, string & extra, } -bool Buffer::removeAutoInsets() +bool BufferView::removeAutoInsets() { - LyXParagraph *par = paragraph; + LyXParagraph * par = buffer()->paragraph; LyXCursor cursor = text->cursor; LyXCursor tmpcursor = cursor; @@ -3174,16 +3120,17 @@ bool Buffer::removeAutoInsets() if (par->AutoDeleteInsets()){ a = true; if (par->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE){ - /* this is possible now, since SetCursor takes - care about footnotes */ + // this is possible now, since SetCursor takes + // care about footnotes text->SetCursorIntern(par, 0); - text->RedoParagraphs(text->cursor, text->cursor.par->Next()); + text->RedoParagraphs(text->cursor, + text->cursor.par->Next()); text->FullRebreak(); } } par = par->next; } - /* avoid forbidden cursor positions caused by error removing */ + // avoid forbidden cursor positions caused by error removing if (cursor.pos > cursor.par->Last()) cursor.pos = cursor.par->Last(); text->SetCursorIntern(cursor.par, cursor.pos); @@ -3194,12 +3141,12 @@ bool Buffer::removeAutoInsets() int Buffer::runLaTeX() { - if (!text) return 0; + if (!users->text) return 0; ProhibitInput(); // get LaTeX-Filename - string name = SpaceLess(ChangeExtension (filename, ".tex", true)); + string name = getLatexName(); string path = OnlyPath(filename); @@ -3209,10 +3156,10 @@ int Buffer::runLaTeX() } Path p(path); // path to LaTeX file - users->getOwner()->getMiniBuffer()->Set(_("Running LaTeX...")); + users->owner()->getMiniBuffer()->Set(_("Running LaTeX...")); // Remove all error insets - bool a = removeAutoInsets(); + bool a = users->removeAutoInsets(); // Always generate the LaTeX file makeLaTeXFile(name, org_path, false); @@ -3221,23 +3168,24 @@ int Buffer::runLaTeX() // do the LaTex run(s) TeXErrors terr; LaTeX latex(lyxrc->latex_command, name, filepath); - int res = latex.run(terr,users->getOwner()->getMiniBuffer()); // running latex + int res = latex.run(terr, + users->owner()->getMiniBuffer()); // running latex // check return value from latex.run(). if ((res & LaTeX::NO_LOGFILE)) { WriteAlert(_("LaTeX did not work!"), _("Missing log file:"), name); } else if ((res & LaTeX::ERRORS)) { - users->getOwner()->getMiniBuffer()->Set(_("Done")); + users->owner()->getMiniBuffer()->Set(_("Done")); // Insert all errors as errors boxes - insertErrors(terr); + users->insertErrors(terr); // Dvi should also be kept dirty if the latex run // ends up with errors. However it should be possible // to view a dirty dvi too. } else { //no errors or any other things to think about so: - users->getOwner()->getMiniBuffer()->Set(_("Done")); + users->owner()->getMiniBuffer()->Set(_("Done")); markDviClean(); } @@ -3256,14 +3204,15 @@ int Buffer::runLaTeX() int Buffer::runLiterate() { - if (!text) return 0; + if (!users->text) return 0; ProhibitInput(); // get LaTeX-Filename - string name = SpaceLess(ChangeExtension (filename, ".tex", true)); + string name = getLatexName(); // get Literate-Filename - string lit_name = SpaceLess(ChangeExtension (filename, lyxrc->literate_extension, true)); + string lit_name = ChangeExtension (getLatexName(), + lyxrc->literate_extension, true); string path = OnlyPath(filename); @@ -3273,10 +3222,10 @@ int Buffer::runLiterate() } Path p(path); // path to Literate file - users->getOwner()->getMiniBuffer()->Set(_("Running Literate...")); + users->owner()->getMiniBuffer()->Set(_("Running Literate...")); // Remove all error insets - bool a = removeAutoInsets(); + bool a = users->removeAutoInsets(); // generate the Literate file if necessary if (!isDviClean() || a) { @@ -3289,23 +3238,23 @@ int Buffer::runLiterate() lyxrc->literate_command, lyxrc->literate_error_filter, lyxrc->build_command, lyxrc->build_error_filter); TeXErrors terr; - int res = literate.weave(terr, users->getOwner()->getMiniBuffer()); + int res = literate.weave(terr, users->owner()->getMiniBuffer()); // check return value from literate.weave(). if ((res & Literate::NO_LOGFILE)) { WriteAlert(_("Literate command did not work!"), _("Missing log file:"), name); } else if ((res & Literate::ERRORS)) { - users->getOwner()->getMiniBuffer()->Set(_("Done")); + users->owner()->getMiniBuffer()->Set(_("Done")); // Insert all errors as errors boxes - insertErrors(terr); + users->insertErrors(terr); // Dvi should also be kept dirty if the latex run // ends up with errors. However it should be possible // to view a dirty dvi too. } else { //no errors or any other things to think about so: - users->getOwner()->getMiniBuffer()->Set(_("Done")); + users->owner()->getMiniBuffer()->Set(_("Done")); markDviClean(); } @@ -3324,14 +3273,15 @@ int Buffer::runLiterate() int Buffer::buildProgram() { - if (!text) return 0; + if (!users->text) return 0; ProhibitInput(); // get LaTeX-Filename - string name = SpaceLess(ChangeExtension (filename, ".tex", true)); + string name = getLatexName(); // get Literate-Filename - string lit_name = SpaceLess(ChangeExtension (filename, lyxrc->literate_extension, true)); + string lit_name = ChangeExtension(getLatexName(), + lyxrc->literate_extension, true); string path = OnlyPath(filename); @@ -3341,10 +3291,10 @@ int Buffer::buildProgram() } Path p(path); // path to Literate file - users->getOwner()->getMiniBuffer()->Set(_("Building Program...")); + users->owner()->getMiniBuffer()->Set(_("Building Program...")); // Remove all error insets - bool a = removeAutoInsets(); + bool a = users->removeAutoInsets(); // generate the LaTeX file if necessary if (!isNwClean() || a) { @@ -3357,22 +3307,22 @@ int Buffer::buildProgram() lyxrc->literate_command, lyxrc->literate_error_filter, lyxrc->build_command, lyxrc->build_error_filter); TeXErrors terr; - int res = literate.build(terr, users->getOwner()->getMiniBuffer()); + int res = literate.build(terr, users->owner()->getMiniBuffer()); // check return value from literate.build(). if ((res & Literate::NO_LOGFILE)) { WriteAlert(_("Build did not work!"), _("Missing log file:"), name); } else if ((res & Literate::ERRORS)) { - users->getOwner()->getMiniBuffer()->Set(_("Done")); + users->owner()->getMiniBuffer()->Set(_("Done")); // Insert all errors as errors boxes - insertErrors(terr); + users->insertErrors(terr); // Literate files should also be kept dirty if the literate // command run ends up with errors. } else { //no errors or any other things to think about so: - users->getOwner()->getMiniBuffer()->Set(_("Done")); + users->owner()->getMiniBuffer()->Set(_("Done")); markNwClean(); } @@ -3394,12 +3344,12 @@ int Buffer::buildProgram() // Other flags: -wall -v0 -x int Buffer::runChktex() { - if (!text) return 0; + if (!users->text) return 0; ProhibitInput(); // get LaTeX-Filename - string name = SpaceLess(ChangeExtension (filename, ".tex", true)); + string name = getLatexName(); string path = OnlyPath(filename); string org_path = path; @@ -3408,10 +3358,10 @@ int Buffer::runChktex() } Path p(path); // path to LaTeX file - users->getOwner()->getMiniBuffer()->Set(_("Running chktex...")); + users->owner()->getMiniBuffer()->Set(_("Running chktex...")); // Remove all error insets - bool a = removeAutoInsets(); + bool a = users->removeAutoInsets(); // Generate the LaTeX file if neccessary if (!isDviClean() || a) { @@ -3428,7 +3378,7 @@ int Buffer::runChktex() _("Could not run with file:"), name); } else if (res > 0) { // Insert all errors as errors boxes - insertErrors(terr); + users->insertErrors(terr); } // if we removed error insets before we ran chktex or if we inserted @@ -3444,17 +3394,14 @@ int Buffer::runChktex() } -extern void AllFloats(char, char); - - -void Buffer::insertErrors(TeXErrors & terr) +void BufferView::insertErrors(TeXErrors & terr) { // Save the cursor position LyXCursor cursor = text->cursor; // This is drastic, but it's the only fix, I could find. (Asger) - AllFloats(1,0); - AllFloats(1,1); + allFloats(1, 0); + allFloats(1, 1); for (TeXErrors::Errors::const_iterator cit = terr.begin(); cit != terr.end(); @@ -3468,9 +3415,9 @@ void Buffer::insertErrors(TeXErrors & terr) int tmpid = -1; int tmppos = -1; - texrow.getIdFromRow(errorrow, tmpid, tmppos); + buffer()->texrow.getIdFromRow(errorrow, tmpid, tmppos); - LyXParagraph* texrowpar; + LyXParagraph * texrowpar = 0; if (tmpid == -1) { texrowpar = text->FirstParagraph(); @@ -3482,8 +3429,7 @@ void Buffer::insertErrors(TeXErrors & terr) if (texrowpar == 0) continue; - InsetError *new_inset = new InsetError(msgtxt); - + InsetError * new_inset = new InsetError(msgtxt); text->SetCursorIntern(texrowpar, tmppos); text->InsertInset(new_inset); text->FullRebreak(); @@ -3493,14 +3439,14 @@ void Buffer::insertErrors(TeXErrors & terr) } -void Buffer::setCursorFromRow (int row) +void BufferView::setCursorFromRow(int row) { int tmpid = -1; int tmppos = -1; - texrow.getIdFromRow(row, tmpid, tmppos); + buffer()->texrow.getIdFromRow(row, tmpid, tmppos); - LyXParagraph* texrowpar; + LyXParagraph * texrowpar; if (tmpid == -1) { texrowpar = text->FirstParagraph(); @@ -3512,41 +3458,29 @@ void Buffer::setCursorFromRow (int row) } -void Buffer::RoffAsciiTable(FILE * file, LyXParagraph * par) +void Buffer::RoffAsciiTable(ostream & os, LyXParagraph * par) { - LyXFont - font1 = LyXFont(LyXFont::ALL_INHERIT), - font2; + LyXFont font1 = LyXFont(LyXFont::ALL_INHERIT); + LyXFont font2; Inset * inset; -#ifdef NEW_TEXT LyXParagraph::size_type i; -#else - int i; -#endif - int - j, - cell = 0; - char - c; - FILE - * fp, * fp2; + int j, cell = 0; + char c; - string fname1 = TmpFileName(string(),"RAT1"); - string fname2 = TmpFileName(string(),"RAT2"); - if (!(fp=fopen(fname1.c_str(),"w"))) { + string fname1 = TmpFileName(string(), "RAT1"); + string fname2 = TmpFileName(string(), "RAT2"); + + ofstream ofs(fname1.c_str()); + if (!ofs) { WriteAlert(_("LYX_ERROR:"), _("Cannot open temporary file:"), fname1); return; } - par->table->RoffEndOfCell(fp, -1); -#ifdef NEW_TEXT + par->table->RoffEndOfCell(ofs, -1); for (i = 0; i < par->size(); ++i) { -#else - for (i = 0; i < par->last; ++i) { -#endif c = par->GetChar(i); if (par->table->IsContRow(cell)) { - if (c == LYX_META_NEWLINE) + if (c == LyXParagraph::META_NEWLINE) cell++; continue; } @@ -3556,44 +3490,45 @@ void Buffer::RoffAsciiTable(FILE * file, LyXParagraph * par) continue; } switch (c) { - case LYX_META_INSET: + case LyXParagraph::META_INSET: if ((inset = par->GetInset(i))) { - if (!(fp2=fopen(fname2.c_str(),"w+"))) { + fstream fs(fname2.c_str(), ios::in|ios::out); + if (!fs) { WriteAlert(_("LYX_ERROR:"), _("Cannot open temporary file:"), fname2); - fclose(fp); + ofs.close(); remove(fname1.c_str()); return; } - inset->Latex(fp2,-1); - rewind(fp2); - c = fgetc(fp2); - while(!feof(fp2)) { + inset->Latex(fs, -1); + fs.seekp(0); + fs.get(c); + while(!fs) { if (c == '\\') - fprintf(fp,"\\\\"); + ofs << "\\\\"; else - fputc(c,fp); - c = fgetc(fp2); + ofs << c; + fs >> c; } - fclose(fp2); + fs.close(); } break; - case LYX_META_NEWLINE: - if (par->table->CellHasContRow(cell)>=0) - par->RoffContTableRows(fp, i+1,cell); - par->table->RoffEndOfCell(fp, cell); + case LyXParagraph::META_NEWLINE: + if (par->table->CellHasContRow(cell)>= 0) + par->RoffContTableRows(ofs, i+1, cell); + par->table->RoffEndOfCell(ofs, cell); cell++; break; - case LYX_META_HFILL: + case LyXParagraph::META_HFILL: break; - case LYX_META_PROTECTED_SEPARATOR: + case LyXParagraph::META_PROTECTED_SEPARATOR: break; case '\\': - fprintf(fp, "\\\\"); + ofs << "\\\\"; break; default: if (c != '\0') - fprintf(fp, "%c", c); + ofs << c; else if (c == '\0') lyxerr.debug() << "RoffAsciiTable:" @@ -3601,40 +3536,41 @@ void Buffer::RoffAsciiTable(FILE * file, LyXParagraph * par) break; } } - par->table->RoffEndOfCell(fp, cell); - fclose(fp); + par->table->RoffEndOfCell(ofs, cell); + ofs.close(); string cmd = lyxrc->ascii_roff_command + " >" + fname2; cmd = subst(cmd, "$$FName", fname1); Systemcalls one(Systemcalls::System, cmd); if (!(lyxerr.debugging(Debug::ROFF))) { remove(fname1.c_str()); } - if (!(fp=fopen(fname2.c_str(),"r"))) { + ifstream ifs(fname2.c_str()); + if (!ifs) { WriteFSAlert(_("Error! Can't open temporary file:"), fname2); return; } // now output the produced file - fprintf(file, "\n\n"); - c = fgetc(fp); - if (feof(fp)) + os << "\n\n"; + ifs.get(c); + if (!ifs) WriteAlert(_("Error!"), _("Error executing *roff command on table")); // overread leading blank lines - while(!feof(fp) && (c == '\n')) - c = fgetc(fp); - while(!feof(fp)) { - for(j=0; jdepth; j++) - fprintf(file, " "); - while(!feof(fp) && (c != '\n')) { - fputc(c,file); - c = fgetc(fp); - } - fputc('\n',file); + while(!ifs && (c == '\n')) + ifs.get(c); + while(!ifs) { + for(j = 0; j < par->depth; ++j) + os << " "; + while(!ifs && (c != '\n')) { + os << c; + ifs.get(c); + } + os << '\n'; // overread trailing blank lines - while(!feof(fp) && (c == '\n')) - c = fgetc(fp); + while(!ifs && (c == '\n')) + ifs.get(c); } - fclose(fp); + ifs.close(); remove(fname2.c_str()); } @@ -3669,39 +3605,10 @@ void Buffer::markDviDirty() } -void Buffer::update(signed char f) -{ - if (!users) return; - - users->getOwner()->updateLayoutChoice(); - - if (!text->selection && f > -3) - text->sel_cursor = text->cursor; - - FreeUpdateTimer(); - text->FullRebreak(); - users->update(); - - if (f != 3 && f != -3) { - users->fitCursor(); - users->updateScrollbar(); - } - - if (f==1 || f==-1) { - if (isLyxClean()) { - markDirty(); - users->getOwner()->getMiniBuffer()->setTimer(4); - } else { - markDirty(); - } - } -} - - void Buffer::validate(LaTeXFeatures & features) { LyXParagraph * par = paragraph; - LyXTextClass const & tclass = + LyXTextClass const & tclass = textclasslist.TextClass(params.textclass); // AMS Style is at document level @@ -3742,7 +3649,7 @@ void Buffer::validate(LaTeXFeatures & features) if (font == 1) { features.amssymb = true; } - else if ((font >= 2 && font <=5)) { + else if ((font >= 2 && font <= 5)) { features.pifont = true; } } @@ -3756,59 +3663,61 @@ void Buffer::validate(LaTeXFeatures & features) void Buffer::setPaperStuff() { - params.papersize = PAPER_DEFAULT; + params.papersize = BufferParams::PAPER_DEFAULT; char c1 = params.paperpackage; - if (c1 == PACKAGE_NONE) { + if (c1 == BufferParams::PACKAGE_NONE) { char c2 = params.papersize2; - if (c2 == VM_PAPER_USLETTER) - params.papersize = PAPER_USLETTER; - else if (c2 == VM_PAPER_USLEGAL) - params.papersize = PAPER_LEGALPAPER; - else if (c2 == VM_PAPER_USEXECUTIVE) - params.papersize = PAPER_EXECUTIVEPAPER; - else if (c2 == VM_PAPER_A3) - params.papersize = PAPER_A3PAPER; - else if (c2 == VM_PAPER_A4) - params.papersize = PAPER_A4PAPER; - else if (c2 == VM_PAPER_A5) - params.papersize = PAPER_A5PAPER; - else if ((c2 == VM_PAPER_B3) || (c2 == VM_PAPER_B4) || - (c2 == VM_PAPER_B5)) - params.papersize = PAPER_B5PAPER; - } else if ((c1 == PACKAGE_A4) || (c1 == PACKAGE_A4WIDE) || - (c1 == PACKAGE_WIDEMARGINSA4)) - params.papersize = PAPER_A4PAPER; + if (c2 == BufferParams::VM_PAPER_USLETTER) + params.papersize = BufferParams::PAPER_USLETTER; + else if (c2 == BufferParams::VM_PAPER_USLEGAL) + params.papersize = BufferParams::PAPER_LEGALPAPER; + else if (c2 == BufferParams::VM_PAPER_USEXECUTIVE) + params.papersize = BufferParams::PAPER_EXECUTIVEPAPER; + else if (c2 == BufferParams::VM_PAPER_A3) + params.papersize = BufferParams::PAPER_A3PAPER; + else if (c2 == BufferParams::VM_PAPER_A4) + params.papersize = BufferParams::PAPER_A4PAPER; + else if (c2 == BufferParams::VM_PAPER_A5) + params.papersize = BufferParams::PAPER_A5PAPER; + else if ((c2 == BufferParams::VM_PAPER_B3) || (c2 == BufferParams::VM_PAPER_B4) || + (c2 == BufferParams::VM_PAPER_B5)) + params.papersize = BufferParams::PAPER_B5PAPER; + } else if ((c1 == BufferParams::PACKAGE_A4) || (c1 == BufferParams::PACKAGE_A4WIDE) || + (c1 == BufferParams::PACKAGE_WIDEMARGINSA4)) + params.papersize = BufferParams::PAPER_A4PAPER; } +#if 0 void Buffer::setOldPaperStuff() { char c = params.papersize = params.papersize2; - params.papersize2 = VM_PAPER_DEFAULT; - params.paperpackage = PACKAGE_NONE; + params.papersize2 = BufferParams::VM_PAPER_DEFAULT; + params.paperpackage = BufferParams::PACKAGE_NONE; if (c == OLD_PAPER_A4PAPER) - params.papersize2 = VM_PAPER_A4; + params.papersize2 = BufferParams::VM_PAPER_A4; else if (c == OLD_PAPER_A4) - params.paperpackage = PACKAGE_A4; + params.paperpackage = BufferParams::PACKAGE_A4; else if (c == OLD_PAPER_A4WIDE) - params.paperpackage = PACKAGE_A4WIDE; + params.paperpackage = BufferParams::PACKAGE_A4WIDE; else if (c == OLD_PAPER_WIDEMARGINSA4) - params.paperpackage = PACKAGE_WIDEMARGINSA4; + params.paperpackage = BufferParams::PACKAGE_WIDEMARGINSA4; else if (c == OLD_PAPER_USLETTER) - params.papersize2 = VM_PAPER_USLETTER; + params.papersize2 = BufferParams::VM_PAPER_USLETTER; else if (c == OLD_PAPER_A5PAPER) - params.papersize2 = VM_PAPER_A5; + params.papersize2 = BufferParams::VM_PAPER_A5; else if (c == OLD_PAPER_B5PAPER) - params.papersize2 = VM_PAPER_B5; + params.papersize2 = BufferParams::VM_PAPER_B5; else if (c == OLD_PAPER_EXECUTIVEPAPER) - params.papersize2 = VM_PAPER_USEXECUTIVE; + params.papersize2 = BufferParams::VM_PAPER_USEXECUTIVE; else if (c == OLD_PAPER_LEGALPAPER) - params.papersize2 = VM_PAPER_USLEGAL; + params.papersize2 = BufferParams::VM_PAPER_USLEGAL; setPaperStuff(); } +#endif -void Buffer::insertInset(Inset * inset, string const & lout, +void BufferView::insertInset(Inset * inset, string const & lout, bool no_table) { // check for table/list in tables @@ -3822,7 +3731,7 @@ void Buffer::insertInset(Inset * inset, string const & lout, text->SetCursorParUndo(); text->FreezeUndo(); - BeforeChange(); + beforeChange(); if (!lout.empty()) { update(-2); text->BreakParagraph(); @@ -3835,7 +3744,7 @@ void Buffer::insertInset(Inset * inset, string const & lout, update(-1); } - int lay = textclasslist.NumberOfLayout(params.textclass, + int lay = textclasslist.NumberOfLayout(buffer()->params.textclass, lout).second; if (lay == -1) // layout not found // use default layout "Standard" (0) @@ -3862,33 +3771,29 @@ void Buffer::insertInset(Inset * inset, string const & lout, // Open and lock an updatable inset -void Buffer::open_new_inset(UpdatableInset * new_inset) +void BufferView::open_new_inset(UpdatableInset * new_inset) { - BeforeChange(); + beforeChange(); text->FinishUndo(); insertInset(new_inset); text->CursorLeft(); update(1); - new_inset->Edit(0,0); + new_inset->Edit(0, 0); } -/* This function should be in Buffer because it's a buffer's property (ale) */ +// This function should be in Buffer because it's a buffer's property (ale) string Buffer::getIncludeonlyList(char delim) { string lst; LyXParagraph * par = paragraph; -#ifdef NEW_TEXT LyXParagraph::size_type pos; -#else - int pos; -#endif Inset * inset; while (par){ pos = -1; while ((inset = par->ReturnNextInsetPointer(pos))){ - if (inset->LyxCode()==Inset::INCLUDE_CODE) { - InsetInclude * insetinc = + if (inset->LyxCode() == Inset::INCLUDE_CODE) { + InsetInclude * insetinc = static_cast(inset); if (insetinc->isInclude() && insetinc->isNoLoad()) { @@ -3906,23 +3811,19 @@ string Buffer::getIncludeonlyList(char delim) } -/* This is also a buffer property (ale) */ +// This is also a buffer property (ale) string Buffer::getReferenceList(char delim) { /// 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 * tmp = bufferlist.getBuffer(params.parentname); if (tmp) return tmp->getReferenceList(delim); } - LyXParagraph *par = paragraph; -#ifdef NEW_TEXT + LyXParagraph * par = paragraph; LyXParagraph::size_type pos; -#else - int pos; -#endif Inset * inset; string lst; while (par){ @@ -3942,13 +3843,13 @@ string Buffer::getReferenceList(char delim) } -/* This is also a buffer property (ale) */ +// This is also a buffer property (ale) string Buffer::getBibkeyList(char delim) { /// 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); + Buffer * tmp = bufferlist.getBuffer(params.parentname); if (tmp) return tmp->getBibkeyList(delim); } @@ -3969,20 +3870,16 @@ string Buffer::getBibkeyList(char delim) par = paragraph; while (par) { Inset * inset; -#ifdef NEW_TEXT LyXParagraph::size_type pos = -1; -#else - int pos = -1; -#endif // Search for Bibtex or Include inset while ((inset = par->ReturnNextInsetPointer(pos))) { - if (inset-> LyxCode()==Inset::BIBTEX_CODE) { + if (inset-> LyxCode() == Inset::BIBTEX_CODE) { if (!bibkeys.empty()) bibkeys += delim; - bibkeys += ((InsetBibtex*)inset)->getKeys(); - } else if (inset-> LyxCode()==Inset::INCLUDE_CODE) { - string bk = ((InsetInclude*)inset)->getKeys(); + bibkeys += static_cast(inset)->getKeys(delim); + } else if (inset-> LyxCode() == Inset::INCLUDE_CODE) { + string bk = static_cast(inset)->getKeys(delim); if (!bk.empty()) { if (!bibkeys.empty()) bibkeys += delim; @@ -4005,22 +3902,18 @@ string Buffer::getBibkeyList(char delim) // think how this will work in a multiwindo/buffer environment, all the // cursors in all the views showing this buffer will move. (Lgb) // OK, then no cursor action should be allowed in buffer. (ale) -bool Buffer::gotoLabel(string const & label) +bool BufferView::gotoLabel(string const & label) { - LyXParagraph * par = paragraph; -#ifdef NEW_TEXT + LyXParagraph * par = buffer()->paragraph; LyXParagraph::size_type pos; -#else - int pos; -#endif Inset * inset; while (par) { pos = -1; while ((inset = par->ReturnNextInsetPointer(pos))){ for (int i = 0; i < inset->GetNumberOfLabels(); i++) { - if (label==inset->getLabel(i)) { - BeforeChange(); + if (label == inset->getLabel(i)) { + beforeChange(); text->SetCursor(par, pos); text->sel_cursor = text->cursor; update(0); @@ -4066,3 +3959,28 @@ void Buffer::markDepClean(string const & name) } } } + + +void Buffer::Dispatch(string const & command) +{ + // Split command string into command and argument + string cmd, line = frontStrip(command); + string arg = strip(frontStrip(split(line, cmd, ' '))); + + Dispatch(lyxaction.LookupFunc(cmd.c_str()), arg.c_str()); +} + + +void Buffer::Dispatch(int action, string const & argument) +{ + switch (action) { + case LFUN_EXPORT: + MenuExport(this, argument); + break; + + default: + lyxerr << "A truly unknown func!" << endl; + break; + + } // end of switch +}