X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.C;h=0f18ec3c11b4bf80108457037d07df85934f3e74;hb=a087bda7ec81f48c97d3903ac2c27b688e054e65;hp=aa481e4815a8906edbad2c62fae13c0dba104d6f;hpb=7eec4960dee45846130877a5e2a939e0dd7d5f0e;p=lyx.git diff --git a/src/buffer.C b/src/buffer.C index aa481e4815..90cc72c46f 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -5,133 +5,218 @@ * * \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 "BranchList.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 "encoding.h" +#include "errorlist.h" #include "exporter.h" -#include "Lsstream.h" #include "format.h" -#include "BufferView.h" +#include "funcrequest.h" +#include "gettext.h" +#include "insetiterator.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 "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 "iterators.h" -#include "lyxtextclasslist.h" +#include "pariterator.h" #include "sgml.h" -#include "paragraph_funcs.h" -#include "messages.h" -#include "author.h" - -#include "frontends/LyXView.h" - -#include "mathed/formulamacro.h" -#include "mathed/formula.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 "mathed/math_macrotemplate.h" +#include "mathed/math_macrotable.h" +#include "mathed/math_support.h" + #include "frontends/Alert.h" #include "graphics/Previews.h" -#include "support/textutils.h" #include "support/filetools.h" -#include "support/path.h" -#include "support/os.h" +#include "support/fs_extras.h" +#ifdef USE_COMPRESSION +# include "support/gzstream.h" +#endif #include "support/lyxlib.h" -#include "support/FileInfo.h" -#include "support/lyxmanip.h" -#include "support/lyxtime.h" +#include "support/os.h" +#include "support/path.h" +#include "support/textutils.h" +#include "support/convert.h" #include -#include -#include "support/BoostFormat.h" +#include + +#if defined (HAVE_UTIME_H) +# include +#elif defined (HAVE_SYS_UTIME_H) +# include +#endif -#include #include -#include #include -#include -#include +#include +#include -#include -#include -#include -#include -#include -#ifdef HAVE_LOCALE -#include -#endif +using lyx::pos_type; +using lyx::pit_type; + +using lyx::support::AddName; +using lyx::support::bformat; +using lyx::support::ChangeExtension; +using lyx::support::cmd_ret; +using lyx::support::createBufferTmpDir; +using lyx::support::destroyDir; +using lyx::support::getFormatFromContents; +using lyx::support::IsDirWriteable; +using lyx::support::LibFileSearch; +using lyx::support::latex_path; +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::subst; +using lyx::support::tempName; +using lyx::support::trim; + +namespace os = lyx::support::os; +namespace fs = boost::filesystem; -#ifndef CXX_GLOBAL_CSTD -using std::pow; -#endif +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::pair; -using std::make_pair; -using std::vector; using std::map; +using std::ostream; +using std::ostringstream; +using std::ofstream; +using std::pair; 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; +int const LYX_FORMAT = 241; } // namespace anon + +typedef std::map DepClean; + +class Buffer::Impl +{ +public: + 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 LyXText that should be wrapped in an InsetText + InsetText inset; + + /// + MacroTable macros; +}; + + +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), + inset(params) +{ + inset.setAutoBreakRows(true); + 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)); } @@ -141,36 +226,112 @@ 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 USE_BOOST_FORMAT - boost::format fmt = _("Could not remove the temporary directory %1$s"); - fmt % tmppath; - string msg = fmt.str(); -#else - string msg = _("Could not remove the temporary directory ") + tmppath; -#endif - Alert::warning(_("Could not remove temporary directory"), msg); + if (!temppath().empty() && !destroyDir(temppath())) { + Alert::warning(_("Could not remove temporary directory"), + 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); +} - // Remove any previewed LaTeX snippets assocoated with this buffer. - grfx::Previews::get().removeLoader(this); + +LyXText & Buffer::text() const +{ + return const_cast(pimpl_->inset.text_); } -string const Buffer::getLatexName(bool no_path) const +InsetBase & Buffer::inset() const +{ + return const_cast(pimpl_->inset); +} + + +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 text().paragraphs(); +} + + +ParagraphList const & Buffer::paragraphs() const +{ + return 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; +} + + +TexRow const & Buffer::texrow() const +{ + return pimpl_->texrow; +} + + +string const Buffer::getLatexName(bool const no_path) const { string const name = ChangeExtension(MakeLatexName(fileName()), ".tex"); - if (no_path) - return OnlyFilename(name); - else - return name; + return no_path ? OnlyFilename(name) : name; } @@ -181,10 +342,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, @@ -196,11 +354,8 @@ pair const Buffer::getLogName() const // If no Latex log or Build log is newer, show Build log - FileInfo const f_fi(fname); - FileInfo const b_fi(bname); - - if (b_fi.exist() && - (!f_fi.exist() || f_fi.getModificationTime() < b_fi.getModificationTime())) { + if (fs::exists(bname) && + (!fs::exists(fname) || fs::last_write_time(fname) < fs::last_write_time(bname))) { lyxerr[Debug::FILES] << "Log name calculated as: " << bname << endl; return make_pair(Buffer::buildlog, bname); } @@ -209,45 +364,20 @@ pair const Buffer::getLogName() const } -void Buffer::setReadonly(bool flag) +void Buffer::setReadonly(bool const 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(fs::is_readonly(pimpl_->filename)); updateTitles(); } @@ -257,26 +387,36 @@ namespace { void unknownClass(string const & unknown) { - string msg = -#if USE_BOOST_FORMAT - boost::io::str(boost::format( - _("Using the default document class, because the " - " class %1$s is unknown.")) % unknown); -#else - _("Using the default document class, because the " - " class ") + unknown + (" is unknown."); -#endif - Alert::warning(_("Unknown document class"), msg); + Alert::warning(_("Unknown document class"), + bformat(_("Using the default document class, because the " + "class %1$s is unknown."), unknown)); } } // anon + int Buffer::readHeader(LyXLex & lex) { int unknown_tokens = 0; + int line = -1; + int begin_header_line = -1; + + // Initialize parameters that may be/go lacking in header: + params().branchlist().clear(); + params().options.erase(); + params().float_placement.erase(); + params().paperwidth.erase(); + params().paperheight.erase(); + params().leftmargin.erase(); + params().rightmargin.erase(); + params().topmargin.erase(); + params().bottommargin.erase(); + params().headheight.erase(); + params().headsep.erase(); + params().footskip.erase(); while (lex.isOK()) { - lex.nextToken(); + lex.next(); string const token = lex.getString(); if (token.empty()) @@ -285,58 +425,60 @@ int Buffer::readHeader(LyXLex & lex) if (token == "\\end_header") break; + ++line; + if (token == "\\begin_header") { + begin_header_line = line; + continue; + } + 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] != '\\') { + if (unknown[0] != '\\' && token == "\\textclass") { 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)); } } } + if (begin_header_line) { + string const s = _("\\begin_header is missing"); + error(ErrorItem(_("Header error"), s, -1, 0, 0)); + } return unknown_tokens; } -// 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 (Asger) -bool Buffer::readBody(LyXLex & lex, ParagraphList::iterator pit) +// Returns false if "\end_document" is not read (Asger) +bool Buffer::readDocument(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(); - string msg = -#if USE_BOOST_FORMAT - boost::io::str(boost::format( - _("Using the default document class, because the " - " class %1$s could not be loaded.")) % theclass); -#else - _("Using the default document class, because the " - " class ") + theclass + (" could not be loaded."); -#endif - Alert::error(_("Can't load document class"), msg); - params.textclass = 0; + lex.next(); + string const token = lex.getString(); + if (token != "\\begin_document") { + string const s = _("\\begin_document is missing"); + error(ErrorItem(_("Header error"), s, -1, 0, 0)); + } + + 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; } } 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 @@ -345,115 +487,28 @@ 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) { -#if USE_BOOST_FORMAT - string s; - if (unknown_tokens == 1) { - boost::format fmt(_("Encountered one unknown token when reading the document %1$s.")); - fmt % fileName(); - s = fmt.str(); - } else { - boost::format fmt(_("Encountered %1$s unknown tokens when reading the document %2$s.")); - fmt % tostr(unknown_tokens); - fmt % fileName(); - s = fmt.str(); - } -#else - string s = _("Encountered "); - if (unknown_tokens == 1) { - s += _("one unknown token"); - } else { - s += tostr(unknown_tokens); - s += _(" unknown tokens"); - } - Alert::warning(_("Document format failure"), s); -#endif - } - - 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 = new Paragraph(); - 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; + return text().read(*this, lex); } // needed to insert the selection -void Buffer::insertStringAsLines(ParagraphList::iterator & par, pos_type & pos, - LyXFont const & fn,string const & str) +void Buffer::insertStringAsLines(ParagraphList & pars, + pit_type & pit, pos_type & pos, + LyXFont const & fn, string const & str, bool autobreakrows) { - LyXLayout_ptr const & layout = par->layout(); - LyXFont font = fn; - par->checkInsertChar(font); + pars[pit].checkInsertChar(font); // insert the string, don't insert doublespace bool space_inserted = true; - bool autobreakrows = !par->inInset() || - static_cast(par->inInset())->getAutoBreakRows(); - for(string::const_iterator cit = str.begin(); + for (string::const_iterator cit = str.begin(); cit != str.end(); ++cit) { + Paragraph & par = pars[pit]; if (*cit == '\n') { - if (autobreakrows && (!par->empty() || layout->keepempty)) { - breakParagraph(params, paragraphs, par, pos, - layout->isEnvironment()); - ++par; + if (autobreakrows && (!par.empty() || par.allowEmpty())) { + breakParagraph(params(), pars, pit, pos, + par.layout()->isEnvironment()); + ++pit; pos = 0; space_inserted = true; } else { @@ -461,20 +516,18 @@ 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); + par.insertChar(pos, ' ', font); ++pos; space_inserted = true; } else { - const pos_type nb = 8 - pos % 8; - for (pos_type a = 0; a < nb ; ++a) { - par->insertChar(pos, ' ', font); + const pos_type n = 8 - pos % 8; + for (pos_type i = 0; i < n; ++i) { + par.insertChar(pos, ' ', font); ++pos; } space_inserted = true; @@ -484,7 +537,7 @@ void Buffer::insertStringAsLines(ParagraphList::iterator & par, pos_type & pos, continue; } else { // just insert the character - par->insertChar(pos, *cit, font); + par.insertChar(pos, *cit, font); ++pos; space_inserted = (*cit == ' '); } @@ -493,26 +546,54 @@ 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 = getFormatFromContents(filename); + if (format == "gzip" || format == "zip" || format == "compress") { + params().compressed = true; + } + + // remove dummy empty par + paragraphs().clear(); + bool ret = readFile(filename, paragraphs().size()); // 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(LyXLex & lex, string const & filename, - ParagraphList::iterator pit) +bool Buffer::readFile(string const & filename, pit_type const 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 const value) { + pimpl_->file_fully_loaded = value; +} + + +bool Buffer::readFile(LyXLex & lex, string const & filename, pit_type const 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; } @@ -521,18 +602,21 @@ 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; } - lex.eatLine(); + lex.next(); string tmp_format = lex.getString(); //lyxerr << "LyX Format: `" << tmp_format << '\'' << endl; // if present remove ".," from string. @@ -540,65 +624,67 @@ 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 const file_format = convert(tmp_format); //lyxerr << "format: " << file_format << endl; - if (file_format == LYX_FORMAT) { - // current format - } else 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.")); - } 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.")); + + if (file_format != LYX_FORMAT) { + 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 = + "python " + 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" + + convert(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 const ret = readFile(tmpfile, pit); + // Do stuff with tmpfile name and buffer name here. + return ret; } + } - bool the_end = readBody(lex, pit); - params.setPaperStuff(); - if (!the_end) { + if (readDocument(lex)) { 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)); } + + //lyxerr << "removing " << MacroTable::localMacros().size() + // << " temporary macro entries" << endl; + //MacroTable::localMacros().clear(); + params().setPaperStuff(); + + pimpl_->file_fully_loaded = true; return true; } @@ -615,53 +701,20 @@ bool Buffer::save() const s = fileName() + '~'; if (!lyxrc.backupdir_path.empty()) s = AddName(lyxrc.backupdir_path, - subst(os::slashify_path(s),'/','!')); - - // Rename is the wrong way of making a backup, - // this is the correct way. - /* truss cp fil fil2: - lstat("LyXVC3.lyx", 0xEFFFF898) Err#2 ENOENT - stat("LyXVC.lyx", 0xEFFFF688) = 0 - open("LyXVC.lyx", O_RDONLY) = 3 - open("LyXVC3.lyx", O_WRONLY|O_CREAT|O_TRUNC, 0600) = 4 - fstat(4, 0xEFFFF508) = 0 - fstat(3, 0xEFFFF508) = 0 - read(3, " # T h i s f i l e w".., 8192) = 5579 - write(4, " # T h i s f i l e w".., 5579) = 5579 - read(3, 0xEFFFD4A0, 8192) = 0 - close(4) = 0 - close(3) = 0 - chmod("LyXVC3.lyx", 0100644) = 0 - lseek(0, 0, SEEK_CUR) = 46440 - _exit(0) - */ - - // Should probably have some more error checking here. - // Doing it this way, also makes the inodes stay the same. - // This is still not a very good solution, in particular we - // might loose the owner of the backup. - FileInfo finfo(fileName()); - if (finfo.exist()) { - mode_t fmode = finfo.getMode(); - struct utimbuf times = { - finfo.getAccessTime(), - finfo.getModificationTime() }; - - ifstream ifs(fileName().c_str()); - ofstream ofs(s.c_str(), ios::out|ios::trunc); - if (ifs && ofs) { - ofs << ifs.rdbuf(); - ifs.close(); - ofs.close(); - ::chmod(s.c_str(), fmode); - - if (::utime(s.c_str(), ×)) { - lyxerr << "utime error." << endl; - } - } else { - lyxerr << "LyX was not able to make " - "backup copy. Beware." << endl; - } + subst(os::internal_path(s),'/','!')); + + // It might very well be that this variant is just + // good enough. (Lgb) + // But to use this we need fs::copy_file to actually do a copy, + // even when the target file exists. (Lgb) + if (fs::exists(fileName()) && fs::is_writable(fs::path(fileName()).branch_path())) { + //try { + fs::copy_file(fileName(), s, false); + //} + //catch (fs::filesystem_error const & fe) { + //lyxerr << "LyX was not able to make backup copy. Beware.\n" + // << fe.what() << endl; + //} } } @@ -670,9 +723,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; @@ -681,50 +733,63 @@ 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()) { - return false; - } + bool retval = false; - ofstream ofs(fname.c_str()); - if (!ofs) { + if (params().compressed) { +#ifdef USE_COMPRESSION + gz::ogzstream ofs(fname.c_str(), ios::out|ios::trunc); + if (!ofs) + return false; + + retval = do_writeFile(ofs); +#else return false; +#endif + } else { + ofstream ofs(fname.c_str(), ios::out|ios::trunc); + 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); + << "\\lyxformat " << LYX_FORMAT << "\n" + << "\\begin_document\n"; + // now write out the buffer parameters. + ofs << "\\begin_header\n"; + 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 + ofs << "\n\\begin_body\n"; + text().write(*this, ofs); + ofs << "\n\\end_body\n"; // Write marker that shows file is complete - ofs << "\n\\the_end" << endl; + ofs << "\\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) @@ -735,317 +800,61 @@ 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) -{ - int d = depth * 2; - if (ldepth > depth) - d += (ldepth - depth) * 2; - return make_pair(d, string(d, ' ')); -} - -} - - -string const Buffer::asciiParagraph(Paragraph const & par, - unsigned int linelen, - bool noparbreak) const -{ - ostringstream buffer; - 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); -#if USE_BOOST_FORMAT - boost::format fmt(_("Could not save the document\n%1$s.")); - fmt % file; - string text = fmt.str(); -#else - string text = _("Could not save the document\n"); - text += file + "."; -#endif - 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, - bool nice, bool only_body, bool only_preamble) + OutputParams const & runparams, + bool output_preamble, bool output_body) { lyxerr[Debug::LATEX] << "makeLaTeXFile..." << endl; - ofstream ofs(fname.c_str()); - if (!ofs) { - string const file = MakeDisplayPath(fname, 50); -#if USE_BOOST_FORMAT - boost::format fmt(_("Could not open the specified document\n%1$s.")); - fmt % file; - string text = fmt.str(); -#else - string text = _("Could not open the specified document\n"); - text += file + "."; -#endif - Alert::error(_("Could not open file"), text); + ofstream ofs; + if (!openFileWrite(ofs, fname)) return; - } - makeLaTeXFile(ofs, original_path, nice, only_body, only_preamble); + makeLaTeXFile(ofs, original_path, + runparams, output_preamble, output_body); ofs.close(); - if (ofs.fail()) { - lyxerr << "File was not closed properly." << endl; - } + if (ofs.fail()) + lyxerr << "File '" << fname << "' was not closed properly." << endl; } void Buffer::makeLaTeXFile(ostream & os, string const & original_path, - bool nice, bool only_body, bool only_preamble) + OutputParams const & runparams_in, + bool const output_preamble, bool const output_body) { - niceFile = 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()), 0); + texrow().start(paragraphs().begin()->id(), 0); - if (!only_body && 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: @@ -1055,609 +864,222 @@ 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 (!nice) { + // Note that input@path is only needed for something the user does + // in the preamble, included .tex files or ERT, files included by + // LyX work without it. + 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); - subst(inputpath, "~", "\\string~"); + string const inputpath = latex_path(original_path); os << "\\makeatletter\n" << "\\def\\input@path{{" << inputpath << "/}}\n" << "\\makeatother\n"; - texrow.newline(); - texrow.newline(); - texrow.newline(); + texrow().newline(); + texrow().newline(); + texrow().newline(); } // Write the preamble - 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()) - << endl; - texrow.newline(); - } - - latexParagraphs(this, paragraphs, paragraphs.begin(), paragraphs.end(), os, texrow); - - // add this just in case after all the paragraphs - os << endl; - texrow.newline(); - - if (!lyxrc.language_auto_end) { - os << subst(lyxrc.language_command_end, "$$lang", - params.language->babel()) - << endl; - texrow.newline(); - } - - if (!only_body) { - os << "\\end{document}\n"; - texrow.newline(); - - lyxerr[Debug::LATEX] << "makeLaTeXFile...done" << endl; - } else { - lyxerr[Debug::LATEX] << "LaTeXFile for inclusion made." - << endl; - } - - // Just to be sure. (Asger) - texrow.newline(); - - lyxerr[Debug::INFO] << "Finished making LaTeX file." << endl; - lyxerr[Debug::INFO] << "Row count was " << texrow.rows() - 1 - << '.' << endl; - - // we want this to be true outside previews (for insetexternal) - niceFile = true; -} - - -bool Buffer::isLatex() const -{ - return params.getLyXTextClass().outputType() == LATEX; -} - - -bool Buffer::isLinuxDoc() const -{ - return params.getLyXTextClass().outputType() == LINUXDOC; -} - - -bool Buffer::isLiterate() const -{ - return params.getLyXTextClass().outputType() == LITERATE; -} - - -bool Buffer::isDocBook() const -{ - return params.getLyXTextClass().outputType() == DOCBOOK; -} - - -bool Buffer::isSGML() const -{ - LyXTextClass const & tclass = params.getLyXTextClass(); - - return tclass.outputType() == LINUXDOC || - tclass.outputType() == DOCBOOK; -} - - -void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) -{ - ofstream ofs(fname.c_str()); - - if (!ofs) { - string const file = MakeDisplayPath(fname, 50); -#if USE_BOOST_FORMAT - boost::format fmt(_("Could not save the specified document\n%1$s.\n")); - fmt % file; - string text = fmt.str(); -#else - string text = _("Could not save the specified document\n"); - text += file + _(".\n"); -#endif - Alert::error(_("Could not save document"), text); - return; - } - - niceFile = nice; // this will be used by included files. - - LaTeXFeatures features(params); - - validate(features); - - texrow.reset(); - - LyXTextClass const & tclass = params.getLyXTextClass(); - - string top_element = tclass.latexname(); - - if (!body_only) { - ofs << "\n\n"; - - if (params.options.empty()) - sgml::openTag(ofs, 0, false, top_element); - else { - string top = top_element; - top += ' '; - 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); - - 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 (!lyxrc.language_auto_begin) { + os << subst(lyxrc.language_command_begin, "$$lang", + params().language->babel()) + << endl; + texrow().newline(); + } - if (style->labeltype == LABEL_MANUAL) - item_name = "tag"; - else - item_name = "item"; + // if we are doing a real file with body, even if this is the + // child of some other buffer, let's cut the link here. + // This happens for example if only a child document is printed. + string save_parentname; + if (output_preamble) { + save_parentname = params().parentname; + params().parentname.erase(); + } - sgml::openTag(ofs, depth + 1, false, item_name); - } - break; + // the real stuff + latexParagraphs(*this, paragraphs(), os, texrow(), runparams); - default: - sgml::openTag(ofs, depth, false, style->latexname()); - break; - } + // Restore the parenthood if needed + if (output_preamble) + params().parentname = save_parentname; - simpleLinuxDocOnePar(ofs, &*pit, depth); + // add this just in case after all the paragraphs + os << endl; + texrow().newline(); - 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; - } + if (!lyxrc.language_auto_end) { + os << subst(lyxrc.language_command_end, "$$lang", + params().language->babel()) + << endl; + texrow().newline(); } - // Close open tags - for (int i = depth; i >= 0; --i) - sgml::closeTag(ofs, depth, false, environment_stack[i]); + if (output_preamble) { + os << "\\end{document}\n"; + texrow().newline(); - if (!body_only) { - ofs << "\n\n"; - sgml::closeTag(ofs, 0, false, top_element); + lyxerr[Debug::LATEX] << "makeLaTeXFile...done" << endl; + } else { + lyxerr[Debug::LATEX] << "LaTeXFile for inclusion made." + << endl; } - ofs.close(); - // How to check for successful close + // Just to be sure. (Asger) + texrow().newline(); - // we want this to be true outside previews (for insetexternal) - niceFile = true; + lyxerr[Debug::INFO] << "Finished making LaTeX file." << endl; + lyxerr[Debug::INFO] << "Row count was " << texrow().rows() - 1 + << '.' << endl; } -// 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) +bool Buffer::isLatex() const { - colcount += newcol; - if (colcount > lyxrc.ascii_linelen) { - os << "\n"; - colcount = newcol; // assume write after this call - } + return params().getLyXTextClass().outputType() == LATEX; } -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 ""; +bool Buffer::isLinuxDoc() const +{ + return params().getLyXTextClass().outputType() == LINUXDOC; } -inline -void operator|=(PAR_TAG & p1, PAR_TAG const & p2) +bool Buffer::isLiterate() const { - p1 = static_cast(p1 | p2); + return params().getLyXTextClass().outputType() == LITERATE; } -inline -void reset(PAR_TAG & p1, PAR_TAG const & p2) +bool Buffer::isDocBook() const { - p1 = static_cast(p1 & ~p2); + return params().getLyXTextClass().outputType() == DOCBOOK; } -} // anon - -// Handle internal paragraph parsing -- layout already processed. -void Buffer::simpleLinuxDocOnePar(ostream & os, - Paragraph * par, - Paragraph::depth_type /*depth*/) +bool Buffer::isSGML() 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; - } + LyXTextClass const & tclass = params().getLyXTextClass(); - 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(); + return tclass.outputType() == LINUXDOC || + tclass.outputType() == DOCBOOK; +} - switch (series_type) { - case LyXFont::BOLD_SERIES: - tag_open.push_back(BF); - break; - default: - break; - } - } +void Buffer::makeLinuxDocFile(string const & fname, + OutputParams const & runparams, + bool const body_only) +{ + ofstream ofs; + if (!openFileWrite(ofs, fname)) + return; - 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; - } + LaTeXFeatures features(*this, params(), runparams.nice); + validate(features); - 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; - } - } + texrow().reset(); - 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); - } + LyXTextClass const & tclass = params().getLyXTextClass(); - for(list< PAR_TAG >::const_iterator j = temp.begin(); - j != temp.end(); ++j) { - tag_state.push(*j); - os << '<' << tag_name(*j) << '>'; - } + string const & top_element = tclass.latexname(); - for(list< PAR_TAG >::const_iterator j = tag_open.begin(); - j != tag_open.end(); ++j) { - tag_state.push(*j); - os << '<' << tag_name(*j) << '>'; - } + if (!body_only) { + ofs << tclass.class_header(); - char c = par->getChar(i); + string preamble = params().preamble; + string const name = runparams.nice ? ChangeExtension(pimpl_->filename, ".sgml") + : fname; + preamble += features.getIncludedFiles(name); + preamble += features.getLyXSGMLEntities(); - if (c == Paragraph::META_INSET) { - Inset * inset = par->getInset(i); - inset->linuxdoc(this, os); - font_old = font; - continue; + if (!preamble.empty()) { + ofs << " [ " << preamble << " ]"; } + ofs << ">\n\n"; - 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(); - } + if (params().options.empty()) + sgml::openTag(ofs, top_element); + else { + string top = top_element; + top += ' '; + top += params().options; + sgml::openTag(ofs, top); } - font_old = font; } - while (!tag_state.empty()) { - os << "'; - tag_state.pop(); - } + ofs << "\n"; - // resets description flag correctly - if (desc_on) { - // not closed... - sgmlLineBreak(os, char_line_count, 6); - os << ""; - } -} + linuxdocParagraphs(*this, paragraphs(), ofs, runparams); + if (!body_only) { + ofs << "\n\n"; + sgml::closeTag(ofs, top_element); + } -// Print an error message. -void Buffer::sgmlError(ParagraphList::iterator /*par*/, int /*pos*/, - string const & /*message*/) const -{ -#ifdef WITH_WARNINGS -#warning This is wrong we cannot insert an inset like this!!! - // I guess this was Jose' so I explain you more or less why this - // is wrong. This way you insert something in the paragraph and - // don't tell it to LyXText (row rebreaking and undo handling!!!) - // I deactivate this code, have a look at BufferView::insertErrors - // how you should do this correctly! (Jug 20020315) -#endif -#if 0 - // insert an error marker in text - InsetError * new_inset = new InsetError(message); - par->insertInset(pos, new_inset, LyXFont(LyXFont::ALL_INHERIT, - params.language)); -#endif + ofs.close(); + 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 const only_body) { - ofstream ofs(fname.c_str()); - if (!ofs) { - string const file = MakeDisplayPath(fname, 50); -#if USE_BOOST_FORMAT - boost::format fmt(_("Could not save the specified document\n%1$s.\n")); - fmt % file; - string text = fmt.str(); -#else - string text = _("Could not save the specified document\n"); - text += file + _(".\n"); -#endif - 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(); - string top_element = tclass.latexname(); + LyXTextClass const & tclass = params().getLyXTextClass(); + string const & top_element = tclass.latexname(); if (!only_body) { - ofs << "encoding()->Name() << "\"?>\n"; + + ofs << "\n"; + preamble += "\n"; + preamble += "\n"; + preamble += "\n"; + } - string preamble = params.preamble; - const string name = nice ? ChangeExtension(filename_, ".sgml") + string const name = runparams.nice ? ChangeExtension(pimpl_->filename, ".sgml") : fname; preamble += features.getIncludedFiles(name); preamble += features.getLyXSGMLEntities(); @@ -1670,334 +1092,31 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) string top = top_element; top += " lang=\""; - top += params.language->code(); + if (runparams.flavor == OutputParams::XML) + top += params().language->code(); + else + top += params().language->code().substr(0,2); 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; - - 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(); - ofs << "\n\n"; - sgml::closeTag(ofs, 0, false, top_element); + sgml::openTag(ofs, top); + ofs << '\n'; + docbookParagraphs(paragraphs(), *this, ofs, runparams); + sgml::closeTag(ofs, top_element); ofs.close(); - // How to check for successful close - - // we want this to be true outside previews (for insetexternal) - niceFile = true; -} - - -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; } @@ -2005,48 +1124,35 @@ 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...")); - - // Remove all error insets - bool const removedErrorInsets = users->removeAutoInsets(); + message(_("Running chktex...")); // Generate the LaTeX file if neccessary - makeLaTeXFile(name, org_path, false); + OutputParams runparams; + runparams.flavor = OutputParams::LATEX; + runparams.nice = false; + makeLaTeXFile(name, org_path, runparams); TeXErrors terr; Chktex chktex(lyxrc.chktex_command, name, filePath()); - int res = chktex.run(terr); // run chktex + int const res = chktex.run(terr); // run chktex 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 - users->insertErrors(terr); + bufferErrors(*this, terr); } - // if we removed error insets before we ran chktex or if we inserted - // error insets after we ran chktex, this must be run: - if (removedErrorInsets || res) { -#warning repaint needed here, or do you mean update() ? - users->repaint(); - users->fitCursor(); - } - users->owner()->busy(false); + busy(false); return res; } @@ -2054,29 +1160,30 @@ int Buffer::runChktex() void Buffer::validate(LaTeXFeatures & features) const { - LyXTextClass const & tclass = params.getLyXTextClass(); + LyXTextClass const & tclass = params().getLyXTextClass(); - if (params.tracking_changes) { + if (features.isAvailable("dvipost") && params().tracking_changes + && params().output_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 @@ -2099,50 +1206,52 @@ void Buffer::validate(LaTeXFeatures & features) const } -vector const Buffer::getLabelList() const +void Buffer::getLabelList(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(); + Buffer const * tmp = getMasterBuffer(); + if (!tmp) { + lyxerr << "getMasterBuffer() failed!" << endl; + BOOST_ASSERT(tmp); } - - 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()); + if (tmp != this) { + tmp->getLabelList(list); + return; } - return label_list; + + for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) + it.nextInset()->getLabelList(*this, list); } // This is also a buffer property (ale) -void Buffer::fillWithBibKeys(vector > & keys) const +void Buffer::fillWithBibKeys(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 (tmp) { - tmp->fillWithBibKeys(keys); - return; - } + Buffer const * tmp = getMasterBuffer(); + BOOST_ASSERT(tmp); + if (tmp != this) { + tmp->fillWithBibKeys(keys); + return; } - 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(); + for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) { + if (it->lyxCode() == InsetBase::BIBTEX_CODE) { + InsetBibtex const & inset = + dynamic_cast(*it); + inset.fillWithBibKeys(*this, keys); + } else if (it->lyxCode() == InsetBase::INCLUDE_CODE) { + InsetInclude const & inset = + dynamic_cast(*it); + inset.fillWithBibKeys(*this, keys); + } else if (it->lyxCode() == InsetBase::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)); @@ -2153,8 +1262,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 const it = pimpl_->dep_clean.find(name); + if (it == pimpl_->dep_clean.end()) return true; return it->second; } @@ -2162,28 +1271,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; @@ -2196,205 +1300,162 @@ 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) { + BOOST_ASSERT(from); + BOOST_ASSERT(to); + lyxerr << "Changing Language!" << endl; - + // Take care of l10n/i18n updateDocLang(to); - ParIterator end = par_iterator_end(); - for (ParIterator it = par_iterator_begin(); it != end; ++it) - (*it)->changeLanguage(params, from, to); + for_each(par_iterator_begin(), + par_iterator_end(), + bind(&Paragraph::changeLanguage, _1, params(), from, to)); } - + void Buffer::updateDocLang(Language const * nlang) { - messages_.reset(new Messages(nlang->code(), "/usr/local/share/locale")); + BOOST_ASSERT(nlang); + + 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; } -void Buffer::inset_iterator::setParagraph() +ParIterator Buffer::getParFromID(int const id) const { - while (pit != pend) { - it = pit->insetlist.begin(); - if (it != pit->insetlist.end()) - return; - ++pit; + ParConstIterator it = par_iterator_begin(); + ParConstIterator const end = par_iterator_end(); + + if (id < 0) { + // John says this is called with id == -1 from undo + lyxerr << "getParFromID(), id: " << id << endl; + return end; } -} + for (; it != end; ++it) + if (it->id() == id) + return it; -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; + return end; } -Paragraph * Buffer::getParFromID(int id) const +bool Buffer::hasParWithID(int const id) const { - if (id < 0) - return 0; - - // why should we allow < 0 ?? - //lyx::Assert(id >= 0); - - ParConstIterator it(par_iterator_begin()); - ParConstIterator end(par_iterator_end()); - - for (; it != end; ++it) { - // go on then, show me how to remove - // the cast - if ((*it)->id() == id) { - return const_cast(*it); - } - } - - return 0; + ParConstIterator const it = getParFromID(id); + return it != par_iterator_end(); } ParIterator Buffer::par_iterator_begin() { - return ParIterator(&*(paragraphs.begin())); + return ::par_iterator_begin(inset()); } ParIterator Buffer::par_iterator_end() { - return ParIterator(); + return ::par_iterator_end(inset()); } + ParConstIterator Buffer::par_iterator_begin() const { - return ParConstIterator(&*(paragraphs.begin())); + return ::par_const_iterator_begin(inset()); } ParConstIterator Buffer::par_iterator_end() const { - return ParConstIterator(); -} - - - -void Buffer::addUser(BufferView * u) -{ - users = u; -} - - -void Buffer::delUser(BufferView *) -{ - users = 0; + return ::par_const_iterator_end(inset()); } 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); } 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; } +#ifdef WITH_WARNINGS +#warning this function should be moved to buffer_pimpl.C +#endif 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; @@ -2404,101 +1465,79 @@ 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; -} - - -Buffer::inset_iterator::inset_iterator() - : pit(0), pend(0) -{} - - -Buffer::inset_iterator::inset_iterator(base_type p, base_type e) - : pit(p), pend(e) -{ - setParagraph(); + params().parentname = name; } -Buffer::inset_iterator & Buffer::inset_iterator::operator++() +Buffer const * Buffer::getMasterBuffer() const { - if (pit != pend) { - ++it; - if (it == pit->insetlist.end()) { - ++pit; - setParagraph(); - } + if (!params().parentname.empty() + && bufferlist.exists(params().parentname)) { + Buffer const * buf = bufferlist.getBuffer(params().parentname); + if (buf) + return buf->getMasterBuffer(); } - return *this; -} - - -Buffer::inset_iterator Buffer::inset_iterator::operator++(int) -{ - inset_iterator tmp = *this; - ++*this; - return tmp; -} - -Buffer::inset_iterator::reference Buffer::inset_iterator::operator*() -{ - return *it.getInset(); + return this; } -Buffer::inset_iterator::pointer Buffer::inset_iterator::operator->() +MacroData const & Buffer::getMacro(std::string const & name) const { - return it.getInset(); + return pimpl_->macros.get(name); } -Paragraph * Buffer::inset_iterator::getPar() +bool Buffer::hasMacro(string const & name) const { - return &(*pit); + return pimpl_->macros.has(name); } -lyx::pos_type Buffer::inset_iterator::getPos() const +void Buffer::insertMacro(string const & name, MacroData const & data) { - return it.getPos(); + MacroTable::globalMacros().insert(name, data); + pimpl_->macros.insert(name, data); } -bool operator==(Buffer::inset_iterator const & iter1, - Buffer::inset_iterator const & iter2) +void Buffer::buildMacros() { - return iter1.pit == iter2.pit - && (iter1.pit == iter1.pend || iter1.it == iter2.it); -} - + // Start with global table. + pimpl_->macros = MacroTable::globalMacros(); -bool operator!=(Buffer::inset_iterator const & iter1, - Buffer::inset_iterator const & iter2) -{ - return !(iter1 == iter2); + // Now add our own. + ParagraphList & pars = text().paragraphs(); + for (size_t i = 0, n = pars.size(); i != n; ++i) { + //lyxerr << "searching main par " << i + // << " for macro definitions" << std::endl; + InsetList::iterator it = pars[i].insetlist.begin(); + InsetList::iterator end = pars[i].insetlist.end(); + for ( ; it != end; ++it) { + //lyxerr << "found inset code " << it->inset->lyxCode() << std::endl; + if (it->inset->lyxCode() == InsetBase::MATHMACRO_CODE) { + MathMacroTemplate & mac + = static_cast(*it->inset); + insertMacro(mac.name(), mac.asMacroData()); + } + } + } }