#include "mathed/MathMacroTemplate.h"
#include "mathed/MathSupport.h"
+#include "graphics/PreviewLoader.h"
+
#include "frontends/alert.h"
#include "frontends/Delegates.h"
#include "frontends/WorkAreaManager.h"
-#include "graphics/Previews.h"
-
#include "support/lassert.h"
#include "support/convert.h"
#include "support/debug.h"
using namespace std;
using namespace lyx::support;
+using namespace lyx::graphics;
namespace lyx {
// Do not remove the comment below, so we get merge conflict in
// independent branches. Instead add your own.
-int const LYX_FORMAT = 413; // rgh: html_css_as_file
+int const LYX_FORMAT = 415; //uwestoehr : support for package undertilde (bug 6622)
typedef map<string, bool> DepClean;
typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;
~Impl()
{
+ delete preview_loader_;
if (wa_) {
wa_->closeAll();
delete wa_;
/// our Text that should be wrapped in an InsetText
InsetText * inset;
+ ///
+ PreviewLoader * preview_loader_;
+
/// This is here to force the test to be done whenever parent_buffer
/// is accessed.
Buffer const * parent() const {
Buffer const * cloned_buffer)
: owner_(owner), lyx_clean(true), bak_clean(true), unnamed(false),
read_only(readonly_), filename(file), file_fully_loaded(false),
- toc_backend(owner), macro_lock(false), timestamp_(0),
- checksum_(0), wa_(0), gui_(0), undo_(*owner), bibinfo_cache_valid_(false),
- bibfile_cache_valid_(false), cite_labels_valid_(false),
- cloned_buffer_(cloned_buffer), doing_export(false), parent_buffer(0)
+ toc_backend(owner), macro_lock(false), timestamp_(0), checksum_(0),
+ wa_(0), gui_(0), undo_(*owner), bibinfo_cache_valid_(false),
+ bibfile_cache_valid_(false), cite_labels_valid_(false),
+ preview_loader_(0), cloned_buffer_(cloned_buffer),
+ doing_export(false), parent_buffer(0)
{
if (!cloned_buffer_) {
temppath = createBufferTmpDir();
}
-void Buffer::updatePreviews() const
+PreviewLoader * Buffer::loader() const
{
- if (graphics::Previews::status() != LyXRC::PREVIEW_OFF)
- thePreviews().generateBufferPreviews(*this);
+ if (lyxrc.preview == LyXRC::PREVIEW_OFF)
+ return 0;
+ if (!d->preview_loader_)
+ d->preview_loader_ = new PreviewLoader(*this);
+ return d->preview_loader_;
}
void Buffer::removePreviews() const
{
- thePreviews().removeLoader(*this);
+ delete d->preview_loader_;
+ d->preview_loader_ = 0;
+}
+
+
+void Buffer::updatePreviews() const
+{
+ PreviewLoader * ploader = loader();
+ if (!ploader)
+ return;
+
+ InsetIterator it = inset_iterator_begin(*d->inset);
+ InsetIterator const end = inset_iterator_end(*d->inset);
+ for (; it != end; ++it)
+ it->addPreview(it, *ploader);
+
+ ploader->startLoading();
}
void Buffer::makeLyXHTMLFile(FileName const & fname,
- OutputParams const & runparams,
- bool const body_only) const
+ OutputParams const & runparams) const
{
LYXERR(Debug::LATEX, "makeLyXHTMLFile...");
updateBuffer(UpdateMaster, OutputUpdate);
updateMacroInstances(OutputUpdate);
- writeLyXHTMLSource(ofs, runparams, body_only);
+ writeLyXHTMLSource(ofs, runparams);
ofs.close();
if (ofs.fail())
{
ListOfBuffers v;
collectChildren(v, false);
+ // Make sure we have not included ourselves.
+ ListOfBuffers::iterator bit = find(v.begin(), v.end(), this);
+ if (bit != v.end()) {
+ LYXERR0("Recursive include detected in `" << fileName() << "'.");
+ v.erase(bit);
+ }
return v;
}
{
ListOfBuffers v;
collectChildren(v, true);
+ // Make sure we have not included ourselves.
+ ListOfBuffers::iterator bit = find(v.begin(), v.end(), this);
+ if (bit != v.end()) {
+ LYXERR0("Recursive include detected in `" << fileName() << "'.");
+ v.erase(bit);
+ }
return v;
}
ErrorList & Buffer::errorList(string const & type) const
{
- static ErrorList emptyErrorList;
- map<string, ErrorList>::iterator it = d->errorLists.find(type);
- if (it == d->errorLists.end())
- return emptyErrorList;
-
- return it->second;
+ return d->errorLists[type];
}
runparams.flavor = OutputParams::PDFLATEX;
else if (backend_format == "luatex")
runparams.flavor = OutputParams::LUATEX;
+ else if (backend_format == "dviluatex")
+ runparams.flavor = OutputParams::DVILUATEX;
else if (backend_format == "xetex")
runparams.flavor = OutputParams::XETEX;
}
// Compute the item depth of the paragraph
par.itemdepth = getItemDepth(it);
- if (layout.margintype == MARGIN_MANUAL
- || layout.latextype == LATEX_BIB_ENVIRONMENT) {
+ if (layout.margintype == MARGIN_MANUAL) {
if (par.params().labelWidthString().empty())
par.params().labelWidthString(par.expandLabel(layout, bp));
+ } else if (layout.latextype == LATEX_BIB_ENVIRONMENT) {
+ // we do not need to do anything here, since the empty case is
+ // handled during export.
} else {
par.params().labelWidthString(docstring());
}