X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.C;h=2ce60e9dfc2310db0740ea1a79fd8fe1aa7b01e7;hb=368f6a53a87eb5997433ecd0f51e854c99360d28;hp=109ce4ee1274bca1e8c820171c2a4fbc55fc0db6;hpb=2a5bc90633d0bb63e5cabd43837b0de78cbd8895;p=lyx.git diff --git a/src/buffer.C b/src/buffer.C index 109ce4ee12..2ce60e9dfc 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -13,6 +13,7 @@ #include "buffer.h" #include "author.h" +#include "BranchList.h" #include "buffer_funcs.h" #include "bufferlist.h" #include "bufferparams.h" @@ -20,12 +21,13 @@ #include "Bullet.h" #include "Chktex.h" #include "debug.h" +#include "encoding.h" #include "errorlist.h" #include "exporter.h" #include "format.h" #include "funcrequest.h" #include "gettext.h" -#include "iterators.h" +#include "insetiterator.h" #include "language.h" #include "LaTeX.h" #include "LaTeXFeatures.h" @@ -34,15 +36,15 @@ #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 "PosIterator.h" +#include "pariterator.h" #include "sgml.h" #include "texrow.h" #include "undo.h" @@ -53,64 +55,76 @@ #include "insets/insetinclude.h" #include "insets/insettext.h" +#include "mathed/MathMacroTemplate.h" +#include "mathed/MathMacroTable.h" +#include "mathed/MathSupport.h" + #include "frontends/Alert.h" +#include "frontends/Application.h" #include "graphics/Previews.h" -#include "support/FileInfo.h" +#include "support/types.h" +#include "support/lyxalgo.h" #include "support/filetools.h" -#include "support/gzstream.h" +#include "support/fs_extras.h" +# include +# include +# include +namespace io = boost::iostreams; #include "support/lyxlib.h" #include "support/os.h" #include "support/path.h" #include "support/textutils.h" -#include "support/tostr.h" +#include "support/convert.h" #include +#include +#include -#include "support/std_sstream.h" +#if defined (HAVE_UTIME_H) +# include +#elif defined (HAVE_SYS_UTIME_H) +# include +#endif #include #include +#include +#include -#include - -#ifdef HAVE_LOCALE -#endif +using lyx::docstring; using lyx::pos_type; +using lyx::pit_type; -using lyx::support::AddName; -using lyx::support::atoi; +using lyx::support::addName; using lyx::support::bformat; -using lyx::support::ChangeExtension; +using lyx::support::changeExtension; using lyx::support::cmd_ret; -using lyx::support::CreateBufferTmpDir; +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::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::makeAbsPath; +using lyx::support::makeDisplayPath; +using lyx::support::makeLatexName; +using lyx::support::onlyFilename; +using lyx::support::onlyPath; +using lyx::support::quoteName; using lyx::support::removeAutosaveFile; using lyx::support::rename; -using lyx::support::RunCommand; +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; +namespace fs = boost::filesystem; using std::endl; using std::for_each; @@ -118,6 +132,7 @@ using std::make_pair; using std::ifstream; using std::ios; +using std::map; using std::ostream; using std::ostringstream; using std::ofstream; @@ -127,20 +142,18 @@ using std::vector; using std::string; -// all these externs should eventually be removed. -extern BufferList bufferlist; - namespace { -const int LYX_FORMAT = 229; +int const LYX_FORMAT = 249; } // namespace anon typedef std::map DepClean; -struct Buffer::Impl +class Buffer::Impl { +public: Impl(Buffer & parent, string const & file, bool readonly); limited_stack undostack; @@ -150,16 +163,16 @@ struct Buffer::Impl string temppath; TexRow texrow; - /// need to regenerate .tex ? + /// need to regenerate .tex? DepClean dep_clean; - /// is save needed + /// is save needed? mutable bool lyx_clean; - /// is autosave needed + /// is autosave needed? mutable bool bak_clean; - /// is this a unnamed file (New...) + /// is this a unnamed file (New...)? bool unnamed; /// buffer is r/o @@ -168,35 +181,39 @@ struct Buffer::Impl /// 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. + /** 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; + /// 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), - text(0, 0) + filename(file), file_fully_loaded(false), + inset(params) { + inset.setAutoBreakRows(true); lyxvc.buffer(&parent); - if (readonly_ || lyxrc.use_tempdir) - temppath = CreateBufferTmpDir(); + temppath = createBufferTmpDir(); + params.filepath = onlyPath(file); + // 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) - : pimpl_(new Impl(*this, file, ronly)) +Buffer::Buffer(string const & file, bool readonly) + : pimpl_(new Impl(*this, file, readonly)) { lyxerr[Debug::INFO] << "Buffer::Buffer()" << endl; } @@ -210,9 +227,10 @@ Buffer::~Buffer() closing(); - if (!temppath().empty() && destroyDir(temppath()) != 0) { + if (!temppath().empty() && !destroyDir(temppath())) { Alert::warning(_("Could not remove temporary directory"), - bformat(_("Could not remove the temporary directory %1$s"), temppath())); + bformat(_("Could not remove the temporary directory %1$s"), + lyx::from_utf8(temppath()))); } // Remove any previewed LaTeX snippets associated with this buffer. @@ -222,7 +240,13 @@ Buffer::~Buffer() LyXText & Buffer::text() const { - return const_cast(pimpl_->text); + return const_cast(pimpl_->inset.text_); +} + + +InsetBase & Buffer::inset() const +{ + return const_cast(pimpl_->inset); } @@ -264,13 +288,13 @@ BufferParams const & Buffer::params() const ParagraphList & Buffer::paragraphs() { - return pimpl_->text.paragraphs(); + return text().paragraphs(); } ParagraphList const & Buffer::paragraphs() const { - return pimpl_->text.paragraphs(); + return text().paragraphs(); } @@ -304,10 +328,10 @@ TexRow const & Buffer::texrow() const } -string const Buffer::getLatexName(bool no_path) const +string const Buffer::getLatexName(bool const no_path) const { - string const name = ChangeExtension(MakeLatexName(fileName()), ".tex"); - return no_path ? OnlyFilename(name) : name; + string const name = changeExtension(makeLatexName(fileName()), ".tex"); + return no_path ? onlyFilename(name) : name; } @@ -318,26 +342,20 @@ 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 = temppath(); + string const path = temppath(); - string const fname = AddName(path, - OnlyFilename(ChangeExtension(filename, + string const fname = addName(path, + onlyFilename(changeExtension(filename, ".log"))); string const bname = - AddName(path, OnlyFilename( - ChangeExtension(filename, + addName(path, onlyFilename( + changeExtension(filename, formats.extension("literate") + ".out"))); // 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); } @@ -346,7 +364,7 @@ pair const Buffer::getLogName() const } -void Buffer::setReadonly(bool flag) +void Buffer::setReadonly(bool const flag) { if (pimpl_->read_only != flag) { pimpl_->read_only = flag; @@ -357,9 +375,9 @@ void Buffer::setReadonly(bool flag) void Buffer::setFileName(string const & newfile) { - pimpl_->filename = MakeAbsPath(newfile); - pimpl_->filepath = OnlyPath(pimpl_->filename); - setReadonly(IsFileWriteable(pimpl_->filename) == 0); + pimpl_->filename = makeAbsPath(newfile); + params().filepath = onlyPath(pimpl_->filename); + setReadonly(fs::is_readonly(pimpl_->filename)); updateTitles(); } @@ -370,8 +388,8 @@ namespace { void unknownClass(string const & unknown) { Alert::warning(_("Unknown document class"), - bformat(_("Using the default document class, because the " - "class %1$s is unknown."), unknown)); + bformat(_("Using the default document class, because the " + "class %1$s is unknown."), lyx::from_utf8(unknown))); } } // anon @@ -380,9 +398,28 @@ void unknownClass(string const & unknown) 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().preamble.erase(); + 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(); + + ErrorList & errorList = errorLists_["Parse"]; while (lex.isOK()) { - lex.nextToken(); + lex.next(); string const token = lex.getString(); if (token.empty()) @@ -391,86 +428,95 @@ int Buffer::readHeader(LyXLex & lex) if (token == "\\end_header") break; - lyxerr[Debug::PARSER] << "Handling header token: `" - << token << '\'' << endl; + ++line; + if (token == "\\begin_header") { + begin_header_line = line; + continue; + } + lyxerr[Debug::PARSER] << "Handling document header token: `" + << token << '\'' << endl; 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)); + docstring const s = bformat(_("Unknown token: " + "%1$s %2$s\n"), + lyx::from_utf8(token), + lyx::from_utf8(lex.getString())); + errorList.push_back(ErrorItem(_("Document header error"), + s, -1, 0, 0)); } } } + if (begin_header_line) { + docstring const s = _("\\begin_header is missing"); + errorList.push_back(ErrorItem(_("Document 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 "\end_document" is not read (Asger) -bool Buffer::readBody(LyXLex & lex) -{ - bool the_end_read = false; - - 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 don't want to adopt the parameters from the - // document we insert, so read them into a temporary buffer - // and then discard it +bool Buffer::readDocument(LyXLex & lex) +{ + ErrorList & errorList = errorLists_["Parse"]; + errorList.clear(); + + lex.next(); + string const token = lex.getString(); + if (token != "\\begin_document") { + docstring const s = _("\\begin_document is missing"); + errorList.push_back(ErrorItem(_("Document header error"), + s, -1, 0, 0)); + } + + // we are reading in a brand new document + BOOST_ASSERT(paragraphs().empty()); - Buffer tmpbuf("", false); - tmpbuf.readHeader(lex); + readHeader(lex); + if (!params().getLyXTextClass().load(filePath())) { + 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."), lyx::from_utf8(theclass))); + params().textclass = 0; } - if (text().read(*this, lex)) - the_end_read = true; + bool const res = text().read(*this, lex, errorList); + for_each(text().paragraphs().begin(), + text().paragraphs().end(), + bind(&Paragraph::setInsetOwner, _1, &inset())); + updateBibfilesCache(); - return the_end_read; + return res; } // 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, docstring const & str, bool autobreakrows) { - LyXLayout_ptr const & layout = par->layout(); - LyXFont font = fn; - par->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 (docstring::const_iterator cit = str.begin(); cit != str.end(); ++cit) { + Paragraph & par = pars[pit]; if (*cit == '\n') { - if (autobreakrows && (!par->empty() || par->allowEmpty())) { - 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 { @@ -478,28 +524,30 @@ void Buffer::insertStringAsLines(ParagraphList::iterator & par, pos_type & pos, } // do not insert consecutive spaces if !free_spacing } else if ((*cit == ' ' || *cit == '\t') && - space_inserted && !par->isFreeSpacing()) { + space_inserted && !par.isFreeSpacing()) { continue; } else if (*cit == '\t') { - if (!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 n = 8 - pos % 8; for (pos_type i = 0; i < n; ++i) { - par->insertChar(pos, ' ', font); + par.insertChar(pos, ' ', font); ++pos; } space_inserted = true; } - } else if (!IsPrintable(*cit)) { +/* FIXME: not needed anymore? + } else if (!isPrintable(*cit)) { // Ignore unprintables continue; +*/ } else { // just insert the character - par->insertChar(pos, *cit, font); + par.insertChar(pos, *cit, font); ++pos; space_inserted = (*cit == ' '); } @@ -511,27 +559,24 @@ void Buffer::insertStringAsLines(ParagraphList::iterator & par, pos_type & pos, bool Buffer::readFile(string const & filename) { // Check if the file is compressed. - string const format = getExtFromContents(filename); + string const format = getFormatFromContents(filename); if (format == "gzip" || format == "zip" || format == "compress") { params().compressed = true; } - bool ret = readFile(filename, paragraphs().begin()); + // remove dummy empty par + paragraphs().clear(); + LyXLex lex(0, 0); + lex.setFile(filename); + if (!readFile(lex, filename)) + return false; // 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); - return ret; -} - - -bool Buffer::readFile(string const & filename, ParagraphList::iterator pit) -{ - LyXLex lex(0, 0); - lex.setFile(filename); - return readFile(lex, filename, pit); + return true; } @@ -541,20 +586,19 @@ bool Buffer::fully_loaded() const } -void Buffer::fully_loaded(bool value) +void Buffer::fully_loaded(bool const value) { pimpl_->file_fully_loaded = value; } -bool Buffer::readFile(LyXLex & lex, string const & filename, - ParagraphList::iterator pit) +bool Buffer::readFile(LyXLex & lex, string const & filename) { BOOST_ASSERT(!filename.empty()); if (!lex.isOK()) { Alert::error(_("Document could not be read"), - bformat(_("%1$s could not be read."), filename)); + bformat(_("%1$s could not be read."), lyx::from_utf8(filename))); return false; } @@ -563,7 +607,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename, if (!lex.isOK()) { Alert::error(_("Document could not be read"), - bformat(_("%1$s could not be read."), filename)); + bformat(_("%1$s could not be read."), lyx::from_utf8(filename))); return false; } @@ -573,11 +617,11 @@ bool Buffer::readFile(LyXLex & lex, string const & filename, Alert::error(_("Document format failure"), bformat(_("%1$s is not a LyX document."), - filename)); + lyx::from_utf8(filename))); return false; } - lex.eatLine(); + lex.next(); string tmp_format = lex.getString(); //lyxerr << "LyX Format: `" << tmp_format << '\'' << endl; // if present remove ".," from string. @@ -585,59 +629,68 @@ bool Buffer::readFile(LyXLex & lex, string const & filename, //lyxerr << " dot found at " << dot << endl; if (dot != string::npos) tmp_format.erase(dot, 1); - int file_format = strToInt(tmp_format); + int const file_format = convert(tmp_format); //lyxerr << "format: " << file_format << endl; - if (file_format > LYX_FORMAT) { - Alert::warning(_("Document format failure"), - bformat(_("%1$s was created with a newer" - " version of LyX. This is likely to" - " cause problems."), - filename)); - } else if (file_format < LYX_FORMAT) { + if (file_format != LYX_FORMAT) { string const tmpfile = tempName(); - string command = LibFileSearch("lyx2lyx", "lyx2lyx"); - if (command.empty()) { + 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."), + lyx::from_utf8(filename))); + return false; + } + string const lyx2lyx = libFileSearch("lyx2lyx", "lyx2lyx"); + if (lyx2lyx.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)); + " could not be found."), + lyx::from_utf8(filename))); return false; } - command += " -t" - + tostr(LYX_FORMAT) - + " -o " + tmpfile + ' ' - + QuoteName(filename); + ostringstream command; + command << os::python() << ' ' << quoteName(lyx2lyx) + << " -t " << convert(LYX_FORMAT) + << " -o " << quoteName(tmpfile) << ' ' + << quoteName(filename); + string const command_str = command.str(); + lyxerr[Debug::INFO] << "Running '" - << command << '\'' + << command_str << '\'' << endl; - cmd_ret const ret = RunCommand(command); + + cmd_ret const ret = runCommand(command_str); 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)); + " failed to convert it."), + lyx::from_utf8(filename))); return false; } else { - bool ret = readFile(tmpfile, pit); + bool const ret = readFile(tmpfile); // Do stuff with tmpfile name and buffer name here. return ret; } } - bool the_end = readBody(lex); - params().setPaperStuff(); - - if (!the_end) { + if (readDocument(lex)) { Alert::error(_("Document format failure"), bformat(_("%1$s ended unexpectedly, which means" - " that it is probably corrupted."), - filename)); + " that it is probably corrupted."), + lyx::from_utf8(filename))); } + + //lyxerr << "removing " << MacroTable::localMacros().size() + // << " temporary macro entries" << endl; + //MacroTable::localMacros().clear(); + pimpl_->file_fully_loaded = true; return true; } @@ -654,54 +707,23 @@ bool Buffer::save() const if (lyxrc.make_backup) { 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; - } + s = addName(lyxrc.backupdir_path, + 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) + try { + fs::copy_file(fileName(), s, false); + } + catch (fs::filesystem_error const & fe) { + Alert::error(_("Backup failure"), + bformat(_("LyX was not able to make a backup copy in %1$s.\n" + "Please check if the directory exists and is writeable."), + lyx::from_utf8(fs::path(s).branch_path().native_directory_string()))); + lyxerr[Debug::DEBUG] << "Fs error: " + << fe.what() << endl; } } @@ -723,21 +745,16 @@ bool Buffer::writeFile(string const & fname) const if (pimpl_->read_only && fname == fileName()) return false; - FileInfo finfo(fname); - if (finfo.exist() && !finfo.writable()) - return false; - - bool retval; + bool retval = false; if (params().compressed) { - gz::ogzstream ofs(fname.c_str()); + io::filtering_ostream ofs(io::gzip_compressor() | io::file_sink(fname)); if (!ofs) return false; retval = do_writeFile(ofs); - } else { - ofstream ofs(fname.c_str()); + ofstream ofs(fname.c_str(), ios::out|ios::trunc); if (!ofs) return false; @@ -760,18 +777,21 @@ bool Buffer::do_writeFile(ostream & ofs) const // write out a comment in the top of the file ofs << "#LyX " << lyx_version << " created this file. For more info see http://www.lyx.org/\n" - << "\\lyxformat " << LYX_FORMAT << "\n"; + << "\\lyxformat " << LYX_FORMAT << "\n" + << "\\begin_document\n"; // now write out the buffer parameters. + ofs << "\\begin_header\n"; params().writeFile(ofs); - ofs << "\\end_header\n"; // 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\\end_document" << endl; + ofs << "\\end_document" << endl; // Shouldn't really be needed.... //ofs.close(); @@ -805,7 +825,7 @@ void Buffer::makeLaTeXFile(string const & fname, if (!openFileWrite(ofs, fname)) return; - makeLaTeXFile(ofs, original_path, + writeLaTeXSource(ofs, original_path, runparams, output_preamble, output_body); ofs.close(); @@ -814,20 +834,21 @@ void Buffer::makeLaTeXFile(string const & fname, } -void Buffer::makeLaTeXFile(ostream & os, +void Buffer::writeLaTeXSource(ostream & os, string const & original_path, OutputParams const & runparams_in, - bool output_preamble, bool output_body) + bool const output_preamble, bool const output_body) { OutputParams runparams = runparams_in; // validate the buffer. lyxerr[Debug::LATEX] << " Validating buffer..." << endl; - LaTeXFeatures features(*this, params(), runparams.nice); + LaTeXFeatures features(*this, params(), runparams); validate(features); lyxerr[Debug::LATEX] << " Buffer validation done." << endl; texrow().reset(); + // The starting paragraph of the coming rows is the // first paragraph of the document. (Asger) texrow().start(paragraphs().begin()->id(), 0); @@ -840,7 +861,7 @@ void Buffer::makeLaTeXFile(ostream & os, texrow().newline(); texrow().newline(); } - lyxerr[Debug::INFO] << "lyx header finished" << endl; + lyxerr[Debug::INFO] << "lyx document header finished" << endl; // There are a few differences between nice LaTeX and usual files: // usual is \batchmode and has a // special input@path to allow the including of figures @@ -848,6 +869,9 @@ 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) + // 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 @@ -856,8 +880,7 @@ void Buffer::makeLaTeXFile(ostream & os, 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" @@ -886,8 +909,22 @@ void Buffer::makeLaTeXFile(ostream & os, texrow().newline(); } + // 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(); + } + + // the real stuff latexParagraphs(*this, paragraphs(), os, texrow(), runparams); + // Restore the parenthood if needed + if (output_preamble) + params().parentname = save_parentname; + // add this just in case after all the paragraphs os << endl; texrow().newline(); @@ -924,12 +961,6 @@ bool Buffer::isLatex() const } -bool Buffer::isLinuxDoc() const -{ - return params().getLyXTextClass().outputType() == LINUXDOC; -} - - bool Buffer::isLiterate() const { return params().getLyXTextClass().outputType() == LITERATE; @@ -942,66 +973,17 @@ bool Buffer::isDocBook() const } -bool Buffer::isSGML() const -{ - LyXTextClass const & tclass = params().getLyXTextClass(); - - return tclass.outputType() == LINUXDOC || - tclass.outputType() == DOCBOOK; -} - - -void Buffer::makeLinuxDocFile(string const & fname, +void Buffer::makeDocBookFile(string const & fname, OutputParams const & runparams, - bool body_only ) + bool const body_only) { + lyxerr[Debug::LATEX] << "makeDocBookFile..." << endl; + ofstream ofs; if (!openFileWrite(ofs, fname)) return; - LaTeXFeatures features(*this, params(), runparams.nice); - validate(features); - - texrow().reset(); - - LyXTextClass const & tclass = params().getLyXTextClass(); - - string top_element = tclass.latexname(); - - if (!body_only) { - ofs << tclass.class_header(); - - string preamble = params().preamble; - string const name = runparams.nice ? ChangeExtension(pimpl_->filename, ".sgml") - : fname; - preamble += features.getIncludedFiles(name); - preamble += features.getLyXSGMLEntities(); - - if (!preamble.empty()) { - ofs << " [ " << preamble << " ]"; - } - 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"; - - linuxdocParagraphs(*this, paragraphs(), ofs, runparams); - - if (!body_only) { - ofs << "\n\n"; - sgml::closeTag(ofs, 0, false, top_element); - } + writeDocBookSource(ofs, fname, runparams, body_only); ofs.close(); if (ofs.fail()) @@ -1009,60 +991,74 @@ void Buffer::makeLinuxDocFile(string const & fname, } -void Buffer::makeDocBookFile(string const & fname, +void Buffer::writeDocBookSource(ostream & os, string const & fname, OutputParams const & runparams, - bool only_body) + bool const only_body) { - ofstream ofs; - if (!openFileWrite(ofs, fname)) - return; - - LaTeXFeatures features(*this, params(), runparams.nice); + LaTeXFeatures features(*this, params(), runparams); validate(features); texrow().reset(); LyXTextClass const & tclass = params().getLyXTextClass(); - string top_element = tclass.latexname(); + string const & top_element = tclass.latexname(); if (!only_body) { - ofs << subst(tclass.class_header(), "#", top_element); + if (runparams.flavor == OutputParams::XML) + os << "encoding()->name() << "\"?>\n"; + + os << "filename, ".sgml") + if (runparams.flavor != OutputParams::XML ) { + preamble += "\n"; + preamble += "\n"; + preamble += "\n"; + preamble += "\n"; + } + + string const name = runparams.nice ? changeExtension(pimpl_->filename, ".sgml") : fname; preamble += features.getIncludedFiles(name); preamble += features.getLyXSGMLEntities(); if (!preamble.empty()) { - ofs << "\n [ " << preamble << " ]"; + os << "\n [ " << preamble << " ]"; } - ofs << ">\n\n"; + os << ">\n\n"; } 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()) { top += ' '; top += params().options; } - sgml::openTag(ofs, 0, false, top); - ofs << "\n"; params().getLyXTextClass().counters().reset(); - docbookParagraphs(*this, paragraphs(), ofs, runparams); - - ofs << "\n\n"; - sgml::closeTag(ofs, 0, false, top_element); - ofs.close(); - if (ofs.fail()) - lyxerr << "File '" << fname << "' was not closed properly." << endl; + sgml::openTag(os, top); + os << '\n'; + docbookParagraphs(paragraphs(), *this, os, runparams); + sgml::closeTag(os, top_element); } @@ -1074,14 +1070,10 @@ int Buffer::runChktex() // get LaTeX-Filename string const name = getLatexName(); - string path = filePath(); - - string const org_path = path; - if (lyxrc.use_tempdir || !IsDirWriteable(path)) { - path = temppath(); - } + string const path = temppath(); + string const org_path = filePath(); - Path p(path); // path to LaTeX file + lyx::support::Path p(path); // path to LaTeX file message(_("Running chktex...")); // Generate the LaTeX file if neccessary @@ -1092,18 +1084,20 @@ int Buffer::runChktex() 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.")); } else if (res > 0) { - // Insert all errors as errors boxes - bufferErrors(*this, terr); + // Fill-in the error list with the TeX errors + bufferErrors(*this, terr, errorLists_["ChkTex"]); } busy(false); + errors("ChkTeX"); + return res; } @@ -1112,10 +1106,9 @@ void Buffer::validate(LaTeXFeatures & features) const { 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 @@ -1155,52 +1148,48 @@ void Buffer::validate(LaTeXFeatures & features) const } -void Buffer::getLabelList(std::vector & list) 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) { - tmp->getLabelList(list); - return; - } + Buffer const * tmp = getMasterBuffer(); + if (!tmp) { + lyxerr << "getMasterBuffer() failed!" << endl; + BOOST_ASSERT(tmp); } - - for (inset_iterator it = inset_const_iterator_begin(); - it != inset_const_iterator_end(); ++it) { - it->getLabelList(*this, list); + if (tmp != this) { + tmp->getLabelList(list); + return; } + + for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) + it.nextInset()->getLabelList(*this, list); } // This is also a buffer property (ale) -void Buffer::fillWithBibKeys(std::vector > & keys) +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() == InsetOld::BIBTEX_CODE) { + 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() == InsetOld::INCLUDE_CODE) { + } else if (it->lyxCode() == InsetBase::INCLUDE_CODE) { InsetInclude const & inset = dynamic_cast(*it); inset.fillWithBibKeys(*this, keys); - } else if (it->lyxCode() == InsetOld::BIBITEM_CODE) { + } else if (it->lyxCode() == InsetBase::BIBITEM_CODE) { InsetBibitem const & inset = dynamic_cast(*it); string const key = inset.getContents(); @@ -1213,9 +1202,56 @@ void Buffer::fillWithBibKeys(std::vector > & keys) } +void Buffer::updateBibfilesCache() +{ + // if this is a child document and the parent is already loaded + // update the parent's cache instead + Buffer * tmp = getMasterBuffer(); + BOOST_ASSERT(tmp); + if (tmp != this) { + tmp->updateBibfilesCache(); + return; + } + + bibfilesCache_.clear(); + for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) { + if (it->lyxCode() == InsetBase::BIBTEX_CODE) { + InsetBibtex const & inset = + dynamic_cast(*it); + vector const bibfiles = inset.getFiles(*this); + bibfilesCache_.insert(bibfilesCache_.end(), + bibfiles.begin(), + bibfiles.end()); + } else if (it->lyxCode() == InsetBase::INCLUDE_CODE) { + InsetInclude & inset = + dynamic_cast(*it); + inset.updateBibfilesCache(*this); + vector const & bibfiles = + inset.getBibfilesCache(*this); + bibfilesCache_.insert(bibfilesCache_.end(), + bibfiles.begin(), + bibfiles.end()); + } + } +} + + +vector const & Buffer::getBibfilesCache() const +{ + // if this is a child document and the parent is already loaded + // use the parent's cache instead + Buffer const * tmp = getMasterBuffer(); + BOOST_ASSERT(tmp); + if (tmp != this) + return tmp->getBibfilesCache(); + + return bibfilesCache_; +} + + bool Buffer::isDepClean(string const & name) const { - DepClean::const_iterator it = pimpl_->dep_clean.find(name); + DepClean::const_iterator const it = pimpl_->dep_clean.find(name); if (it == pimpl_->dep_clean.end()) return true; return it->second; @@ -1239,8 +1275,8 @@ bool Buffer::dispatch(FuncRequest const & func, bool * result) bool dispatched = true; switch (func.action) { - case LFUN_EXPORT: { - bool const tmp = Exporter::Export(this, func.argument, false); + case LFUN_BUFFER_EXPORT: { + bool const tmp = Exporter::Export(this, lyx::to_utf8(func.argument()), false); if (result) *result = tmp; break; @@ -1255,27 +1291,35 @@ bool Buffer::dispatch(FuncRequest const & func, bool * result) void Buffer::changeLanguage(Language const * from, Language const * to) { - lyxerr << "Changing Language!" << endl; + BOOST_ASSERT(from); + BOOST_ASSERT(to); // 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)); + + text().current_font.setLanguage(to); + text().real_current_font.setLanguage(to); } void Buffer::updateDocLang(Language const * nlang) { + BOOST_ASSERT(nlang); + pimpl_->messages.reset(new Messages(nlang->code())); + + updateLabels(*this); } -bool Buffer::isMultiLingual() +bool Buffer::isMultiLingual() const { - ParIterator end = par_iterator_end(); - for (ParIterator it = par_iterator_begin(); it != end; ++it) + ParConstIterator end = par_iterator_end(); + for (ParConstIterator it = par_iterator_begin(); it != end; ++it) if (it->isMultiLingual(params())) return true; @@ -1283,24 +1327,11 @@ bool Buffer::isMultiLingual() } -void Buffer::inset_iterator::setParagraph() -{ - while (pit != pend) { - it = pit->insetlist.begin(); - if (it != pit->insetlist.end()) - return; - ++pit; - } -} - - -ParIterator Buffer::getParFromID(int id) const +ParIterator Buffer::getParFromID(int const id) const { -#warning FIXME: const correctness! (Andre) - ParIterator it = const_cast(this)->par_iterator_begin(); - ParIterator end = const_cast(this)->par_iterator_end(); + ParConstIterator it = par_iterator_begin(); + ParConstIterator const end = par_iterator_end(); -#warning FIXME, perhaps this func should return a ParIterator? (Lgb) if (id < 0) { // John says this is called with id == -1 from undo lyxerr << "getParFromID(), id: " << id << endl; @@ -1315,60 +1346,34 @@ ParIterator Buffer::getParFromID(int id) const } -bool Buffer::hasParWithID(int id) const +bool Buffer::hasParWithID(int const id) const { - ParConstIterator it = par_iterator_begin(); - ParConstIterator end = par_iterator_end(); - - if (id < 0) { - // John says this is called with id == -1 from undo - lyxerr << "hasParWithID(), id: " << id << endl; - return 0; - } - - for (; it != end; ++it) - if (it->id() == id) - return true; - - return false; -} - - -PosIterator Buffer::pos_iterator_begin() -{ - return PosIterator(¶graphs(), paragraphs().begin(), 0); -} - - -PosIterator Buffer::pos_iterator_end() -{ - return PosIterator(¶graphs(), paragraphs().end(), 0); + ParConstIterator const it = getParFromID(id); + return it != par_iterator_end(); } ParIterator Buffer::par_iterator_begin() { - return ParIterator(paragraphs().begin(), paragraphs()); + return ::par_iterator_begin(inset()); } ParIterator Buffer::par_iterator_end() { - return ParIterator(paragraphs().end(), paragraphs()); + return ::par_iterator_end(inset()); } ParConstIterator Buffer::par_iterator_begin() const { - ParagraphList const & pars = paragraphs(); - return ParConstIterator(const_cast(pars).begin(), pars); + return ::par_const_iterator_begin(inset()); } ParConstIterator Buffer::par_iterator_end() const { - ParagraphList const & pars = paragraphs(); - return ParConstIterator(const_cast(pars).end(), pars); + return ::par_const_iterator_end(inset()); } @@ -1378,7 +1383,7 @@ Language const * Buffer::getLanguage() const } -string const Buffer::B_(string const & l10n) const +docstring const Buffer::B_(string const & l10n) const { if (pimpl_->messages.get()) { return pimpl_->messages->get(l10n); @@ -1424,12 +1429,15 @@ void Buffer::setUnnamed(bool flag) } -bool Buffer::isUnnamed() +bool Buffer::isUnnamed() const { return pimpl_->unnamed; } +#ifdef WITH_WARNINGS +#warning this function should be moved to buffer_pimpl.C +#endif void Buffer::markDirty() { if (pimpl_->lyx_clean) { @@ -1455,7 +1463,7 @@ string const & Buffer::fileName() const string const & Buffer::filePath() const { - return pimpl_->filepath; + return params().filepath; } @@ -1471,99 +1479,157 @@ void Buffer::setParentName(string const & name) } -Buffer::inset_iterator::inset_iterator() - : pit(), pend() -{} - - -Buffer::inset_iterator::inset_iterator(base_type p, base_type e) - : pit(p), pend(e) +Buffer const * Buffer::getMasterBuffer() const { - setParagraph(); + if (!params().parentname.empty() + && theApp->bufferList().exists(params().parentname)) { + Buffer const * buf = theApp->bufferList().getBuffer(params().parentname); + if (buf) + return buf->getMasterBuffer(); + } + + return this; } -Buffer::inset_iterator Buffer::inset_iterator_begin() +Buffer * Buffer::getMasterBuffer() { - return inset_iterator(paragraphs().begin(), paragraphs().end()); + if (!params().parentname.empty() + && theApp->bufferList().exists(params().parentname)) { + Buffer * buf = theApp->bufferList().getBuffer(params().parentname); + if (buf) + return buf->getMasterBuffer(); + } + + return this; } -Buffer::inset_iterator Buffer::inset_iterator_end() +MacroData const & Buffer::getMacro(std::string const & name) const { - return inset_iterator(paragraphs().end(), paragraphs().end()); + return pimpl_->macros.get(name); } -Buffer::inset_iterator Buffer::inset_const_iterator_begin() const +bool Buffer::hasMacro(string const & name) const { - ParagraphList & pars = const_cast(paragraphs()); - return inset_iterator(pars.begin(), pars.end()); + return pimpl_->macros.has(name); } -Buffer::inset_iterator Buffer::inset_const_iterator_end() const +void Buffer::insertMacro(string const & name, MacroData const & data) { - ParagraphList & pars = const_cast(paragraphs()); - return inset_iterator(pars.end(), pars.end()); + MacroTable::globalMacros().insert(name, data); + pimpl_->macros.insert(name, data); } -Buffer::inset_iterator & Buffer::inset_iterator::operator++() +void Buffer::buildMacros() { - if (pit != pend) { - ++it; - if (it == pit->insetlist.end()) { - ++pit; - setParagraph(); + // Start with global table. + pimpl_->macros = MacroTable::globalMacros(); + + // Now add our own. + ParagraphList const & 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 const & insets = pars[i].insetlist; + InsetList::const_iterator it = insets.begin(); + InsetList::const_iterator end = insets.end(); + for ( ; it != end; ++it) { + //lyxerr << "found inset code " << it->inset->lyxCode() << std::endl; + if (it->inset->lyxCode() == InsetBase::MATHMACRO_CODE) { + MathMacroTemplate const & mac + = static_cast(*it->inset); + insertMacro(mac.name(), mac.asMacroData()); + } } } - return *this; } -Buffer::inset_iterator Buffer::inset_iterator::operator++(int) +void Buffer::saveCursor(StableDocIterator cur, StableDocIterator anc) { - inset_iterator tmp = *this; - ++*this; - return tmp; + cursor_ = cur; + anchor_ = anc; } -Buffer::inset_iterator::reference Buffer::inset_iterator::operator*() +void Buffer::changeRefsIfUnique(string const & from, string const & to) { - return *it->inset; -} + // Check if the label 'from' appears more than once + vector labels; + getLabelList(labels); + if (lyx::count(labels.begin(), labels.end(), from) > 1) + return; -Buffer::inset_iterator::pointer Buffer::inset_iterator::operator->() -{ - return it->inset; -} - + InsetBase::Code code = InsetBase::REF_CODE; -ParagraphList::iterator Buffer::inset_iterator::getPar() const -{ - return pit; + ParIterator it = par_iterator_begin(); + ParIterator end = par_iterator_end(); + for ( ; it != end; ++it) { + bool changed_inset = false; + for (InsetList::iterator it2 = it->insetlist.begin(); + it2 != it->insetlist.end(); ++it2) { + if (it2->inset->lyxCode() == code) { + InsetCommand * inset = static_cast(it2->inset); + if (inset->getContents() == from) { + inset->setContents(to); + //inset->setButtonLabel(); + changed_inset = true; + } + } + } + } } -lyx::pos_type Buffer::inset_iterator::getPos() const +void Buffer::getSourceCode(ostream & os, lyx::pit_type par_begin, lyx::pit_type par_end, bool full_source) { - return it->pos; + OutputParams runparams; + runparams.nice = true; + runparams.flavor = OutputParams::LATEX; + runparams.linelen = lyxrc.ascii_linelen; + // No side effect of file copying and image conversion + runparams.dryrun = true; + + if (full_source) { + os << "% Preview source code\n\n"; + if (isLatex()) + writeLaTeXSource(os, filePath(), runparams, true, true); + else + writeDocBookSource(os, fileName(), runparams, false); + } else { + runparams.par_begin = par_begin; + runparams.par_end = par_end; + if (par_begin + 1 == par_end) + os << "% Preview source code for paragraph " << par_begin << "\n\n"; + else + os << "% Preview source code from paragraph " << par_begin << " to " << par_end - 1 << "\n\n"; + // output paragraphs + if (isLatex()) { + texrow().reset(); + latexParagraphs(*this, paragraphs(), os, texrow(), runparams); + } else // DocBook + docbookParagraphs(paragraphs(), *this, os, runparams); + } } -bool operator==(Buffer::inset_iterator const & iter1, - Buffer::inset_iterator const & iter2) +ErrorList const & Buffer::errorList(string const & type) const { - return iter1.pit == iter2.pit - && (iter1.pit == iter1.pend || iter1.it == iter2.it); + static ErrorList const emptyErrorList; + std::map::const_iterator I = errorLists_.find(type); + if (I == errorLists_.end()) + return emptyErrorList; + + return I->second; } -bool operator!=(Buffer::inset_iterator const & iter1, - Buffer::inset_iterator const & iter2) +ErrorList & Buffer::errorList(string const & type) { - return !(iter1 == iter2); + return errorLists_[type]; }