X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=0f37edd9dcb1868dbad7bce1159a87a1172b8e60;hb=44e86aa4e9a602c90a5f96b4c716f28cd2582192;hp=3911edb41bb64d5a220ab4dff18859fc171a3021;hpb=01691cde49aac9579a1931d2de48e582c93a2363;p=lyx.git diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 3911edb41b..0f37edd9dc 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -133,14 +133,6 @@ int const LYX_FORMAT = LYX_FORMAT_LYX; typedef map DepClean; typedef map > RefCache; -void showPrintError(string const & name) -{ - docstring str = bformat(_("Could not print the document %1$s.\n" - "Check that your printer is set up correctly."), - makeDisplayPath(name, 50)); - Alert::error(_("Print document failed"), str); -} - } // namespace anon @@ -219,7 +211,13 @@ public: mutable TocBackend toc_backend; /// macro tables - typedef pair ScopeMacro; + struct ScopeMacro { + ScopeMacro() {} + ScopeMacro(DocIterator const & s, MacroData const & m) + : scope(s), macro(m) {} + DocIterator scope; + MacroData macro; + }; typedef map PositionScopeMacroMap; typedef map NamePositionScopeMacroMap; /// map from the macro name to the position map, @@ -230,13 +228,29 @@ public: /// positions of child buffers in the buffer typedef map BufferPositionMap; - typedef pair ScopeBuffer; + struct ScopeBuffer { + ScopeBuffer() {} + ScopeBuffer(DocIterator const & s,Buffer const * b) + : scope(s), buffer(b) {} + DocIterator scope; + Buffer const * buffer; + }; typedef map PositionScopeBufferMap; /// position of children buffers in this buffer BufferPositionMap children_positions; /// map from children inclusion positions to their scope and their buffer PositionScopeBufferMap position_to_children; + /// Contains the old buffer filePath() while saving-as, or the + /// directory where the document was last saved while loading. + string old_position; + + /** Keeps track of the path of local layout files. + * If possible, it is always relative to the buffer path. + * Empty for layouts in system or user directory. + */ + string layout_position; + /// Container for all sort of Buffer dependant errors. map errorLists; @@ -274,6 +288,15 @@ public: /// to be updated. mutable bool cite_labels_valid_; + /// These two hold the file name and format, written to by + /// Buffer::preview and read from by LFUN_BUFFER_VIEW_CACHE. + FileName preview_file_; + string preview_format_; + /// If there was an error when previewing, on the next preview we do + /// a fresh compile (e.g. in case the user installed a package that + /// was missing). + bool preview_error_; + mutable RefCache ref_cache_; /// our Text that should be wrapped in an InsetText @@ -355,7 +378,7 @@ private: static FileName createBufferTmpDir() { // FIXME This would be the ideal application for a TempDir class (like - // TempFile but for directories) + // TempFile but for directories) string counter; { static int count; @@ -385,9 +408,10 @@ Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_, file_fully_loaded(false), ignore_parent(false), toc_backend(owner), macro_lock(false), timestamp_(0), checksum_(0), wa_(0), gui_(0), undo_(*owner), bibinfo_cache_valid_(false), bibfile_cache_valid_(false), - cite_labels_valid_(false), preview_loader_(0), + cite_labels_valid_(false), inset(0), preview_loader_(0), cloned_buffer_(cloned_buffer), clone_list_(0), - doing_export(false), parent_buffer(0) + doing_export(false), parent_buffer(0), + word_count_(0), char_count_(0), blank_count_(0) { if (!cloned_buffer_) { temppath = createBufferTmpDir(); @@ -407,6 +431,10 @@ Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_, cite_labels_valid_ = cloned_buffer_->d->cite_labels_valid_; unnamed = cloned_buffer_->d->unnamed; internal_buffer = cloned_buffer_->d->internal_buffer; + layout_position = cloned_buffer_->d->layout_position; + preview_file_ = cloned_buffer_->d->preview_file_; + preview_format_ = cloned_buffer_->d->preview_format_; + preview_error_ = cloned_buffer_->d->preview_error_; } @@ -425,7 +453,6 @@ Buffer::Buffer(string const & file, bool readonly, Buffer const * cloned_buffer) it.paragraph().setId(cloned_it.paragraph().id()); } else d->inset = new InsetText(this); - d->inset->setAutoBreakRows(true); d->inset->getText(0)->setMacrocontextPosition(par_iterator_begin()); } @@ -558,7 +585,7 @@ void Buffer::cloneWithChildren(BufferMap & bufmap, CloneList * clones) const for (; it != end; ++it) { DocIterator dit = it->first.clone(buffer_clone); dit.setBuffer(buffer_clone); - Buffer * child = const_cast(it->second.second); + Buffer * child = const_cast(it->second.buffer); child->cloneWithChildren(bufmap, clones); BufferMap::iterator const bit = bufmap.find(child); @@ -775,7 +802,7 @@ string Buffer::logName(LogType * type) const // Also consider the master buffer log file FileName masterfname = fname; - LogType mtype; + LogType mtype = latexlog; if (masterBuffer() != this) { string const mlogfile = masterBuffer()->logName(&mtype); masterfname = FileName(mlogfile); @@ -895,12 +922,11 @@ int Buffer::readHeader(Lexer & lex) LYXERR(Debug::PARSER, "Handling document header token: `" << token << '\''); - string unknown = params().readToken(lex, token, d->filename.onlyPath()); - if (!unknown.empty()) { - if (unknown[0] != '\\' && token == "\\textclass") { - Alert::warning(_("Unknown document class"), - bformat(_("Using the default document class, because the " - "class %1$s is unknown."), from_utf8(unknown))); + string const result = + params().readToken(lex, token, d->filename.onlyPath()); + if (!result.empty()) { + if (token == "\\textclass") { + d->layout_position = result; } else { ++unknown_tokens; docstring const s = bformat(_("Unknown token: " @@ -997,7 +1023,9 @@ bool Buffer::readDocument(Lexer & lex) params().indiceslist().addDefault(B_("Index")); // read main text + d->old_position = originFilePath(); bool const res = text().read(lex, errorList, d->inset); + d->old_position.clear(); // inform parent buffer about local macros if (parent()) { @@ -1143,6 +1171,12 @@ void Buffer::setFullyLoaded(bool value) } +bool Buffer::lastPreviewError() const +{ + return d->preview_error_; +} + + PreviewLoader * Buffer::loader() const { if (!isExporting() && lyxrc.preview == LyXRC::PREVIEW_OFF) @@ -1294,8 +1328,12 @@ bool Buffer::save() const // if the file does not yet exist, none of the backup activity // that follows is necessary - if (!fileName().exists()) - return writeFile(fileName()); + if (!fileName().exists()) { + if (!writeFile(fileName())) + return false; + markClean(); + return true; + } // we first write the file to a new name, then move it to its // proper location once that has been done successfully. that @@ -1365,12 +1403,12 @@ bool Buffer::save() const // to restore it, but that would basically mean trying to do again // what we just failed to do. better to leave things as they are. Alert::error(_("Write failure"), - bformat(_("The file has successfully been saved as:\n %1$s.\n" - "But LyX could not move it to:\n %2$s.\n" - "Your original file has been backed up to:\n %3$s"), - from_utf8(savefile.absFileName()), - from_utf8(fileName().absFileName()), - from_utf8(backupName.absFileName()))); + bformat(_("The file has successfully been saved as:\n %1$s.\n" + "But LyX could not move it to:\n %2$s.\n" + "Your original file has been backed up to:\n %3$s"), + from_utf8(savefile.absFileName()), + from_utf8(fileName().absFileName()), + from_utf8(backupName.absFileName()))); } else { // either we did not try to make a backup, or else we tried and failed, // or else the original file was a symlink, in which case it was copied, @@ -1509,7 +1547,7 @@ bool Buffer::write(ostream & ofs) const // now write out the buffer parameters. ofs << "\\begin_header\n"; - params().writeFile(ofs); + params().writeFile(ofs, this); ofs << "\\end_header\n"; // write the text @@ -1744,7 +1782,7 @@ void Buffer::writeLaTeXSource(otexstream & os, } os << "\\makeatletter\n" << "\\def\\input@path{{" - << docdir << "/}}\n" + << docdir << "}}\n" << "\\makeatother\n"; } } @@ -1851,7 +1889,7 @@ void Buffer::writeDocBookSource(odocstream & os, string const & fname, d->texrow.reset(); DocumentClass const & tclass = params().documentClass(); - string const top_element = tclass.latexname(); + string const & top_element = tclass.latexname(); bool const output_preamble = output == FullSource || output == OnlyPreamble; @@ -2125,9 +2163,9 @@ void Buffer::getLabelList(vector & list) const } list.clear(); - Toc & toc = d->toc_backend.toc("label"); - TocIterator toc_it = toc.begin(); - TocIterator end = toc.end(); + shared_ptr toc = d->toc_backend.toc("label"); + TocIterator toc_it = toc->begin(); + TocIterator end = toc->end(); for (; toc_it != end; ++toc_it) { if (toc_it->depth() == 0) list.push_back(toc_it->str()); @@ -2400,7 +2438,6 @@ bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag) case LFUN_BRANCH_ADD: case LFUN_BRANCHES_RENAME: - case LFUN_BUFFER_PRINT: // if no Buffer is present, then of course we won't be called! break; @@ -2408,6 +2445,11 @@ bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag) enable = !isReadonly(); break; + case LFUN_BUFFER_VIEW_CACHE: + (d->preview_file_).refresh(); + enable = (d->preview_file_).exists(); + break; + default: return false; } @@ -2505,7 +2547,8 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr) // Execute the command in the background Systemcall call; - call.startscript(Systemcall::DontWait, command, filePath()); + call.startscript(Systemcall::DontWait, command, + filePath(), layoutPos()); break; } @@ -2630,122 +2673,11 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr) break; } - case LFUN_BUFFER_PRINT: { - // we'll assume there's a problem until we succeed - dr.setError(true); - string target = func.getArg(0); - string target_name = func.getArg(1); - string command = func.getArg(2); - - if (target.empty() - || target_name.empty() - || command.empty()) { - LYXERR0("Unable to parse " << func.argument()); - docstring const msg = - bformat(_("Unable to parse \"%1$s\""), func.argument()); - dr.setMessage(msg); - break; - } - if (target != "printer" && target != "file") { - LYXERR0("Unrecognized target \"" << target << '"'); - docstring const msg = - bformat(_("Unrecognized target \"%1$s\""), from_utf8(target)); - dr.setMessage(msg); - break; - } - - if (doExport("dvi", true) != ExportSuccess) { - showPrintError(absFileName()); - dr.setMessage(_("Error exporting to DVI.")); - break; - } - - // Push directory path. - string const path = temppath(); - // Prevent the compiler from optimizing away p - FileName pp(path); - PathChanger p(pp); - - // there are three cases here: - // 1. we print to a file - // 2. we print directly to a printer - // 3. we print using a spool command (print to file first) - Systemcall one; - int res = 0; - string const dviname = changeExtension(latexName(true), "dvi"); - - if (target == "printer") { - if (!lyxrc.print_spool_command.empty()) { - // case 3: print using a spool - string const psname = changeExtension(dviname,".ps"); - command += ' ' + lyxrc.print_to_file - + quoteName(psname) - + ' ' - + quoteName(dviname); - - string command2 = lyxrc.print_spool_command + ' '; - if (target_name != "default") { - command2 += lyxrc.print_spool_printerprefix - + target_name - + ' '; - } - command2 += quoteName(psname); - // First run dvips. - // If successful, then spool command - res = one.startscript(Systemcall::Wait, command, - filePath()); - - if (res == 0) { - // If there's no GUI, we have to wait on this command. Otherwise, - // LyX deletes the temporary directory, and with it the spooled - // file, before it can be printed!! - Systemcall::Starttype stype = use_gui ? - Systemcall::DontWait : Systemcall::Wait; - res = one.startscript(stype, command2, - filePath()); - } - } else { - // case 2: print directly to a printer - if (target_name != "default") - command += ' ' + lyxrc.print_to_printer + target_name + ' '; - // as above.... - Systemcall::Starttype stype = use_gui ? - Systemcall::DontWait : Systemcall::Wait; - res = one.startscript(stype, command + - quoteName(dviname), filePath()); - } - - } else { - // case 1: print to a file - FileName const filename(makeAbsPath(target_name, filePath())); - FileName const dvifile(makeAbsPath(dviname, path)); - if (filename.exists()) { - docstring text = bformat( - _("The file %1$s already exists.\n\n" - "Do you want to overwrite that file?"), - makeDisplayPath(filename.absFileName())); - if (Alert::prompt(_("Overwrite file?"), - text, 0, 1, _("&Overwrite"), _("&Cancel")) != 0) - break; - } - command += ' ' + lyxrc.print_to_file - + quoteName(filename.toFilesystemEncoding()) - + ' ' - + quoteName(dvifile.toFilesystemEncoding()); - // as above.... - Systemcall::Starttype stype = use_gui ? - Systemcall::DontWait : Systemcall::Wait; - res = one.startscript(stype, command, filePath()); - } - - if (res == 0) - dr.setError(false); - else { - dr.setMessage(_("Error running external commands.")); - showPrintError(absFileName()); - } + case LFUN_BUFFER_VIEW_CACHE: + if (!formats.view(*this, d->preview_file_, + d->preview_format_)) + dr.setMessage(_("Error viewing the output file.")); break; - } default: dispatched = false; @@ -2975,6 +2907,38 @@ string Buffer::filePath() const } +string Buffer::originFilePath() const +{ + if (FileName::isAbsolute(params().origin)) + return params().origin; + + return filePath(); +} + + +string Buffer::layoutPos() const +{ + return d->layout_position; +} + + +void Buffer::setLayoutPos(string const & path) +{ + if (path.empty()) { + d->layout_position.clear(); + return; + } + + LATTEST(FileName::isAbsolute(path)); + + d->layout_position = + to_utf8(makeRelPath(from_utf8(path), from_utf8(filePath()))); + + if (d->layout_position.empty()) + d->layout_position = "."; +} + + bool Buffer::isReadonly() const { return d->read_only; @@ -3121,12 +3085,12 @@ MacroData const * Buffer::Impl::getBufferMacro(docstring const & name, if (it != nameIt->second.end()) { while (true) { // scope ends behind pos? - if (pos < it->second.first) { + if (pos < it->second.scope) { // Looks good, remember this. If there // is no external macro behind this, // we found the right one already. bestPos = it->first; - bestData = &it->second.second; + bestData = &it->second.macro; break; } @@ -3151,13 +3115,13 @@ MacroData const * Buffer::Impl::getBufferMacro(docstring const & name, break; // scope ends behind pos? - if (pos < it->second.first + if (pos < it->second.scope && (cloned_buffer_ || - theBufferList().isLoaded(it->second.second))) { + theBufferList().isLoaded(it->second.buffer))) { // look for macro in external file macro_lock = true; MacroData const * data - = it->second.second->getMacro(name, false); + = it->second.buffer->getMacro(name, false); macro_lock = false; if (data) { bestPos = it->first; @@ -3322,7 +3286,7 @@ void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope) continue; // register macro - // FIXME (Abdel), I don't understandt why we pass 'it' here + // FIXME (Abdel), I don't understand why we pass 'it' here // instead of 'macroTemplate' defined above... is this correct? macros[macroTemplate.name()][it] = Impl::ScopeMacro(scope, MacroData(const_cast(owner_), it)); @@ -3546,11 +3510,12 @@ void Buffer::changeRefsIfUnique(docstring const & from, docstring const & to) } } - -void Buffer::getSourceCode(odocstream & os, string const & format, +// returns NULL if id-to-row conversion is unsupported +auto_ptr Buffer::getSourceCode(odocstream & os, string const & format, pit_type par_begin, pit_type par_end, OutputWhat output, bool master) const { + auto_ptr texrow(NULL); OutputParams runparams(¶ms().encoding()); runparams.nice = true; runparams.flavor = params().getOutputFlavor(format); @@ -3604,12 +3569,12 @@ void Buffer::getSourceCode(odocstream & os, string const & format, LaTeXFeatures features(*this, params(), runparams); params().validate(features); runparams.use_polyglossia = features.usePolyglossia(); - TexRow texrow; - texrow.reset(); - texrow.newline(); - texrow.newline(); + texrow.reset(new TexRow()); + texrow->reset(); + texrow->newline(); + texrow->newline(); // latex or literate - otexstream ots(os, texrow); + otexstream ots(os, *texrow); // the real stuff latexParagraphs(*this, text(), ots, runparams); @@ -3632,7 +3597,7 @@ void Buffer::getSourceCode(odocstream & os, string const & format, if (output == FullSource) write(ods); else if (output == OnlyPreamble) - params().writeFile(ods); + params().writeFile(ods, this); else if (output == OnlyBody) text().write(ods); os << from_utf8(ods.str()); @@ -3647,15 +3612,17 @@ void Buffer::getSourceCode(odocstream & os, string const & format, writeDocBookSource(os, absFileName(), runparams, output); } else { // latex or literate - d->texrow.reset(); - d->texrow.newline(); - d->texrow.newline(); - otexstream ots(os, d->texrow); + texrow.reset(new TexRow()); + texrow->reset(); + texrow->newline(); + texrow->newline(); + otexstream ots(os, *texrow); if (master) runparams.is_child = true; writeLaTeXSource(ots, string(), runparams, output); } } + return texrow; } @@ -4106,12 +4073,10 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir d->cloned_buffer_->d->errorLists[error_type] = d->errorLists[error_type]; } - if (!success) - return ExportConverterError; if (put_in_tempdir) { result_file = tmp_result_file.absFileName(); - return ExportSuccess; + return success ? ExportSuccess : ExportConverterError; } if (dest_filename.empty()) @@ -4176,7 +4141,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir formats.prettyName(format))); } - return ExportSuccess; + return success ? ExportSuccess : ExportConverterError; } @@ -4201,11 +4166,28 @@ Buffer::ExportStatus Buffer::preview(string const & format, bool includeall) con } // (2) export with included children only ExportStatus const status = doExport(format, true, false, result_file); + FileName const previewFile(result_file); + + LATTEST (isClone()); + d->cloned_buffer_->d->preview_file_ = previewFile; + d->cloned_buffer_->d->preview_format_ = format; + d->cloned_buffer_->d->preview_error_ = (status != ExportSuccess); + if (status != ExportSuccess) return status; - if (!formats.view(*this, FileName(result_file), format)) - return PreviewError; - return PreviewSuccess; + if (previewFile.exists()) { + if (!formats.view(*this, previewFile, format)) + return PreviewError; + else + return PreviewSuccess; + } + else { + // Successful export but no output file? + // Probably a bug in error detection. + LATTEST (status != ExportSuccess); + + return status; + } } @@ -4440,9 +4422,9 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const if (master != this) { bufToUpdate.insert(this); master->updateBuffer(UpdateMaster, utype); - // If the master buffer has no gui associated with it, then the TocModel is - // not updated during the updateBuffer call and TocModel::toc_ is invalid - // (bug 5699). The same happens if the master buffer is open in a different + // If the master buffer has no gui associated with it, then the TocModel is + // not updated during the updateBuffer call and TocModel::toc_ is invalid + // (bug 5699). The same happens if the master buffer is open in a different // window. This test catches both possibilities. // See: http://marc.info/?l=lyx-devel&m=138590578911716&w=2 // There remains a problem here: If there is another child open in yet a third @@ -4479,6 +4461,7 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const d->bibinfo_cache_valid_ = true; d->cite_labels_valid_ = true; + /// FIXME: Perf cbuf.tocBackend().update(utype == OutputUpdate); if (scope == UpdateMaster) cbuf.structureChanged(); @@ -4750,13 +4733,13 @@ int Buffer::spellCheck(DocIterator & from, DocIterator & to, DocIterator const end = to_end ? doc_iterator_end(this) : to; // OK, we start from here. for (; from != end; from.forwardPos()) { - // We are only interested in text so remove the math CursorSlice. - while (from.inMathed()) { + // This skips all insets with spell check disabled. + while (!from.allowSpellCheck()) { from.pop_back(); from.pos()++; } // If from is at the end of the document (which is possible - // when leaving the mathed) LyX will crash later otherwise. + // when "from" was changed above) LyX will crash later otherwise. if (from.atEnd() || (!to_end && from >= end)) break; to = from; @@ -4766,7 +4749,6 @@ int Buffer::spellCheck(DocIterator & from, DocIterator & to, word_lang = wl; break; } - // Do not increase progress when from == to, otherwise the word // count will be wrong. if (from != to) { @@ -4884,6 +4866,8 @@ bool Buffer::saveAs(FileName const & fn) FileName const old_name = fileName(); FileName const old_auto = getAutosaveFileName(); bool const old_unnamed = isUnnamed(); + bool success = true; + d->old_position = filePath(); setFileName(fn); markDirty(); @@ -4901,22 +4885,19 @@ bool Buffer::saveAs(FileName const & fn) // are still valid. checkChildBuffers(); checkMasterBuffer(); - return true; } else { // save failed // reset the old filename and unnamed state setFileName(old_name); setUnnamed(old_unnamed); - return false; + success = false; } + + d->old_position.clear(); + return success; } -// FIXME We could do better here, but it is complicated. What would be -// nice is to offer either (a) to save the child buffer to an appropriate -// location, so that it would "move with the master", or else (b) to update -// the InsetInclude so that it pointed to the same file. But (a) is a bit -// complicated, because the code for this lives in GuiView. void Buffer::checkChildBuffers() { Impl::BufferPositionMap::iterator it = d->children_positions.begin(); @@ -4936,11 +4917,6 @@ void Buffer::checkChildBuffers() if (oldloc == newloc) continue; // the location of the child file is incorrect. - Alert::warning(_("Included File Invalid"), - bformat(_("Saving this document to a new location has made the file:\n" - " %1$s\n" - "inaccessible. You will need to update the included filename."), - from_utf8(oldloc))); cbuf->setParent(0); inset_inc->setChildBuffer(0); } @@ -4970,4 +4946,23 @@ void Buffer::checkMasterBuffer() setParent(0); } + +string Buffer::includedFilePath(string const & name, string const & ext) const +{ + bool isabsolute = FileName::isAbsolute(name); + // old_position already contains a trailing path separator + string const absname = isabsolute ? name : d->old_position + name; + + if (d->old_position.empty() + || equivalent(FileName(d->old_position), FileName(filePath())) + || !FileName(addExtension(absname, ext)).exists()) + return name; + + if (isabsolute) + return to_utf8(makeRelPath(from_utf8(name), from_utf8(filePath()))); + + return to_utf8(makeRelPath(from_utf8(FileName(absname).realPath()), + from_utf8(filePath()))); +} + } // namespace lyx