Scons: update_po target, part one: language_l10n.pot

[lyx.git] / src / output_plaintext.C

diff --git a/src/output_plaintext.C b/src/output_plaintext.C
index 6ccb342265f101371b7cf3305af9e63b4fe96e35..d3072e4dc8a0e9d3284c3c2dced865a750c02189 100644 (file)
--- a/src/output_plaintext.C
+++ b/src/output_plaintext.C
@@ -29,7 +29,6 @@ namespace lyx {
 
 using support::ascii_lowercase;
 using support::compare_ascii_no_case;
-using support::compare_no_case;
 using support::contains;
 using support::FileName;
 
@@ -91,7 +90,7 @@ void writePlaintextParagraph(Buffer const & buf,
 
        // 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) {
@@ -117,14 +116,8 @@ void writePlaintextParagraph(Buffer const & buf,
                ltype_depth = 0;
        }
 
-       /* maybe some vertical spaces */
-
        /* the labelwidthstring used in lists */
 
-       /* some lines? */
-
-       /* some pagebreaks? */
-
        /* noindent ? */
 
        /* what about the alignment */
@@ -192,12 +185,13 @@ void writePlaintextParagraph(Buffer const & buf,
        docstring word;
 
        for (pos_type i = 0; i < par.size(); ++i) {
-               if (par.isDeleted(i)) // deleted characters don't make much sense in plain text output
+               // 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: {
+
+               if (c == Paragraph::META_INSET || c == ' ') {
                        if (runparams.linelen > 0 &&
                            currlinelen + word.length() > runparams.linelen) {
                                os << '\n';
@@ -208,28 +202,23 @@ void writePlaintextParagraph(Buffer const & buf,
                        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 >= runparams.linelen)
-                               currlinelen = len - runparams.linelen;
+                       if (len >= InsetBase::PLAINTEXT_NEWLINE)
+                               currlinelen = len - InsetBase::PLAINTEXT_NEWLINE;
                        else
                                currlinelen += len;
                        break;
                }
 
                case ' ':
-                       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 << ' ';
-                       currlinelen += word.length() + 1;
-                       word.erase();
+                       os << ' ';
+                       currlinelen++;
                        break;
 
                case '\0':