X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_plaintext.C;h=d0da1d04dc56c3310efd38fc54b6169842dce883;hb=37e82a546392d43f787826b85481a11f2a27af15;hp=a852a49e404fd47f6322a7dc95e773f417b6aa46;hpb=0d43ba149a41e8860dde316ccbd4336d6b0bbdfa;p=lyx.git

diff --git a/src/output_plaintext.C b/src/output_plaintext.C
index a852a49e40..d0da1d04dc 100644
--- a/src/output_plaintext.C
+++ b/src/output_plaintext.C
@@ -25,9 +25,6 @@
 #include "support/gzstream.h"
 #include "support/lstrings.h"
 
-#ifdef HAVE_LOCALE
-#endif
-
 using lyx::support::ascii_lowercase;
 using lyx::support::compare_ascii_no_case;
 using lyx::support::compare_no_case;
@@ -55,11 +52,10 @@ void writeFileAscii(Buffer const & buf,
 void writeFileAscii(Buffer const & buf, ostream & os,
 	OutputParams const & runparams)
 {
-	Buffer & tmp = const_cast<Buffer &>(buf);
-	ParagraphList par = const_cast<ParagraphList&>(tmp.paragraphs());
-	ParagraphList::iterator beg = par.begin();
-	ParagraphList::iterator end = par.end();
-	ParagraphList::iterator it = beg;
+	ParagraphList const par = buf.paragraphs();
+	ParagraphList::const_iterator beg = par.begin();
+	ParagraphList::const_iterator end = par.end();
+	ParagraphList::const_iterator it = beg;
 	for (; it != end; ++it) {
 		asciiParagraph(buf, *it, os, runparams, it == beg);
 	}
@@ -88,7 +84,7 @@ void asciiParagraph(Buffer const & buf,
 {
 	int ltype = 0;
 	Paragraph::depth_type ltype_depth = 0;
-	bool ref_printed = false;
+	static bool ref_printed = false;
 	Paragraph::depth_type depth = par.params().depth();
 
 	// First write the layout
@@ -210,7 +206,9 @@ void asciiParagraph(Buffer const & buf,
 				currlinelen += word.length();
 				word.erase();
 			}
-			if (inset->plaintext(buf, os, runparams)) {
+			OutputParams rp = runparams;
+			rp.depth = par.params().depth();
+			if (inset->plaintext(buf, os, rp)) {
 				// to be sure it breaks paragraph
 				currlinelen += runparams.linelen;
 			}
@@ -238,7 +236,7 @@ void asciiParagraph(Buffer const & buf,
 		default:
 			word += c;
 			if (runparams.linelen > 0 &&
-				currlinelen + word.length() > runparams.linelen)
+			    currlinelen + word.length() > runparams.linelen)
 			{
 				os << "\n";
 				pair<int, string> p = addDepth(depth, ltype_depth);