#include "Converter.h"
#include "Encoding.h"
#include "Format.h"
-#include "InsetIterator.h"
-#include "LaTeXFeatures.h"
#include "LyXRC.h"
#include "output.h"
#include "OutputParams.h"
#include "frontends/Application.h" // hexName
-#include "insets/Inset.h"
-
#include "support/convert.h"
#include "support/debug.h"
#include "support/FileName.h"
#include "support/filetools.h"
#include "support/ForkedCalls.h"
#include "support/lstrings.h"
+#include "support/os.h"
#include "support/TempFile.h"
void refreshPreviews();
/// Emit this signal when an image is ready for display.
- signals2::signal<void(PreviewImage const &)> imageReady;
+ signal<void(PreviewImage const &)> imageReady;
Buffer const & buffer() const { return buffer_; }
/// Called by the ForkedCall process that generated the bitmap files.
void finishedGenerating(pid_t, int);
///
- void dumpPreamble(otexstream &, OutputParams::FLAVOR) const;
+ void dumpPreamble(otexstream &, Flavor) const;
///
void dumpData(odocstream &, BitmapFile const &) const;
/// We don't own this
static lyx::Converter const * pconverter_;
- Trackable trackable_;
};
//
PreviewLoader::PreviewLoader(Buffer const & b)
- : pimpl_(new Impl(*this, b))
+ : pimpl_(make_shared<Impl>(*this, b))
{}
-PreviewLoader::~PreviewLoader()
-{
- delete pimpl_;
-}
-
-
PreviewImage const * PreviewLoader::preview(string const & latex_snippet) const
{
return pimpl_->preview(latex_snippet);
}
-signals2::connection PreviewLoader::connect(slot const & slot) const
+connection PreviewLoader::connect(slot const & slot) const
{
return pimpl_->imageReady.connect(slot);
}
namespace {
-std::function<SnippetPair (string const &)> IncrementedFileName
- (string const & to_format, string const & filename_base)
-{
- return [&to_format, &filename_base](string const & snippet)
+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)
{
- static int counter_ = 1;
ostringstream os;
- os << filename_base << counter_++ << '.' << to_format;
- string const file = os.str();
- return make_pair(snippet, FileName(file));
- };
-}
+ os << base_ << counter_++ << '.' << to_format_;
+ string const file_name = os.str();
+ return make_pair(snippet, FileName(file_name));
+ }
+
+private:
+ string const & to_format_;
+ string const & base_;
+ int counter_;
+};
InProgress::InProgress(string const & filename_base,
{
font_scaling_factor_ = int(buffer_.fontScalingFactor());
if (theApp()) {
- fg_color_ = strtol(theApp()->hexName(foregroundColor()).c_str(), nullptr, 16);
- bg_color_ = strtol(theApp()->hexName(backgroundColor()).c_str(), nullptr, 16);
+ fg_color_ = convert(theApp()->hexName(foregroundColor()), 16);
+ bg_color_ = convert(theApp()->hexName(backgroundColor()), 16);
} else {
fg_color_ = 0x0;
bg_color_ = 0xffffff;
int fg = 0x0;
int bg = 0xffffff;
if (theApp()) {
- fg = strtol(theApp()->hexName(foregroundColor()).c_str(), nullptr, 16);
- bg = strtol(theApp()->hexName(backgroundColor()).c_str(), nullptr, 16);
+ fg = convert(theApp()->hexName(foregroundColor()), 16);
+ bg = convert(theApp()->hexName(backgroundColor()), 16);
}
if (font_scaling_factor_ != fs || fg_color_ != fg || bg_color_ != bg) {
// Schedule refresh of all previews on zoom or color changes.
// Don't try to access the cache until we are done.
if (delay_refresh_->isActive() || !finished_generating_)
return nullptr;
+
Cache::const_iterator it = cache_.find(latex_snippet);
return (it == cache_.end()) ? nullptr : it->second.get();
}
namespace {
-std::function<void (InProgressProcess &)> EraseSnippet(string const & s) {
+std::function<void (InProgressProcess &)> EraseSnippet(string const & s)
+{
return [&s](InProgressProcess & process) {
BitmapFile & snippets = process.second.snippets;
BitmapFile::iterator it = snippets.begin();
if (it != end)
snippets.erase(it, it+1);
};
-};
+}
} // namespace
}
otexstream os(of);
- OutputParams runparams(&enc);
- LaTeXFeatures features(buffer_, buffer_.params(), runparams);
-
if (!openFileWrite(of, latexfile))
return;
}
of << "\\batchmode\n";
- // Set \jobname of previews to the document name (see bug 9627)
- of << "\\def\\jobname{"
- << from_utf8(changeExtension(buffer_.latexName(true), ""))
- << "}\n";
-
- LYXERR(Debug::LATEX, "Format = " << buffer_.params().getDefaultOutputFormat());
+ LYXERR(Debug::OUTFILE, "Format = " << buffer_.params().getDefaultOutputFormat());
string latexparam = "";
bool docformat = !buffer_.params().default_output_format.empty()
&& buffer_.params().default_output_format != "default";
// Use LATEX flavor if the document does not specify a specific
// output format (see bug 9371).
- OutputParams::FLAVOR flavor = docformat
+ Flavor flavor = docformat
? buffer_.params().getOutputFlavor()
- : OutputParams::LATEX;
+ : Flavor::LaTeX;
if (buffer_.params().encoding().package() == Encoding::japanese) {
latexparam = " --latex=platex";
- flavor = OutputParams::LATEX;
+ flavor = Flavor::LaTeX;
}
else if (buffer_.params().useNonTeXFonts) {
- if (flavor == OutputParams::LUATEX)
+ if (flavor == Flavor::LuaTeX)
latexparam = " --latex=lualatex";
else {
- flavor = OutputParams::XETEX;
+ flavor = Flavor::XeTeX;
latexparam = " --latex=xelatex";
}
}
else {
switch (flavor) {
- case OutputParams::PDFLATEX:
+ case Flavor::PdfLaTeX:
latexparam = " --latex=pdflatex";
break;
- case OutputParams::XETEX:
+ case Flavor::XeTeX:
latexparam = " --latex=xelatex";
break;
- case OutputParams::LUATEX:
+ case Flavor::LuaTeX:
latexparam = " --latex=lualatex";
break;
- case OutputParams::DVILUATEX:
+ case Flavor::DviLuaTeX:
latexparam = " --latex=dvilualatex";
break;
default:
- flavor = OutputParams::LATEX;
+ flavor = Flavor::LaTeX;
}
}
dumpPreamble(os, flavor);
// The conversion command.
ostringstream cs;
- cs << pconverter_->command()
+ cs << subst(pconverter_->command(), "$${python}", os::python())
<< " " << quoteName(latexfile.toFilesystemEncoding())
<< " --dpi " << font_scaling_factor_;
// Initiate the conversion from LaTeX to bitmap images files.
ForkedCall::sigPtr convert_ptr = make_shared<ForkedCall::sig>();
- convert_ptr->connect(ForkedProcess::slot([this](pid_t pid, int retval){
- finishedGenerating(pid, retval);
- }).track_foreign(trackable_.p()));
+ weak_ptr<PreviewLoader::Impl> this_ = parent_.pimpl_;
+ convert_ptr->connect([this_](pid_t pid, int retval){
+ if (auto p = this_.lock()) {
+ p->finishedGenerating(pid, retval);
+ }
+ });
ForkedCall call(buffer_.filePath());
int ret = call.startScript(command, convert_ptr);
imageReady(*nit->get());
}
finished_generating_ = true;
+ buffer_.scheduleRedrawWorkAreas();
}
-void PreviewLoader::Impl::dumpPreamble(otexstream & os, OutputParams::FLAVOR flavor) const
+void PreviewLoader::Impl::dumpPreamble(otexstream & os, Flavor flavor) const
{
// Dump the preamble only.
- LYXERR(Debug::LATEX, "dumpPreamble, flavor == " << flavor);
+ LYXERR(Debug::OUTFILE, "dumpPreamble, flavor == " << static_cast<int>(flavor));
OutputParams runparams(&buffer_.params().encoding());
runparams.flavor = flavor;
runparams.nice = true;
buffer_.writeLaTeXSource(os, buffer_.filePath(), runparams, Buffer::OnlyPreamble);
// FIXME! This is a HACK! The proper fix is to control the 'true'
- // passed to WriteStream below:
+ // passed to TeXMathStream below:
// int InsetMathNest::latex(Buffer const &, odocstream & os,
// OutputParams const & runparams) const
// {
- // WriteStream wi(os, runparams.moving_arg, true);
+ // TeXMathStream wi(os, runparams.moving_arg, true);
// par_->write(wi);
// return wi.line();
// }
projects / lyx.git / blobdiff