/**
- * \file PreviewLoader.C
+ * \file PreviewLoader.C
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Angus Leeming
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "PreviewLoader.h"
#include "PreviewImage.h"
#include "buffer.h"
#include "converter.h"
+#include "format.h"
#include "debug.h"
#include "lyxrc.h"
-#include "LColor.h"
-
-#include "insets/inset.h"
#include "frontends/lyx_gui.h" // hexname
#include "support/forkedcontr.h"
#include "support/lstrings.h"
#include "support/lyxlib.h"
+#include "support/tostr.h"
#include <boost/bind.hpp>
-#include <boost/signals/trackable.hpp>
+#include "support/std_sstream.h"
#include <fstream>
#include <iomanip>
-#include <list>
-#include <map>
-#include <utility>
-#include <vector>
+
+namespace support = lyx::support;
+
using std::endl;
using std::find;
FindFirst(string const & comp) : comp_(comp) {}
bool operator()(StrPair const & sp)
{
- return sp.first < comp_;
+ return sp.first == comp_;
}
private:
string const comp_;
} // namespace anon
-namespace grfx {
+namespace lyx {
+namespace graphics {
struct PreviewLoader::Impl : public boost::signals::trackable {
///
return pimpl_->buffer();
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
// The details of the Impl
StrPair const operator()(string const & snippet)
{
ostringstream os;
- os << base_ << counter_++ << "." << to_format_;
+ os << base_ << counter_++ << '.' << to_format_;
string const file = STRCONV(os.str());
return make_pair(snippet, file);
void InProgress::stop() const
{
if (pid)
- ForkedcallsController::get().kill(pid, 0);
+ support::ForkedcallsController::get().kill(pid, 0);
if (!metrics_file.empty())
- lyx::unlink(metrics_file);
+ 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::unlink(vit->second);
+ support::unlink(vit->second);
}
}
} // namespace anon
-namespace grfx {
+namespace lyx {
+namespace graphics {
PreviewLoader::Impl::Impl(PreviewLoader & p, Buffer const & b)
: parent_(p), buffer_(b), font_scaling_factor_(0.0)
if (!pconverter_ || status(latex_snippet) != NotFound)
return;
- string const snippet = trim(latex_snippet);
+ string const snippet = support::trim(latex_snippet);
if (snippet.empty())
return;
lyxerr[Debug::GRAPHICS] << "PreviewLoader::startLoading()" << endl;
// As used by the LaTeX file and by the resulting image files
- string const filename_base(unique_filename(buffer_.tmppath));
+ string directory = buffer_.tmppath;
+ if (directory.empty())
+ directory = buffer_.filePath();
+
+ string const filename_base(unique_filename(directory));
// Create an InProgress instance to place in the map of all
// such processes if it starts correctly.
// The conversion command.
ostringstream cs;
- cs << pconverter_->command << " " << latexfile << " "
- << int(font_scaling_factor_) << " " << pconverter_->to;
+ cs << pconverter_->command << ' ' << latexfile << ' '
+ << int(font_scaling_factor_) << ' ' << pconverter_->to;
- string const command = "sh " + LibScriptSearch(STRCONV(cs.str()));
+ string const command = "sh " + support::LibScriptSearch(STRCONV(cs.str()));
// Initiate the conversion from LaTeX to bitmap images files.
- Forkedcall::SignalTypePtr convert_ptr(new Forkedcall::SignalType);
+ support::Forkedcall::SignalTypePtr
+ convert_ptr(new support::Forkedcall::SignalType);
convert_ptr->connect(
boost::bind(&Impl::finishedGenerating, this, _1, _2));
- Forkedcall call;
+ support::Forkedcall call;
int ret = call.startscript(command, convert_ptr);
if (ret != 0) {
in_progress_.erase(git);
// Tell the outside world
- std::list<PreviewImagePtr>::const_iterator nit = newimages.begin();
- std::list<PreviewImagePtr>::const_iterator nend = newimages.end();
+ 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());
}
// Why on earth is Buffer::makeLaTeXFile a non-const method?
Buffer & tmp = const_cast<Buffer &>(buffer_);
// Dump the preamble only.
- tmp.makeLaTeXFile(os, buffer_.filePath(), true, false, true);
+ LatexRunParams runparams;
+ runparams.flavor = LatexRunParams::LATEX;
+ runparams.nice = true;
+ runparams.moving_arg = true;
+ runparams.free_spacing = true;
+ tmp.makeLaTeXFile(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 &, ostream & os,
+ // LatexRunParams 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();
for (; it != end; ++it)
- if (it->lyxCode() == Inset::MATHMACRO_CODE)
- it->latex(&buffer_, os, true, true);
+ if (it->lyxCode() == InsetOld::MATHMACRO_CODE)
+ it->latex(buffer_, os, runparams);
// All equation lables appear as "(#)" + preview.sty's rendering of
// the label name
os << "\\AtBeginDocument{\\AtBeginDvi{%\n"
<< "\\special{!userdict begin/bop-hook{//bop-hook exec\n"
- << "<" << fg << bg << ">{255 div}forall setrgbcolor\n"
+ << '<' << fg << bg << ">{255 div}forall setrgbcolor\n"
<< "clippath fill setrgbcolor}bind def end}}}\n";
}
}
}
-} // namespace grfx
-
+} // namespace graphics
+} // namespace lyx
namespace {
{
static int theCounter = 0;
string const filename = tostr(theCounter++) + "lyxpreview";
- return AddName(bufferpath, filename);
+ return support::AddName(bufferpath, filename);
}
double const a = ascent + tp_ascent;
double const d = descent - tp_descent;
- if (!lyx::float_equal(a + d, 0, 0.1))
+ if (!support::float_equal(a + d, 0, 0.1))
*it = a / (a + d);
if (++it == end)
projects / features.git / blobdiff