anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Put the dummy tex2lyx support where it is supposed to be.

Browse Source
This commit is contained in:
Richard Heck 2017-12-23 15:04:40 -05:00
parent 320edd1c24
commit 2335d196b4
3 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/Converter.cpp
View File

@ -419,9 +419,16 @@ bool Converters::convert(Buffer const * buffer,
Systemcall::Starttype starttype =
(buffer && buffer->isClone()) ?
Systemcall::WaitLoop : Systemcall::Wait;
one.startscript(starttype, command,
buffer ? buffer->filePath() : string(),
buffer ? buffer->layoutPos() : string());
int const exitval = one.startscript(starttype, command,
buffer ? buffer->filePath() : string(),
buffer ? buffer->layoutPos() : string());
if (exitval == Systemcall::KILLED) {
frontend::Alert::warning(
_("Converter killed"),
bformat(_("The running converter\n %1$s\nwas killed by the user."),
from_utf8(command)));
return false;
}
if (to_file.isReadableFile()) {
if (conversionflags & try_cache)
ConverterCache::get().add(orig_from,
@ -567,6 +574,8 @@ bool Converters::convert(Buffer const * buffer,
&& !contains(command, "-shell-escape"))
command += " -shell-escape ";
LYXERR(Debug::FILES, "Running " << command);
// FIXME KILLED
// Check changed return value here.
if (!runLaTeX(*buffer, command, runparams, errorList))
return false;
} else {
@ -595,6 +604,8 @@ bool Converters::convert(Buffer const * buffer,
LYXERR(Debug::FILES, "Running "
<< command
<< " to update aux file");
// FIXME KILLED
// Check changed return value here.
if (!runLaTeX(*buffer, command,
runparams, errorList))
return false;
@ -652,6 +663,14 @@ bool Converters::convert(Buffer const * buffer,
: string(),
buffer ? buffer->layoutPos()
: string());
if (res == Systemcall::KILLED) {
frontend::Alert::warning(
_("Converter killed"),
bformat(_("The running converter\n %1$s\nwas killed by the user."),
from_utf8(command)));
return false;
}
if (!real_outfile.empty()) {
Mover const & mover = getMover(conv.to());
if (!mover.rename(outfile, real_outfile))
@ -669,10 +688,17 @@ bool Converters::convert(Buffer const * buffer,
string const command2 = conv.parselog() +
" < " + quoteName(infile2 + ".out") +
" > " + quoteName(logfile);
one.startscript(starttype,
res = one.startscript(starttype,
to_filesystem8bit(from_utf8(command2)),
buffer->filePath(),
buffer->layoutPos());
if (res == Systemcall::KILLED) {
frontend::Alert::warning(
_("Converter killed"),
bformat(_("The running converter\n %1$s\nwas killed by the user."),
from_utf8(command)));
return false;
}
if (!scanLog(*buffer, command, makeAbsPath(logfile, path), errorList))
return false;
}
@ -800,6 +826,8 @@ bool Converters::scanLog(Buffer const & buffer, string const & /*command*/,
}
// FIXME KILL
// Probably need to return an INT here
bool Converters::runLaTeX(Buffer const & buffer, string const & command,
OutputParams const & runparams, ErrorList & errorList)
{

10
src/tex2lyx/dummy_impl.cpp
View File

@ -129,6 +129,16 @@ frontend::FontMetrics const & theFontMetrics(FontInfo const &) {
return dummy;
}
//
// Dummy theApp() support (needed by support/Systemcall.cpp)
//
struct App {
bool cancel_export;
};
App app;
App * theApp() { return &app; }
//
// Keep the linker happy on Windows
//

9
src/tex2lyx/tex2lyx.cpp
View File

@ -49,15 +49,6 @@ using namespace lyx::support::os;
namespace lyx {
struct App {
bool cancel_export;
};
App app;
App * theApp() { return &app; }
string const trimSpaceAndEol(string const & a)
{
return trim(a, " \t\n\r");