X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.C;h=ca805619747a7121c7303d97b018f3283f95f732;hb=d891a896f47df2d7f048ad7e4498f2fd4f3c5d3b;hp=ea8485e06667046a9481b4935a29333757b00a0b;hpb=9bf624381d44baee4a209584a23c40795e623514;p=lyx.git diff --git a/src/buffer.C b/src/buffer.C index ea8485e066..ca80561974 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -5,134 +5,203 @@ * * \author Lars Gullik Bjønnes * - * Full author contact details are available in file CREDITS + * Full author contact details are available in file CREDITS. */ #include #include "buffer.h" + +#include "author.h" +#include "buffer_funcs.h" #include "bufferlist.h" -#include "LyXAction.h" -#include "lyxrc.h" -#include "lyxlex.h" -#include "tex-strings.h" -#include "layout.h" -#include "bufferview_funcs.h" -#include "lyxfont.h" -#include "version.h" -#include "LaTeX.h" +#include "bufferparams.h" +#include "counters.h" +#include "Bullet.h" #include "Chktex.h" #include "debug.h" -#include "LaTeXFeatures.h" -#include "lyxtext.h" -#include "gettext.h" -#include "language.h" -#include "exporter.h" #include "errorlist.h" -#include "Lsstream.h" +#include "exporter.h" #include "format.h" -#include "BufferView.h" -#include "ParagraphParameters.h" +#include "funcrequest.h" +#include "gettext.h" #include "iterators.h" -#include "lyxtextclasslist.h" -#include "sgml.h" -#include "paragraph_funcs.h" +#include "language.h" +#include "LaTeX.h" +#include "LaTeXFeatures.h" +#include "LyXAction.h" +#include "lyxlex.h" +#include "lyxtext.h" +#include "lyxrc.h" +#include "lyxvc.h" +#include "lyx_main.h" #include "messages.h" -#include "author.h" - -#include "frontends/LyXView.h" - -#include "mathed/formulamacro.h" -#include "mathed/formula.h" +#include "output.h" +#include "output_docbook.h" +#include "output_latex.h" +#include "output_linuxdoc.h" +#include "paragraph.h" +#include "paragraph_funcs.h" +#include "ParagraphParameters.h" +#include "PosIterator.h" +#include "sgml.h" +#include "texrow.h" +#include "undo.h" +#include "version.h" -#include "insets/inseterror.h" #include "insets/insetbibitem.h" #include "insets/insetbibtex.h" #include "insets/insetinclude.h" #include "insets/insettext.h" -#include "frontends/Dialogs.h" #include "frontends/Alert.h" #include "graphics/Previews.h" -#include "support/textutils.h" +#include "support/FileInfo.h" #include "support/filetools.h" -#include "support/path.h" +#include "support/gzstream.h" +#include "support/lyxlib.h" #include "support/os.h" +#include "support/path.h" +#include "support/textutils.h" #include "support/tostr.h" -#include "support/lyxlib.h" -#include "support/FileInfo.h" -#include "support/lyxmanip.h" -#include "support/lyxtime.h" #include -#include -#include +#include "support/std_sstream.h" + #include -#include #include -#include -#include -#include -#include -#include -#include #include #ifdef HAVE_LOCALE -#include #endif -#ifndef CXX_GLOBAL_CSTD -using std::pow; -#endif +using lyx::pos_type; + +using lyx::support::AddName; +using lyx::support::atoi; +using lyx::support::bformat; +using lyx::support::ChangeExtension; +using lyx::support::cmd_ret; +using lyx::support::createBufferTmpDir; +using lyx::support::destroyDir; +using lyx::support::FileInfo; +using lyx::support::FileInfo; +using lyx::support::getExtFromContents; +using lyx::support::IsDirWriteable; +using lyx::support::IsFileWriteable; +using lyx::support::LibFileSearch; +using lyx::support::ltrim; +using lyx::support::MakeAbsPath; +using lyx::support::MakeDisplayPath; +using lyx::support::MakeLatexName; +using lyx::support::OnlyFilename; +using lyx::support::OnlyPath; +using lyx::support::Path; +using lyx::support::QuoteName; +using lyx::support::removeAutosaveFile; +using lyx::support::rename; +using lyx::support::RunCommand; +using lyx::support::split; +using lyx::support::strToInt; +using lyx::support::subst; +using lyx::support::tempName; +using lyx::support::trim; + +namespace os = lyx::support::os; + +using std::endl; +using std::for_each; +using std::make_pair; -using std::ostream; -using std::ofstream; using std::ifstream; -using std::fstream; using std::ios; -using std::setw; -using std::endl; +using std::ostream; +using std::ostringstream; +using std::ofstream; using std::pair; -using std::make_pair; -using std::vector; -using std::map; using std::stack; -using std::list; -using std::for_each; +using std::vector; +using std::string; -using lyx::pos_type; -using lyx::textclass_type; // all these externs should eventually be removed. extern BufferList bufferlist; namespace { -const int LYX_FORMAT = 223; +const int LYX_FORMAT = 229; } // namespace anon + +typedef std::map DepClean; + +struct Buffer::Impl +{ + Impl(Buffer & parent, string const & file, bool readonly); + + limited_stack undostack; + limited_stack redostack; + BufferParams params; + LyXVC lyxvc; + string temppath; + TexRow texrow; + + /// need to regenerate .tex ? + DepClean dep_clean; + + /// is save needed + mutable bool lyx_clean; + + /// is autosave needed + mutable bool bak_clean; + + /// is this a unnamed file (New...) + bool unnamed; + + /// buffer is r/o + bool read_only; + + /// name of the file the buffer is associated with. + string filename; + + /// The path to the document file. + string filepath; + + boost::scoped_ptr messages; + + /** set to true only when the file is fully loaded. + * Used to prevent the premature generation of previews + * and by the citation inset. + */ + bool file_fully_loaded; + + /// our Text + LyXText text; +}; + + +Buffer::Impl::Impl(Buffer & parent, string const & file, bool readonly_) + : lyx_clean(true), bak_clean(true), unnamed(false), read_only(readonly_), + filename(file), filepath(OnlyPath(file)), file_fully_loaded(false), + text(0, 0) +{ + lyxvc.buffer(&parent); + temppath = createBufferTmpDir(); + // FIXME: And now do something if temppath == string(), because we + // assume from now on that temppath points to a valid temp dir. + // See http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg67406.html +} + + Buffer::Buffer(string const & file, bool ronly) - : niceFile(true), lyx_clean(true), bak_clean(true), - unnamed(false), read_only(ronly), - filename_(file), users(0) + : pimpl_(new Impl(*this, file, ronly)) { lyxerr[Debug::INFO] << "Buffer::Buffer()" << endl; - filepath_ = OnlyPath(file); - lyxvc.buffer(this); - if (read_only || lyxrc.use_tempdir) { - tmppath = CreateBufferTmpDir(); - } else { - tmppath.erase(); - } - - // set initial author - authors().record(Author(lyxrc.user_name, lyxrc.user_email)); } @@ -142,20 +211,99 @@ Buffer::~Buffer() // 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->buffer(0); + closing(); - if (!tmppath.empty() && destroyDir(tmppath) != 0) { + if (!temppath().empty() && destroyDir(temppath()) != 0) { Alert::warning(_("Could not remove temporary directory"), - bformat(_("Could not remove the temporary directory %1$s"), tmppath)); + bformat(_("Could not remove the temporary directory %1$s"), temppath())); } - paragraphs.clear(); + // Remove any previewed LaTeX snippets associated with this buffer. + lyx::graphics::Previews::get().removeLoader(*this); +} + + +LyXText & Buffer::text() const +{ + return const_cast(pimpl_->text); +} + + +limited_stack & Buffer::undostack() +{ + return pimpl_->undostack; +} + + +limited_stack const & Buffer::undostack() const +{ + return pimpl_->undostack; +} + + +limited_stack & Buffer::redostack() +{ + return pimpl_->redostack; +} + + +limited_stack const & Buffer::redostack() const +{ + return pimpl_->redostack; +} + + +BufferParams & Buffer::params() +{ + return pimpl_->params; +} + + +BufferParams const & Buffer::params() const +{ + return pimpl_->params; +} + + +ParagraphList & Buffer::paragraphs() +{ + return pimpl_->text.paragraphs(); +} + + +ParagraphList const & Buffer::paragraphs() const +{ + return pimpl_->text.paragraphs(); +} + + +LyXVC & Buffer::lyxvc() +{ + return pimpl_->lyxvc; +} + + +LyXVC const & Buffer::lyxvc() const +{ + return pimpl_->lyxvc; +} + + +string const & Buffer::temppath() const +{ + return pimpl_->temppath; +} + + +TexRow & Buffer::texrow() +{ + return pimpl_->texrow; +} - // Remove any previewed LaTeX snippets assocoated with this buffer. - grfx::Previews::get().removeLoader(this); + +TexRow const & Buffer::texrow() const +{ + return pimpl_->texrow; } @@ -173,10 +321,7 @@ pair const Buffer::getLogName() const if (filename.empty()) return make_pair(Buffer::latexlog, string()); - string path = OnlyPath(filename); - - if (lyxrc.use_tempdir || !IsDirWriteable(path)) - path = tmppath; + string const path = temppath(); string const fname = AddName(path, OnlyFilename(ChangeExtension(filename, @@ -203,43 +348,18 @@ pair const Buffer::getLogName() const void Buffer::setReadonly(bool flag) { - if (read_only != flag) { - read_only = flag; - updateTitles(); - users->owner()->getDialogs().updateBufferDependent(false); + if (pimpl_->read_only != flag) { + pimpl_->read_only = flag; + readonly(flag); } } -AuthorList & Buffer::authors() -{ - return params.authorlist; -} - - -/// Update window titles of all users -// Should work on a list -void Buffer::updateTitles() const -{ - if (users) - users->owner()->updateWindowTitle(); -} - - -/// Reset autosave timer of all users -// Should work on a list -void Buffer::resetAutosaveTimers() const -{ - if (users) - users->owner()->resetAutosaveTimer(); -} - - void Buffer::setFileName(string const & newfile) { - filename_ = MakeAbsPath(newfile); - filepath_ = OnlyPath(filename_); - setReadonly(IsFileWriteable(filename_) == 0); + pimpl_->filename = MakeAbsPath(newfile); + pimpl_->filepath = OnlyPath(pimpl_->filename); + setReadonly(IsFileWriteable(pimpl_->filename) == 0); updateTitles(); } @@ -251,11 +371,12 @@ void unknownClass(string const & unknown) { Alert::warning(_("Unknown document class"), bformat(_("Using the default document class, because the " - " class %1$s is unknown."), unknown)); + "class %1$s is unknown."), unknown)); } } // anon + int Buffer::readHeader(LyXLex & lex) { int unknown_tokens = 0; @@ -273,12 +394,19 @@ int Buffer::readHeader(LyXLex & lex) lyxerr[Debug::PARSER] << "Handling header token: `" << token << '\'' << endl; - string unknown = params.readToken(lex, token); + + string unknown = params().readToken(lex, token); if (!unknown.empty()) { if (unknown[0] != '\\') { unknownClass(unknown); } else { ++unknown_tokens; + string const s = bformat(_("Unknown token: " + "%1$s %2$s\n"), + token, + lex.getString()); + error(ErrorItem(_("Header error"), s, + -1, 0, 0)); } } } @@ -293,28 +421,21 @@ int Buffer::readHeader(LyXLex & lex) // changed to be public and have one parameter // if par = 0 normal behavior // else insert behavior -// Returns false if "\the_end" is not read (Asger) -bool Buffer::readBody(LyXLex & lex, ParagraphList::iterator pit) +// Returns false if "\end_document" is not read (Asger) +bool Buffer::readBody(LyXLex & lex) { - int unknown_tokens = 0; - - Paragraph::depth_type depth = 0; bool the_end_read = false; - if (paragraphs.empty()) { - unknown_tokens += readHeader(lex); - - if (!params.getLyXTextClass().load()) { - string theclass = params.getLyXTextClass().name(); + if (paragraphs().empty()) { + readHeader(lex); + if (!params().getLyXTextClass().load()) { + string theclass = params().getLyXTextClass().name(); Alert::error(_("Can't load document class"), bformat( "Using the default document class, because the " " class %1$s could not be loaded.", theclass)); - params.textclass = 0; + params().textclass = 0; } } else { - // We are inserting into an existing document - users->text->breakParagraph(paragraphs); - // We don't want to adopt the parameters from the // document we insert, so read them into a temporary buffer // and then discard it @@ -323,84 +444,16 @@ bool Buffer::readBody(LyXLex & lex, ParagraphList::iterator pit) tmpbuf.readHeader(lex); } - while (lex.isOK()) { - lex.nextToken(); - string const token = lex.getString(); - - if (token.empty()) - continue; - - lyxerr[Debug::PARSER] << "Handling token: `" - << token << '\'' << endl; - - if (token == "\\the_end") { - the_end_read = true; - continue; - } - - unknown_tokens += readParagraph(lex, token, paragraphs, pit, depth); - } - - - if (unknown_tokens > 0) { - string s; - if (unknown_tokens == 1) { - s = bformat(_("Encountered one unknown token when reading " - "the document %1$s."), fileName()); - } else { - s = bformat(_("Encountered %1$s unknown tokens when reading " - "the document %2$s."), tostr(unknown_tokens), fileName()); - } - Alert::warning(_("Document format failure"), s); - } + if (text().read(*this, lex)) + the_end_read = true; return the_end_read; } -int Buffer::readParagraph(LyXLex & lex, string const & token, - ParagraphList & pars, ParagraphList::iterator & pit, - Paragraph::depth_type & depth) -{ - static Change current_change; - int unknown = 0; - - if (token == "\\layout") { - lex.pushToken(token); - - Paragraph par; - par.params().depth(depth); - if (params.tracking_changes) - par.trackChanges(); - LyXFont f(LyXFont::ALL_INHERIT, params.language); - par.setFont(0, f); - - // FIXME: goddamn InsetTabular makes us pass a Buffer - // not BufferParams - unknown += ::readParagraph(*this, par, lex); - - // insert after - if (pit != pars.end()) - ++pit; - pit = pars.insert(pit, par); - } else if (token == "\\begin_deeper") { - ++depth; - } else if (token == "\\end_deeper") { - if (!depth) { - lex.printError("\\end_deeper: " "depth is already null"); - } else { - --depth; - } - } else { - ++unknown; - } - return unknown; -} - - // needed to insert the selection void Buffer::insertStringAsLines(ParagraphList::iterator & par, pos_type & pos, - LyXFont const & fn,string const & str) + LyXFont const & fn, string const & str) { LyXLayout_ptr const & layout = par->layout(); @@ -414,8 +467,8 @@ void Buffer::insertStringAsLines(ParagraphList::iterator & par, pos_type & pos, for(string::const_iterator cit = str.begin(); cit != str.end(); ++cit) { if (*cit == '\n') { - if (autobreakrows && (!par->empty() || layout->keepempty)) { - breakParagraph(params, paragraphs, par, pos, + if (autobreakrows && (!par->empty() || par->allowEmpty())) { + breakParagraph(params(), paragraphs(), par, pos, layout->isEnvironment()); ++par; pos = 0; @@ -425,19 +478,17 @@ void Buffer::insertStringAsLines(ParagraphList::iterator & par, pos_type & pos, } // do not insert consecutive spaces if !free_spacing } else if ((*cit == ' ' || *cit == '\t') && - space_inserted && !layout->free_spacing && - !par->isFreeSpacing()) - { + space_inserted && !par->isFreeSpacing()) { continue; } else if (*cit == '\t') { - if (!layout->free_spacing && !par->isFreeSpacing()) { + if (!par->isFreeSpacing()) { // tabs are like spaces here par->insertChar(pos, ' ', font); ++pos; space_inserted = true; } else { - const pos_type nb = 8 - pos % 8; - for (pos_type a = 0; a < nb ; ++a) { + const pos_type n = 8 - pos % 8; + for (pos_type i = 0; i < n; ++i) { par->insertChar(pos, ' ', font); ++pos; } @@ -457,26 +508,53 @@ void Buffer::insertStringAsLines(ParagraphList::iterator & par, pos_type & pos, } -bool Buffer::readFile(LyXLex & lex, string const & filename) +bool Buffer::readFile(string const & filename) { - bool ret = readFile(lex, filename, paragraphs.begin()); + // Check if the file is compressed. + string const format = getExtFromContents(filename); + if (format == "gzip" || format == "zip" || format == "compress") { + params().compressed = true; + } + + bool ret = readFile(filename, paragraphs().begin()); // After we have read a file, we must ensure that the buffer // language is set and used in the gui. // If you know of a better place to put this, please tell me. (Lgb) - updateDocLang(params.language); + updateDocLang(params().language); return ret; } -// FIXME: all the below Alerts should give the filename.. +bool Buffer::readFile(string const & filename, ParagraphList::iterator pit) +{ + LyXLex lex(0, 0); + lex.setFile(filename); + return readFile(lex, filename, pit); +} + + +bool Buffer::fully_loaded() const +{ + return pimpl_->file_fully_loaded; +} + + +void Buffer::fully_loaded(bool value) +{ + pimpl_->file_fully_loaded = value; +} + + bool Buffer::readFile(LyXLex & lex, string const & filename, ParagraphList::iterator pit) { + BOOST_ASSERT(!filename.empty()); + if (!lex.isOK()) { Alert::error(_("Document could not be read"), - _("The specified document could not be read.")); + bformat(_("%1$s could not be read."), filename)); return false; } @@ -485,14 +563,17 @@ bool Buffer::readFile(LyXLex & lex, string const & filename, if (!lex.isOK()) { Alert::error(_("Document could not be read"), - _("The specified document could not be read.")); + bformat(_("%1$s could not be read."), filename)); return false; } // the first token _must_ be... if (token != "\\lyxformat") { + lyxerr << "Token: " << token << endl; + Alert::error(_("Document format failure"), - _("The specified document is not a LyX document.")); + bformat(_("%1$s is not a LyX document."), + filename)); return false; } @@ -504,65 +585,69 @@ bool Buffer::readFile(LyXLex & lex, string const & filename, //lyxerr << " dot found at " << dot << endl; if (dot != string::npos) tmp_format.erase(dot, 1); - file_format = strToInt(tmp_format); + int file_format = strToInt(tmp_format); //lyxerr << "format: " << file_format << endl; - if (file_format == LYX_FORMAT) { - // current format - } else if (file_format > LYX_FORMAT) { + + if (file_format > LYX_FORMAT) { Alert::warning(_("Document format failure"), - _("This document was created with a newer version of " - "LyX. This is likely to cause problems.")); + bformat(_("%1$s was created with a newer" + " version of LyX. This is likely to" + " cause problems."), + filename)); } else if (file_format < LYX_FORMAT) { - // old formats - if (file_format < 200) { - Alert::error(_("Document format failure"), - _("This LyX document is too old to be read " - "by this version of LyX. Try LyX 0.10.")); + string const tmpfile = tempName(); + if (tmpfile.empty()) { + Alert::error(_("Conversion failed"), + bformat(_("%1$s is from an earlier" + " version of LyX, but a temporary" + " file for converting it could" + " not be created."), + filename)); return false; - } else if (!filename.empty()) { - string command = - LibFileSearch("lyx2lyx", "lyx2lyx"); - if (command.empty()) { - Alert::error(_("Conversion script not found"), - _("The document is from an earlier version " - "of LyX, but the conversion script lyx2lyx " - "could not be found.")); - return false; - } - command += " -t" - +tostr(LYX_FORMAT) + ' ' - + QuoteName(filename); - lyxerr[Debug::INFO] << "Running '" - << command << '\'' - << endl; - cmd_ret const ret = RunCommand(command); - if (ret.first) { - Alert::error(_("Conversion script failed"), - _("The document is from an earlier version " - "of LyX, but the lyx2lyx script failed " - "to convert it.")); - return false; - } - istringstream is(STRCONV(ret.second)); - LyXLex tmplex(0, 0); - tmplex.setStream(is); - return readFile(tmplex, string(), pit); - } else { - // This code is reached if lyx2lyx failed (for - // some reason) to change the file format of - // the file. - lyx::Assert(false); + } + string command = LibFileSearch("lyx2lyx", "lyx2lyx"); + if (command.empty()) { + Alert::error(_("Conversion script not found"), + bformat(_("%1$s is from an earlier" + " version of LyX, but the" + " conversion script lyx2lyx" + " could not be found."), + filename)); return false; } + command += " -t" + + tostr(LYX_FORMAT) + + " -o " + tmpfile + ' ' + + QuoteName(filename); + lyxerr[Debug::INFO] << "Running '" + << command << '\'' + << endl; + cmd_ret const ret = RunCommand(command); + if (ret.first != 0) { + Alert::error(_("Conversion script failed"), + bformat(_("%1$s is from an earlier version" + " of LyX, but the lyx2lyx script" + " failed to convert it."), + filename)); + return false; + } else { + bool ret = readFile(tmpfile, pit); + // Do stuff with tmpfile name and buffer name here. + return ret; + } + } - bool the_end = readBody(lex, pit); - params.setPaperStuff(); + + bool the_end = readBody(lex); + params().setPaperStuff(); if (!the_end) { Alert::error(_("Document format failure"), - _("The document ended unexpectedly, which means " - "that it is probably corrupted.")); + bformat(_("%1$s ended unexpectedly, which means" + " that it is probably corrupted."), + filename)); } + pimpl_->file_fully_loaded = true; return true; } @@ -634,9 +719,8 @@ bool Buffer::save() const removeAutosaveFile(fileName()); } else { // Saving failed, so backup is not backup - if (lyxrc.make_backup) { - lyx::rename(s, fileName()); - } + if (lyxrc.make_backup) + rename(s, fileName()); return false; } return true; @@ -645,50 +729,61 @@ bool Buffer::save() const bool Buffer::writeFile(string const & fname) const { - if (read_only && (fname == fileName())) { + if (pimpl_->read_only && fname == fileName()) return false; - } FileInfo finfo(fname); - if (finfo.exist() && !finfo.writable()) { + if (finfo.exist() && !finfo.writable()) return false; - } - ofstream ofs(fname.c_str()); - if (!ofs) { - return false; + bool retval; + + if (params().compressed) { + gz::ogzstream ofs(fname.c_str()); + if (!ofs) + return false; + + retval = do_writeFile(ofs); + + } else { + ofstream ofs(fname.c_str()); + if (!ofs) + return false; + + retval = do_writeFile(ofs); } + return retval; +} + + +bool Buffer::do_writeFile(ostream & ofs) const +{ #ifdef HAVE_LOCALE // Use the standard "C" locale for file output. ofs.imbue(std::locale::classic()); #endif - // The top of the file should not be written by params. + // The top of the file should not be written by params(). // write out a comment in the top of the file - ofs << '#' << lyx_docversion + ofs << "#LyX " << lyx_version << " created this file. For more info see http://www.lyx.org/\n" << "\\lyxformat " << LYX_FORMAT << "\n"; - // now write out the buffer paramters. - params.writeFile(ofs); + // now write out the buffer parameters. + params().writeFile(ofs); ofs << "\\end_header\n"; - Paragraph::depth_type depth = 0; - - // this will write out all the paragraphs - // using recursive descent. - ParagraphList::iterator pit = paragraphs.begin(); - ParagraphList::iterator pend = paragraphs.end(); - for (; pit != pend; ++pit) - pit->write(this, ofs, params, depth); + // write the text + text().write(*this, ofs); // Write marker that shows file is complete - ofs << "\n\\the_end" << endl; + ofs << "\n\\end_document" << endl; - ofs.close(); + // Shouldn't really be needed.... + //ofs.close(); // how to check if close went ok? // Following is an attempt... (BE 20001011) @@ -699,308 +794,60 @@ bool Buffer::writeFile(string const & fname) const // which should include file system full errors. bool status = true; - if (!ofs.good()) { + if (!ofs) { status = false; -#if 0 - if (ofs.bad()) { - lyxerr << "Buffer::writeFile: BAD ERROR!" << endl; - } else { - lyxerr << "Buffer::writeFile: NOT SO BAD ERROR!" - << endl; - } -#endif + lyxerr << "File was not closed properly." << endl; } return status; } -namespace { - -pair const addDepth(int depth, int ldepth) +void Buffer::makeLaTeXFile(string const & fname, + string const & original_path, + OutputParams const & runparams, + bool output_preamble, bool output_body) { - int d = depth * 2; - if (ldepth > depth) - d += (ldepth - depth) * 2; - return make_pair(d, string(d, ' ')); -} + lyxerr[Debug::LATEX] << "makeLaTeXFile..." << endl; + + ofstream ofs; + if (!openFileWrite(ofs, fname)) + return; + makeLaTeXFile(ofs, original_path, + runparams, output_preamble, output_body); + + ofs.close(); + if (ofs.fail()) + lyxerr << "File '" << fname << "' was not closed properly." << endl; } -string const Buffer::asciiParagraph(Paragraph const & par, - unsigned int linelen, - bool noparbreak) const +void Buffer::makeLaTeXFile(ostream & os, + string const & original_path, + OutputParams const & runparams_in, + bool output_preamble, bool output_body) { - ostringstream buffer; - Paragraph::depth_type depth = 0; - int ltype = 0; - Paragraph::depth_type ltype_depth = 0; - bool ref_printed = false; -// if (!par->previous()) { -#if 0 - // begins or ends a deeper area ? - if (depth != par->params().depth()) { - if (par->params().depth() > depth) { - while (par->params().depth() > depth) { - ++depth; - } - } else { - while (par->params().depth() < depth) { - --depth; - } - } - } -#else - depth = par.params().depth(); -#endif - - // First write the layout - string const & tmp = par.layout()->name(); - if (compare_no_case(tmp, "itemize") == 0) { - ltype = 1; - ltype_depth = depth + 1; - } else if (compare_ascii_no_case(tmp, "enumerate") == 0) { - ltype = 2; - ltype_depth = depth + 1; - } else if (contains(ascii_lowercase(tmp), "ection")) { - ltype = 3; - ltype_depth = depth + 1; - } else if (contains(ascii_lowercase(tmp), "aragraph")) { - ltype = 4; - ltype_depth = depth + 1; - } else if (compare_ascii_no_case(tmp, "description") == 0) { - ltype = 5; - ltype_depth = depth + 1; - } else if (compare_ascii_no_case(tmp, "abstract") == 0) { - ltype = 6; - ltype_depth = 0; - } else if (compare_ascii_no_case(tmp, "bibliography") == 0) { - ltype = 7; - ltype_depth = 0; - } else { - ltype = 0; - ltype_depth = 0; - } - - /* maybe some vertical spaces */ - - /* the labelwidthstring used in lists */ - - /* some lines? */ - - /* some pagebreaks? */ - - /* noindent ? */ - - /* what about the alignment */ - - // linelen <= 0 is special and means we don't have paragraph breaks - - string::size_type currlinelen = 0; - - if (!noparbreak) { - if (linelen > 0) - buffer << "\n\n"; - - buffer << string(depth * 2, ' '); - currlinelen += depth * 2; - - //-- - // we should probably change to the paragraph language in the - // gettext here (if possible) so that strings are outputted in - // the correct language! (20012712 Jug) - //-- - switch (ltype) { - case 0: // Standard - case 4: // (Sub)Paragraph - case 5: // Description - break; - case 6: // Abstract - if (linelen > 0) { - buffer << _("Abstract") << "\n\n"; - currlinelen = 0; - } else { - string const abst = _("Abstract: "); - buffer << abst; - currlinelen += abst.length(); - } - break; - case 7: // Bibliography - if (!ref_printed) { - if (linelen > 0) { - buffer << _("References") << "\n\n"; - currlinelen = 0; - } else { - string const refs = _("References: "); - buffer << refs; - currlinelen += refs.length(); - } - - ref_printed = true; - } - break; - default: - { - string const parlab = par.params().labelString(); - buffer << parlab << ' '; - currlinelen += parlab.length() + 1; - } - break; - - } - } - - if (!currlinelen) { - pair p = addDepth(depth, ltype_depth); - buffer << p.second; - currlinelen += p.first; - } - - // this is to change the linebreak to do it by word a bit more - // intelligent hopefully! (only in the case where we have a - // max linelength!) (Jug) - - string word; - - for (pos_type i = 0; i < par.size(); ++i) { - char c = par.getUChar(params, i); - switch (c) { - case Paragraph::META_INSET: - { - Inset const * inset = par.getInset(i); - if (inset) { - if (linelen > 0) { - buffer << word; - currlinelen += word.length(); - word.erase(); - } - if (inset->ascii(this, buffer, linelen)) { - // to be sure it breaks paragraph - currlinelen += linelen; - } - } - } - break; - - default: - if (c == ' ') { - if (linelen > 0 && - currlinelen + word.length() > linelen - 10) { - buffer << "\n"; - pair p = addDepth(depth, ltype_depth); - buffer << p.second; - currlinelen = p.first; - } - - buffer << word << ' '; - currlinelen += word.length() + 1; - word.erase(); - - } else { - if (c != '\0') { - word += c; - } else { - lyxerr[Debug::INFO] << - "writeAsciiFile: NULL char in structure." << endl; - } - if ((linelen > 0) && - (currlinelen + word.length()) > linelen) - { - buffer << "\n"; - - pair p = - addDepth(depth, ltype_depth); - buffer << p.second; - currlinelen = p.first; - } - } - break; - } - } - buffer << word; - return STRCONV(buffer.str()); -} - - -void Buffer::writeFileAscii(string const & fname, int linelen) -{ - ofstream ofs(fname.c_str()); - if (!ofs) { - string const file = MakeDisplayPath(fname, 50); - string text = bformat(_("Could not save the document\n%1$s."), file); - Alert::error(_("Could not save document"), text); - return; - } - writeFileAscii(ofs, linelen); -} - - -void Buffer::writeFileAscii(ostream & os, int linelen) -{ - ParagraphList::iterator beg = paragraphs.begin(); - ParagraphList::iterator end = paragraphs.end(); - ParagraphList::iterator it = beg; - for (; it != end; ++it) { - os << asciiParagraph(*it, linelen, it == beg); - } - os << "\n"; -} - - - -void Buffer::makeLaTeXFile(string const & fname, - string const & original_path, - LatexRunParams const & runparams, - bool only_body, bool only_preamble) -{ - lyxerr[Debug::LATEX] << "makeLaTeXFile..." << endl; - - ofstream ofs(fname.c_str()); - if (!ofs) { - string const file = MakeDisplayPath(fname, 50); - string text = bformat(_("Could not open the specified document\n%1$s."), - file); - Alert::error(_("Could not open file"), text); - return; - } - - makeLaTeXFile(ofs, original_path, - runparams, only_body, only_preamble); - - ofs.close(); - if (ofs.fail()) { - lyxerr << "File was not closed properly." << endl; - } -} - - -void Buffer::makeLaTeXFile(ostream & os, - string const & original_path, - LatexRunParams const & runparams_in, - bool only_body, bool only_preamble) -{ - LatexRunParams runparams = runparams_in; - niceFile = runparams.nice; // this will be used by Insetincludes. + OutputParams runparams = runparams_in; // validate the buffer. lyxerr[Debug::LATEX] << " Validating buffer..." << endl; - LaTeXFeatures features(params); + LaTeXFeatures features(*this, params(), runparams.nice); validate(features); lyxerr[Debug::LATEX] << " Buffer validation done." << endl; - texrow.reset(); + texrow().reset(); // The starting paragraph of the coming rows is the // first paragraph of the document. (Asger) - texrow.start(paragraphs.begin()->id(), 0); + texrow().start(paragraphs().begin()->id(), 0); - if (!only_body && runparams.nice) { - os << "%% " << lyx_docversion << " created this file. " + if (output_preamble && runparams.nice) { + os << "%% LyX " << lyx_version << " created this file. " "For more info, see http://www.lyx.org/.\n" "%% Do not edit unless you really know what " "you are doing.\n"; - texrow.newline(); - texrow.newline(); + texrow().newline(); + texrow().newline(); } lyxerr[Debug::INFO] << "lyx header finished" << endl; // There are a few differences between nice LaTeX and usual files: @@ -1010,12 +857,12 @@ void Buffer::makeLaTeXFile(ostream & os, // input@path is set when the actual parameter // original_path is set. This is done for usual tex-file, but not // for nice-latex-file. (Matthias 250696) - if (!only_body) { + if (output_preamble) { if (!runparams.nice) { // code for usual, NOT nice-latex-file os << "\\batchmode\n"; // changed // from \nonstopmode - texrow.newline(); + texrow().newline(); } if (!original_path.empty()) { string inputpath = os::external_path(original_path); @@ -1024,46 +871,46 @@ void Buffer::makeLaTeXFile(ostream & os, << "\\def\\input@path{{" << inputpath << "/}}\n" << "\\makeatother\n"; - texrow.newline(); - texrow.newline(); - texrow.newline(); + texrow().newline(); + texrow().newline(); + texrow().newline(); } // Write the preamble - runparams.use_babel = params.writeLaTeX(os, features, texrow); + runparams.use_babel = params().writeLaTeX(os, features, texrow()); - if (only_preamble) + if (!output_body) return; // make the body. os << "\\begin{document}\n"; - texrow.newline(); - } // only_body + texrow().newline(); + } // output_preamble lyxerr[Debug::INFO] << "preamble finished, now the body." << endl; if (!lyxrc.language_auto_begin) { os << subst(lyxrc.language_command_begin, "$$lang", - params.language->babel()) + params().language->babel()) << endl; - texrow.newline(); + texrow().newline(); } - latexParagraphs(this, paragraphs, os, texrow, runparams); + latexParagraphs(*this, paragraphs(), os, texrow(), runparams); // add this just in case after all the paragraphs os << endl; - texrow.newline(); + texrow().newline(); if (!lyxrc.language_auto_end) { os << subst(lyxrc.language_command_end, "$$lang", - params.language->babel()) + params().language->babel()) << endl; - texrow.newline(); + texrow().newline(); } - if (!only_body) { + if (output_preamble) { os << "\\end{document}\n"; - texrow.newline(); + texrow().newline(); lyxerr[Debug::LATEX] << "makeLaTeXFile...done" << endl; } else { @@ -1072,79 +919,69 @@ void Buffer::makeLaTeXFile(ostream & os, } // Just to be sure. (Asger) - texrow.newline(); + texrow().newline(); lyxerr[Debug::INFO] << "Finished making LaTeX file." << endl; - lyxerr[Debug::INFO] << "Row count was " << texrow.rows() - 1 + lyxerr[Debug::INFO] << "Row count was " << texrow().rows() - 1 << '.' << endl; - - // we want this to be true outside previews (for insetexternal) - niceFile = true; } bool Buffer::isLatex() const { - return params.getLyXTextClass().outputType() == LATEX; + return params().getLyXTextClass().outputType() == LATEX; } bool Buffer::isLinuxDoc() const { - return params.getLyXTextClass().outputType() == LINUXDOC; + return params().getLyXTextClass().outputType() == LINUXDOC; } bool Buffer::isLiterate() const { - return params.getLyXTextClass().outputType() == LITERATE; + return params().getLyXTextClass().outputType() == LITERATE; } bool Buffer::isDocBook() const { - return params.getLyXTextClass().outputType() == DOCBOOK; + return params().getLyXTextClass().outputType() == DOCBOOK; } bool Buffer::isSGML() const { - LyXTextClass const & tclass = params.getLyXTextClass(); + LyXTextClass const & tclass = params().getLyXTextClass(); return tclass.outputType() == LINUXDOC || tclass.outputType() == DOCBOOK; } -void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) +void Buffer::makeLinuxDocFile(string const & fname, + OutputParams const & runparams, + bool body_only) { - ofstream ofs(fname.c_str()); - - if (!ofs) { - string const file = MakeDisplayPath(fname, 50); - string text = bformat(_("Could not save the specified document\n%1$s.\n"), - file); - Alert::error(_("Could not save document"), text); + ofstream ofs; + if (!openFileWrite(ofs, fname)) return; - } - - niceFile = nice; // this will be used by included files. - - LaTeXFeatures features(params); + LaTeXFeatures features(*this, params(), runparams.nice); validate(features); - texrow.reset(); + texrow().reset(); - LyXTextClass const & tclass = params.getLyXTextClass(); + LyXTextClass const & tclass = params().getLyXTextClass(); string top_element = tclass.latexname(); if (!body_only) { - ofs << "filename, ".sgml") : fname; preamble += features.getIncludedFiles(name); preamble += features.getLyXSGMLEntities(); @@ -1154,144 +991,21 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) } ofs << ">\n\n"; - if (params.options.empty()) + if (params().options.empty()) sgml::openTag(ofs, 0, false, top_element); else { string top = top_element; top += ' '; - top += params.options; + top += params().options; sgml::openTag(ofs, 0, false, top); } } - ofs << "\n"; - Paragraph::depth_type depth = 0; // paragraph depth - string item_name; - vector environment_stack(5); - - users->resetErrorList(); - - ParagraphList::iterator pit = paragraphs.begin(); - ParagraphList::iterator pend = paragraphs.end(); - for (; pit != pend; ++pit) { - LyXLayout_ptr const & style = pit->layout(); - // treat as a special case for compatibility with old code - if (pit->isInset(0)) { - Inset * inset = pit->getInset(0); - Inset::Code lyx_code = inset->lyxCode(); - if (lyx_code == Inset::TOC_CODE) { - string const temp = "toc"; - sgml::openTag(ofs, depth, false, temp); - continue; - } - } - - // environment tag closing - for (; depth > pit->params().depth(); --depth) { - sgml::closeTag(ofs, depth, false, environment_stack[depth]); - environment_stack[depth].erase(); - } - - // write opening SGML tags - switch (style->latextype) { - case LATEX_PARAGRAPH: - if (depth == pit->params().depth() - && !environment_stack[depth].empty()) { - sgml::closeTag(ofs, depth, false, environment_stack[depth]); - environment_stack[depth].erase(); - if (depth) - --depth; - else - ofs << "

"; - } - sgml::openTag(ofs, depth, false, style->latexname()); - break; - - case LATEX_COMMAND: - if (depth != 0) - sgmlError(pit, 0, - _("Error: Wrong depth for LatexType Command.\n")); - - if (!environment_stack[depth].empty()) { - sgml::closeTag(ofs, depth, false, environment_stack[depth]); - ofs << "

"; - } - - environment_stack[depth].erase(); - sgml::openTag(ofs, depth, false, style->latexname()); - break; - - case LATEX_ENVIRONMENT: - case LATEX_ITEM_ENVIRONMENT: - case LATEX_BIB_ENVIRONMENT: - { - string const & latexname = style->latexname(); - - if (depth == pit->params().depth() - && environment_stack[depth] != latexname) { - sgml::closeTag(ofs, depth, false, - environment_stack[depth]); - environment_stack[depth].erase(); - } - if (depth < pit->params().depth()) { - depth = pit->params().depth(); - environment_stack[depth].erase(); - } - if (environment_stack[depth] != latexname) { - if (depth == 0) { - sgml::openTag(ofs, depth, false, "p"); - } - sgml::openTag(ofs, depth, false, latexname); - - if (environment_stack.size() == depth + 1) - environment_stack.push_back("!-- --"); - environment_stack[depth] = latexname; - } - - if (style->latexparam() == "CDATA") - ofs << "latextype == LATEX_ENVIRONMENT) break; - - if (style->labeltype == LABEL_MANUAL) - item_name = "tag"; - else - item_name = "item"; - - sgml::openTag(ofs, depth + 1, false, item_name); - } - break; - - default: - sgml::openTag(ofs, depth, false, style->latexname()); - break; - } - - simpleLinuxDocOnePar(ofs, pit, depth); - - ofs << "\n"; - // write closing SGML tags - switch (style->latextype) { - case LATEX_COMMAND: - break; - case LATEX_ENVIRONMENT: - case LATEX_ITEM_ENVIRONMENT: - case LATEX_BIB_ENVIRONMENT: - if (style->latexparam() == "CDATA") - ofs << "]]>"; - break; - default: - sgml::closeTag(ofs, depth, false, style->latexname()); - break; - } - } - - // Close open tags - for (int i = depth; i >= 0; --i) - sgml::closeTag(ofs, depth, false, environment_stack[i]); + linuxdocParagraphs(*this, paragraphs(), ofs, runparams); if (!body_only) { ofs << "\n\n"; @@ -1299,299 +1013,32 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) } ofs.close(); - // How to check for successful close - - // we want this to be true outside previews (for insetexternal) - niceFile = true; - - users->showErrorList(_("LinuxDoc")); -} - - -// checks, if newcol chars should be put into this line -// writes newline, if necessary. -namespace { - -void sgmlLineBreak(ostream & os, string::size_type & colcount, - string::size_type newcol) -{ - colcount += newcol; - if (colcount > lyxrc.ascii_linelen) { - os << "\n"; - colcount = newcol; // assume write after this call - } -} - -enum PAR_TAG { - NONE=0, - TT = 1, - SF = 2, - BF = 4, - IT = 8, - SL = 16, - EM = 32 -}; - - -string tag_name(PAR_TAG const & pt) { - switch (pt) { - case NONE: return "!-- --"; - case TT: return "tt"; - case SF: return "sf"; - case BF: return "bf"; - case IT: return "it"; - case SL: return "sl"; - case EM: return "em"; - } - return ""; -} - - -inline -void operator|=(PAR_TAG & p1, PAR_TAG const & p2) -{ - p1 = static_cast(p1 | p2); -} - - -inline -void reset(PAR_TAG & p1, PAR_TAG const & p2) -{ - p1 = static_cast(p1 & ~p2); -} - -} // anon - - -// Handle internal paragraph parsing -- layout already processed. -void Buffer::simpleLinuxDocOnePar(ostream & os, - ParagraphList::iterator par, - Paragraph::depth_type /*depth*/) const -{ - LyXLayout_ptr const & style = par->layout(); - - string::size_type char_line_count = 5; // Heuristic choice ;-) - - // gets paragraph main font - LyXFont font_old; - bool desc_on; - if (style->labeltype == LABEL_MANUAL) { - font_old = style->labelfont; - desc_on = true; - } else { - font_old = style->font; - desc_on = false; - } - - LyXFont::FONT_FAMILY family_type = LyXFont::ROMAN_FAMILY; - LyXFont::FONT_SERIES series_type = LyXFont::MEDIUM_SERIES; - LyXFont::FONT_SHAPE shape_type = LyXFont::UP_SHAPE; - bool is_em = false; - - stack tag_state; - // parsing main loop - for (pos_type i = 0; i < par->size(); ++i) { - - PAR_TAG tag_close = NONE; - list < PAR_TAG > tag_open; - - LyXFont const font = par->getFont(params, i, outerFont(par, paragraphs)); - - if (font_old.family() != font.family()) { - switch (family_type) { - case LyXFont::SANS_FAMILY: - tag_close |= SF; - break; - case LyXFont::TYPEWRITER_FAMILY: - tag_close |= TT; - break; - default: - break; - } - - family_type = font.family(); - - switch (family_type) { - case LyXFont::SANS_FAMILY: - tag_open.push_back(SF); - break; - case LyXFont::TYPEWRITER_FAMILY: - tag_open.push_back(TT); - break; - default: - break; - } - } - - if (font_old.series() != font.series()) { - switch (series_type) { - case LyXFont::BOLD_SERIES: - tag_close |= BF; - break; - default: - break; - } - - series_type = font.series(); - - switch (series_type) { - case LyXFont::BOLD_SERIES: - tag_open.push_back(BF); - break; - default: - break; - } - - } - - if (font_old.shape() != font.shape()) { - switch (shape_type) { - case LyXFont::ITALIC_SHAPE: - tag_close |= IT; - break; - case LyXFont::SLANTED_SHAPE: - tag_close |= SL; - break; - default: - break; - } - - shape_type = font.shape(); - - switch (shape_type) { - case LyXFont::ITALIC_SHAPE: - tag_open.push_back(IT); - break; - case LyXFont::SLANTED_SHAPE: - tag_open.push_back(SL); - break; - default: - break; - } - } - // handle tag - if (font_old.emph() != font.emph()) { - if (font.emph() == LyXFont::ON) { - tag_open.push_back(EM); - is_em = true; - } - else if (is_em) { - tag_close |= EM; - is_em = false; - } - } - - list < PAR_TAG > temp; - while (!tag_state.empty() && tag_close) { - PAR_TAG k = tag_state.top(); - tag_state.pop(); - os << "'; - if (tag_close & k) - reset(tag_close,k); - else - temp.push_back(k); - } - - for(list< PAR_TAG >::const_iterator j = temp.begin(); - j != temp.end(); ++j) { - tag_state.push(*j); - os << '<' << tag_name(*j) << '>'; - } - - for(list< PAR_TAG >::const_iterator j = tag_open.begin(); - j != tag_open.end(); ++j) { - tag_state.push(*j); - os << '<' << tag_name(*j) << '>'; - } - - char c = par->getChar(i); - - if (c == Paragraph::META_INSET) { - Inset * inset = par->getInset(i); - inset->linuxdoc(this, os); - font_old = font; - continue; - } - - if (style->latexparam() == "CDATA") { - // "TeX"-Mode on == > SGML-Mode on. - if (c != '\0') - os << c; - ++char_line_count; - } else { - bool ws; - string str; - boost::tie(ws, str) = sgml::escapeChar(c); - if (ws && !style->free_spacing && !par->isFreeSpacing()) { - // in freespacing mode, spaces are - // non-breaking characters - if (desc_on) {// if char is ' ' then... - - ++char_line_count; - sgmlLineBreak(os, char_line_count, 6); - os << ""; - desc_on = false; - } else { - sgmlLineBreak(os, char_line_count, 1); - os << c; - } - } else { - os << str; - char_line_count += str.length(); - } - } - font_old = font; - } - - while (!tag_state.empty()) { - os << "'; - tag_state.pop(); - } - - // resets description flag correctly - if (desc_on) { - // not closed... - sgmlLineBreak(os, char_line_count, 6); - os << ""; - } -} - - -// Print an error message. -void Buffer::sgmlError(ParagraphList::iterator pit, int pos, - string const & message) const -{ - users->addError(ErrorItem(message, string(), pit->id(), pos, pos)); + if (ofs.fail()) + lyxerr << "File '" << fname << "' was not closed properly." << endl; } -void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) +void Buffer::makeDocBookFile(string const & fname, + OutputParams const & runparams, + bool only_body) { - ofstream ofs(fname.c_str()); - if (!ofs) { - string const file = MakeDisplayPath(fname, 50); - string text = bformat(_("Could not save the specified document\n%1$s.\n"), - file); - Alert::error(_("Could not save document"), text); + ofstream ofs; + if (!openFileWrite(ofs, fname)) return; - } - - niceFile = nice; // this will be used by Insetincludes. - LaTeXFeatures features(params); + LaTeXFeatures features(*this, params(), runparams.nice); validate(features); - texrow.reset(); + texrow().reset(); - LyXTextClass const & tclass = params.getLyXTextClass(); + LyXTextClass const & tclass = params().getLyXTextClass(); string top_element = tclass.latexname(); if (!only_body) { - ofs << "filename, ".sgml") : fname; preamble += features.getIncludedFiles(name); preamble += features.getLyXSGMLEntities(); @@ -1604,337 +1051,27 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) string top = top_element; top += " lang=\""; - top += params.language->code(); + top += params().language->code(); top += '"'; - if (!params.options.empty()) { + if (!params().options.empty()) { top += ' '; - top += params.options; + top += params().options; } sgml::openTag(ofs, 0, false, top); - ofs << "\n"; - vector environment_stack(10); - vector environment_inner(10); - vector command_stack(10); - - bool command_flag = false; - Paragraph::depth_type command_depth = 0; - Paragraph::depth_type command_base = 0; - Paragraph::depth_type cmd_depth = 0; - Paragraph::depth_type depth = 0; // paragraph depth - - string item_name; - string command_name; - - users->resetErrorList(); - - ParagraphList::iterator par = paragraphs.begin(); - ParagraphList::iterator pend = paragraphs.end(); - - for (; par != pend; ++par) { - string sgmlparam; - string c_depth; - string c_params; - int desc_on = 0; // description mode - - LyXLayout_ptr const & style = par->layout(); - - // environment tag closing - for (; depth > par->params().depth(); --depth) { - if (environment_inner[depth] != "!-- --") { - item_name = "listitem"; - sgml::closeTag(ofs, command_depth + depth, false, item_name); - if (environment_inner[depth] == "varlistentry") - sgml::closeTag(ofs, depth+command_depth, false, environment_inner[depth]); - } - sgml::closeTag(ofs, depth + command_depth, false, environment_stack[depth]); - environment_stack[depth].erase(); - environment_inner[depth].erase(); - } - - if (depth == par->params().depth() - && environment_stack[depth] != style->latexname() - && !environment_stack[depth].empty()) { - if (environment_inner[depth] != "!-- --") { - item_name= "listitem"; - sgml::closeTag(ofs, command_depth+depth, false, item_name); - if (environment_inner[depth] == "varlistentry") - sgml::closeTag(ofs, depth + command_depth, false, environment_inner[depth]); - } - - sgml::closeTag(ofs, depth + command_depth, false, environment_stack[depth]); - - environment_stack[depth].erase(); - environment_inner[depth].erase(); - } - - // Write opening SGML tags. - switch (style->latextype) { - case LATEX_PARAGRAPH: - sgml::openTag(ofs, depth + command_depth, - false, style->latexname()); - break; - - case LATEX_COMMAND: - if (depth != 0) - sgmlError(par, 0, - _("Error: Wrong depth for LatexType Command.\n")); - - command_name = style->latexname(); - - sgmlparam = style->latexparam(); - c_params = split(sgmlparam, c_depth,'|'); - - cmd_depth = lyx::atoi(c_depth); - - if (command_flag) { - if (cmd_depth < command_base) { - for (Paragraph::depth_type j = command_depth; - j >= command_base; --j) { - sgml::closeTag(ofs, j, false, command_stack[j]); - ofs << endl; - } - command_depth = command_base = cmd_depth; - } else if (cmd_depth <= command_depth) { - for (int j = command_depth; - j >= int(cmd_depth); --j) { - sgml::closeTag(ofs, j, false, command_stack[j]); - ofs << endl; - } - command_depth = cmd_depth; - } else - command_depth = cmd_depth; - } else { - command_depth = command_base = cmd_depth; - command_flag = true; - } - if (command_stack.size() == command_depth + 1) - command_stack.push_back(string()); - command_stack[command_depth] = command_name; - - // treat label as a special case for - // more WYSIWYM handling. - // This is a hack while paragraphs can't have - // attributes, like id in this case. - if (par->isInset(0)) { - Inset * inset = par->getInset(0); - Inset::Code lyx_code = inset->lyxCode(); - if (lyx_code == Inset::LABEL_CODE) { - command_name += " id=\""; - command_name += (static_cast(inset))->getContents(); - command_name += '"'; - desc_on = 3; - } - } - - sgml::openTag(ofs, depth + command_depth, false, command_name); - - item_name = c_params.empty() ? "title" : c_params; - sgml::openTag(ofs, depth + 1 + command_depth, false, item_name); - break; - - case LATEX_ENVIRONMENT: - case LATEX_ITEM_ENVIRONMENT: - if (depth < par->params().depth()) { - depth = par->params().depth(); - environment_stack[depth].erase(); - } - - if (environment_stack[depth] != style->latexname()) { - if (environment_stack.size() == depth + 1) { - environment_stack.push_back("!-- --"); - environment_inner.push_back("!-- --"); - } - environment_stack[depth] = style->latexname(); - environment_inner[depth] = "!-- --"; - sgml::openTag(ofs, depth + command_depth, false, environment_stack[depth]); - } else { - if (environment_inner[depth] != "!-- --") { - item_name= "listitem"; - sgml::closeTag(ofs, command_depth + depth, false, item_name); - if (environment_inner[depth] == "varlistentry") - sgml::closeTag(ofs, depth + command_depth, false, environment_inner[depth]); - } - } - - if (style->latextype == LATEX_ENVIRONMENT) { - if (!style->latexparam().empty()) { - if (style->latexparam() == "CDATA") - ofs << "latexparam()); - } - break; - } - - desc_on = (style->labeltype == LABEL_MANUAL); - - environment_inner[depth] = desc_on ? "varlistentry" : "listitem"; - sgml::openTag(ofs, depth + 1 + command_depth, - false, environment_inner[depth]); - - item_name = desc_on ? "term" : "para"; - sgml::openTag(ofs, depth + 1 + command_depth, - false, item_name); - break; - default: - sgml::openTag(ofs, depth + command_depth, - false, style->latexname()); - break; - } - - simpleDocBookOnePar(ofs, par, desc_on, - depth + 1 + command_depth); - - string end_tag; - // write closing SGML tags - switch (style->latextype) { - case LATEX_COMMAND: - end_tag = c_params.empty() ? "title" : c_params; - sgml::closeTag(ofs, depth + command_depth, - false, end_tag); - break; - case LATEX_ENVIRONMENT: - if (!style->latexparam().empty()) { - if (style->latexparam() == "CDATA") - ofs << "]]>"; - else - sgml::closeTag(ofs, depth + command_depth, false, style->latexparam()); - } - break; - case LATEX_ITEM_ENVIRONMENT: - if (desc_on == 1) break; - end_tag = "para"; - sgml::closeTag(ofs, depth + 1 + command_depth, false, end_tag); - break; - case LATEX_PARAGRAPH: - sgml::closeTag(ofs, depth + command_depth, false, style->latexname()); - break; - default: - sgml::closeTag(ofs, depth + command_depth, false, style->latexname()); - break; - } - } - - // Close open tags - for (int d = depth; d >= 0; --d) { - if (!environment_stack[depth].empty()) { - if (environment_inner[depth] != "!-- --") { - item_name = "listitem"; - sgml::closeTag(ofs, command_depth + depth, false, item_name); - if (environment_inner[depth] == "varlistentry") - sgml::closeTag(ofs, depth + command_depth, false, environment_inner[depth]); - } - - sgml::closeTag(ofs, depth + command_depth, false, environment_stack[depth]); - } - } - - for (int j = command_depth; j >= 0 ; --j) - if (!command_stack[j].empty()) { - sgml::closeTag(ofs, j, false, command_stack[j]); - ofs << endl; - } + params().getLyXTextClass().counters().reset(); + docbookParagraphs(*this, paragraphs(), ofs, runparams); ofs << "\n\n"; sgml::closeTag(ofs, 0, false, top_element); ofs.close(); - // How to check for successful close - - // we want this to be true outside previews (for insetexternal) - niceFile = true; - users->showErrorList(_("DocBook")); -} - - -void Buffer::simpleDocBookOnePar(ostream & os, - ParagraphList::iterator par, int & desc_on, - Paragraph::depth_type depth) const -{ - bool emph_flag = false; - - LyXLayout_ptr const & style = par->layout(); - - LyXFont font_old = (style->labeltype == LABEL_MANUAL ? style->labelfont : style->font); - - int char_line_count = depth; - //if (!style.free_spacing) - // os << string(depth,' '); - - // parsing main loop - for (pos_type i = 0; i < par->size(); ++i) { - LyXFont font = par->getFont(params, i, outerFont(par, paragraphs)); - - // handle tag - if (font_old.emph() != font.emph()) { - if (font.emph() == LyXFont::ON) { - if (style->latexparam() == "CDATA") - os << "]]>"; - os << ""; - if (style->latexparam() == "CDATA") - os << "latexparam() == "CDATA") - os << "]]>"; - os << ""; - if (style->latexparam() == "CDATA") - os << "isInset(i)) { - Inset * inset = par->getInset(i); - // don't print the inset in position 0 if desc_on == 3 (label) - if (i || desc_on != 3) { - if (style->latexparam() == "CDATA") - os << "]]>"; - inset->docbook(this, os, false); - if (style->latexparam() == "CDATA") - os << "getChar(i); - bool ws; - string str; - boost::tie(ws, str) = sgml::escapeChar(c); - - if (style->pass_thru) { - os << c; - } else if (style->free_spacing || par->isFreeSpacing() || c != ' ') { - os << str; - } else if (desc_on ==1) { - ++char_line_count; - os << "\n"; - desc_on = 2; - } else { - os << ' '; - } - } - font_old = font; - } - - if (emph_flag) { - if (style->latexparam() == "CDATA") - os << "]]>"; - os << ""; - if (style->latexparam() == "CDATA") - os << " not closed... - os << "\n "; - } - if (style->free_spacing) - os << '\n'; + if (ofs.fail()) + lyxerr << "File '" << fname << "' was not closed properly." << endl; } @@ -1942,25 +1079,19 @@ void Buffer::simpleDocBookOnePar(ostream & os, // Other flags: -wall -v0 -x int Buffer::runChktex() { - if (!users->text) return 0; - - users->owner()->busy(true); + busy(true); // get LaTeX-Filename string const name = getLatexName(); - string path = filePath(); - - string const org_path = path; - if (lyxrc.use_tempdir || !IsDirWriteable(path)) { - path = tmppath; - } + string const path = temppath(); + string const org_path = filePath(); Path p(path); // path to LaTeX file - users->owner()->message(_("Running chktex...")); + message(_("Running chktex...")); // Generate the LaTeX file if neccessary - LatexRunParams runparams; - runparams.flavor = LatexRunParams::LATEX; + OutputParams runparams; + runparams.flavor = OutputParams::LATEX; runparams.nice = false; makeLaTeXFile(name, org_path, runparams); @@ -1970,15 +1101,13 @@ int Buffer::runChktex() if (res == -1) { Alert::error(_("chktex failure"), - _("Could not run chktex successfully.")); + _("Could not run chktex successfully.")); } else if (res > 0) { // Insert all errors as errors boxes - ErrorList el (*this, terr); - users->setErrorList(el); - users->showErrorList(_("ChkTeX")); + bufferErrors(*this, terr); } - users->owner()->busy(false); + busy(false); return res; } @@ -1986,29 +1115,29 @@ int Buffer::runChktex() void Buffer::validate(LaTeXFeatures & features) const { - LyXTextClass const & tclass = params.getLyXTextClass(); + LyXTextClass const & tclass = params().getLyXTextClass(); - if (params.tracking_changes) { + if (params().tracking_changes) { features.require("dvipost"); features.require("color"); } // AMS Style is at document level - if (params.use_amsmath == BufferParams::AMS_ON + if (params().use_amsmath == BufferParams::AMS_ON || tclass.provides(LyXTextClass::amsmath)) features.require("amsmath"); - for_each(paragraphs.begin(), paragraphs.end(), + for_each(paragraphs().begin(), paragraphs().end(), boost::bind(&Paragraph::validate, _1, boost::ref(features))); // the bullet shapes are buffer level not paragraph level // so they are tested here for (int i = 0; i < 4; ++i) { - if (params.user_defined_bullets[i] != ITEMIZE_DEFAULTS[i]) { - int const font = params.user_defined_bullets[i].getFont(); + if (params().user_defined_bullet(i) != ITEMIZE_DEFAULTS[i]) { + int const font = params().user_defined_bullet(i).getFont(); if (font == 0) { - int const c = params - .user_defined_bullets[i] + int const c = params() + .user_defined_bullet(i) .getCharacter(); if (c == 16 || c == 17 @@ -2031,34 +1160,35 @@ void Buffer::validate(LaTeXFeatures & features) const } -vector const Buffer::getLabelList() const +void Buffer::getLabelList(std::vector & list) const { /// if this is a child document and the parent is already loaded /// Use the parent's list instead [ale990407] - if (!params.parentname.empty() - && bufferlist.exists(params.parentname)) { - Buffer const * tmp = bufferlist.getBuffer(params.parentname); - if (tmp) - return tmp->getLabelList(); + if (!params().parentname.empty() + && bufferlist.exists(params().parentname)) { + Buffer const * tmp = bufferlist.getBuffer(params().parentname); + if (tmp) { + tmp->getLabelList(list); + return; + } } - vector label_list; for (inset_iterator it = inset_const_iterator_begin(); it != inset_const_iterator_end(); ++it) { - vector const l = it->getLabelList(); - label_list.insert(label_list.end(), l.begin(), l.end()); + it->getLabelList(*this, list); } - return label_list; } // This is also a buffer property (ale) -void Buffer::fillWithBibKeys(vector > & keys) const +void Buffer::fillWithBibKeys(std::vector > & keys) + const { /// 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 const * tmp = bufferlist.getBuffer(params.parentname); + if (!params().parentname.empty() && + bufferlist.exists(params().parentname)) { + Buffer const * tmp = bufferlist.getBuffer(params().parentname); if (tmp) { tmp->fillWithBibKeys(keys); return; @@ -2067,14 +1197,19 @@ void Buffer::fillWithBibKeys(vector > & keys) const for (inset_iterator it = inset_const_iterator_begin(); it != inset_const_iterator_end(); ++it) { - if (it->lyxCode() == Inset::BIBTEX_CODE) - static_cast(*it).fillWithBibKeys(this, keys); - else if (it->lyxCode() == Inset::INCLUDE_CODE) - static_cast(*it).fillWithBibKeys(keys); - else if (it->lyxCode() == Inset::BIBITEM_CODE) { - InsetBibitem & bib = static_cast(*it); - string const key = bib.getContents(); - string const opt = bib.getOptions(); + if (it->lyxCode() == InsetOld::BIBTEX_CODE) { + InsetBibtex const & inset = + dynamic_cast(*it); + inset.fillWithBibKeys(*this, keys); + } else if (it->lyxCode() == InsetOld::INCLUDE_CODE) { + InsetInclude const & inset = + dynamic_cast(*it); + inset.fillWithBibKeys(*this, keys); + } else if (it->lyxCode() == InsetOld::BIBITEM_CODE) { + InsetBibitem const & inset = + dynamic_cast(*it); + string const key = inset.getContents(); + string const opt = inset.getOptions(); string const ref; // = pit->asString(this, false); string const info = opt + "TheBibliographyRef" + ref; keys.push_back(pair(key, info)); @@ -2085,8 +1220,8 @@ void Buffer::fillWithBibKeys(vector > & keys) const bool Buffer::isDepClean(string const & name) const { - DepClean::const_iterator it = dep_clean_.find(name); - if (it == dep_clean_.end()) + DepClean::const_iterator it = pimpl_->dep_clean.find(name); + if (it == pimpl_->dep_clean.end()) return true; return it->second; } @@ -2094,28 +1229,23 @@ bool Buffer::isDepClean(string const & name) const void Buffer::markDepClean(string const & name) { - dep_clean_[name] = true; + pimpl_->dep_clean[name] = true; } bool Buffer::dispatch(string const & command, bool * result) { - // Split command string into command and argument - string cmd; - string line = ltrim(command); - string const arg = trim(split(line, cmd, ' ')); - - return dispatch(lyxaction.LookupFunc(cmd), arg, result); + return dispatch(lyxaction.lookupFunc(command), result); } -bool Buffer::dispatch(int action, string const & argument, bool * result) +bool Buffer::dispatch(FuncRequest const & func, bool * result) { bool dispatched = true; - switch (action) { + switch (func.action) { case LFUN_EXPORT: { - bool const tmp = Exporter::Export(this, argument, false); + bool const tmp = Exporter::Export(this, func.argument, false); if (result) *result = tmp; break; @@ -2128,22 +1258,6 @@ bool Buffer::dispatch(int action, string const & argument, bool * result) } -void Buffer::resizeInsets(BufferView * bv) -{ - /// then remove all LyXText in text-insets - for_each(paragraphs.begin(), paragraphs.end(), - boost::bind(&Paragraph::resizeInsetsLyXText, _1, bv)); -} - - -void Buffer::redraw() -{ -#warning repaint needed here, or do you mean update() ? - users->repaint(); - users->fitCursor(); -} - - void Buffer::changeLanguage(Language const * from, Language const * to) { lyxerr << "Changing Language!" << endl; @@ -2153,21 +1267,21 @@ void Buffer::changeLanguage(Language const * from, Language const * to) ParIterator end = par_iterator_end(); for (ParIterator it = par_iterator_begin(); it != end; ++it) - (*it)->changeLanguage(params, from, to); + it->changeLanguage(params(), from, to); } void Buffer::updateDocLang(Language const * nlang) { - messages_.reset(new Messages(nlang->code())); + pimpl_->messages.reset(new Messages(nlang->code())); } -bool Buffer::isMultiLingual() +bool Buffer::isMultiLingual() const { - ParIterator end = par_iterator_end(); - for (ParIterator it = par_iterator_begin(); it != end; ++it) - if ((*it)->isMultiLingual(params)) + ParConstIterator end = par_iterator_end(); + for (ParConstIterator it = par_iterator_begin(); it != end; ++it) + if (it->isMultiLingual(params())) return true; return false; @@ -2185,21 +1299,6 @@ void Buffer::inset_iterator::setParagraph() } -Inset * Buffer::getInsetFromID(int id_arg) const -{ - for (inset_iterator it = inset_const_iterator_begin(); - it != inset_const_iterator_end(); ++it) - { - if (it->id() == id_arg) - return &(*it); - Inset * in = it->getInsetFromID(id_arg); - if (in) - return in; - } - return 0; -} - - ParIterator Buffer::getParFromID(int id) const { #warning FIXME: const correctness! (Andre) @@ -2214,7 +1313,7 @@ ParIterator Buffer::getParFromID(int id) const } for (; it != end; ++it) - if ((*it)->id() == id) + if (it->id() == id) return it; return end; @@ -2223,8 +1322,8 @@ ParIterator Buffer::getParFromID(int id) const bool Buffer::hasParWithID(int id) const { - ParIterator it(const_cast(this)->par_iterator_begin()); - ParIterator end(const_cast(this)->par_iterator_end()); + ParConstIterator it = par_iterator_begin(); + ParConstIterator end = par_iterator_end(); if (id < 0) { // John says this is called with id == -1 from undo @@ -2233,59 +1332,61 @@ bool Buffer::hasParWithID(int id) const } for (; it != end; ++it) - if ((*it)->id() == id) + if (it->id() == id) return true; return false; } -ParIterator Buffer::par_iterator_begin() +PosIterator Buffer::pos_iterator_begin() { - return ParIterator(paragraphs.begin(), paragraphs); + return PosIterator(¶graphs(), paragraphs().begin(), 0); } -ParIterator Buffer::par_iterator_end() +PosIterator Buffer::pos_iterator_end() { - return ParIterator(paragraphs.end(), paragraphs); + return PosIterator(¶graphs(), paragraphs().end(), 0); } -ParConstIterator Buffer::par_iterator_begin() const + +ParIterator Buffer::par_iterator_begin() { - return ParConstIterator(paragraphs.begin(), paragraphs); + return ParIterator(paragraphs().begin(), paragraphs()); } -ParConstIterator Buffer::par_iterator_end() const +ParIterator Buffer::par_iterator_end() { - return ParConstIterator(paragraphs.end(), paragraphs); + return ParIterator(paragraphs().end(), paragraphs()); } - -void Buffer::addUser(BufferView * u) +ParConstIterator Buffer::par_iterator_begin() const { - users = u; + ParagraphList const & pars = paragraphs(); + return ParConstIterator(const_cast(pars).begin(), pars); } -void Buffer::delUser(BufferView *) +ParConstIterator Buffer::par_iterator_end() const { - users = 0; + ParagraphList const & pars = paragraphs(); + return ParConstIterator(const_cast(pars).end(), pars); } Language const * Buffer::getLanguage() const { - return params.language; + return params().language; } string const Buffer::B_(string const & l10n) const { - if (messages_.get()) { - return messages_->get(l10n); + if (pimpl_->messages.get()) { + return pimpl_->messages->get(l10n); } return _(l10n); @@ -2294,56 +1395,56 @@ string const Buffer::B_(string const & l10n) const bool Buffer::isClean() const { - return lyx_clean; + return pimpl_->lyx_clean; } bool Buffer::isBakClean() const { - return bak_clean; + return pimpl_->bak_clean; } void Buffer::markClean() const { - if (!lyx_clean) { - lyx_clean = true; + if (!pimpl_->lyx_clean) { + pimpl_->lyx_clean = true; updateTitles(); } // if the .lyx file has been saved, we don't need an // autosave - bak_clean = true; + pimpl_->bak_clean = true; } void Buffer::markBakClean() { - bak_clean = true; + pimpl_->bak_clean = true; } void Buffer::setUnnamed(bool flag) { - unnamed = flag; + pimpl_->unnamed = flag; } -bool Buffer::isUnnamed() +bool Buffer::isUnnamed() const { - return unnamed; + return pimpl_->unnamed; } void Buffer::markDirty() { - if (lyx_clean) { - lyx_clean = false; + if (pimpl_->lyx_clean) { + pimpl_->lyx_clean = false; updateTitles(); } - bak_clean = false; + pimpl_->bak_clean = false; - DepClean::iterator it = dep_clean_.begin(); - DepClean::const_iterator const end = dep_clean_.end(); + DepClean::iterator it = pimpl_->dep_clean.begin(); + DepClean::const_iterator const end = pimpl_->dep_clean.end(); for (; it != end; ++it) { it->second = false; @@ -2353,36 +1454,30 @@ void Buffer::markDirty() string const & Buffer::fileName() const { - return filename_; + return pimpl_->filename; } string const & Buffer::filePath() const { - return filepath_; + return pimpl_->filepath; } bool Buffer::isReadonly() const { - return read_only; -} - - -BufferView * Buffer::getUser() const -{ - return users; + return pimpl_->read_only; } void Buffer::setParentName(string const & name) { - params.parentname = name; + params().parentname = name; } Buffer::inset_iterator::inset_iterator() - : pit(0), pend(0) + : pit(), pend() {} @@ -2393,6 +1488,32 @@ Buffer::inset_iterator::inset_iterator(base_type p, base_type e) } +Buffer::inset_iterator Buffer::inset_iterator_begin() +{ + return inset_iterator(paragraphs().begin(), paragraphs().end()); +} + + +Buffer::inset_iterator Buffer::inset_iterator_end() +{ + return inset_iterator(paragraphs().end(), paragraphs().end()); +} + + +Buffer::inset_iterator Buffer::inset_const_iterator_begin() const +{ + ParagraphList & pars = const_cast(paragraphs()); + return inset_iterator(pars.begin(), pars.end()); +} + + +Buffer::inset_iterator Buffer::inset_const_iterator_end() const +{ + ParagraphList & pars = const_cast(paragraphs()); + return inset_iterator(pars.end(), pars.end()); +} + + Buffer::inset_iterator & Buffer::inset_iterator::operator++() { if (pit != pend) { @@ -2416,13 +1537,13 @@ Buffer::inset_iterator Buffer::inset_iterator::operator++(int) Buffer::inset_iterator::reference Buffer::inset_iterator::operator*() { - return *it.getInset(); + return *it->inset; } Buffer::inset_iterator::pointer Buffer::inset_iterator::operator->() { - return it.getInset(); + return it->inset; } @@ -2434,7 +1555,7 @@ ParagraphList::iterator Buffer::inset_iterator::getPar() const lyx::pos_type Buffer::inset_iterator::getPos() const { - return it.getPos(); + return it->pos; }