From a536ee7718c7ffbe185843330986cfda08b31868 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Sat, 30 Jul 2016 23:48:27 -0400 Subject: [PATCH] Fix preview of external material with plaintext and DocBook. (cherry picked from commit 93a612220ed4ce604c864b72b14efc59e8ce6683) --- src/insets/InsetExternal.cpp | 10 ++++++---- status.22x | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp index 097dc7d3e0..8e89ead8be 100644 --- a/src/insets/InsetExternal.cpp +++ b/src/insets/InsetExternal.cpp @@ -729,10 +729,11 @@ int InsetExternal::plaintext(odocstringstream & os, TexRow texrow; otexstream ots(os, texrow); + bool const external_in_tmpdir = !runparams.nice; + bool const dryrun = runparams.dryrun || runparams.inComment; ots << '\n'; // output external material on a new line external::writeExternal(params_, "Ascii", buffer(), ots, - *(runparams.exportdata), false, - runparams.dryrun || runparams.inComment); + *(runparams.exportdata), external_in_tmpdir, dryrun); return PLAINTEXT_NEWLINE; } @@ -743,9 +744,10 @@ int InsetExternal::docbook(odocstream & os, TexRow texrow; odocstringstream ods; otexstream ots(ods, texrow); + bool const external_in_tmpdir = !runparams.nice; + bool const dryrun = runparams.dryrun || runparams.inComment; external::writeExternal(params_, "DocBook", buffer(), ots, - *(runparams.exportdata), false, - runparams.dryrun || runparams.inComment); + *(runparams.exportdata), external_in_tmpdir, dryrun); os << ods.str(); return int(count(ods.str().begin(), ods.str().end(), '\n')); } diff --git a/status.22x b/status.22x index 86543d00c9..35acf5ee38 100644 --- a/status.22x +++ b/status.22x @@ -43,6 +43,8 @@ What's new - Fixed fen2ascii script. +- Fixed preview of external material with plaintext and DocBook. + * LYX2LYX -- 2.39.5