X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=9826b51f7fd3b0bf068a8961be5bf141c878083c;hb=3bbce7f24afbb469fff5ad352778af73d57b44d8;hp=5c7b88682b1e0e041f841ea92af61ebbcf2b8b30;hpb=65b674ba4eff34df1ef7a7cf0f9e6a2585294c00;p=features.git diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 5c7b88682b..9826b51f7f 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -627,10 +627,9 @@ void Buffer::cloneWithChildren(BufferMap & bufmap, CloneList_ptr clones) const // The clone needs its own DocumentClass, since running updateBuffer() will // modify it, and we would otherwise be sharing it with the original Buffer. buffer_clone->params().makeDocumentClass(true); - ErrorList el; cap::switchBetweenClasses( params().documentClassPtr(), buffer_clone->params().documentClassPtr(), - static_cast(buffer_clone->inset()), el); + static_cast(buffer_clone->inset())); bufmap[this] = buffer_clone; clones->insert(buffer_clone); @@ -672,10 +671,9 @@ Buffer * Buffer::cloneBufferOnly() const { // The clone needs its own DocumentClass, since running updateBuffer() will // modify it, and we would otherwise be sharing it with the original Buffer. buffer_clone->params().makeDocumentClass(true); - ErrorList el; cap::switchBetweenClasses( params().documentClassPtr(), buffer_clone->params().documentClassPtr(), - static_cast(buffer_clone->inset()), el); + static_cast(buffer_clone->inset())); clones->insert(buffer_clone); buffer_clone->d->clone_list_ = clones; @@ -963,6 +961,7 @@ int Buffer::readHeader(Lexer & lex) params().biblatex_citestyle.erase(); params().multibib.erase(); params().lineno_opts.clear(); + params().spellignore().clear(); for (int i = 0; i < 4; ++i) { params().user_defined_bullet(i) = ITEMIZE_DEFAULTS[i]; @@ -1111,6 +1110,24 @@ bool Buffer::readDocument(Lexer & lex) } +bool Buffer::isSyncTeXenabled() const +{ + bool enabled = params().output_sync; + + if (!enabled) + for (auto const & c : theConverters()) { + const string dest = c.to().substr(0,3); + if (dest == "dvi" || dest == "pdf") { + const string cmd = c.command(); + enabled |= cmd.find("-synctex=") != string::npos + && cmd.find("-synctex=0") == string::npos; + if (enabled) + break; + } + } + return enabled; +} + bool Buffer::importString(string const & format, docstring const & contents, ErrorList & errorList) { Format const * fmt = theFormats().getFormat(format); @@ -1146,7 +1163,7 @@ bool Buffer::importFile(string const & format, FileName const & name, ErrorList FileName const lyx = tempFileName("Buffer_importFileXXXXXX.lyx"); Converters::RetVal const retval = - theConverters().convert(nullptr, name, lyx, name, format, "lyx", errorList); + theConverters().convert(this, name, lyx, name, format, "lyx", errorList); if (retval == Converters::SUCCESS) { bool const success = readFile(lyx) == ReadSuccess; removeTempFile(lyx); @@ -1740,7 +1757,7 @@ Buffer::ExportStatus Buffer::makeLaTeXFile(FileName const & fname, OutputParams runparams = runparams_in; string const encoding = runparams.encoding->iconvName(); - LYXERR(Debug::LATEX, "makeLaTeXFile encoding: " << encoding << ", fname=" << fname.realPath()); + LYXERR(Debug::OUTFILE, "makeLaTeXFile encoding: " << encoding << ", fname=" << fname.realPath()); ofdocstream ofs; try { ofs.reset(encoding); } @@ -1813,7 +1830,7 @@ Buffer::ExportStatus Buffer::makeLaTeXFile(FileName const & fname, lyx_exit(1); } - d->texrow = move(os.texrow()); + d->texrow = std::move(os.texrow()); ofs.close(); if (ofs.fail()) { @@ -1852,7 +1869,7 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os, BufferEncodings::initUnicodeMath(*this); // validate the buffer. - LYXERR(Debug::LATEX, " Validating buffer..."); + LYXERR(Debug::OUTFILE, " Validating buffer..."); LaTeXFeatures features(*this, params(), runparams); validate(features); // This is only set once per document (in master) @@ -1861,7 +1878,7 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os, runparams.use_hyperref = features.isRequired("hyperref"); runparams.use_CJK = features.mustProvide("CJK"); } - LYXERR(Debug::LATEX, " Buffer validation done."); + LYXERR(Debug::OUTFILE, " Buffer validation done."); bool const output_preamble = output == FullSource || output == OnlyPreamble; @@ -2080,9 +2097,9 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os, if (output_preamble) { os << "\\end{document}\n"; - LYXERR(Debug::LATEX, "makeLaTeXFile...done"); + LYXERR(Debug::OUTFILE, "makeLaTeXFile...done"); } else { - LYXERR(Debug::LATEX, "LaTeXFile for inclusion made."); + LYXERR(Debug::OUTFILE, "LaTeXFile for inclusion made."); } runparams_in.encoding = runparams.encoding; @@ -2096,7 +2113,7 @@ Buffer::ExportStatus Buffer::makeDocBookFile(FileName const & fname, OutputParams const & runparams, OutputWhat output) const { - LYXERR(Debug::LATEX, "makeDocBookFile..."); + LYXERR(Debug::OUTFILE, "makeDocBookFile..."); ofdocstream ofs; if (!openFileWrite(ofs, fname)) @@ -2107,8 +2124,7 @@ Buffer::ExportStatus Buffer::makeDocBookFile(FileName const & fname, updateBuffer(); updateMacroInstances(OutputUpdate); - ExportStatus const retval = - writeDocBookSource(ofs, runparams, output); + ExportStatus const retval = writeDocBookSource(ofs, runparams, output); if (retval == ExportKilled) return ExportKilled; @@ -2134,7 +2150,7 @@ Buffer::ExportStatus Buffer::writeDocBookSource(odocstream & os, bool const output_preamble = output == FullSource || output == OnlyPreamble; bool const output_body = - output == FullSource || output == OnlyBody || output == IncludedFile; + output == FullSource || output == OnlyBody || output == IncludedFile; if (output_preamble) { // XML preamble, no doctype needed. @@ -2145,12 +2161,23 @@ Buffer::ExportStatus Buffer::writeDocBookSource(odocstream & os, << "\n"; + // Prepare the name space declaration for MathML depending on document preferences. + string mathmlNamespace; + if (params().docbook_mathml_prefix != BufferParams::NoPrefix) { + string mathmlPrefix; + if (params().docbook_mathml_prefix == BufferParams::MPrefix) + mathmlPrefix = "m"; + else if (params().docbook_mathml_prefix == BufferParams::MMLPrefix) + mathmlPrefix = "mml"; + mathmlNamespace = + " xmlns:" + mathmlPrefix + "=\"http://www.w3.org/1998/Math/MathML\""; + } + // Directly output the root tag, based on the current type of document. string languageCode = params().language->code(); string params = "xml:lang=\"" + languageCode + '"' + " xmlns=\"http://docbook.org/ns/docbook\"" + " xmlns:xlink=\"http://www.w3.org/1999/xlink\"" - + " xmlns:m=\"http://www.w3.org/1998/Math/MathML\"" + + mathmlNamespace + " xmlns:xi=\"http://www.w3.org/2001/XInclude\"" + " version=\"5.2\""; @@ -2176,7 +2203,7 @@ Buffer::ExportStatus Buffer::writeDocBookSource(odocstream & os, Buffer::ExportStatus Buffer::makeLyXHTMLFile(FileName const & fname, OutputParams const & runparams) const { - LYXERR(Debug::LATEX, "makeLyXHTMLFile..."); + LYXERR(Debug::OUTFILE, "makeLyXHTMLFile..."); ofdocstream ofs; if (!openFileWrite(ofs, fname)) @@ -2374,13 +2401,13 @@ void Buffer::validate(LaTeXFeatures & features) const for (Paragraph const & p : paragraphs()) p.validate(features); - if (lyxerr.debugging(Debug::LATEX)) { + if (lyxerr.debugging(Debug::OUTFILE)) { features.showStruct(); } } -void Buffer::getLabelList(vector & list) const +void Buffer::getLabelList(vector> & list) const { // If this is a child document, use the master's list instead. if (parent()) { @@ -2392,7 +2419,7 @@ void Buffer::getLabelList(vector & list) const shared_ptr toc = d->toc_backend.toc("label"); for (auto const & tocit : *toc) { if (tocit.depth() == 0) - list.push_back(tocit.str()); + list.push_back(make_pair(tocit.str(), tocit.asString())); } } @@ -2677,7 +2704,7 @@ void Buffer::markDepClean(string const & name) } -bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag) +bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag) const { if (isInternal()) { // FIXME? if there is an Buffer LFUN that can be dispatched even @@ -3538,9 +3565,6 @@ void Buffer::collectChildren(ListOfBuffers & children, bool grand_children) cons // loop over children for (auto const & p : d->children_positions) { Buffer * child = const_cast(p.first); - // This can happen when called during GUI operations - if (!theBufferList().isLoaded(child)) - continue; // No duplicates ListOfBuffers::const_iterator bit = find(children.begin(), children.end(), child); if (bit != children.end()) @@ -3817,7 +3841,7 @@ void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope) // 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)); + Impl::ScopeMacro(scope, MacroData(owner_, it)); } // next paragraph @@ -4361,6 +4385,9 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir void Buffer::setMathFlavor(OutputParams & op) const { + // Passes the way to generate formulae to the XHTML output code. + // In particular, this function has no impact on the DocBook code, as it + // uses another mechanism to handle math flavours. switch (params().html_math_output) { case BufferParams::MathML: op.math_flavor = OutputParams::MathAsMathML; @@ -4404,7 +4431,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir Converters converters = theConverters(); bool need_nice_file = false; if (find(backs.begin(), backs.end(), format) == backs.end()) { - // Get shortest path to format + // Get the shortest path to format converters.buildGraph(); Graph::EdgePath path; for (string const & sit : backs) { @@ -4570,7 +4597,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir result_file = changeExtension(d->exportFileName().absFileName(), ext); else result_file = dest_filename; - // We need to copy referenced files (e. g. included graphics + // We need to copy referenced files (e.g. included graphics // if format == "dvi") to the result dir. vector const extfiles = runparams.exportdata->externalFiles(format); @@ -4695,7 +4722,7 @@ Buffer::ReadStatus Buffer::loadEmergency() "%1$s exists.\n\nRecover emergency save?"), file); int const load_emerg = Alert::prompt(_("Load emergency save?"), text, - 0, 2, _("&Recover"), _("&Load Original"), _("&Cancel")); + 0, 3, _("&Recover"), _("&Load Original"), _("&Only show difference"), _("&Cancel")); switch (load_emerg) { @@ -4770,6 +4797,22 @@ Buffer::ReadStatus Buffer::loadEmergency() return ReadOriginal; } + case 2: { + string const f1 = d->filename.absFileName(); + string const f2 = emergencyFile.absFileName(); + if (loadThisLyXFile(d->filename) != ReadSuccess) + return ReadCancel; + string const par = "compare run-blocking " + quoteName(f1) + " " + quoteName(f2); + LYXERR(Debug::FILES, par << "\n"); + lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, par)); + + //release the emergency buffer loaded by compare + Buffer * emerBuffer = theBufferList().getBuffer(emergencyFile); + if (emerBuffer) + theBufferList().release(emerBuffer); + + return ReadCancel; //Release the buffer of Original immediatelly + } default: break; } @@ -4899,10 +4942,21 @@ void Buffer::bufferRefs(TeXErrors const & terr, ErrorList & errorList) const } +void Buffer::updateBuffer() const +{ + updateBuffer(UpdateMaster, InternalUpdate); + d->need_update = false; +} + + void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const { LBUFERR(!text().paragraphs().empty()); + // This can be called when loading a file, so that there be no + // open undo group. + UndoGroupHelper ugh(const_cast(this)); + // Use the master text class also for child documents Buffer const * const master = masterBuffer(); DocumentClass const & textclass = master->params().documentClass(); @@ -5125,31 +5179,11 @@ void Buffer::Impl::setLabel(ParIterator & it, UpdateType utype) const switch(layout.labeltype) { case LABEL_ITEMIZE: { - // At some point of time we should do something more - // clever here, like: - // par.params().labelString( - // bp.user_defined_bullet(par.itemdepth).getText()); - // for now, use a simple hardcoded label - docstring itemlabel; - switch (par.itemdepth) { - case 0: - // • U+2022 BULLET - itemlabel = char_type(0x2022); - break; - case 1: - // – U+2013 EN DASH - itemlabel = char_type(0x2013); - break; - case 2: - // ∗ U+2217 ASTERISK OPERATOR - itemlabel = char_type(0x2217); - break; - case 3: - // · U+00B7 MIDDLE DOT - itemlabel = char_type(0x00b7); - break; - } - par.params().labelString(itemlabel); + par.params().labelString( + (par.itemdepth < 4) + ? bp.user_defined_bullet(par.itemdepth).getLabel() + // Display fallback for too deeply nested items + : bformat(from_ascii("[?%1$d]"), int(par.itemdepth + 1))); break; } @@ -5346,6 +5380,15 @@ int Buffer::spellCheck(DocIterator & from, DocIterator & to, } +void Buffer::requestSpellcheck() +{ + ParagraphList::iterator pit = paragraphs().begin(); + ParagraphList::iterator pend = paragraphs().end(); + for (; pit != pend; ++pit) + pit->requestSpellCheck(); +} + + void Buffer::Impl::updateStatistics(DocIterator & from, DocIterator & to, bool skipNoOutput) { bool inword = false;