X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_plaintext.cpp;h=15e700eb8f1cf564d92b0eb273483d2942234a3a;hb=68ee68103a77300c3aa01db9e63bd01b8243a0eb;hp=3ff3771049b5b49a31f18b2f5cd08abd7568b9fa;hpb=f1cba8ff64b369792fd49f5ddf90e8126ab476ac;p=lyx.git

diff --git a/src/output_plaintext.cpp b/src/output_plaintext.cpp
index 3ff3771049..15e700eb8f 100644
--- a/src/output_plaintext.cpp
+++ b/src/output_plaintext.cpp
@@ -34,9 +34,15 @@ namespace lyx {
 void writePlaintextFile(Buffer const & buf, FileName const & fname,
 	OutputParams const & runparams)
 {
-	odocfstream ofs;
+	ofdocstream ofs;
 	if (!openFileWrite(ofs, fname))
 		return;
+
+	// make sure we are ready to export
+	buf.updateBuffer();
+	buf.updateMacroInstances(OutputUpdate);
+	buf.makeCitationLabels();
+
 	writePlaintextFile(buf, ofs, runparams);
 }
 
@@ -66,11 +72,12 @@ static pair<int, docstring> addDepth(int depth, int ldepth)
 	return make_pair(d, docstring(d, ' '));
 }
 
+
 void writePlaintextParagraph(Buffer const & buf,
 		    Paragraph const & par,
-		    odocstream & os,
+		    odocstream & ods,
 		    OutputParams const & runparams,
-		    bool & ref_printed)
+		    bool & ref_printed, size_t max_length)
 {
 	int ltype = 0;
 	depth_type ltype_depth = 0;
@@ -114,6 +121,7 @@ void writePlaintextParagraph(Buffer const & buf,
 
 	string::size_type currlinelen = 0;
 
+	odocstringstream os;
 	os << docstring(depth * 2, ' ');
 	currlinelen += depth * 2;
 
@@ -177,6 +185,9 @@ void writePlaintextParagraph(Buffer const & buf,
 		if (par.isDeleted(i))
 			continue;
 
+		if (os.str().size() > max_length)
+			break;
+
 		char_type c = par.getUChar(buf.params(), i);
 
 		if (par.isInset(i) || c == ' ') {
@@ -195,7 +206,7 @@ void writePlaintextParagraph(Buffer const & buf,
 		if (par.isInset(i)) {
 			OutputParams rp = runparams;
 			rp.depth = par.params().depth();
-			int len = par.getInset(i)->plaintext(os, rp);
+			int len = par.getInset(i)->plaintext(os, rp, max_length);
 			if (len >= Inset::PLAINTEXT_NEWLINE)
 				currlinelen = len - Inset::PLAINTEXT_NEWLINE;
 			else
@@ -206,7 +217,7 @@ void writePlaintextParagraph(Buffer const & buf,
 		switch (c) {
 		case ' ':
 			os << ' ';
-			currlinelen++;
+			++currlinelen;
 			break;
 
 		case '\0':
@@ -231,6 +242,7 @@ void writePlaintextParagraph(Buffer const & buf,
 		}
 		os << word;
 	}
+	ods << os.str();
 }