The branch, 2.0.x, has been updated. - Log -----------------------------------------------------------------
commit 57e5eba4c1bd63488f786a025e1b3d4a29815edf Author: Richard Heck <[email protected]> Date: Mon Mar 19 17:33:47 2012 -0400 Backport fix for bug #8087: Include children in plaintext export. (cherry picked from commit 98a810c9d8b8d6bc0086779b7fa2d5be434bdbe2) Forgot the return value. (cherry picked from commit 0459c43769e507a68f2ec6e053350d4a77d19534) diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp index 5684497..2940124 100644 --- a/src/insets/InsetInclude.cpp +++ b/src/insets/InsetInclude.cpp @@ -34,6 +34,7 @@ #include "LyXRC.h" #include "Lexer.h" #include "MetricsInfo.h" +#include "output_plaintext.h" #include "output_xhtml.h" #include "OutputParams.h" #include "TextClass.h" @@ -796,7 +797,7 @@ docstring InsetInclude::xhtml(XHTMLStream & xs, OutputParams const & rp) const } -int InsetInclude::plaintext(odocstream & os, OutputParams const &) const +int InsetInclude::plaintext(odocstream & os, OutputParams const & op) const { if (isVerbatim(params()) || isListings(params())) { os << '[' << screenLabel() << '\n'; @@ -804,11 +805,16 @@ int InsetInclude::plaintext(odocstream & os, OutputParams const &) const os << includedFileName(buffer(), params()).fileContents("UTF-8"); os << "\n]"; return PLAINTEXT_NEWLINE + 1; // one char on a separate line - } else { + } + + Buffer const * const ibuf = loadIfNeeded(); + if (!ibuf) { docstring const str = '[' + screenLabel() + ']'; os << str; return str.size(); } + writePlaintextFile(*ibuf, os, op); + return 0; } ----------------------------------------------------------------------- Summary of changes: src/insets/InsetInclude.cpp | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) hooks/post-receive -- The LyX Source Repository
