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::string;
-void writeFileAscii(Buffer const & buf, string const & fname,
+void writePlaintextFile(Buffer const & buf, FileName const & fname,
OutputParams const & runparams)
{
odocfstream ofs;
if (!openFileWrite(ofs, fname))
return;
- writeFileAscii(buf, ofs, runparams);
+ writePlaintextFile(buf, ofs, runparams);
}
-void writeFileAscii(Buffer const & buf, odocstream & os,
+void writePlaintextFile(Buffer const & buf, odocstream & os,
OutputParams const & runparams)
{
bool ref_printed = false;
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";
}
}
-void asciiParagraph(Buffer const & buf,
+void writePlaintextParagraph(Buffer const & buf,
Paragraph const & par,
odocstream & os,
OutputParams const & runparams,
// First write the layout
string const & tmp = par.layout()->name();
- if (compare_no_case(tmp, "itemize") == 0) {
+ if (compare_ascii_no_case(tmp, "itemize") == 0) {
ltype = 1;
ltype_depth = depth + 1;
} else if (compare_ascii_no_case(tmp, "enumerate") == 0) {
ltype_depth = 0;
}
- /* maybe some vertical spaces */
-
/* the labelwidthstring used in lists */
- /* some lines? */
-
- /* some pagebreaks? */
-
/* noindent ? */
/* 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;
default: {
docstring const label = par.params().labelString();
- os << label << ' ';
- currlinelen += label.length() + 1;
+ 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) {
+ // deleted characters don't make much sense in plain text output
+ if (par.isDeleted(i))
+ 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();
- }
- OutputParams rp = runparams;
- rp.depth = par.params().depth();
- if (inset->plaintext(buf, os, rp)) {
- // to be sure it breaks paragraph
- currlinelen += runparams.linelen;
- }
- break;
- }
- case ' ':
+ if (c == Paragraph::META_INSET || c == ' ') {
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;
currlinelen = p.first;
}
- os << word << ' ';
- currlinelen += word.length() + 1;
+ os << word;
+ currlinelen += word.length();
word.erase();
+ }
+
+ switch (c) {
+ case Paragraph::META_INSET: {
+ OutputParams rp = runparams;
+ rp.depth = par.params().depth();
+ int len = par.getInset(i)->plaintext(buf, os, rp);
+ if (len >= InsetBase::PLAINTEXT_NEWLINE)
+ currlinelen = len - InsetBase::PLAINTEXT_NEWLINE;
+ else
+ currlinelen += len;
+ break;
+ }
+
+ case ' ':
+ os << ' ';
+ currlinelen++;
break;
case '\0':
- lyxerr[Debug::INFO] <<
- "writeAsciiFile: NULL char in structure." << endl;
+ LYXERR(Debug::INFO) <<
+ "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;
}
}
- os << word;
+
+ // currlinelen may be greater than runparams.linelen!
+ // => check whether word is empty and do nothing in this case
+ if (!word.empty()) {
+ 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;
+ }
}