X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=979b37ed5f27d220bfce3cec9f8954e5a8a4fc5c;hb=86fab2cefa122a5b0c0ee4ade472e41d9a3ff1cf;hp=1e526fa9da227f61b4cbdcdf9dbeaae1977c6182;hpb=bd4c74b3b783bb47c37d0f22da2206da7eabf3da;p=lyx.git diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 1e526fa9da..979b37ed5f 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -69,6 +69,7 @@ #include "insets/InsetBibitem.h" #include "insets/InsetBibtex.h" +#include "insets/InsetBranch.h" #include "insets/InsetInclude.h" #include "insets/InsetText.h" @@ -126,7 +127,7 @@ namespace { // Do not remove the comment below, so we get merge conflict in // independent branches. Instead add your own. -int const LYX_FORMAT = 362; // jspitzm: support applemac encoding +int const LYX_FORMAT = 364; // spitz: branch suffixes for filenames typedef map DepClean; typedef map > RefCache; @@ -439,12 +440,29 @@ Undo & Buffer::undo() string Buffer::latexName(bool const no_path) const { - FileName latex_name = makeLatexName(d->filename); + FileName latex_name = + makeLatexName(exportFileName()); return no_path ? latex_name.onlyFileName() : latex_name.absFilename(); } +FileName Buffer::exportFileName() const +{ + docstring const branch_suffix = + params().branchlist().getFilenameSuffix(); + if (branch_suffix.empty()) + return fileName(); + + string const name = fileName().onlyFileNameWithoutExt() + + to_utf8(branch_suffix); + FileName res(fileName().onlyPath().absFilename() + "/" + name); + res.changeExtension(fileName().extension()); + + return res; +} + + string Buffer::logName(LogType * type) const { string const filename = latexName(false); @@ -467,14 +485,31 @@ string Buffer::logName(LogType * type) const changeExtension(filename, formats.extension(bufferFormat()) + ".out")))); - // If no Latex log or Build log is newer, show Build log + // Also consider the master buffer log file + FileName masterfname = fname; + LogType mtype; + if (masterBuffer() != this) { + string const mlogfile = masterBuffer()->logName(&mtype); + masterfname = FileName(mlogfile); + } + // If no Latex log or Build log is newer, show Build log if (bname.exists() && - (!fname.exists() || fname.lastModified() < bname.lastModified())) { + ((!fname.exists() && !masterfname.exists()) + || (fname.lastModified() < bname.lastModified() + && masterfname.lastModified() < bname.lastModified()))) { LYXERR(Debug::FILES, "Log name calculated as: " << bname); if (type) *type = buildlog; return bname.absFilename(); + // If we have a newer master file log or only a master log, show this + } else if (fname != masterfname + && (!fname.exists() && (masterfname.exists() + || fname.lastModified() < masterfname.lastModified()))) { + LYXERR(Debug::FILES, "Log name calculated as: " << masterfname); + if (type) + *type = mtype; + return masterfname.absFilename(); } LYXERR(Debug::FILES, "Log name calculated as: " << fname); if (type) @@ -1604,6 +1639,8 @@ bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag) break; } + 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! flag.setEnabled(true); @@ -1640,6 +1677,28 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr) break; } + case LFUN_BRANCH_ADD: { + BranchList & branchList = params().branchlist(); + docstring const branchName = func.argument(); + if (branchName.empty()) { + dispatched = false; + break; + } + Branch * branch = branchList.find(branchName); + if (branch) { + LYXERR0("Branch " << branchName << " does already exist."); + dr.setError(true); + docstring const msg = + bformat(_("Branch \"%1$s\" does already exist."), branchName); + dr.setMessage(msg); + } else { + branchList.add(branchName); + dr.setError(false); + dr.update(Update::Force); + } + break; + } + case LFUN_BRANCH_ACTIVATE: case LFUN_BRANCH_DEACTIVATE: { BranchList & branchList = params().branchlist(); @@ -1664,6 +1723,41 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr) break; } + case LFUN_BRANCHES_RENAME: { + if (func.argument().empty()) + break; + + docstring const oldname = from_utf8(func.getArg(0)); + docstring const newname = from_utf8(func.getArg(1)); + InsetIterator it = inset_iterator_begin(inset()); + InsetIterator const end = inset_iterator_end(inset()); + bool success = false; + for (; it != end; ++it) { + if (it->lyxCode() == BRANCH_CODE) { + InsetBranch & ins = static_cast(*it); + if (ins.branch() == oldname) { + undo().recordUndo(it); + ins.rename(newname); + success = true; + continue; + } + } + if (it->lyxCode() == INCLUDE_CODE) { + // get buffer of external file + InsetInclude const & ins = + static_cast(*it); + Buffer * child = ins.getChildBuffer(); + if (!child) + continue; + child->dispatch(func, dr); + } + } + + if (success) + dr.update(Update::Force); + break; + } + case LFUN_BUFFER_PRINT: { // we'll assume there's a problem until we succeed dr.setError(true); @@ -2311,6 +2405,35 @@ void Buffer::updateMacros() const } +void Buffer::getUsedBranches(std::list & result, bool const from_master) const +{ + InsetIterator it = inset_iterator_begin(inset()); + InsetIterator const end = inset_iterator_end(inset()); + for (; it != end; ++it) { + if (it->lyxCode() == BRANCH_CODE) { + InsetBranch & br = static_cast(*it); + docstring const name = br.branch(); + if (!from_master && !params().branchlist().find(name)) + result.push_back(name); + else if (from_master && !masterBuffer()->params().branchlist().find(name)) + result.push_back(name); + continue; + } + if (it->lyxCode() == INCLUDE_CODE) { + // get buffer of external file + InsetInclude const & ins = + static_cast(*it); + Buffer * child = ins.getChildBuffer(); + if (!child) + continue; + child->getUsedBranches(result, true); + } + } + // remove duplicates + result.unique(); +} + + void Buffer::updateMacroInstances() const { LYXERR(Debug::MACROS, "updateMacroInstances for " @@ -2543,10 +2666,10 @@ void Buffer::structureChanged() const } -void Buffer::errors(string const & err) const +void Buffer::errors(string const & err, bool from_master) const { if (gui_) - gui_->errors(err); + gui_->errors(err, from_master); } @@ -2836,8 +2959,14 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir, tmp_result_file, FileName(absFileName()), backend_format, format, error_list); // Emit the signal to show the error list. - if (format != backend_format) + if (format != backend_format) { errors(error_type); + // also to the children, in case of master-buffer-view + std::vector clist = getChildren(); + for (vector::const_iterator cit = clist.begin(); + cit != clist.end(); ++cit) + (*cit)->errors(error_type, true); + } if (!success) return false; @@ -2846,7 +2975,7 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir, return true; } - result_file = changeExtension(absFileName(), ext); + result_file = changeExtension(exportFileName().absFilename(), ext); // We need to copy referenced files (e. g. included graphics // if format == "dvi") to the result dir. vector const files = @@ -3083,7 +3212,7 @@ void Buffer::updateLabels(UpdateScope scope) const // Do this here in case the master has no gui associated with it. Then, // the TocModel is not updated and TocModel::toc_ is invalid (bug 5699). if (!master->gui_) - structureChanged(); + structureChanged(); // was buf referenced from the master (i.e. not in bufToUpdate anymore)? if (bufToUpdate.find(this) == bufToUpdate.end()) @@ -3211,7 +3340,7 @@ static void setLabel(Buffer const & buf, ParIterator & it) if (layout.margintype == MARGIN_MANUAL || layout.latextype == LATEX_BIB_ENVIRONMENT) { if (par.params().labelWidthString().empty()) - par.params().labelWidthString(par.translateIfPossible(layout.labelstring(), bp)); + par.params().labelWidthString(par.expandLabel(layout, bp)); } else { par.params().labelWidthString(docstring()); } @@ -3277,7 +3406,8 @@ static void setLabel(Buffer const & buf, ParIterator & it) counters.reset(enumcounter); counters.step(enumcounter); - par.params().labelString(counters.theCounter(enumcounter)); + string const & lang = par.getParLanguage(bp)->code(); + par.params().labelString(counters.theCounter(enumcounter, lang)); break; } @@ -3290,10 +3420,11 @@ static void setLabel(Buffer const & buf, ParIterator & it) else { docstring name = buf.B_(textclass.floats().getType(type).name()); if (counters.hasCounter(from_utf8(type))) { + string const & lang = par.getParLanguage(bp)->code(); counters.step(from_utf8(type)); full_label = bformat(from_ascii("%1$s %2$s:"), name, - counters.theCounter(from_utf8(type))); + counters.theCounter(from_utf8(type), lang)); } else full_label = bformat(from_ascii("%1$s #:"), name); } @@ -3310,8 +3441,7 @@ static void setLabel(Buffer const & buf, ParIterator & it) case LABEL_CENTERED_TOP_ENVIRONMENT: case LABEL_STATIC: case LABEL_BIBLIO: - par.params().labelString( - par.translateIfPossible(layout.labelstring(), bp)); + par.params().labelString(par.expandLabel(layout, bp)); break; } } @@ -3348,77 +3478,27 @@ void Buffer::updateLabels(ParIterator & parit) const } -bool Buffer::nextWord(DocIterator & from, DocIterator & to, - docstring & word) const -{ - bool inword = false; - bool ignoreword = false; - string lang_code; - // Go backward a bit if needed in order to return the word currently - // pointed by 'from'. - while (from && from.pos() && isLetter(from)) - from.backwardPos(); - // OK, we start from here. - to = from; - while (to.depth()) { - if (isLetter(to)) { - if (!inword) { - inword = true; - ignoreword = false; - from = to; - word.clear(); - lang_code = to.paragraph().getFontSettings(params(), - to.pos()).language()->code(); - } - // Insets like optional hyphens and ligature - // break are part of a word. - if (!to.paragraph().isInset(to.pos())) { - char_type const c = to.paragraph().getChar(to.pos()); - word += c; - if (isDigit(c)) - ignoreword = true; - } - } else { // !isLetter(cur) - if (inword && !word.empty() && !ignoreword) - return true; - inword = false; - } - to.forwardPos(); - } - from = to; - word.clear(); - return false; -} - - int Buffer::spellCheck(DocIterator & from, DocIterator & to, WordLangTuple & word_lang, docstring_list & suggestions) const { int progress = 0; - SpellChecker::Result res = SpellChecker::OK; - SpellChecker * speller = theSpellChecker(); + WordLangTuple wl; suggestions.clear(); - docstring word; - while (nextWord(from, to, word)) { - ++progress; - string lang_code = lyxrc.spellchecker_use_alt_lang - ? lyxrc.spellchecker_alt_lang - : from.paragraph().getFontSettings(params(), from.pos()).language()->code(); - WordLangTuple wl(word, lang_code); - res = speller->check(wl); - // ... just bail out if the spellchecker reports an error. - if (!speller->error().empty()) { - throw ExceptionMessage(WarningException, - _("The spellchecker has failed."), speller->error()); - } - if (res != SpellChecker::OK && res != SpellChecker::IGNORED_WORD) { + word_lang = WordLangTuple(); + // OK, we start from here. + DocIterator const end = doc_iterator_end(this); + for (; from != end; from.forwardPos()) { + // We are only interested in text so remove the math CursorSlice. + while (from.inMathed()) + from.forwardInset(); + to = from; + if (from.paragraph().spellCheck(from.pos(), to.pos(), wl, suggestions)) { word_lang = wl; break; } from = to; + ++progress; } - while (!(word = speller->nextMiss()).empty()) - suggestions.push_back(word); return progress; }