X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_plaintext.C;h=ae70ac44d14fae4d71e5ec022be9c72b044c6ad0;hb=0da3d53269a49c66b24615d24e20e441dcf7c07e;hp=59039655954d7e91f34e42876529c46f90b4fc27;hpb=34b7650cbbe6a9ed2de812e75771451b8c8fe983;p=lyx.git

diff --git a/src/output_plaintext.C b/src/output_plaintext.C
index 5903965595..ae70ac44d1 100644
--- a/src/output_plaintext.C
+++ b/src/output_plaintext.C
@@ -24,32 +24,32 @@
 
 #include "support/lstrings.h"
 
-using lyx::support::ascii_lowercase;
-using lyx::support::compare_ascii_no_case;
-using lyx::support::compare_no_case;
-using lyx::support::contains;
 
-using lyx::docstring;
-using lyx::pos_type;
+namespace lyx {
+
+using support::ascii_lowercase;
+using support::compare_ascii_no_case;
+using support::compare_no_case;
+using support::contains;
+using support::FileName;
+
 using std::endl;
 using std::ostream;
-using std::ofstream;
 using std::pair;
 using std::string;
 
 
-void writeFileAscii(Buffer const & buf,
-		    string const & fname,
-		    OutputParams const & runparams)
+void writePlaintextFile(Buffer const & buf, FileName const & fname,
+	OutputParams const & runparams)
 {
-	lyx::odocfstream ofs;
-	if (!::openFileWrite(ofs, fname))
+	odocfstream ofs;
+	if (!openFileWrite(ofs, fname))
 		return;
-	writeFileAscii(buf, ofs, runparams);
+	writePlaintextFile(buf, ofs, runparams);
 }
 
 
-void writeFileAscii(Buffer const & buf, lyx::odocstream & os,
+void writePlaintextFile(Buffer const & buf, odocstream & os,
 	OutputParams const & runparams)
 {
 	bool ref_printed = false;
@@ -58,9 +58,11 @@ void writeFileAscii(Buffer const & buf, lyx::odocstream & os,
 	ParagraphList::const_iterator end = par.end();
 	ParagraphList::const_iterator it = beg;
 	for (; it != end; ++it) {
-		asciiParagraph(buf, *it, os, runparams, ref_printed);
+		writePlaintextParagraph(buf, *it, os, runparams, ref_printed);
+		os << "\n";
+		if (runparams.linelen > 0)
+			os << "\n";
 	}
-	os << "\n";
 }
 
 
@@ -77,15 +79,15 @@ pair<int, docstring> const addDepth(int depth, int ldepth)
 }
 
 
-void asciiParagraph(Buffer const & buf,
+void writePlaintextParagraph(Buffer const & buf,
 		    Paragraph const & par,
-		    lyx::odocstream & os,
+		    odocstream & os,
 		    OutputParams const & runparams,
 		    bool & ref_printed)
 {
 	int ltype = 0;
-	Paragraph::depth_type ltype_depth = 0;
-	Paragraph::depth_type depth = par.params().depth();
+	depth_type ltype_depth = 0;
+	depth_type depth = par.params().depth();
 
 	// First write the layout
 	string const & tmp = par.layout()->name();
@@ -127,13 +129,10 @@ void asciiParagraph(Buffer const & buf,
 
 	/* what about the alignment */
 
-	// runparams.linelen <= 0 is special and means we don't have paragraph breaks
+	// runparams.linelen == 0 is special and means we don't have paragraph breaks
 
 	string::size_type currlinelen = 0;
 
-	if (runparams.linelen > 0)
-		os << "\n\n";
-
 	os << docstring(depth * 2, ' ');
 	currlinelen += depth * 2;
 
@@ -174,38 +173,37 @@ void asciiParagraph(Buffer const & buf,
 		break;
 
 	default: {
-		// FIXME UNICODE
-		docstring const label =
-			lyx::from_utf8(par.params().labelString());
-		os << label << ' ';
-		currlinelen += label.length() + 1;
+		docstring const label = par.params().labelString();
+		if (!label.empty()) {
+			os << label << ' ';
+			currlinelen += label.length() + 1;
+		}
 		break;
 	}
 
 	}
 
-	if (!currlinelen) {
+	if (currlinelen == 0) {
 		pair<int, docstring> p = addDepth(depth, ltype_depth);
 		os << p.second;
 		currlinelen += p.first;
 	}
 
-	// this is to change the linebreak to do it by word a bit more
-	// intelligent hopefully! (only in the case where we have a
-	// max runparams.linelength!) (Jug)
-
 	docstring word;
 
 	for (pos_type i = 0; i < par.size(); ++i) {
-		lyx::char_type c = par.getUChar(buf.params(), i);
+		if (par.isDeleted(i)) // deleted characters don't make much sense in plain text output
+			continue;
+
+		char_type c = par.getUChar(buf.params(), i);
 		switch (c) {
 		case Paragraph::META_INSET: {
 			InsetBase const * inset = par.getInset(i);
-			if (runparams.linelen > 0) {
-				os << word;
-				currlinelen += word.length();
-				word.erase();
-			}
+
+			os << word;
+			currlinelen += word.length();
+			word.erase();
+
 			OutputParams rp = runparams;
 			rp.depth = par.params().depth();
 			if (inset->plaintext(buf, os, rp)) {
@@ -217,7 +215,7 @@ void asciiParagraph(Buffer const & buf,
 
 		case ' ':
 			if (runparams.linelen > 0 &&
-			    currlinelen + word.length() > runparams.linelen - 10) {
+			    currlinelen + word.length() > runparams.linelen) {
 				os << '\n';
 				pair<int, docstring> p = addDepth(depth, ltype_depth);
 				os << p.second;
@@ -230,21 +228,24 @@ void asciiParagraph(Buffer const & buf,
 
 		case '\0':
 			lyxerr[Debug::INFO] <<
-				"writeAsciiFile: NULL char in structure." << endl;
+				"writePlaintextFile: NULL char in structure." << endl;
 			break;
 
 		default:
 			word += c;
-			if (runparams.linelen > 0 &&
-			    currlinelen + word.length() > runparams.linelen)
-			{
-				os << '\n';
-				pair<int, docstring> p = addDepth(depth, ltype_depth);
-				os << p.second;
-				currlinelen = p.first;
-			}
 			break;
 		}
 	}
+
+	if (runparams.linelen > 0 &&
+	    currlinelen + word.length() > runparams.linelen) {
+		os << '\n';
+		pair<int, docstring> p = addDepth(depth, ltype_depth);
+		os << p.second;
+		currlinelen = p.first;
+	}
 	os << word;
 }
+
+
+} // namespace lyx