-/*
- * \file PreviewLoader.C
- * Copyright 2002 the LyX Team
- * Read the file COPYING
+/**
+ * \file PreviewLoader.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
- * \author Angus Leeming <a.leeming@ic.ac.uk>
+ * \author Angus Leeming
+ *
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "PreviewLoader.h"
#include "PreviewImage.h"
-#include "PreviewMetrics.h"
+#include "GraphicsCache.h"
#include "buffer.h"
-#include "bufferparams.h"
#include "converter.h"
#include "debug.h"
-#include "lyxrc.h"
+#include "format.h"
+#include "insetiterator.h"
#include "LColor.h"
+#include "lyxrc.h"
+#include "outputparams.h"
+#include "paragraph.h"
-#include "insets/inset.h"
+#include "frontends/Application.h" // hexName
-#include "frontends/lyx_gui.h" // hexname
+#include "insets/inset.h"
#include "support/filetools.h"
#include "support/forkedcall.h"
+#include "support/forkedcontr.h"
#include "support/lstrings.h"
#include "support/lyxlib.h"
+#include "support/convert.h"
#include <boost/bind.hpp>
-#include <boost/signals/trackable.hpp>
+#include <sstream>
#include <fstream>
#include <iomanip>
-#include <map>
+
+using lyx::support::FileName;
using std::endl;
-using std::ofstream;
-using std::ostream;
-using std::setfill;
-using std::setw;
+using std::find;
+using std::fill;
+using std::find_if;
+using std::make_pair;
+
+using boost::bind;
+
+using std::ifstream;
+using std::list;
+using std::map;
+using std::ostringstream;
+using std::pair;
+using std::vector;
+using std::string;
namespace {
-string const unique_filename()
+typedef pair<string, FileName> SnippetPair;
+
+// A list of alll snippets to be converted to previews
+typedef list<string> PendingSnippets;
+
+// Each item in the vector is a pair<snippet, image file name>.
+typedef vector<SnippetPair> BitmapFile;
+
+
+string const unique_filename(string const & bufferpath)
{
-
- static string dir;
- if (dir.empty()) {
- string const tmp = lyx::tempName();
- lyx::unlink(tmp);
- dir = OnlyPath(tmp);
+ static int theCounter = 0;
+ string const filename = lyx::convert<string>(theCounter++) + "lyxpreview";
+ return lyx::support::addName(bufferpath, filename);
+}
+
+
+lyx::Converter const * setConverter()
+{
+ string const from = "lyxpreview";
+
+ typedef vector<string> FmtList;
+ typedef lyx::graphics::Cache GCache;
+ FmtList const loadableFormats = GCache::get().loadableFormats();
+ FmtList::const_iterator it = loadableFormats.begin();
+ FmtList::const_iterator const end = loadableFormats.end();
+
+ for (; it != end; ++it) {
+ string const to = *it;
+ if (from == to)
+ continue;
+
+ lyx::Converter const * ptr = lyx::theConverters().getConverter(from, to);
+ if (ptr)
+ return ptr;
}
- static int theCounter = 0;
- ostringstream os;
- os << dir << theCounter++ << "lyxpreview";
+ static bool first = true;
+ if (first) {
+ first = false;
+ lyx::lyxerr << "PreviewLoader::startLoading()\n"
+ << "No converter from \"lyxpreview\" format has been "
+ "defined."
+ << endl;
+ }
+ return 0;
+}
+
+
+void setAscentFractions(vector<double> & ascent_fractions,
+ FileName const & metrics_file)
+{
+ // If all else fails, then the images will have equal ascents and
+ // descents.
+ vector<double>::iterator it = ascent_fractions.begin();
+ vector<double>::iterator end = ascent_fractions.end();
+ fill(it, end, 0.5);
+
+ ifstream in(metrics_file.toFilesystemEncoding().c_str());
+ if (!in.good()) {
+ lyx::lyxerr[lyx::Debug::GRAPHICS]
+ << "setAscentFractions(" << metrics_file << ")\n"
+ << "Unable to open file!" << endl;
+ return;
+ }
+
+ bool error = false;
+
+ int snippet_counter = 1;
+ while (!in.eof() && it != end) {
+ string snippet;
+ int id;
+ double ascent_fraction;
+
+ in >> snippet >> id >> ascent_fraction;
+
+ if (!in.good())
+ // eof after all
+ break;
+
+ error = snippet != "Snippet";
+ if (error)
+ break;
+
+ error = id != snippet_counter;
+ if (error)
+ break;
+
+ *it = ascent_fraction;
- return os.str().c_str();
+ ++snippet_counter;
+ ++it;
+ }
+
+ if (error) {
+ lyx::lyxerr[lyx::Debug::GRAPHICS]
+ << "setAscentFractions(" << metrics_file << ")\n"
+ << "Error reading file!\n" << endl;
+ }
}
+
+class FindFirst : public std::unary_function<SnippetPair, bool> {
+public:
+ FindFirst(string const & comp) : comp_(comp) {}
+ bool operator()(SnippetPair const & sp) const
+ {
+ return sp.first == comp_;
+ }
+private:
+ string const comp_;
+};
+
+
+/// Store info on a currently executing, forked process.
+class InProgress {
+public:
+ ///
+ InProgress() : pid(0) {}
+ ///
+ InProgress(string const & filename_base,
+ PendingSnippets const & pending,
+ string const & to_format);
+ /// Remove any files left lying around and kill the forked process.
+ void stop() const;
+
+ ///
+ pid_t pid;
+ ///
+ string command;
+ ///
+ FileName metrics_file;
+ ///
+ BitmapFile snippets;
+};
+
+typedef map<pid_t, InProgress> InProgressProcesses;
+
+typedef InProgressProcesses::value_type InProgressProcess;
+
} // namespace anon
-namespace grfx {
-struct PreviewLoader::Impl : public boost::signals::trackable {
+namespace lyx {
+
+namespace graphics {
+
+class PreviewLoader::Impl : public boost::signals::trackable {
+public:
///
Impl(PreviewLoader & p, Buffer const & b);
+ /// Stop any InProgress items still executing.
+ ~Impl();
///
PreviewImage const * preview(string const & latex_snippet) const;
///
///
void startLoading();
+ /// Emit this signal when an image is ready for display.
+ boost::signal<void(PreviewImage const &)> imageReady;
+
+ Buffer const & buffer() const { return buffer_; }
+
private:
/// Called by the Forkedcall process that generated the bitmap files.
- void finishedGenerating(string const &, pid_t, int);
+ void finishedGenerating(pid_t, int);
///
- void dumpPreamble(ostream &) const;
+ void dumpPreamble(odocstream &) const;
///
- void dumpData(ostream &) const;
-
- ///
- static void setConverter();
- /// We don't own this
- static Converter const * pconverter_;
+ void dumpData(odocstream &, BitmapFile const &) const;
- /** The cache allows easy retrieval of already-generated images
+ /** cache_ allows easy retrieval of already-generated images
* using the LaTeX snippet as the identifier.
*/
typedef boost::shared_ptr<PreviewImage> PreviewImagePtr;
///
- typedef std::map<string, PreviewImagePtr> Cache;
+ typedef map<string, PreviewImagePtr> Cache;
///
Cache cache_;
- /** The map stores the LaTeX snippet and the name of the generated
- * bitmap image file.
+ /** pending_ stores the LaTeX snippets in anticipation of them being
+ * sent to the converter.
*/
- typedef std::map<string, string> PendingMap;
- ///
- PendingMap pending_;
-
- /// Store info on a currently executing, forked process.
- struct InProgress {
- ///
- typedef std::map<string, string> PendingMap;
- ///
- InProgress() {}
- ///
- InProgress(string const & mf, PendingMap const & s)
- : metrics_file(mf), snippets(s)
- {}
- ///
- string metrics_file;
- ///
- PendingMap snippets;
- };
- friend class InProgress;
-
- /// Store all forked processes so that we can proceed thereafter.
- typedef std::map<string, InProgress> InProgressMap;
- ///
- InProgressMap in_progress_;
+ PendingSnippets pending_;
+
+ /** in_progress_ stores all forked processes so that we can proceed
+ * thereafter.
+ The map uses the conversion commands as its identifiers.
+ */
+ InProgressProcesses in_progress_;
- ///
- string filename_base_;
///
PreviewLoader & parent_;
///
Buffer const & buffer_;
+ ///
+ double font_scaling_factor_;
+
+ /// We don't own this
+ static Converter const * pconverter_;
};
Converter const * PreviewLoader::Impl::pconverter_;
+//
+// The public interface, defined in PreviewLoader.h
+//
+
PreviewLoader::PreviewLoader(Buffer const & b)
: pimpl_(new Impl(*this, b))
{}
}
-void PreviewLoader::add(string const & latex_snippet)
+void PreviewLoader::add(string const & latex_snippet) const
{
pimpl_->add(latex_snippet);
}
-void PreviewLoader::remove(string const & latex_snippet)
+void PreviewLoader::remove(string const & latex_snippet) const
{
pimpl_->remove(latex_snippet);
}
-void PreviewLoader::startLoading()
+void PreviewLoader::startLoading() const
{
pimpl_->startLoading();
}
-void PreviewLoader::Impl::setConverter()
+boost::signals::connection PreviewLoader::connect(slot_type const & slot) const
{
- if (pconverter_)
- return;
+ return pimpl_->imageReady.connect(slot);
+}
- string const from = "lyxpreview";
- Formats::FormatList::const_iterator it = formats.begin();
- Formats::FormatList::const_iterator end = formats.end();
+void PreviewLoader::emitSignal(PreviewImage const & pimage) const
+{
+ pimpl_->imageReady(pimage);
+}
- for (; it != end; ++it) {
- string const to = it->name();
- if (from == to)
- continue;
- Converter const * ptr = converters.getConverter(from, to);
- if (ptr) {
- pconverter_ = ptr;
- break;
- }
+
+Buffer const & PreviewLoader::buffer() const
+{
+ return pimpl_->buffer();
+}
+
+} // namespace graphics
+} // namespace lyx
+
+
+// The details of the Impl
+// =======================
+
+namespace {
+
+class IncrementedFileName {
+public:
+ IncrementedFileName(string const & to_format,
+ string const & filename_base)
+ : to_format_(to_format), base_(filename_base), counter_(1)
+ {}
+
+ SnippetPair const operator()(string const & snippet)
+ {
+ ostringstream os;
+ os << base_ << counter_++ << '.' << to_format_;
+ string const file = os.str();
+
+ return make_pair(snippet, FileName(file));
}
- if (pconverter_)
- return;
+private:
+ string const & to_format_;
+ string const & base_;
+ int counter_;
+};
- static bool first = true;
- if (!first)
- return;
- first = false;
- lyxerr << "PreviewLoader::startLoading()\n"
- << "No converter from \"lyxpreview\" format has been defined."
- << endl;
+InProgress::InProgress(string const & filename_base,
+ PendingSnippets const & pending,
+ string const & to_format)
+ : pid(0),
+ metrics_file(FileName(filename_base + ".metrics")),
+ snippets(pending.size())
+{
+ PendingSnippets::const_iterator pit = pending.begin();
+ PendingSnippets::const_iterator pend = pending.end();
+ BitmapFile::iterator sit = snippets.begin();
+
+ std::transform(pit, pend, sit,
+ IncrementedFileName(to_format, filename_base));
+}
+
+
+void InProgress::stop() const
+{
+ if (pid)
+ lyx::support::ForkedcallsController::get().kill(pid, 0);
+
+ if (!metrics_file.empty())
+ lyx::support::unlink(metrics_file);
+
+ BitmapFile::const_iterator vit = snippets.begin();
+ BitmapFile::const_iterator vend = snippets.end();
+ for (; vit != vend; ++vit) {
+ if (!vit->second.empty())
+ lyx::support::unlink(vit->second);
+ }
}
+} // namespace anon
+
+
+namespace lyx {
+namespace graphics {
PreviewLoader::Impl::Impl(PreviewLoader & p, Buffer const & b)
- : filename_base_(unique_filename()), parent_(p), buffer_(b)
-{}
+ : parent_(p), buffer_(b), font_scaling_factor_(0.0)
+{
+ font_scaling_factor_ = 0.01 * lyxrc.dpi * lyxrc.zoom *
+ convert<double>(lyxrc.preview_scale_factor);
+
+ lyxerr[Debug::GRAPHICS] << "The font scaling factor is "
+ << font_scaling_factor_ << endl;
+
+ if (!pconverter_)
+ pconverter_ = setConverter();
+}
+
+
+PreviewLoader::Impl::~Impl()
+{
+ InProgressProcesses::iterator ipit = in_progress_.begin();
+ InProgressProcesses::iterator ipend = in_progress_.end();
+
+ for (; ipit != ipend; ++ipit) {
+ ipit->second.stop();
+ }
+}
PreviewImage const *
}
+namespace {
+
+class FindSnippet : public std::unary_function<InProgressProcess, bool> {
+public:
+ FindSnippet(string const & s) : snippet_(s) {}
+ bool operator()(InProgressProcess const & process) const
+ {
+ BitmapFile const & snippets = process.second.snippets;
+ BitmapFile::const_iterator beg = snippets.begin();
+ BitmapFile::const_iterator end = snippets.end();
+ return find_if(beg, end, FindFirst(snippet_)) != end;
+ }
+
+private:
+ string const snippet_;
+};
+
+} // namespace anon
+
PreviewLoader::Status
PreviewLoader::Impl::status(string const & latex_snippet) const
{
Cache::const_iterator cit = cache_.find(latex_snippet);
if (cit != cache_.end())
- return PreviewLoader::Ready;
+ return Ready;
- PendingMap::const_iterator pit = pending_.find(latex_snippet);
- if (pit != pending_.end())
- return PreviewLoader::InQueue;
+ PendingSnippets::const_iterator pit = pending_.begin();
+ PendingSnippets::const_iterator pend = pending_.end();
- InProgressMap::const_iterator git = in_progress_.begin();
- InProgressMap::const_iterator gend = in_progress_.end();
+ pit = find(pit, pend, latex_snippet);
+ if (pit != pend)
+ return InQueue;
- for (; git != gend; ++git) {
- PendingMap::const_iterator pit =
- git->second.snippets.find(latex_snippet);
- if (pit != git->second.snippets.end())
- return PreviewLoader::Processing;
- }
+ InProgressProcesses::const_iterator ipit = in_progress_.begin();
+ InProgressProcesses::const_iterator ipend = in_progress_.end();
+
+ ipit = find_if(ipit, ipend, FindSnippet(latex_snippet));
+ if (ipit != ipend)
+ return Processing;
- return PreviewLoader::NotFound;
+ return NotFound;
}
void PreviewLoader::Impl::add(string const & latex_snippet)
{
- if (!pconverter_) {
- setConverter();
- if (!pconverter_)
- return;
- }
-
- Cache::const_iterator cit = cache_.find(latex_snippet);
- if (cit != cache_.end())
+ if (!pconverter_ || status(latex_snippet) != NotFound)
return;
- PendingMap::const_iterator pit = pending_.find(latex_snippet);
- if (pit != pending_.end())
+ string const snippet = support::trim(latex_snippet);
+ if (snippet.empty())
return;
- int const snippet_counter = int(pending_.size()) + 1;
- ostringstream os;
- os << filename_base_
- << setfill('0') << setw(3) << snippet_counter
- << "." << pconverter_->to;
- string const image_filename = os.str().c_str();
+ lyxerr[Debug::GRAPHICS] << "adding snippet:\n" << snippet << endl;
- pending_[latex_snippet] = image_filename;
+ pending_.push_back(snippet);
}
+namespace {
+
+class EraseSnippet {
+public:
+ EraseSnippet(string const & s) : snippet_(s) {}
+ void operator()(InProgressProcess & process)
+ {
+ BitmapFile & snippets = process.second.snippets;
+ BitmapFile::iterator it = snippets.begin();
+ BitmapFile::iterator end = snippets.end();
+
+ it = find_if(it, end, FindFirst(snippet_));
+ if (it != end)
+ snippets.erase(it, it+1);
+ }
+
+private:
+ string const & snippet_;
+};
+
+} // namespace anon
+
+
void PreviewLoader::Impl::remove(string const & latex_snippet)
{
Cache::iterator cit = cache_.find(latex_snippet);
if (cit != cache_.end())
cache_.erase(cit);
- PendingMap::iterator pit = pending_.find(latex_snippet);
- if (pit != pending_.end())
- pending_.erase(pit);
+ PendingSnippets::iterator pit = pending_.begin();
+ PendingSnippets::iterator pend = pending_.end();
- InProgressMap::iterator git = in_progress_.begin();
- InProgressMap::iterator gend = in_progress_.end();
+ pending_.erase(std::remove(pit, pend, latex_snippet), pend);
- while (git != gend) {
- InProgressMap::iterator curr = git;
- ++git;
+ InProgressProcesses::iterator ipit = in_progress_.begin();
+ InProgressProcesses::iterator ipend = in_progress_.end();
- PendingMap::iterator pit =
- curr->second.snippets.find(latex_snippet);
- if (pit != curr->second.snippets.end())
- curr->second.snippets.erase(pit);
+ std::for_each(ipit, ipend, EraseSnippet(latex_snippet));
+ while (ipit != ipend) {
+ InProgressProcesses::iterator curr = ipit++;
if (curr->second.snippets.empty())
in_progress_.erase(curr);
}
void PreviewLoader::Impl::startLoading()
{
- if (pending_.empty())
+ if (pending_.empty() || !pconverter_)
return;
- if (!pconverter_) {
- setConverter();
- if (!pconverter_)
- return;
- }
+ // Only start the process off after the buffer is loaded from file.
+ if (!buffer_.fully_loaded())
+ return;
lyxerr[Debug::GRAPHICS] << "PreviewLoader::startLoading()" << endl;
+ // As used by the LaTeX file and by the resulting image files
+ string const directory = buffer_.temppath();
+
+ string const filename_base = unique_filename(directory);
+
+ // Create an InProgress instance to place in the map of all
+ // such processes if it starts correctly.
+ InProgress inprogress(filename_base, pending_, pconverter_->to);
+
+ // clear pending_, so we're ready to start afresh.
+ pending_.clear();
+
// Output the LaTeX file.
- string const latexfile = filename_base_ + ".tex";
+ FileName const latexfile(filename_base + ".tex");
- ofstream of(latexfile.c_str());
+ // FIXME UNICODE
+ // This creates an utf8 encoded file, but the proper inputenc
+ // command is missing.
+ odocfstream of(latexfile.toFilesystemEncoding().c_str());
+ if (!of) {
+ lyxerr[Debug::GRAPHICS] << "PreviewLoader::startLoading()\n"
+ << "Unable to create LaTeX file\n"
+ << latexfile << endl;
+ return;
+ }
+ of << "\\batchmode\n";
dumpPreamble(of);
of << "\n\\begin{document}\n";
- dumpData(of);
+ dumpData(of, inprogress.snippets);
of << "\n\\end{document}\n";
of.close();
// The conversion command.
ostringstream cs;
- cs << pconverter_->command << " " << latexfile << " "
- << tostr(0.01 * lyxrc.dpi * lyxrc.zoom);
-
- // Store the generation process in a list of all generating processes
- // (I anticipate that this will be small!)
- string const command = cs.str().c_str();
- string const metrics_file = filename_base_ + ".metrics";
- in_progress_[command] = InProgress(metrics_file, pending_);
+ cs << pconverter_->command << ' ' << pconverter_->to << ' '
+ << support::quoteName(latexfile.toFilesystemEncoding()) << ' '
+ << int(font_scaling_factor_) << ' '
+ << theApp()->hexName(LColor::preview) << ' '
+ << theApp()->hexName(LColor::background);
- // Reset the filename and clear the data, so we're ready to
- // start afresh.
- pending_.clear();
- filename_base_ = unique_filename();
+ string const command = support::libScriptSearch(cs.str());
// Initiate the conversion from LaTeX to bitmap images files.
- Forkedcall::SignalTypePtr convert_ptr;
- convert_ptr.reset(new Forkedcall::SignalType);
-
- convert_ptr->connect(
- boost::bind(&Impl::finishedGenerating, this, _1, _2, _3));
+ support::Forkedcall::SignalTypePtr
+ convert_ptr(new support::Forkedcall::SignalType);
+ convert_ptr->connect(bind(&Impl::finishedGenerating, this, _1, _2));
- Forkedcall call;
+ support::Forkedcall call;
int ret = call.startscript(command, convert_ptr);
if (ret != 0) {
- InProgressMap::iterator it = in_progress_.find(command);
- if (it != in_progress_.end())
- in_progress_.erase(it);
-
lyxerr[Debug::GRAPHICS] << "PreviewLoader::startLoading()\n"
- << "Unable to start process \n"
+ << "Unable to start process\n"
<< command << endl;
+ return;
}
+
+ // Store the generation process in a list of all such processes
+ inprogress.pid = call.pid();
+ inprogress.command = command;
+ in_progress_[inprogress.pid] = inprogress;
}
-void PreviewLoader::Impl::finishedGenerating(string const & command,
- pid_t /* pid */, int retval)
+void PreviewLoader::Impl::finishedGenerating(pid_t pid, int retval)
{
+ // Paranoia check!
+ InProgressProcesses::iterator git = in_progress_.find(pid);
+ if (git == in_progress_.end()) {
+ lyxerr << "PreviewLoader::finishedGenerating(): unable to find "
+ "data for PID " << pid << endl;
+ return;
+ }
+
+ string const command = git->second.command;
string const status = retval > 0 ? "failed" : "succeeded";
lyxerr[Debug::GRAPHICS] << "PreviewLoader::finishedInProgress("
<< retval << "): processing " << status
if (retval > 0)
return;
- InProgressMap::iterator git = in_progress_.find(command);
- if (git == in_progress_.end()) {
- lyxerr << "PreviewLoader::finishedGenerating(): unable to find "
- "data for\n"
- << command << "!" << endl;
- return;
- }
-
// Read the metrics file, if it exists
- PreviewMetrics metrics_file(git->second.metrics_file);
-
+ vector<double> ascent_fractions(git->second.snippets.size());
+ setAscentFractions(ascent_fractions, git->second.metrics_file);
+
// Add these newly generated bitmap files to the cache and
// start loading them into LyX.
- PendingMap::const_iterator it = git->second.snippets.begin();
- PendingMap::const_iterator end = git->second.snippets.end();
+ BitmapFile::const_iterator it = git->second.snippets.begin();
+ BitmapFile::const_iterator end = git->second.snippets.end();
+
+ std::list<PreviewImagePtr> newimages;
int metrics_counter = 0;
- for (; it != end; ++it) {
+ for (; it != end; ++it, ++metrics_counter) {
string const & snip = it->first;
+ FileName const & file = it->second;
+ double af = ascent_fractions[metrics_counter];
- // Paranoia check
- Cache::const_iterator chk = cache_.find(snip);
- if (chk != cache_.end())
- continue;
-
- // Mental note (Angus, 4 July 2002, having just found out the
- // hard way :-().
- // We /must/ first add to the cache and then start the
- // image loading process.
- // If not, then outside functions can be called before by the
- // image loader before the PreviewImage is properly constucted.
- // This can lead to all sorts of horribleness if such a
- // function attempts to access its internals.
- string const & file = it->second;
- double af = metrics_file.ascent_fraction(metrics_counter++);
PreviewImagePtr ptr(new PreviewImage(parent_, snip, file, af));
-
cache_[snip] = ptr;
- ptr->startLoading();
+ newimages.push_back(ptr);
}
+ // Remove the item from the list of still-executing processes.
in_progress_.erase(git);
+
+ // Tell the outside world
+ std::list<PreviewImagePtr>::const_reverse_iterator
+ nit = newimages.rbegin();
+ std::list<PreviewImagePtr>::const_reverse_iterator
+ nend = newimages.rend();
+ for (; nit != nend; ++nit) {
+ imageReady(*nit->get());
+ }
}
-void PreviewLoader::Impl::dumpPreamble(ostream & os) const
+void PreviewLoader::Impl::dumpPreamble(odocstream & os) const
{
// Why on earth is Buffer::makeLaTeXFile a non-const method?
Buffer & tmp = const_cast<Buffer &>(buffer_);
// Dump the preamble only.
- tmp.makeLaTeXFile(os, string(), true, false, true);
+ OutputParams runparams;
+ runparams.flavor = OutputParams::LATEX;
+ runparams.nice = true;
+ runparams.moving_arg = true;
+ runparams.free_spacing = true;
+ tmp.writeLaTeXSource(os, buffer_.filePath(), runparams, true, false);
+
+ // FIXME! This is a HACK! The proper fix is to control the 'true'
+ // passed to WriteStream below:
+ // int InsetFormula::latex(Buffer const &, odocstream & os,
+ // OutputParams const & runparams) const
+ // {
+ // WriteStream wi(os, runparams.moving_arg, true);
+ // par_->write(wi);
+ // return wi.line();
+ // }
+ os << "\n"
+ << "\\def\\lyxlock{}\n"
+ << "\n";
// Loop over the insets in the buffer and dump all the math-macros.
- Buffer::inset_iterator it = buffer_.inset_const_iterator_begin();
- Buffer::inset_iterator end = buffer_.inset_const_iterator_end();
+ InsetBase & inset = buffer_.inset();
+ InsetIterator it = inset_iterator_begin(inset);
+ InsetIterator const end = inset_iterator_end(inset);
- for (; it != end; ++it) {
- if ((*it)->lyxCode() == Inset::MATHMACRO_CODE) {
- (*it)->latex(&buffer_, os, true, true);
- }
- }
+ for (; it != end; ++it)
+ if (it->lyxCode() == InsetBase::MATHMACRO_CODE)
+ it->latex(buffer_, os, runparams);
+
+ // All equation lables appear as "(#)" + preview.sty's rendering of
+ // the label name
+ if (lyxrc.preview_hashed_labels)
+ os << "\\renewcommand{\\theequation}{\\#}\n";
// Use the preview style file to ensure that each snippet appears on a
// fresh page.
os << "\n"
- << "\\usepackage[active,dvips,tightpage]{preview}\n"
+ << "\\usepackage[active,delayed,dvips,showlabels,lyx]{preview}\n"
<< "\n";
-
- // This piece of PostScript magic ensures that the foreground and
- // background colors are the same as the LyX screen.
- string fg = lyx_gui::hexname(LColor::preview);
- if (fg.empty()) fg = "000000";
-
- string bg = lyx_gui::hexname(LColor::background);
- if (bg.empty()) bg = "ffffff";
-
- os << "\\AtBeginDocument{\\AtBeginDvi{%\n"
- << "\\special{!userdict begin/bop-hook{//bop-hook exec\n"
- << "<" << fg << bg << ">{255 div}forall setrgbcolor\n"
- << "clippath fill setrgbcolor}bind def end}}}\n";
}
-namespace {
-
-typedef std::pair<string, string> StrPair;
-
-struct CompSecond {
- bool operator()(StrPair const & lhs, StrPair const & rhs)
- {
- return lhs.second < rhs.second;
- }
-};
-
-} // namespace anon
-
-
-void PreviewLoader::Impl::dumpData(ostream & os) const
+void PreviewLoader::Impl::dumpData(odocstream & os,
+ BitmapFile const & vec) const
{
- if (pending_.empty())
+ if (vec.empty())
return;
- // Sorting by image filename ensures that the snippets are put into
- // the LaTeX file in the expected order.
- std::vector<StrPair> vec(pending_.begin(), pending_.end());
- std::sort(vec.begin(), vec.end(), CompSecond());
-
- std::vector<StrPair>::const_iterator it = vec.begin();
- std::vector<StrPair>::const_iterator end = vec.end();
+ BitmapFile::const_iterator it = vec.begin();
+ BitmapFile::const_iterator end = vec.end();
for (; it != end; ++it) {
+ // FIXME UNICODE
os << "\\begin{preview}\n"
- << it->first
+ << from_utf8(it->first)
<< "\n\\end{preview}\n\n";
}
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
+