* output_plaintext.C: cosmetics in comment: line length cannot be < 0

[lyx.git] / src / output_plaintext.C

diff --git a/src/output_plaintext.C b/src/output_plaintext.C
index 59039655954d7e91f34e42876529c46f90b4fc27..4ffc0c655382b1ba8f151e127caa41bd32149591 100644 (file)
--- 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,7 +58,7 @@ 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";
 }
@@ -77,15 +77,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,7 +127,7 @@ 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;
 
@@ -174,9 +174,7 @@ void asciiParagraph(Buffer const & buf,
                break;
 
        default: {
-               // FIXME UNICODE
-               docstring const label =
-                       lyx::from_utf8(par.params().labelString());
+               docstring const label = par.params().labelString();
                os << label << ' ';
                currlinelen += label.length() + 1;
                break;
@@ -197,15 +195,13 @@ void asciiParagraph(Buffer const & buf,
        docstring word;
 
        for (pos_type i = 0; i < par.size(); ++i) {
-               lyx::char_type c = par.getUChar(buf.params(), i);
+               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)) {
@@ -230,7 +226,7 @@ void asciiParagraph(Buffer const & buf,
 
                case '\0':
                        lyxerr[Debug::INFO] <<
-                               "writeAsciiFile: NULL char in structure." << endl;
+                               "writePlaintextFile: NULL char in structure." << endl;
                        break;
 
                default:
@@ -248,3 +244,6 @@ void asciiParagraph(Buffer const & buf,
        }
        os << word;
 }
+
+
+} // namespace lyx