X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=3c7f1cc1e0f46c26fc9170d643cff3b50def377f;hb=3bf1b97ae547aea5d0243e41b2d8af463a6e40c5;hp=7cb5ac205d332b4130d6848a21f3e596d22bb87a;hpb=e366dba9bfb702a83f697e9eb75aa0a1ad5ef3ce;p=features.git diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 7cb5ac205d..3c7f1cc1e0 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -1110,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); @@ -1145,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); @@ -1739,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); } @@ -1851,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) @@ -1860,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; @@ -2079,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; @@ -2095,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)) @@ -2132,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. @@ -2146,13 +2164,13 @@ Buffer::ExportStatus Buffer::writeDocBookSource(odocstream & os, // 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"; + 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(); @@ -2185,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)) @@ -2383,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()) { @@ -2401,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())); } } @@ -2686,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 @@ -3547,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()) @@ -4938,6 +4953,10 @@ 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(); @@ -5160,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; }