#include "Chktex.h"
#include "Converter.h"
#include "Counters.h"
-#include "debug.h"
#include "DocIterator.h"
#include "EmbeddedFiles.h"
#include "Encoding.h"
#include "Exporter.h"
#include "Format.h"
#include "FuncRequest.h"
-#include "gettext.h"
#include "InsetIterator.h"
#include "InsetList.h"
#include "Language.h"
#include "LyX.h"
#include "LyXRC.h"
#include "LyXVC.h"
-#include "Messages.h"
#include "output_docbook.h"
#include "output.h"
#include "output_latex.h"
#include "frontends/alert.h"
#include "frontends/Delegates.h"
#include "frontends/WorkAreaManager.h"
-#include "frontends/FileDialog.h"
#include "graphics/Previews.h"
-#include "support/types.h"
-#include "support/lyxalgo.h"
-#include "support/FileFilterList.h"
+#include "support/convert.h"
+#include "support/debug.h"
+#include "support/ExceptionMessage.h"
+#include "support/FileName.h"
+#include "support/FileNameList.h"
#include "support/filetools.h"
-#include "support/Forkedcall.h"
+#include "support/ForkedCalls.h"
+#include "support/gettext.h"
#include "support/gzstream.h"
-#include "support/lyxlib.h"
+#include "support/lstrings.h"
+#include "support/lyxalgo.h"
#include "support/os.h"
+#include "support/Package.h"
#include "support/Path.h"
#include "support/textutils.h"
-#include "support/convert.h"
-
-#if !defined (HAVE_FORK)
-# define fork() -1
-#endif
+#include "support/types.h"
+#include "support/FileZipListDir.h"
#include <boost/bind.hpp>
#include <boost/shared_ptr.hpp>
#include <sstream>
#include <fstream>
-using std::endl;
-using std::for_each;
-using std::make_pair;
-
-using std::ios;
-using std::map;
-using std::ostream;
-using std::ostringstream;
-using std::ofstream;
-using std::ifstream;
-using std::pair;
-using std::stack;
-using std::vector;
-using std::string;
-using std::time_t;
+using namespace std;
+using namespace lyx::support;
namespace lyx {
-using support::addName;
-using support::bformat;
-using support::changeExtension;
-using support::cmd_ret;
-using support::createBufferTmpDir;
-using support::FileName;
-using support::libFileSearch;
-using support::latex_path;
-using support::ltrim;
-using support::makeAbsPath;
-using support::makeDisplayPath;
-using support::makeLatexName;
-using support::onlyFilename;
-using support::onlyPath;
-using support::quoteName;
-using support::removeAutosaveFile;
-using support::rename;
-using support::runCommand;
-using support::split;
-using support::subst;
-using support::tempName;
-using support::trim;
-using support::sum;
-using support::suffixIs;
-
namespace Alert = frontend::Alert;
namespace os = support::os;
namespace {
-int const LYX_FORMAT = 299; // Uwe: Hyperlink types
+int const LYX_FORMAT = 315; // Richard Heck: column separation
} // namespace anon
-typedef std::map<string, bool> DepClean;
+typedef map<string, bool> DepClean;
class Buffer::Impl
{
public:
Impl(Buffer & parent, FileName const & file, bool readonly);
+
+ ~Impl()
+ {
+ if (wa_) {
+ wa_->closeAll();
+ delete wa_;
+ }
+ }
BufferParams params;
LyXVC lyxvc;
- string temppath;
- TexRow texrow;
+ FileName temppath;
+ mutable TexRow texrow;
+ Buffer const * parent_buffer;
/// need to regenerate .tex?
DepClean dep_clean;
InsetText inset;
///
- TocBackend toc_backend;
-
- /// macro table
- typedef std::map<unsigned int, MacroData, std::greater<int> > PositionToMacroMap;
- typedef std::map<docstring, PositionToMacroMap> NameToPositionMacroMap;
- NameToPositionMacroMap macros;
+ mutable TocBackend toc_backend;
+
+ /// macro tables
+ typedef pair<DocIterator, MacroData> ScopeMacro;
+ typedef map<DocIterator, ScopeMacro> PositionScopeMacroMap;
+ typedef map<docstring, PositionScopeMacroMap> NamePositionScopeMacroMap;
+ NamePositionScopeMacroMap macros;
+ bool macro_lock;
+
+ /// positions of child buffers in the buffer
+ typedef map<Buffer const * const, DocIterator> BufferPositionMap;
+ typedef pair<DocIterator, Buffer const *> ScopeBuffer;
+ typedef map<DocIterator, ScopeBuffer> PositionScopeBufferMap;
+ BufferPositionMap children_positions;
+ PositionScopeBufferMap position_to_children;
/// Container for all sort of Buffer dependant errors.
map<string, ErrorList> errorLists;
/// all embedded files of this buffer
- EmbeddedFiles embedded_files;
+ EmbeddedFileList embedded_files;
/// timestamp and checksum used to test if the file has been externally
/// modified. (Used to properly enable 'File->Revert to saved', bug 4114).
///
Undo undo_;
+
+ /// A cache for the bibfiles (including bibfiles of loaded child
+ /// documents), needed for appropriate update of natbib labels.
+ mutable EmbeddedFileList bibfilesCache_;
};
+/// Creates the per buffer temporary directory
+static FileName createBufferTmpDir()
+{
+ static int count;
+ // We are in our own directory. Why bother to mangle name?
+ // In fact I wrote this code to circumvent a problematic behaviour
+ // (bug?) of EMX mkstemp().
+ FileName tmpfl(package().temp_dir().absFilename() + "/lyx_tmpbuf" +
+ convert<string>(count++));
+
+ if (!tmpfl.createDirectory(0777)) {
+ throw ExceptionMessage(WarningException, _("Disk Error: "), bformat(
+ _("LyX could not create the temporary directory '%1$s' (Disk is full maybe?)"),
+ from_utf8(tmpfl.absFilename())));
+ }
+ return tmpfl;
+}
+
Buffer::Impl::Impl(Buffer & parent, FileName const & file, bool readonly_)
- : lyx_clean(true), bak_clean(true), unnamed(false), read_only(readonly_),
- filename(file), file_fully_loaded(false), inset(params),
- toc_backend(&parent), embedded_files(&parent), timestamp_(0),
- checksum_(0), wa_(0), undo_(parent)
+ : parent_buffer(0), lyx_clean(true), bak_clean(true), unnamed(false),
+ read_only(readonly_), filename(file), file_fully_loaded(false),
+ inset(params), toc_backend(&parent), macro_lock(false),
+ embedded_files(), timestamp_(0), checksum_(0), wa_(0),
+ undo_(parent)
{
+ temppath = createBufferTmpDir();
inset.setAutoBreakRows(true);
lyxvc.setBuffer(&parent);
- temppath = createBufferTmpDir();
- params.filepath = onlyPath(file.absFilename());
- // 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
-
if (use_gui)
wa_ = new frontend::WorkAreaManager;
}
Buffer::Buffer(string const & file, bool readonly)
- : pimpl_(new Impl(*this, FileName(file), readonly)), gui_(0)
+ : d(new Impl(*this, FileName(file), readonly)), gui_(0)
{
- LYXERR(Debug::INFO) << "Buffer::Buffer()" << endl;
+ LYXERR(Debug::INFO, "Buffer::Buffer()");
+
+ d->inset.getText(0)->setMacrocontextPosition(par_iterator_begin());
}
Buffer::~Buffer()
{
- LYXERR(Debug::INFO) << "Buffer::~Buffer()" << endl;
+ LYXERR(Debug::INFO, "Buffer::~Buffer()");
// here the buffer should take care that it is
// saved properly, before it goes into the void.
- Buffer * master = masterBuffer();
- if (master != this && use_gui)
+ // GuiView already destroyed
+ gui_ = 0;
+
+ Buffer const * master = masterBuffer();
+ if (master != this && use_gui) {
// We are closing buf which was a child document so we
// must update the labels and section numbering of its master
// Buffer.
updateLabels(*master);
+ master->updateMacros();
+ }
- if (!temppath().empty() && !FileName(temppath()).destroyDirectory()) {
+ resetChildDocuments(false);
+
+ if (!d->temppath.destroyDirectory()) {
Alert::warning(_("Could not remove temporary directory"),
bformat(_("Could not remove the temporary directory %1$s"),
- from_utf8(temppath())));
+ from_utf8(d->temppath.absFilename())));
}
// Remove any previewed LaTeX snippets associated with this buffer.
graphics::Previews::get().removeLoader(*this);
- if (pimpl_->wa_) {
- pimpl_->wa_->closeAll();
- delete pimpl_->wa_;
- }
- delete pimpl_;
+ delete d;
}
void Buffer::changed() const
{
- if (pimpl_->wa_)
- pimpl_->wa_->redrawAll();
+ if (d->wa_)
+ d->wa_->redrawAll();
}
frontend::WorkAreaManager & Buffer::workAreaManager() const
{
- BOOST_ASSERT(pimpl_->wa_);
- return *pimpl_->wa_;
+ BOOST_ASSERT(d->wa_);
+ return *d->wa_;
}
Text & Buffer::text() const
{
- return const_cast<Text &>(pimpl_->inset.text_);
+ return const_cast<Text &>(d->inset.text_);
}
Inset & Buffer::inset() const
{
- return const_cast<InsetText &>(pimpl_->inset);
+ return const_cast<InsetText &>(d->inset);
}
BufferParams & Buffer::params()
{
- return pimpl_->params;
+ return d->params;
}
BufferParams const & Buffer::params() const
{
- return pimpl_->params;
+ return d->params;
}
LyXVC & Buffer::lyxvc()
{
- return pimpl_->lyxvc;
+ return d->lyxvc;
}
LyXVC const & Buffer::lyxvc() const
{
- return pimpl_->lyxvc;
-}
-
-
-string const & Buffer::temppath() const
-{
- return pimpl_->temppath;
+ return d->lyxvc;
}
-TexRow & Buffer::texrow()
+string const Buffer::temppath() const
{
- return pimpl_->texrow;
+ return d->temppath.absFilename();
}
TexRow const & Buffer::texrow() const
{
- return pimpl_->texrow;
+ return d->texrow;
}
-TocBackend & Buffer::tocBackend()
+TocBackend & Buffer::tocBackend() const
{
- return pimpl_->toc_backend;
+ return d->toc_backend;
}
-TocBackend const & Buffer::tocBackend() const
+EmbeddedFileList & Buffer::embeddedFiles()
{
- return pimpl_->toc_backend;
+ return d->embedded_files;
}
-EmbeddedFiles & Buffer::embeddedFiles()
+EmbeddedFileList const & Buffer::embeddedFiles() const
{
- return pimpl_->embedded_files;
+ return d->embedded_files;
}
-EmbeddedFiles const & Buffer::embeddedFiles() const
+bool Buffer::embedded() const
{
- return pimpl_->embedded_files;
+ return params().embedded;
}
Undo & Buffer::undo()
{
- return pimpl_->undo_;
+ return d->undo_;
}
string Buffer::latexName(bool const no_path) const
{
- string const name = changeExtension(makeLatexName(absFileName()), ".tex");
- return no_path ? onlyFilename(name) : name;
+ FileName latex_name = makeLatexName(d->filename);
+ return no_path ? latex_name.onlyFileName()
+ : latex_name.absFilename();
}
if (bname.exists() &&
(!fname.exists() || fname.lastModified() < bname.lastModified())) {
- LYXERR(Debug::FILES) << "Log name calculated as: " << bname << endl;
+ LYXERR(Debug::FILES, "Log name calculated as: " << bname);
if (type)
*type = buildlog;
return bname.absFilename();
}
- LYXERR(Debug::FILES) << "Log name calculated as: " << fname << endl;
+ LYXERR(Debug::FILES, "Log name calculated as: " << fname);
if (type)
*type = latexlog;
return fname.absFilename();
void Buffer::setReadonly(bool const flag)
{
- if (pimpl_->read_only != flag) {
- pimpl_->read_only = flag;
+ if (d->read_only != flag) {
+ d->read_only = flag;
setReadOnly(flag);
}
}
void Buffer::setFileName(string const & newfile)
{
- pimpl_->filename = makeAbsPath(newfile);
- params().filepath = onlyPath(pimpl_->filename.absFilename());
- setReadonly(pimpl_->filename.isReadOnly());
+ d->filename = makeAbsPath(newfile);
+ setReadonly(d->filename.isReadOnly());
updateTitles();
}
params().headheight.erase();
params().headsep.erase();
params().footskip.erase();
+ params().columnsep.erase();
params().listings_params.clear();
params().clearLayoutModules();
params().pdfoptions().clear();
params().temp_bullet(i) = ITEMIZE_DEFAULTS[i];
}
- ErrorList & errorList = pimpl_->errorLists["Parse"];
+ ErrorList & errorList = d->errorLists["Parse"];
while (lex.isOK()) {
lex.next();
continue;
}
- LYXERR(Debug::PARSER) << "Handling document header token: `"
- << token << '\'' << endl;
+ LYXERR(Debug::PARSER, "Handling document header token: `"
+ << token << '\'');
- string unknown = params().readToken(lex, token);
+ string unknown = params().readToken(lex, token, d->filename.onlyPath());
if (!unknown.empty()) {
if (unknown[0] != '\\' && token == "\\textclass") {
Alert::warning(_("Unknown document class"),
errorList.push_back(ErrorItem(_("Document header error"),
s, -1, 0, 0));
}
+
+ params().makeTextClass();
return unknown_tokens;
}
// Returns false if "\end_document" is not read (Asger)
bool Buffer::readDocument(Lexer & lex)
{
- ErrorList & errorList = pimpl_->errorLists["Parse"];
+ ErrorList & errorList = d->errorLists["Parse"];
errorList.clear();
lex.next();
BOOST_ASSERT(paragraphs().empty());
readHeader(lex);
- TextClass const & baseClass = textclasslist[params().getBaseClass()];
- if (!baseClass.load(filePath())) {
- string theclass = baseClass.name();
- Alert::error(_("Can't load document class"), bformat(
- _("Using the default document class, because the "
- "class %1$s could not be loaded."), from_utf8(theclass)));
- params().setBaseClass(defaultTextclass());
- }
if (params().outputChanges) {
bool dvipost = LaTeXFeatures::isAvailable("dvipost");
}
// read main text
- bool const res = text().read(*this, lex, errorList);
- for_each(text().paragraphs().begin(),
- text().paragraphs().end(),
- bind(&Paragraph::setInsetOwner, _1, &inset()));
+ bool const res = text().read(*this, lex, errorList, &(d->inset));
+ updateMacros();
+ updateMacroInstances();
return res;
}
}
-bool Buffer::readString(std::string const & s)
+bool Buffer::readString(string const & s)
{
params().compressed = false;
// remove dummy empty par
paragraphs().clear();
Lexer lex(0, 0);
- std::istringstream is(s);
+ istringstream is(s);
lex.setStream(is);
- FileName const name(tempName());
+ FileName const name = FileName::tempName();
switch (readFile(lex, name, true)) {
case failure:
return false;
case wrongversion: {
// We need to call lyx2lyx, so write the input to a file
- std::ofstream os(name.toFilesystemEncoding().c_str());
+ ofstream os(name.toFilesystemEncoding().c_str());
os << s;
os.close();
return readFile(name);
string format = filename.guessFormatFromContents();
if (format == "zip") {
// decompress to a temp directory
- LYXERR(Debug::FILES) << filename << " is in zip format. Unzip to " << temppath() << endl;
+ LYXERR(Debug::FILES, filename << " is in zip format. Unzip to " << temppath());
::unzipToDir(filename.toFilesystemEncoding(), temppath());
//
FileName lyxfile(addName(temppath(), "content.lyx"));
// if both manifest.txt and file.lyx exist, this is am embedded file
if (lyxfile.exists()) {
+ // if in bundled format, save checksum of the compressed file, not content.lyx
+ saveCheckSum(filename);
params().embedded = true;
fname = lyxfile;
}
bool Buffer::isFullyLoaded() const
{
- return pimpl_->file_fully_loaded;
+ return d->file_fully_loaded;
}
void Buffer::setFullyLoaded(bool value)
{
- pimpl_->file_fully_loaded = value;
+ d->file_fully_loaded = value;
}
// save timestamp and checksum of the original disk file, making sure
// to not overwrite them with those of the file created in the tempdir
// when it has to be converted to the current format.
- if (!pimpl_->checksum_) {
+ if (!d->checksum_) {
// Save the timestamp and checksum of disk file. If filename is an
- // emergency file, save the timestamp and sum of the original lyx file
+ // emergency file, save the timestamp and checksum of the original lyx file
// because isExternallyModified will check for this file. (BUG4193)
- string diskfile = filename.toFilesystemEncoding();
+ string diskfile = filename.absFilename();
if (suffixIs(diskfile, ".emergency"))
diskfile = diskfile.substr(0, diskfile.size() - 10);
saveCheckSum(FileName(diskfile));
// lyx2lyx would fail
return wrongversion;
- FileName const tmpfile(tempName());
+ FileName const tmpfile = FileName::tempName();
if (tmpfile.empty()) {
Alert::error(_("Conversion failed"),
bformat(_("%1$s is from a different"
<< ' ' << quoteName(filename.toFilesystemEncoding());
string const command_str = command.str();
- LYXERR(Debug::INFO) << "Running '"
- << command_str << '\''
- << endl;
+ LYXERR(Debug::INFO, "Running '" << command_str << '\'');
cmd_ret const ret = runCommand(command_str);
if (ret.first != 0) {
from_utf8(filename.absFilename())));
}
- pimpl_->file_fully_loaded = true;
+ d->file_fully_loaded = true;
return success;
}
// We don't need autosaves in the immediate future. (Asger)
resetAutosaveTimers();
- string const encodedFilename = pimpl_->filename.toFilesystemEncoding();
+ string const encodedFilename = d->filename.toFilesystemEncoding();
FileName backupName;
bool madeBackup = false;
backupName = FileName(absFileName() + '~');
if (!lyxrc.backupdir_path.empty()) {
string const mangledName =
- subst(subst(os::internal_path(
- backupName.absFilename()), '/', '!'), ':', '!');
+ subst(subst(backupName.absFilename(), '/', '!'), ':', '!');
backupName = FileName(addName(lyxrc.backupdir_path,
mangledName));
}
- if (fileName().copyTo(backupName, false)) {
+ if (fileName().copyTo(backupName)) {
madeBackup = true;
} else {
Alert::error(_("Backup failure"),
bformat(_("Cannot create backup file %1$s.\n"
"Please check whether the directory exists and is writeable."),
from_utf8(backupName.absFilename())));
- //LYXERR(Debug::DEBUG) << "Fs error: " << fe.what() << endl;
+ //LYXERR(Debug::DEBUG, "Fs error: " << fe.what());
}
}
return false;
}
- if (writeFile(pimpl_->filename)) {
+ if (writeFile(d->filename)) {
markClean();
- removeAutosaveFile(absFileName());
- saveCheckSum(pimpl_->filename);
return true;
} else {
// Saving failed, so backup is not backup
if (madeBackup)
- rename(backupName, pimpl_->filename);
+ backupName.moveTo(d->filename);
return false;
}
}
bool Buffer::writeFile(FileName const & fname) const
{
- if (pimpl_->read_only && fname == pimpl_->filename)
+ if (d->read_only && fname == d->filename)
return false;
bool retval = false;
content = FileName(addName(temppath(), "content.lyx"));
else
content = fname;
-
+
+ docstring const str = bformat(_("Saving document %1$s..."),
+ makeDisplayPath(content.absFilename()));
+ message(str);
+
if (params().compressed) {
gz::ogzstream ofs(content.toFilesystemEncoding().c_str(), ios::out|ios::trunc);
- if (!ofs)
- return false;
-
- retval = write(ofs);
+ retval = ofs && write(ofs);
} else {
ofstream ofs(content.toFilesystemEncoding().c_str(), ios::out|ios::trunc);
- if (!ofs)
- return false;
+ retval = ofs && write(ofs);
+ }
- retval = write(ofs);
+ if (!retval) {
+ message(str + _(" could not write file!."));
+ return false;
}
- if (retval && params().embedded) {
- // write file.lyx and all the embedded files to the zip file fname
- // if embedding is enabled
- return pimpl_->embedded_files.writeFile(fname);
+ removeAutosaveFile(d->filename.absFilename());
+
+ if (params().embedded) {
+ message(str + _(" writing embedded files!."));
+ // if embedding is enabled, write file.lyx and all the embedded files
+ // to the zip file fname.
+ if (!d->embedded_files.writeFile(fname, *this)) {
+ message(str + _(" could not write embedded files!."));
+ return false;
+ }
}
- return retval;
+ saveCheckSum(d->filename);
+ message(str + _(" done."));
+
+ return true;
}
{
#ifdef HAVE_LOCALE
// Use the standard "C" locale for file output.
- ofs.imbue(std::locale::classic());
+ ofs.imbue(locale::classic());
#endif
// The top of the file should not be written by params().
<< "\\lyxformat " << LYX_FORMAT << "\n"
<< "\\begin_document\n";
-
/// For each author, set 'used' to true if there is a change
/// by this author in the document; otherwise set it to 'false'.
AuthorList::Authors::const_iterator a_it = params().authors().begin();
for (; a_it != a_end; ++a_it)
a_it->second.setUsed(false);
- ParIterator const end = par_iterator_end();
- ParIterator it = par_iterator_begin();
+ ParIterator const end = const_cast<Buffer *>(this)->par_iterator_end();
+ ParIterator it = const_cast<Buffer *>(this)->par_iterator_begin();
for ( ; it != end; ++it)
it->checkAuthors(params().authors());
bool Buffer::makeLaTeXFile(FileName const & fname,
string const & original_path,
OutputParams const & runparams,
- bool output_preamble, bool output_body)
+ bool output_preamble, bool output_body) const
{
string const encoding = runparams.encoding->iconvName();
- LYXERR(Debug::LATEX) << "makeLaTeXFile encoding: "
- << encoding << "..." << endl;
+ LYXERR(Debug::LATEX, "makeLaTeXFile encoding: " << encoding << "...");
- odocfstream ofs(encoding);
+ odocfstream ofs;
+ try { ofs.reset(encoding); }
+ catch (iconv_codecvt_facet_exception & e) {
+ lyxerr << "Caught iconv exception: " << e.what() << endl;
+ Alert::error(_("Iconv software exception Detected"), bformat(_("Please "
+ "verify that the support software for your encoding (%1$s) is "
+ "properly installed"), from_ascii(encoding)));
+ return false;
+ }
if (!openFileWrite(ofs, fname))
return false;
//TexStream ts(ofs.rdbuf(), &texrow());
-
+ ErrorList & errorList = d->errorLists["Export"];
+ errorList.clear();
bool failed_export = false;
try {
- texrow().reset();
+ d->texrow.reset();
writeLaTeXSource(ofs, original_path,
runparams, output_preamble, output_body);
}
+ catch (EncodingException & e) {
+ odocstringstream ods;
+ ods.put(e.failed_char);
+ ostringstream oss;
+ oss << "0x" << hex << e.failed_char << dec;
+ docstring msg = bformat(_("Could not find LaTeX command for character '%1$s'"
+ " (code point %2$s)"),
+ ods.str(), from_utf8(oss.str()));
+ errorList.push_back(ErrorItem(msg, _("Some characters of your document are probably not "
+ "representable in the chosen encoding.\n"
+ "Changing the document encoding to utf8 could help."),
+ e.par_id, e.pos, e.pos + 1));
+ failed_export = true;
+ }
catch (iconv_codecvt_facet_exception & e) {
- lyxerr << "Caught iconv exception: " << e.what() << endl;
+ errorList.push_back(ErrorItem(_("iconv conversion failed"),
+ _(e.what()), -1, 0, 0));
failed_export = true;
}
- catch (std::exception const & e) {
- lyxerr << "Caught \"normal\" exception: " << e.what() << endl;
+ catch (exception const & e) {
+ errorList.push_back(ErrorItem(_("conversion failed"),
+ _(e.what()), -1, 0, 0));
failed_export = true;
}
catch (...) {
lyxerr << "Caught some really weird exception..." << endl;
- LyX::cref().emergencyCleanup();
- abort();
+ LyX::cref().exit(1);
}
ofs.close();
lyxerr << "File '" << fname << "' was not closed properly." << endl;
}
- if (failed_export) {
- Alert::error(_("Encoding error"),
- _("Some characters of your document are probably not "
- "representable in the chosen encoding.\n"
- "Changing the document encoding to utf8 could help."));
- return false;
- }
- return true;
+ errors("Export");
+ return !failed_export;
}
void Buffer::writeLaTeXSource(odocstream & os,
string const & original_path,
OutputParams const & runparams_in,
- bool const output_preamble, bool const output_body)
+ bool const output_preamble, bool const output_body) const
{
OutputParams runparams = runparams_in;
// validate the buffer.
- LYXERR(Debug::LATEX) << " Validating buffer..." << endl;
+ LYXERR(Debug::LATEX, " Validating buffer...");
LaTeXFeatures features(*this, params(), runparams);
validate(features);
- LYXERR(Debug::LATEX) << " Buffer validation done." << endl;
+ LYXERR(Debug::LATEX, " Buffer validation done.");
// The starting paragraph of the coming rows is the
// first paragraph of the document. (Asger)
"For more info, see http://www.lyx.org/.\n"
"%% Do not edit unless you really know what "
"you are doing.\n";
- texrow().newline();
- texrow().newline();
+ d->texrow.newline();
+ d->texrow.newline();
}
- LYXERR(Debug::INFO) << "lyx document header finished" << endl;
+ LYXERR(Debug::INFO, "lyx document header finished");
// 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
// code for usual, NOT nice-latex-file
os << "\\batchmode\n"; // changed
// from \nonstopmode
- texrow().newline();
+ d->texrow.newline();
}
if (!original_path.empty()) {
// FIXME UNICODE
<< "\\def\\input@path{{"
<< inputpath << "/}}\n"
<< "\\makeatother\n";
- texrow().newline();
- texrow().newline();
- texrow().newline();
+ d->texrow.newline();
+ d->texrow.newline();
+ d->texrow.newline();
}
// Write the preamble
- runparams.use_babel = params().writeLaTeX(os, features, texrow());
+ runparams.use_babel = params().writeLaTeX(os, features, d->texrow);
if (!output_body)
return;
// make the body.
os << "\\begin{document}\n";
- texrow().newline();
+ d->texrow.newline();
} // output_preamble
- texrow().start(paragraphs().begin()->id(), 0);
+ d->texrow.start(paragraphs().begin()->id(), 0);
- LYXERR(Debug::INFO) << "preamble finished, now the body." << endl;
+ LYXERR(Debug::INFO, "preamble finished, now the body.");
- if (!lyxrc.language_auto_begin &&
- !params().language->babel().empty()) {
- // FIXME UNICODE
- os << from_utf8(subst(lyxrc.language_command_begin,
- "$$lang",
- params().language->babel()))
- << '\n';
- texrow().newline();
- }
+ // load children, if not already done.
+ // This includes an updateMacro() call.
+ // Don't move this behind the parent_buffer=0 code below,
+ // because then the macros will not get the right "redefinition"
+ // flag as they don't see the parent macros which are output before.
+ loadChildDocuments();
- Encoding const & encoding = params().encoding();
- if (encoding.package() == Encoding::CJK) {
- // Open a CJK environment, since in contrast to the encodings
- // handled by inputenc the document encoding is not set in
- // the preamble if it is handled by CJK.sty.
- os << "\\begin{CJK}{" << from_ascii(encoding.latexName())
- << "}{}\n";
- texrow().newline();
- }
+ // fold macros if possible, still with parent buffer as the
+ // macros will be put in the prefix anyway.
+ updateMacroInstances();
// 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;
+ Buffer const * save_parent = 0;
if (output_preamble) {
- save_parentname = params().parentname;
- params().parentname.erase();
- }
+ // output the macros visible for this buffer
+ writeParentMacros(os);
- loadChildDocuments();
+ save_parent = d->parent_buffer;
+ d->parent_buffer = 0;
+ }
// the real stuff
- latexParagraphs(*this, paragraphs(), os, texrow(), runparams);
+ latexParagraphs(*this, text(), os, d->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();
+ if (output_preamble) {
+ d->parent_buffer = save_parent;
- if (encoding.package() == Encoding::CJK) {
- // Close the open CJK environment.
- // latexParagraphs will have opened one even if the last text
- // was not CJK.
- os << "\\end{CJK}\n";
- texrow().newline();
+ // restore macros with correct parent buffer (especially
+ // important for the redefinition flag which depends on the
+ // parent)
+ updateMacros();
}
- if (!lyxrc.language_auto_end &&
- !params().language->babel().empty()) {
- os << from_utf8(subst(lyxrc.language_command_end,
- "$$lang",
- params().language->babel()))
- << '\n';
- texrow().newline();
- }
+ // add this just in case after all the paragraphs
+ os << endl;
+ d->texrow.newline();
if (output_preamble) {
os << "\\end{document}\n";
- texrow().newline();
-
- LYXERR(Debug::LATEX) << "makeLaTeXFile...done" << endl;
+ d->texrow.newline();
+ LYXERR(Debug::LATEX, "makeLaTeXFile...done");
} else {
- LYXERR(Debug::LATEX) << "LaTeXFile for inclusion made."
- << endl;
+ LYXERR(Debug::LATEX, "LaTeXFile for inclusion made.");
}
runparams_in.encoding = runparams.encoding;
// Just to be sure. (Asger)
- texrow().newline();
+ d->texrow.newline();
- LYXERR(Debug::INFO) << "Finished making LaTeX file." << endl;
- LYXERR(Debug::INFO) << "Row count was " << texrow().rows() - 1
- << '.' << endl;
+ LYXERR(Debug::INFO, "Finished making LaTeX file.");
+ LYXERR(Debug::INFO, "Row count was " << d->texrow.rows() - 1 << '.');
}
void Buffer::makeDocBookFile(FileName const & fname,
OutputParams const & runparams,
- bool const body_only)
+ bool const body_only) const
{
- LYXERR(Debug::LATEX) << "makeDocBookFile..." << endl;
+ LYXERR(Debug::LATEX, "makeDocBookFile...");
- //ofstream ofs;
odocfstream ofs;
if (!openFileWrite(ofs, fname))
return;
void Buffer::writeDocBookSource(odocstream & os, string const & fname,
OutputParams const & runparams,
- bool const only_body)
+ bool const only_body) const
{
LaTeXFeatures features(*this, params(), runparams);
validate(features);
- texrow().reset();
+ d->texrow.reset();
TextClass const & tclass = params().getTextClass();
string const top_element = tclass.latexname();
string const name = addName(path.absFilename(), latexName());
string const org_path = filePath();
- support::PathChanger p(path); // path to LaTeX file
+ PathChanger p(path); // path to LaTeX file
message(_("Running chktex..."));
// Generate the LaTeX file if neccessary
Alert::error(_("chktex failure"),
_("Could not run chktex successfully."));
} else if (res > 0) {
- ErrorList & errlist = pimpl_->errorLists["ChkTeX"];
+ ErrorList & errlist = d->errorLists["ChkTeX"];
errlist.clear();
bufferErrors(terr, errlist);
}
void Buffer::validate(LaTeXFeatures & features) const
{
- TextClass const & tclass = params().getTextClass();
-
- if (params().outputChanges) {
- bool dvipost = LaTeXFeatures::isAvailable("dvipost");
- bool xcolorsoul = LaTeXFeatures::isAvailable("soul") &&
- LaTeXFeatures::isAvailable("xcolor");
-
- if (features.runparams().flavor == OutputParams::LATEX) {
- if (dvipost) {
- features.require("ct-dvipost");
- features.require("dvipost");
- } else if (xcolorsoul) {
- features.require("ct-xcolor-soul");
- features.require("soul");
- features.require("xcolor");
- } else {
- features.require("ct-none");
- }
- } else if (features.runparams().flavor == OutputParams::PDFLATEX ) {
- if (xcolorsoul) {
- features.require("ct-xcolor-soul");
- features.require("soul");
- features.require("xcolor");
- features.require("pdfcolmk"); // improves color handling in PDF output
- } else {
- features.require("ct-none");
- }
- }
- }
-
- // AMS Style is at document level
- if (params().use_amsmath == BufferParams::package_on
- || tclass.provides("amsmath"))
- features.require("amsmath");
- if (params().use_esint == BufferParams::package_on)
- features.require("esint");
+ params().validate(features);
loadChildDocuments();
for_each(paragraphs().begin(), paragraphs().end(),
boost::bind(&Paragraph::validate, _1, boost::ref(features)));
- // the bullet shapes are buffer level not paragraph level
- // so they are tested here
- for (int i = 0; i < 4; ++i) {
- if (params().user_defined_bullet(i) != ITEMIZE_DEFAULTS[i]) {
- int const font = params().user_defined_bullet(i).getFont();
- if (font == 0) {
- int const c = params()
- .user_defined_bullet(i)
- .getCharacter();
- if (c == 16
- || c == 17
- || c == 25
- || c == 26
- || c == 31) {
- features.require("latexsym");
- }
- } else if (font == 1) {
- features.require("amssymb");
- } else if ((font >= 2 && font <= 5)) {
- features.require("pifont");
- }
- }
- }
-
if (lyxerr.debugging(Debug::LATEX)) {
features.showStruct();
}
}
-void Buffer::updateBibfilesCache()
+void Buffer::updateBibfilesCache() const
{
// if this is a child document and the parent is already loaded
// update the parent's cache instead
- Buffer * tmp = masterBuffer();
+ Buffer const * tmp = masterBuffer();
BOOST_ASSERT(tmp);
if (tmp != this) {
tmp->updateBibfilesCache();
return;
}
- bibfilesCache_.clear();
+ d->bibfilesCache_.clear();
for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
if (it->lyxCode() == BIBTEX_CODE) {
InsetBibtex const & inset =
static_cast<InsetBibtex const &>(*it);
- vector<FileName> const bibfiles = inset.getFiles(*this);
- bibfilesCache_.insert(bibfilesCache_.end(),
+ EmbeddedFileList const bibfiles = inset.getFiles(*this);
+ d->bibfilesCache_.insert(d->bibfilesCache_.end(),
bibfiles.begin(),
bibfiles.end());
} else if (it->lyxCode() == INCLUDE_CODE) {
InsetInclude & inset =
static_cast<InsetInclude &>(*it);
inset.updateBibfilesCache(*this);
- vector<FileName> const & bibfiles =
+ EmbeddedFileList const & bibfiles =
inset.getBibfilesCache(*this);
- bibfilesCache_.insert(bibfilesCache_.end(),
+ d->bibfilesCache_.insert(d->bibfilesCache_.end(),
bibfiles.begin(),
bibfiles.end());
}
}
-vector<FileName> const & Buffer::getBibfilesCache() const
+EmbeddedFileList const & Buffer::getBibfilesCache() const
{
// if this is a child document and the parent is already loaded
// use the parent's cache instead
return tmp->getBibfilesCache();
// We update the cache when first used instead of at loading time.
- if (bibfilesCache_.empty())
+ if (d->bibfilesCache_.empty())
const_cast<Buffer *>(this)->updateBibfilesCache();
- return bibfilesCache_;
+ return d->bibfilesCache_;
}
bool Buffer::isDepClean(string const & name) const
{
- DepClean::const_iterator const it = pimpl_->dep_clean.find(name);
- if (it == pimpl_->dep_clean.end())
+ DepClean::const_iterator const it = d->dep_clean.find(name);
+ if (it == d->dep_clean.end())
return true;
return it->second;
}
void Buffer::markDepClean(string const & name)
{
- pimpl_->dep_clean[name] = true;
+ d->dep_clean[name] = true;
}
}
-ParIterator Buffer::getParFromID(int const id) const
+DocIterator Buffer::getParFromID(int const id) const
{
- ParConstIterator it = par_iterator_begin();
- ParConstIterator const end = par_iterator_end();
-
if (id < 0) {
// John says this is called with id == -1 from undo
lyxerr << "getParFromID(), id: " << id << endl;
- return end;
+ return doc_iterator_end(inset());
}
- for (; it != end; ++it)
- if (it->id() == id)
+ for (DocIterator it = doc_iterator_begin(inset()); !it.atEnd(); it.forwardPar())
+ if (it.paragraph().id() == id)
return it;
- return end;
+ return doc_iterator_end(inset());
}
bool Buffer::hasParWithID(int const id) const
{
- ParConstIterator const it = getParFromID(id);
- return it != par_iterator_end();
+ return !getParFromID(id).atEnd();
}
ParIterator Buffer::par_iterator_begin()
{
- return lyx::par_iterator_begin(inset());
+ return ParIterator(doc_iterator_begin(inset()));
}
ParIterator Buffer::par_iterator_end()
{
- return lyx::par_iterator_end(inset());
+ return ParIterator(doc_iterator_end(inset()));
}
bool Buffer::isClean() const
{
- return pimpl_->lyx_clean;
+ return d->lyx_clean;
}
bool Buffer::isBakClean() const
{
- return pimpl_->bak_clean;
+ return d->bak_clean;
}
bool Buffer::isExternallyModified(CheckMethod method) const
{
- BOOST_ASSERT(pimpl_->filename.exists());
+ BOOST_ASSERT(d->filename.exists());
// if method == timestamp, check timestamp before checksum
return (method == checksum_method
- || pimpl_->timestamp_ != pimpl_->filename.lastModified())
- && pimpl_->checksum_ != sum(pimpl_->filename);
+ || d->timestamp_ != d->filename.lastModified())
+ && d->checksum_ != d->filename.checksum();
}
void Buffer::saveCheckSum(FileName const & file) const
{
if (file.exists()) {
- pimpl_->timestamp_ = file.lastModified();
- pimpl_->checksum_ = sum(file);
+ d->timestamp_ = file.lastModified();
+ d->checksum_ = file.checksum();
} else {
// in the case of save to a new file.
- pimpl_->timestamp_ = 0;
- pimpl_->checksum_ = 0;
+ d->timestamp_ = 0;
+ d->checksum_ = 0;
}
}
void Buffer::markClean() const
{
- if (!pimpl_->lyx_clean) {
- pimpl_->lyx_clean = true;
+ if (!d->lyx_clean) {
+ d->lyx_clean = true;
updateTitles();
}
// if the .lyx file has been saved, we don't need an
// autosave
- pimpl_->bak_clean = true;
+ d->bak_clean = true;
}
void Buffer::markBakClean() const
{
- pimpl_->bak_clean = true;
+ d->bak_clean = true;
}
void Buffer::setUnnamed(bool flag)
{
- pimpl_->unnamed = flag;
+ d->unnamed = flag;
}
bool Buffer::isUnnamed() const
{
- return pimpl_->unnamed;
+ return d->unnamed;
}
// FIXME: this function should be moved to buffer_pimpl.C
void Buffer::markDirty()
{
- if (pimpl_->lyx_clean) {
- pimpl_->lyx_clean = false;
+ if (d->lyx_clean) {
+ d->lyx_clean = false;
updateTitles();
}
- pimpl_->bak_clean = false;
+ d->bak_clean = false;
- DepClean::iterator it = pimpl_->dep_clean.begin();
- DepClean::const_iterator const end = pimpl_->dep_clean.end();
+ DepClean::iterator it = d->dep_clean.begin();
+ DepClean::const_iterator const end = d->dep_clean.end();
for (; it != end; ++it)
it->second = false;
FileName Buffer::fileName() const
{
- return pimpl_->filename;
+ return d->filename;
}
string Buffer::absFileName() const
{
- return pimpl_->filename.absFilename();
+ return d->filename.absFilename();
}
-string const & Buffer::filePath() const
+string Buffer::filePath() const
{
- return params().filepath;
+ return d->filename.onlyPath().absFilename() + "/";
}
bool Buffer::isReadonly() const
{
- return pimpl_->read_only;
+ return d->read_only;
}
-void Buffer::setParentName(string const & name)
+void Buffer::setParent(Buffer const * buffer)
{
- if (name == pimpl_->filename.absFilename())
- // Avoids recursive include.
- params().parentname.clear();
- else
- params().parentname = name;
+ // Avoids recursive include.
+ d->parent_buffer = buffer == this ? 0 : buffer;
+ updateMacros();
}
-Buffer const * Buffer::masterBuffer() const
+Buffer const * Buffer::parent()
{
- if (!params().parentname.empty()
- && theBufferList().exists(params().parentname)) {
- Buffer const * buf = theBufferList().getBuffer(params().parentname);
- //We need to check if the parent is us...
- //FIXME RECURSIVE INCLUDE
- //This is not sufficient, since recursive includes could be downstream.
- if (buf && buf != this)
- return buf->masterBuffer();
- }
-
- return this;
+ return d->parent_buffer;
}
-Buffer * Buffer::masterBuffer()
+Buffer const * Buffer::masterBuffer() const
{
- if (!params().parentname.empty()
- && theBufferList().exists(params().parentname)) {
- Buffer * buf = theBufferList().getBuffer(params().parentname);
- //We need to check if the parent is us...
- //FIXME RECURSIVE INCLUDE
- //This is not sufficient, since recursive includes could be downstream.
- if (buf && buf != this)
- return buf->masterBuffer();
- }
-
- return this;
+ if (!d->parent_buffer)
+ return this;
+
+ return d->parent_buffer->masterBuffer();
}
-bool Buffer::hasMacro(docstring const & name, Paragraph const & par) const
+template<typename M>
+typename M::iterator greatest_below(M & m, typename M::key_type const & x)
{
- Impl::PositionToMacroMap::iterator it;
- it = pimpl_->macros[name].upper_bound(par.macrocontextPosition());
- if (it != pimpl_->macros[name].end())
- return true;
+ if (m.empty())
+ return m.end();
- // If there is a master buffer, query that
- const Buffer * master = masterBuffer();
- if (master && master != this)
- return master->hasMacro(name);
+ typename M::iterator it = m.lower_bound(x);
+ if (it == m.begin())
+ return m.end();
- return MacroTable::globalMacros().has(name);
+ it--;
+ return it;
}
-bool Buffer::hasMacro(docstring const & name) const
+MacroData const * Buffer::getBufferMacro(docstring const & name,
+ DocIterator const & pos) const
{
- if( !pimpl_->macros[name].empty() )
- return true;
+ LYXERR(Debug::MACROS, "Searching for " << to_ascii(name) << " at " << pos);
- // If there is a master buffer, query that
- const Buffer * master = masterBuffer();
- if (master && master != this)
- return master->hasMacro(name);
+ // if paragraphs have no macro context set, pos will be empty
+ if (pos.empty())
+ return 0;
+
+ // we haven't found anything yet
+ DocIterator bestPos = par_iterator_begin();
+ MacroData const * bestData = 0;
+
+ // find macro definitions for name
+ Impl::NamePositionScopeMacroMap::iterator nameIt
+ = d->macros.find(name);
+ if (nameIt != d->macros.end()) {
+ // find last definition in front of pos or at pos itself
+ Impl::PositionScopeMacroMap::const_iterator it
+ = greatest_below(nameIt->second, pos);
+ if (it != nameIt->second.end()) {
+ while (true) {
+ // scope ends behind pos?
+ if (pos < it->second.first) {
+ // 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;
+ break;
+ }
+
+ // try previous macro if there is one
+ if (it == nameIt->second.begin())
+ break;
+ it--;
+ }
+ }
+ }
+
+ // find macros in included files
+ Impl::PositionScopeBufferMap::const_iterator it
+ = greatest_below(d->position_to_children, pos);
+ if (it == d->position_to_children.end())
+ // no children before
+ return bestData;
+
+ while (true) {
+ // do we know something better (i.e. later) already?
+ if (it->first < bestPos )
+ break;
+
+ // scope ends behind pos?
+ if (pos < it->second.first) {
+ // look for macro in external file
+ d->macro_lock = true;
+ MacroData const * data
+ = it->second.second->getMacro(name, false);
+ d->macro_lock = false;
+ if (data) {
+ bestPos = it->first;
+ bestData = data;
+ break;
+ }
+ }
- return MacroTable::globalMacros().has(name);
+ // try previous file if there is one
+ if (it == d->position_to_children.begin())
+ break;
+ --it;
+ }
+
+ // return the best macro we have found
+ return bestData;
}
-MacroData const & Buffer::getMacro(docstring const & name,
- Paragraph const & par) const
+MacroData const * Buffer::getMacro(docstring const & name,
+ DocIterator const & pos, bool global) const
{
- Impl::PositionToMacroMap::iterator it;
- it = pimpl_->macros[name].upper_bound(par.macrocontextPosition());
- if( it != pimpl_->macros[name].end() )
- return it->second;
+ if (d->macro_lock)
+ return 0;
+
+ // query buffer macros
+ MacroData const * data = getBufferMacro(name, pos);
+ if (data != 0)
+ return data;
// If there is a master buffer, query that
- const Buffer * master = masterBuffer();
- if (master && master != this)
- return master->getMacro(name);
+ if (d->parent_buffer) {
+ d->macro_lock = true;
+ MacroData const * macro
+ = d->parent_buffer->getMacro(name, *this, false);
+ d->macro_lock = false;
+ if (macro)
+ return macro;
+ }
+
+ if (global) {
+ data = MacroTable::globalMacros().get(name);
+ if (data != 0)
+ return data;
+ }
- return MacroTable::globalMacros().get(name);
+ return 0;
}
-MacroData const & Buffer::getMacro(docstring const & name) const
+MacroData const * Buffer::getMacro(docstring const & name, bool global) const
{
- Impl::PositionToMacroMap::iterator it;
- it = pimpl_->macros[name].begin();
- if( it != pimpl_->macros[name].end() )
- return it->second;
+ // set scope end behind the last paragraph
+ DocIterator scope = par_iterator_begin();
+ scope.pit() = scope.lastpit() + 1;
+
+ return getMacro(name, scope, global);
+}
- // If there is a master buffer, query that
- const Buffer * master = masterBuffer();
- if (master && master != this)
- return master->getMacro(name);
- return MacroTable::globalMacros().get(name);
+MacroData const * Buffer::getMacro(docstring const & name, Buffer const & child, bool global) const
+{
+ // look where the child buffer is included first
+ Impl::BufferPositionMap::iterator it
+ = d->children_positions.find(&child);
+ if (it == d->children_positions.end())
+ return 0;
+
+ // check for macros at the inclusion position
+ return getMacro(name, it->second, global);
}
-void Buffer::updateMacros()
+void Buffer::updateEnvironmentMacros(DocIterator & it,
+ pit_type lastpit,
+ DocIterator & scope) const
{
- // start with empty table
- pimpl_->macros = Impl::NameToPositionMacroMap();
-
- // Iterate over buffer
- ParagraphList & pars = text().paragraphs();
- for (size_t i = 0, n = pars.size(); i != n; ++i) {
- // set position again
- pars[i].setMacrocontextPosition(i);
-
- //lyxerr << "searching main par " << i
- // << " for macro definitions" << std::endl;
- InsetList const & insets = pars[i].insetList();
- InsetList::const_iterator it = insets.begin();
+ Paragraph & par = it.paragraph();
+ depth_type depth
+ = par.params().depth();
+ Length const & leftIndent
+ = par.params().leftIndent();
+
+ // look for macros in each paragraph
+ while (it.pit() <= lastpit) {
+ Paragraph & par = it.paragraph();
+
+ // increased depth?
+ if ((par.params().depth() > depth
+ || par.params().leftIndent() != leftIndent)
+ && par.layout()->isEnvironment()) {
+ updateBlockMacros(it, scope);
+ continue;
+ }
+
+ // iterate over the insets of the current paragraph
+ InsetList const & insets = par.insetList();
+ InsetList::const_iterator iit = insets.begin();
InsetList::const_iterator end = insets.end();
- for ( ; it != end; ++it) {
- if (it->inset->lyxCode() != MATHMACRO_CODE)
+ for (; iit != end; ++iit) {
+ it.pos() = iit->pos;
+
+ // is it a nested text inset?
+ if (iit->inset->asInsetText()) {
+ // Inset needs its own scope?
+ InsetText const * itext
+ = iit->inset->asInsetText();
+ bool newScope = itext->isMacroScope(*this);
+
+ // scope which ends just behind die inset
+ DocIterator insetScope = it;
+ insetScope.pos()++;
+
+ // collect macros in inset
+ it.push_back(CursorSlice(*iit->inset));
+ updateInsetMacros(it, newScope ? insetScope : scope);
+ it.pop_back();
+ continue;
+ }
+
+ // is it an external file?
+ if (iit->inset->lyxCode() == INCLUDE_CODE) {
+ // get buffer of external file
+ InsetCommand const & inset
+ = static_cast<InsetCommand const &>(*iit->inset);
+ InsetCommandParams const & ip = inset.params();
+ d->macro_lock = true;
+ Buffer * child = loadIfNeeded(*this, ip);
+ d->macro_lock = false;
+ if (!child)
+ continue;
+
+ // register its position, but only when it is
+ // included first in the buffer
+ if (d->children_positions.find(child)
+ == d->children_positions.end())
+ d->children_positions[child] = it;
+
+ // register child with its scope
+ d->position_to_children[it] = Impl::ScopeBuffer(scope, child);
+
+ continue;
+ }
+
+ if (iit->inset->lyxCode() != MATHMACRO_CODE)
continue;
// get macro data
- MathMacroTemplate const & macroTemplate
- = static_cast<MathMacroTemplate const &>(*it->inset);
+ MathMacroTemplate & macroTemplate
+ = static_cast<MathMacroTemplate &>(*iit->inset);
+ MacroContext mc(*this, it);
+ macroTemplate.updateToContext(mc);
// valid?
- if (macroTemplate.validMacro()) {
- MacroData macro = macroTemplate.asMacroData();
+ bool valid = macroTemplate.validMacro();
+ // FIXME: Should be fixNameAndCheckIfValid() in fact,
+ // then the BufferView's cursor will be invalid in
+ // some cases which leads to crashes.
+ if (!valid)
+ continue;
- // redefinition?
- // call hasMacro here instead of directly querying mc to
- // also take the master document into consideration
- macro.setRedefinition(hasMacro(macroTemplate.name()));
+ // register macro
+ d->macros[macroTemplate.name()][it]
+ = Impl::ScopeMacro(scope, MacroData(*this, it));
+ }
- // register macro (possibly overwrite the previous one of this paragraph)
- pimpl_->macros[macroTemplate.name()][i] = macro;
- }
+ // next paragraph
+ it.pit()++;
+ it.pos() = 0;
+ }
+}
+
+
+void Buffer::updateBlockMacros(DocIterator & it, DocIterator & scope) const
+{
+ Paragraph & par = it.paragraph();
+
+ // set scope for macros in this paragraph:
+ // * either the "old" outer scope
+ // * or the scope ending after the environment
+ if (par.layout()->isEnvironment()) {
+ // find end of environment block,
+ DocIterator envEnd = it;
+ pit_type n = it.lastpit() + 1;
+ depth_type depth = par.params().depth();
+ Length const & length = par.params().leftIndent();
+ // looping through the paragraph, basically until
+ // the layout changes or the depth gets smaller.
+ // (the logic of output_latex.cpp's TeXEnvironment)
+ do {
+ envEnd.pit()++;
+ if (envEnd.pit() == n)
+ break;
+ } while (par.layout() == envEnd.paragraph().layout()
+ || depth < envEnd.paragraph().params().depth()
+ || length != envEnd.paragraph().params().leftIndent());
+
+ // collect macros from environment block
+ updateEnvironmentMacros(it, envEnd.pit() - 1, envEnd);
+ } else {
+ // collect macros from paragraph
+ updateEnvironmentMacros(it, it.pit(), scope);
+ }
+}
+
+
+void Buffer::updateInsetMacros(DocIterator & it, DocIterator & scope) const
+{
+ // look for macros in each paragraph
+ pit_type n = it.lastpit() + 1;
+ while (it.pit() < n)
+ updateBlockMacros(it, scope);
+}
+
+
+void Buffer::updateMacros() const
+{
+ if (d->macro_lock)
+ return;
+
+ LYXERR(Debug::MACROS, "updateMacro of " << d->filename.onlyFileName());
+
+ // start with empty table
+ d->macros.clear();
+ d->children_positions.clear();
+ d->position_to_children.clear();
+
+ // Iterate over buffer, starting with first paragraph
+ // The scope must be bigger than any lookup DocIterator
+ // later. For the global lookup, lastpit+1 is used, hence
+ // we use lastpit+2 here.
+ DocIterator it = par_iterator_begin();
+ DocIterator outerScope = it;
+ outerScope.pit() = outerScope.lastpit() + 2;
+ updateInsetMacros(it, outerScope);
+}
+
+
+void Buffer::updateMacroInstances() const
+{
+ LYXERR(Debug::MACROS, "updateMacroInstances for "
+ << d->filename.onlyFileName());
+ DocIterator it = doc_iterator_begin(inset());
+ DocIterator end = doc_iterator_end(inset());
+ for (; it != end; it.forwardPos()) {
+ // look for MathData cells in InsetMathNest insets
+ Inset * inset = it.nextInset();
+ if (!inset)
+ continue;
+
+ InsetMath * minset = inset->asInsetMath();
+ if (!minset)
+ continue;
+
+ // update macro in all cells of the InsetMathNest
+ DocIterator::idx_type n = minset->nargs();
+ MacroContext mc = MacroContext(*this, it);
+ for (DocIterator::idx_type i = 0; i < n; ++i) {
+ MathData & data = minset->cell(i);
+ data.updateMacros(0, mc);
}
}
}
+void Buffer::listMacroNames(MacroNameSet & macros) const
+{
+ if (d->macro_lock)
+ return;
+
+ d->macro_lock = true;
+
+ // loop over macro names
+ Impl::NamePositionScopeMacroMap::iterator nameIt
+ = d->macros.begin();
+ Impl::NamePositionScopeMacroMap::iterator nameEnd
+ = d->macros.end();
+ for (; nameIt != nameEnd; ++nameIt)
+ macros.insert(nameIt->first);
+
+ // loop over children
+ Impl::BufferPositionMap::iterator it
+ = d->children_positions.begin();
+ Impl::BufferPositionMap::iterator end
+ = d->children_positions.end();
+ for (; it != end; ++it)
+ it->first->listMacroNames(macros);
+
+ // call parent
+ if (d->parent_buffer)
+ d->parent_buffer->listMacroNames(macros);
+
+ d->macro_lock = false;
+}
+
+
+void Buffer::writeParentMacros(odocstream & os) const
+{
+ if (!d->parent_buffer)
+ return;
+
+ // collect macro names
+ MacroNameSet names;
+ d->parent_buffer->listMacroNames(names);
+
+ // resolve and output them
+ MacroNameSet::iterator it = names.begin();
+ MacroNameSet::iterator end = names.end();
+ for (; it != end; ++it) {
+ // defined?
+ MacroData const * data =
+ d->parent_buffer->getMacro(*it, *this, false);
+ if (data)
+ data->write(os, true);
+ }
+}
+
+
void Buffer::changeRefsIfUnique(docstring const & from, docstring const & to,
InsetCode code)
{
paramName = "reference";
}
- if (std::count(labels.begin(), labels.end(), from) > 1)
+ if (count(labels.begin(), labels.end(), from) > 1)
return;
for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
// No side effect of file copying and image conversion
runparams.dryrun = true;
- texrow().reset();
+ d->texrow.reset();
if (full_source) {
os << "% " << _("Preview source code") << "\n\n";
- texrow().newline();
- texrow().newline();
+ d->texrow.newline();
+ d->texrow.newline();
if (isLatex())
writeLaTeXSource(os, filePath(), runparams, true, true);
else {
convert<docstring>(par_begin),
convert<docstring>(par_end - 1))
<< "\n\n";
- texrow().newline();
- texrow().newline();
+ d->texrow.newline();
+ d->texrow.newline();
// output paragraphs
if (isLatex()) {
- latexParagraphs(*this, paragraphs(), os, texrow(), runparams);
+ latexParagraphs(*this, text(), os, d->texrow, runparams);
} else {
// DocBook
docbookParagraphs(paragraphs(), *this, os, runparams);
}
-ErrorList const & Buffer::errorList(string const & type) const
+ErrorList & Buffer::errorList(string const & type) const
{
- static ErrorList const emptyErrorList;
- std::map<string, ErrorList>::const_iterator I = pimpl_->errorLists.find(type);
- if (I == pimpl_->errorLists.end())
+ static ErrorList emptyErrorList;
+ map<string, ErrorList>::iterator I = d->errorLists.find(type);
+ if (I == d->errorLists.end())
return emptyErrorList;
return I->second;
}
-ErrorList & Buffer::errorList(string const & type)
-{
- return pimpl_->errorLists[type];
-}
-
-
void Buffer::structureChanged() const
{
if (gui_)
}
-void Buffer::errors(std::string const & err) const
+void Buffer::errors(string const & err) const
{
if (gui_)
gui_->errors(err);
void Buffer::setReadOnly(bool on) const
{
- if (pimpl_->wa_)
- pimpl_->wa_->setReadOnly(on);
+ if (d->wa_)
+ d->wa_->setReadOnly(on);
}
void Buffer::updateTitles() const
{
- if (pimpl_->wa_)
- pimpl_->wa_->updateTitles();
+ if (d->wa_)
+ d->wa_->updateTitles();
}
namespace {
-class AutoSaveBuffer : public support::ForkedProcess {
+class AutoSaveBuffer : public ForkedProcess {
public:
///
AutoSaveBuffer(Buffer const & buffer, FileName const & fname)
};
-#if !defined (HAVE_FORK)
-# define fork() -1
-#endif
-
int AutoSaveBuffer::generateChild()
{
// tmp_ret will be located (usually) in /tmp
// will that be a problem?
+ // Note that this calls ForkedCalls::fork(), so it's
+ // ok cross-platform.
pid_t const pid = fork();
// If you want to debug the autosave
// you should set pid to -1, and comment out the fork.
- if (pid == 0 || pid == -1) {
- // pid = -1 signifies that lyx was unable
- // to fork. But we will do the save
- // anyway.
- bool failed = false;
-
- FileName const tmp_ret(tempName(FileName(), "lyxauto"));
- if (!tmp_ret.empty()) {
- buffer_.writeFile(tmp_ret);
- // assume successful write of tmp_ret
- if (!rename(tmp_ret, fname_)) {
- failed = true;
- // most likely couldn't move between
- // filesystems unless write of tmp_ret
- // failed so remove tmp file (if it
- // exists)
- unlink(tmp_ret);
- }
- } else {
+ if (pid != 0 && pid != -1)
+ return pid;
+
+ // pid = -1 signifies that lyx was unable
+ // to fork. But we will do the save
+ // anyway.
+ bool failed = false;
+ FileName const tmp_ret = FileName::tempName("lyxauto");
+ if (!tmp_ret.empty()) {
+ buffer_.writeFile(tmp_ret);
+ // assume successful write of tmp_ret
+ if (!tmp_ret.moveTo(fname_))
failed = true;
- }
-
- if (failed) {
- // failed to write/rename tmp_ret so try writing direct
- if (!buffer_.writeFile(fname_)) {
- // It is dangerous to do this in the child,
- // but safe in the parent, so...
- if (pid == -1) // emit message signal.
- buffer_.message(_("Autosave failed!"));
- }
- }
- if (pid == 0) { // we are the child so...
- _exit(0);
+ } else
+ failed = true;
+
+ if (failed) {
+ // failed to write/rename tmp_ret so try writing direct
+ if (!buffer_.writeFile(fname_)) {
+ // It is dangerous to do this in the child,
+ // but safe in the parent, so...
+ if (pid == -1) // emit message signal.
+ buffer_.message(_("Autosave failed!"));
}
}
+
+ if (pid == 0) // we are the child so...
+ _exit(0);
+
return pid;
}
// create autosave filename
string fname = filePath();
fname += '#';
- fname += onlyFilename(absFileName());
+ fname += d->filename.onlyFileName();
fname += '#';
AutoSaveBuffer autosave(*this, FileName(fname));
}
-/** Write a buffer to a new file name and rename the buffer
- according to the new file name.
-
- This function is e.g. used by menu callbacks and
- LFUN_BUFFER_WRITE_AS.
-
- If 'newname' is empty (the default), the user is asked via a
- dialog for the buffer's new name and location.
-
- If 'newname' is non-empty and has an absolute path, that is used.
- Otherwise the base directory of the buffer is used as the base
- for any relative path in 'newname'.
-*/
-
-bool Buffer::writeAs(string const & newname)
+void Buffer::resetChildDocuments(bool close_them) const
{
- string fname = absFileName();
- string const oldname = fname;
-
- if (newname.empty()) { /// No argument? Ask user through dialog
-
- // FIXME UNICODE
- FileDialog dlg(_("Choose a filename to save document as"),
- LFUN_BUFFER_WRITE_AS);
- dlg.setButton1(_("Documents|#o#O"), from_utf8(lyxrc.document_path));
- dlg.setButton2(_("Templates|#T#t"), from_utf8(lyxrc.template_path));
-
- if (!support::isLyXFilename(fname))
- fname += ".lyx";
-
- support::FileFilterList const filter(_("LyX Documents (*.lyx)"));
-
- FileDialog::Result result =
- dlg.save(from_utf8(onlyPath(fname)),
- filter,
- from_utf8(onlyFilename(fname)));
-
- if (result.first == FileDialog::Later)
- return false;
-
- fname = to_utf8(result.second);
-
- if (fname.empty())
- return false;
-
- // Make sure the absolute filename ends with appropriate suffix
- fname = makeAbsPath(fname).absFilename();
- if (!support::isLyXFilename(fname))
- fname += ".lyx";
-
- } else
- fname = makeAbsPath(newname, onlyPath(oldname)).absFilename();
-
- if (FileName(fname).exists()) {
- docstring const file = makeDisplayPath(fname, 30);
- docstring text = bformat(_("The document %1$s already "
- "exists.\n\nDo you want to "
- "overwrite that document?"),
- file);
- int const ret = Alert::prompt(_("Overwrite document?"),
- text, 0, 1, _("&Overwrite"), _("&Cancel"));
-
- if (ret == 1)
- return false;
- }
-
- // Ok, change the name of the buffer
- setFileName(fname);
- markDirty();
- bool unnamed = isUnnamed();
- setUnnamed(false);
- saveCheckSum(FileName(fname));
-
- if (!menuWrite()) {
- setFileName(oldname);
- setUnnamed(unnamed);
- saveCheckSum(FileName(oldname));
- return false;
- }
-
- removeAutosaveFile(oldname);
- return true;
-}
+ if (text().empty())
+ return;
+ for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
+ if (it->lyxCode() != INCLUDE_CODE)
+ continue;
+ InsetCommand const & inset = static_cast<InsetCommand const &>(*it);
+ InsetCommandParams const & ip = inset.params();
-bool Buffer::menuWrite()
-{
- if (save()) {
- LyX::ref().session().lastFiles().add(FileName(absFileName()));
- return true;
+ resetParentBuffer(this, ip, close_them);
}
- // FIXME: we don't tell the user *WHY* the save failed !!
-
- docstring const file = makeDisplayPath(absFileName(), 30);
-
- docstring text = bformat(_("The document %1$s could not be saved.\n\n"
- "Do you want to rename the document and "
- "try again?"), file);
- int const ret = Alert::prompt(_("Rename and save?"),
- text, 0, 1, _("&Rename"), _("&Cancel"));
-
- if (ret != 0)
- return false;
+ if (use_gui && masterBuffer() == this)
+ updateLabels(*this);
- return writeAs();
+ // clear references to children in macro tables
+ d->children_positions.clear();
+ d->position_to_children.clear();
}
if (use_gui && masterBuffer() == this)
updateLabels(*this);
+
+ updateMacros();
}
bool Buffer::doExport(string const & format, bool put_in_tempdir,
- string & result_file)
+ string & result_file) const
{
string backend_format;
OutputParams runparams(¶ms().encoding());
filename = changeExtension(filename,
formats.extension(backend_format));
+ // fix macros
+ updateMacroInstances();
+
// Plain text backend
if (backend_format == "text")
writePlaintextFile(*this, FileName(filename), runparams);
if (!makeLaTeXFile(FileName(filename), string(), runparams))
return false;
} else if (!lyxrc.tex_allows_spaces
- && support::contains(filePath(), ' ')) {
+ && contains(filePath(), ' ')) {
Alert::error(_("File name error"),
_("The directory path to the document cannot contain spaces."));
return false;
if (!success)
return false;
- if (put_in_tempdir)
+ if (put_in_tempdir) {
result_file = tmp_result_file.absFilename();
- else {
- result_file = changeExtension(absFileName(), ext);
- // We need to copy referenced files (e. g. included graphics
- // if format == "dvi") to the result dir.
- vector<ExportedFile> const files =
- runparams.exportdata->externalFiles(format);
- string const dest = onlyPath(result_file);
- CopyStatus status = SUCCESS;
- for (vector<ExportedFile>::const_iterator it = files.begin();
- it != files.end() && status != CANCEL; ++it) {
- string const fmt =
- formats.getFormatFromFile(it->sourceName);
- status = copyFile(fmt, it->sourceName,
- makeAbsPath(it->exportName, dest),
- it->exportName, status == FORCE);
- }
- if (status == CANCEL) {
- message(_("Document export cancelled."));
- } else if (tmp_result_file.exists()) {
- // Finally copy the main file
- status = copyFile(format, tmp_result_file,
- FileName(result_file), result_file,
- status == FORCE);
- message(bformat(_("Document exported as %1$s "
- "to file `%2$s'"),
- formats.prettyName(format),
- makeDisplayPath(result_file)));
- } else {
- // This must be a dummy converter like fax (bug 1888)
- message(bformat(_("Document exported as %1$s"),
- formats.prettyName(format)));
- }
+ return true;
+ }
+
+ result_file = changeExtension(absFileName(), ext);
+ // We need to copy referenced files (e. g. included graphics
+ // if format == "dvi") to the result dir.
+ vector<ExportedFile> const files =
+ runparams.exportdata->externalFiles(format);
+ string const dest = onlyPath(result_file);
+ CopyStatus status = SUCCESS;
+ for (vector<ExportedFile>::const_iterator it = files.begin();
+ it != files.end() && status != CANCEL; ++it) {
+ string const fmt = formats.getFormatFromFile(it->sourceName);
+ status = copyFile(fmt, it->sourceName,
+ makeAbsPath(it->exportName, dest),
+ it->exportName, status == FORCE);
+ }
+ if (status == CANCEL) {
+ message(_("Document export cancelled."));
+ } else if (tmp_result_file.exists()) {
+ // Finally copy the main file
+ status = copyFile(format, tmp_result_file,
+ FileName(result_file), result_file,
+ status == FORCE);
+ message(bformat(_("Document exported as %1$s "
+ "to file `%2$s'"),
+ formats.prettyName(format),
+ makeDisplayPath(result_file)));
+ } else {
+ // This must be a dummy converter like fax (bug 1888)
+ message(bformat(_("Document exported as %1$s"),
+ formats.prettyName(format)));
}
return true;
}
-bool Buffer::doExport(string const & format, bool put_in_tempdir)
+bool Buffer::doExport(string const & format, bool put_in_tempdir) const
{
string result_file;
return doExport(format, put_in_tempdir, result_file);
}
-bool Buffer::preview(string const & format)
+bool Buffer::preview(string const & format) const
{
string result_file;
if (!doExport(format, true, result_file))
return readFile(a);
case 1:
// Here we delete the autosave
- unlink(a);
+ a.removeFile();
break;
default:
return false;
bool Buffer::loadLyXFile(FileName const & s)
{
- if (s.isReadable()) {
+ if (s.isReadableFile()) {
if (readFileHelper(s)) {
lyxvc().file_found_hook(s);
if (!s.isWritable())
int id_start = -1;
int pos_start = -1;
int errorRow = cit->error_in_line;
- bool found = texrow().getIdFromRow(errorRow, id_start,
+ bool found = d->texrow.getIdFromRow(errorRow, id_start,
pos_start);
int id_end = -1;
int pos_end = -1;
do {
++errorRow;
- found = texrow().getIdFromRow(errorRow, id_end, pos_end);
+ found = d->texrow.getIdFromRow(errorRow, id_end, pos_end);
} while (found && id_start == id_end && pos_start == pos_end);
errorList.push_back(ErrorItem(cit->error_desc,
projects / lyx.git / blobdiff