The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 98a810c9d8b8d6bc0086779b7fa2d5be434bdbe2
Author: Richard Heck <[email protected]>
Date:   Mon Mar 19 17:33:47 2012 -0400

    Fix bug #8087: Include children in plaintext export.

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 9040960..13c4888 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"
@@ -804,7 +805,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';
@@ -812,11 +813,15 @@ 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);
 }
 
 

-----------------------------------------------------------------------

Summary of changes:
 src/insets/InsetInclude.cpp |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to