Remove space at end of line, when superfluous.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8953 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/lyx2lyx/ChangeLog b/lib/lyx2lyx/ChangeLog
index 7193f4946f7979a0d0e4ccf7828ba5a664c1cc07..3fea8f6bb99de1a180b2ac80077235811dc3415b 100644 (file)
--- a/lib/lyx2lyx/ChangeLog
+++ b/lib/lyx2lyx/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-16  José Matos  <jamatos@lyx.org>
+
+       * lyx_1_4.lyx (convert_comment, convert_breaks, convert_frameless_box):
+       (convert_names, add_begin_body, strip_end_space): use the same policy
+       of lyx of not using spaces as the last character in a line that starts
+       with a command token (\xxxxx).
+
 2004-08-15  José Matos  <jamatos@lyx.org>
 
        * lyx_1_4.py (normalize_papersize, denormalize_papersize):

diff --git a/lib/lyx2lyx/lyx_1_4.py b/lib/lyx2lyx/lyx_1_4.py
index 947915f357273e820826358667555e55d6848e14..97eab4dea288e83ab828081829915cce3c1fefad 100644 (file)
--- a/lib/lyx2lyx/lyx_1_4.py
+++ b/lib/lyx2lyx/lyx_1_4.py
@@ -194,7 +194,7 @@ def convert_comment(lines):
                i = find_token(lines, "\\layout", i)
                 if i == -1:
                     i = len(lines) - 1
-                    lines[i:i] = ["\\end_inset ","",""]
+                    lines[i:i] = ["\\end_inset","",""]
                     return
 
                 j = find_token(lines, '\\begin_deeper', old_i, i)
@@ -211,7 +211,7 @@ def convert_comment(lines):
                         #but if this happens deal with it greacefully adding
                         #the missing \end_deeper.
                         i = len(lines) - 1
-                        lines[i:i] = ["\end_deeper","","","\\end_inset ","",""]
+                        lines[i:i] = ["\end_deeper","","","\\end_inset","",""]
                         return
                     else:
                         del lines[i]
@@ -225,7 +225,7 @@ def convert_comment(lines):
                         #but if this happens deal with it greacefully adding
                         #the missing \end_inset.
                         i = len(lines) - 1
-                        lines[i:i] = ["\\end_inset ","","","\\end_inset ","",""]
+                        lines[i:i] = ["\\end_inset","","","\\end_inset","",""]
                         return
                     else:
                         i = i + 1
@@ -525,7 +525,7 @@ def convert_breaks(lines):
                 paragraph_above.extend(['\\newpage ',''])
 
             if vspace_top != -1:
-                paragraph_above.extend(['\\begin_inset VSpace ' + vspace_top_value,'\\end_inset ','',''])
+                paragraph_above.extend(['\\begin_inset VSpace ' + vspace_top_value,'\\end_inset','',''])
 
             if line_top != -1:
                 paragraph_above.extend(['\\lyxline ',''])
@@ -550,7 +550,7 @@ def convert_breaks(lines):
                 paragraph_bellow.extend(['\\lyxline ',''])
 
             if vspace_bot != -1:
-                paragraph_bellow.extend(['\\begin_inset VSpace ' + vspace_bot_value,'\\end_inset ','',''])
+                paragraph_bellow.extend(['\\begin_inset VSpace ' + vspace_bot_value,'\\end_inset','',''])
 
             if pb_bot != -1:
                 paragraph_bellow.extend(['\\newpage ',''])
@@ -1037,7 +1037,7 @@ def convert_frameless_box(lines, opt):
             else:
                 lines[i] = lines[i] + '}'
            i = i + 1
-           lines[i:i] = ['', '\\end_inset ']
+           lines[i:i] = ['', '\\end_inset']
            i = i + 2
            j = find_end_of_inset(lines, i)
            if j == -1:
@@ -1249,7 +1249,7 @@ def convert_names(lines, opt):
                           "%s" % firstname,
                           "\end_layout",
                           "",
-                          "\end_inset ",
+                          "\end_inset",
                           "",
                           "",
                           "\\begin_inset CharStyle Surname",
@@ -1260,7 +1260,7 @@ def convert_names(lines, opt):
                           "%s" % surname,
                           "\\end_layout",
                           "",
-                          "\\end_inset ",
+                          "\\end_inset",
                           ""]
 
 
@@ -1419,10 +1419,10 @@ def add_begin_header(header, opt):
 
 
 def remove_begin_header(header, opt):
-    i = find_token(header, "\\begin_header", 0)
+    i = find_token(header, "\\begin_document", 0)
     if i != -1:
         del header[i]
-    i = find_token(header, "\\begin_document", 0)
+    i = find_token(header, "\\begin_header", 0)
     if i != -1:
         del header[i]
 
@@ -1432,6 +1432,7 @@ def remove_begin_header(header, opt):
 #
 def add_begin_body(body, opt):
     body.insert(0, '\\begin_body')
+    body.insert(1, '')
     i = find_token(body, "\\end_document", 0)
     body.insert(i, '\\end_body')
 
@@ -1439,6 +1440,8 @@ def remove_begin_body(body, opt):
     i = find_token(body, "\\begin_body", 0)
     if i != -1:
         del body[i]
+        if not body[i]:
+            del body[i]
     i = find_token(body, "\\end_body", 0)
     if i != -1:
         del body[i]
@@ -1470,6 +1473,15 @@ def denormalize_papersize(header):
         header[i] = '\\papersize Custom'
 
 
+##
+# Strip spaces at end of command line
+#
+def strip_end_space(body):
+    for i in range(len(body)):
+        if body[i][:1] == '\\':
+            body[i] = strip(body[i])
+
+
 ##
 # Convertion hub
 #
@@ -1556,6 +1568,7 @@ def convert(file):
         add_begin_header(file.header, file)
         add_begin_body(file.body, file)
         normalize_papersize(file.header)
+        strip_end_space(file.body)
         file.format = 236
 
 def revert(file):
@@ -1638,7 +1651,7 @@ def revert(file):
        revert_spaces(file.body)
        revert_bibtex(file.body)
        rm_tracking_changes(file.header)
-       rm_file.body_changes(file.body)
+       rm_body_changes(file.body)
        file.format = 221
 
 

diff --git a/src/ChangeLog b/src/ChangeLog
index 9276d8a741bc9a8c1929c0a352b0385e53669ac0..578f044b61feb7b7027306a7e900cb46efa4a378 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2004-08-16  José Matos  <jamatos@lyx.org>
+
+       * ParagraphParameters.C (write):
+       * Spacing.C (writeFile):
+       * bufferparams.C (writeLaTeX):
+       * lyx_cb.C (Reconfigure):
+       * paragraph.C (write):
+       * tabular.C (write): remove unnecessary space at end of line.
+
+
 2004-08-16  José Matos  <jamatos@lyx.org>
 
        * text.C (readParagraph): remove debug message.

diff --git a/src/ParagraphParameters.C b/src/ParagraphParameters.C
index 2d0ee33f2063842cffc366ca1736cd309890a888..a1e62c521ef25ea99bf1222c5b7dbc193fa00b31 100644 (file)
--- a/src/ParagraphParameters.C
+++ b/src/ParagraphParameters.C
@@ -225,25 +225,27 @@ void ParagraphParameters::read(LyXLex & lex)
 
 void ParagraphParameters::write(ostream & os) const
 {
+       ostringstream oss;
+
        // Maybe the paragraph has special spacing
-       spacing().writeFile(os, true);
+       spacing().writeFile(oss, true);
 
        // The labelwidth string used in lists.
        if (!labelWidthString().empty())
-               os << "\\labelwidthstring "
+               oss << "\\labelwidthstring "
                   << labelWidthString() << '\n';
 
        // Start of appendix?
        if (startOfAppendix())
-               os << "\\start_of_appendix ";
+               oss << "\\start_of_appendix ";
 
        // Noindent?
        if (noindent())
-               os << "\\noindent ";
+               oss << "\\noindent ";
 
        // Do we have a manual left indent?
        if (!leftIndent().zero())
-               os << "\\leftindent " << leftIndent().asString()
+               oss << "\\leftindent " << leftIndent().asString()
                   << ' ';
 
        // Alignment?
@@ -255,8 +257,9 @@ void ParagraphParameters::write(ostream & os) const
                case LYX_ALIGN_CENTER: h = 3; break;
                default: h = 0; break;
                }
-               os << "\\align " << string_align[h] << ' ';
+               oss << "\\align " << string_align[h] << ' ';
        }
+       os << rtrim(oss.str());
 }
 
 

diff --git a/src/Spacing.C b/src/Spacing.C
index ddb9ddbba187fd69f74c763b0b0ebc99fbbcd250..695398b6ff8bae92203f6b735b6de9e336fb82b3 100644 (file)
--- a/src/Spacing.C
+++ b/src/Spacing.C
@@ -72,9 +72,9 @@ void Spacing::writeFile(ostream & os, bool para) const
                os.setf(ios::showpoint|ios::fixed);
                os.precision(2);
                os << cmd << spacing_string[getSpace()]
-                  << ' ' << getValue() << " \n";
+                  << ' ' << getValue() << "\n";
        } else {
-               os << cmd << spacing_string[getSpace()] << " \n";
+               os << cmd << spacing_string[getSpace()] << "\n";
        }
 }
 

diff --git a/src/buffer.C b/src/buffer.C
index 136065377866753173e44d1c47af27c7d3e4fee9..67127e1ef850efcdf663daf949467057ea5bbc4b 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -792,7 +792,7 @@ bool Buffer::do_writeFile(ostream & ofs) const
            << "\\begin_document\n";
 
        // now write out the buffer parameters.
-       ofs << "\n\\begin_header\n";
+       ofs << "\\begin_header\n";
        params().writeFile(ofs);
        ofs << "\\end_header\n";
        

diff --git a/src/bufferparams.C b/src/bufferparams.C
index d593f230d5adc77004f25d5f378fe6af8467a25c..d5b40ba8ee8524957c54d4e96472ecbb2750b762 100644 (file)
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -1005,7 +1005,7 @@ bool BufferParams::writeLaTeX(ostream & os, LaTeXFeatures & features,
                        "\\dvipost{osstart color push Red}\n"
                        "\\dvipost{osend color pop}\n"
                        "\\dvipost{cbstart color push Blue}\n"
-                       "\\dvipost{cbend color pop} \n";
+                       "\\dvipost{cbend color pop}\n";
        }
 
        int const nlines =

diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog
index 86cdf425d0892bf26aba48ed123a0b696fad24a0..c15e84fc3c8c7ce4e905420541f7c9c95c091b8f 100644 (file)
--- a/src/graphics/ChangeLog
+++ b/src/graphics/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-16  José Matos  <jamatos@lyx.org>
+
+       * PreviewLoader.C (Impl::startLoading): remove space at end of line.
+
 2004-08-15  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
        * pch.h: new file

diff --git a/src/graphics/PreviewLoader.C b/src/graphics/PreviewLoader.C
index f3109b910e412e61886a67cfed11bfbe9af294c3..aa01f6f13c02644f553b9cfc04eb52715435f9c5 100644 (file)
--- a/src/graphics/PreviewLoader.C
+++ b/src/graphics/PreviewLoader.C
@@ -510,7 +510,7 @@ void PreviewLoader::Impl::startLoading()
 
        if (ret != 0) {
                lyxerr[Debug::GRAPHICS] << "PreviewLoader::startLoading()\n"
-                                       << "Unable to start process \n"
+                                       << "Unable to start process\n"
                                        << command << endl;
                return;
        }

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 003a03ba20ef1633c512cbe378b4594d0416a576..5487284c365f7e9656d5fa19ba7b0d868d9f2a26 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-16  José Matos  <jamatos@lyx.org>
+
+       * insethfill.C (write):
+       * insetline.C (write):
+       * insetnewline.C (write):
+       * insetpagebreak.C (write): remove space at end of line.
+
 2004-08-16  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * insettabular.C (plaintext): do not use ownerPar to get the

diff --git a/src/insets/insethfill.C b/src/insets/insethfill.C
index c84bff45e873b5080a024eefd214eda7d6a8c1fc..0e43c963f4876a1c3058caacc1bd579dcbb7ea57 100644 (file)
--- a/src/insets/insethfill.C
+++ b/src/insets/insethfill.C
@@ -77,7 +77,7 @@ int InsetHFill::docbook(Buffer const &, std::ostream & os,
 
 void InsetHFill::write(Buffer const &, ostream & os) const
 {
-       os << "\n\\hfill \n";
+       os << "\n\\hfill\n";
 }
 
 

diff --git a/src/insets/insetline.C b/src/insets/insetline.C
index 221b48570ba8d77f3b2fd14697047f622dc367fb..a2e5d1384338a6296b666e92064a357a462bea47 100644 (file)
--- a/src/insets/insetline.C
+++ b/src/insets/insetline.C
@@ -32,7 +32,7 @@ void InsetLine::read(Buffer const &, LyXLex &)
 
 void InsetLine::write(Buffer const &, ostream & os) const
 {
-       os << "\n\\lyxline \n";
+       os << "\n\\lyxline\n";
 }
 
 

diff --git a/src/insets/insetnewline.C b/src/insets/insetnewline.C
index 1ebf900acd95a25dddf2f68393497886b1b927d2..239e2c2fd484cee51e0083341d7e5e29054d7163 100644 (file)
--- a/src/insets/insetnewline.C
+++ b/src/insets/insetnewline.C
@@ -35,7 +35,7 @@ void InsetNewline::read(Buffer const &, LyXLex &)
 
 void InsetNewline::write(Buffer const &, ostream & os) const
 {
-       os << "\n\\newline \n";
+       os << "\n\\newline\n";
 }
 
 

diff --git a/src/insets/insetpagebreak.C b/src/insets/insetpagebreak.C
index 60fe40e25ecde576e891241261464e58dc838902..d86a826be59a97c10767a61a616c3f40cd30a650 100644 (file)
--- a/src/insets/insetpagebreak.C
+++ b/src/insets/insetpagebreak.C
@@ -33,7 +33,7 @@ void InsetPagebreak::read(Buffer const &, LyXLex &)
 
 void InsetPagebreak::write(Buffer const &, ostream & os) const
 {
-       os << "\n\\newpage \n";
+       os << "\n\\newpage\n";
 }
 
 

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 213ff3967687d8eb375f36ec1a2f8c5236375742..663c4c46818e9242290677a63b6f2a24ad1b6b85 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -453,6 +453,6 @@ void Reconfigure(BufferView * bv)
 
        Alert::information(_("System reconfigured"),
                _("The system has been reconfigured.\n"
-               "You need to restart LyX to make use of any \n"
+               "You need to restart LyX to make use of any\n"
                "updated document class specifications."));
 }

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 9dba249f81194e17e1da72e44e9e61c88ae964de..ba3872d8ceca5bb5606c788d734e68f4de3c3149 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-16  José Matos  <jamatos@lyx.org>
+
+       * formulamacro.C (write):
+       * math_macrotemplate.C (write): remove space at end of line.
+
 2004-08-15  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
        * pch.h: new file

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index 303cb7049044f092edb6d15bb3f0b1bbdc98f48b..092ccb976eb3031acee6743d07d7f5ecf7f72366 100644 (file)
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -69,7 +69,7 @@ auto_ptr<InsetBase> InsetFormulaMacro::clone() const
 
 void InsetFormulaMacro::write(Buffer const &, ostream & os) const
 {
-       os << "FormulaMacro ";
+       os << "FormulaMacro\n";
        WriteStream wi(os, false, false);
        tmpl()->write(wi);
 }

diff --git a/src/mathed/math_macrotemplate.C b/src/mathed/math_macrotemplate.C
index 697a58a635d24116a6acd89d7a26cf9e5f2d1b6b..c0b869b985f0becf435601e640dd12dbd0ead14e 100644 (file)
--- a/src/mathed/math_macrotemplate.C
+++ b/src/mathed/math_macrotemplate.C
@@ -172,7 +172,7 @@ void MathMacroTemplate::read(Buffer const &, LyXLex & lex)
 void MathMacroTemplate::write(Buffer const &, std::ostream & os) const
 {
        WriteStream wi(os, false, false);
-       os << "FormulaMacro ";
+       os << "FormulaMacro\n";
        write(wi);
 }
 
@@ -180,12 +180,12 @@ void MathMacroTemplate::write(Buffer const &, std::ostream & os) const
 void MathMacroTemplate::write(WriteStream & os) const
 {
        if (type_ == "def") {
-               os << "\n\\def\\" << name_.c_str();
+               os << "\\def\\" << name_.c_str();
                for (int i = 1; i <= numargs_; ++i)
                        os << '#' << i;
        } else {
                // newcommand or renewcommand
-               os << "\n\\" << type_.c_str() << "{\\" << name_.c_str() << '}';
+               os << "\\" << type_.c_str() << "{\\" << name_.c_str() << '}';
                if (numargs_ > 0)
                        os << '[' << numargs_ << ']';
        }

diff --git a/src/paragraph.C b/src/paragraph.C
index b139c85fee4c836f105fc223cbc49c5d7a86fb08..05a525c53a9e22dbfd891308c190d3e6ab31fae7 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -138,12 +138,12 @@ void Paragraph::write(Buffer const & buf, ostream & os,
        if (dth != params().depth()) {
                if (params().depth() > dth) {
                        while (params().depth() > dth) {
-                               os << "\n\\begin_deeper ";
+                               os << "\n\\begin_deeper";
                                ++dth;
                        }
                } else {
                        while (params().depth() < dth) {
-                               os << "\n\\end_deeper ";
+                               os << "\n\\end_deeper";
                                --dth;
                        }
                }
@@ -192,13 +192,13 @@ void Paragraph::write(Buffer const & buf, ostream & os,
                                } else {
                                        os << "\n\\begin_inset ";
                                        inset->write(buf, os);
-                                       os << "\n\\end_inset \n\n";
+                                       os << "\n\\end_inset\n\n";
                                        column = 0;
                                }
                }
                break;
                case '\\':
-                       os << "\n\\backslash \n";
+                       os << "\n\\backslash\n";
                        column = 0;
                        break;
                case '.':

diff --git a/src/tabular.C b/src/tabular.C
index 87e8e09edab5303f923761a2ee6e772038717f5e..b8957c2ba2a6723a7c369b3bb4d9120c75b78144 100644 (file)
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -1126,7 +1126,7 @@ void LyXTabular::write(Buffer const & buf, ostream & os) const
                           << ">\n";
                        os << "\\begin_inset ";
                        cell_info[i][j].inset.write(buf, os);
-                       os << "\n\\end_inset \n"
+                       os << "\n\\end_inset\n"
                           << "</cell>\n";
                }
                os << "</row>\n";

diff --git a/src/tex2lyx/ChangeLog b/src/tex2lyx/ChangeLog
index 8ac816b51528768c3f4f49dbff41420238a7a741..25b500dd7aae59a8fd03eb54928850d28d712c7c 100644 (file)
--- a/src/tex2lyx/ChangeLog
+++ b/src/tex2lyx/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-16  José Matos  <jamatos@lyx.org>
+
+       * context.C (begin_deeper, end_deeper):
+       * preamble.C (end_preamble):
+       * table.C (handle_tabular):
+       * text.C (end_inset, handle_ert, handle_comment):
+       (parse_text_attributes, parse_text): remove space at end of line.
+
 2004-08-10  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
        * preamble.C (split_options): new, split package options into vector

diff --git a/src/tex2lyx/context.C b/src/tex2lyx/context.C
index a914c098de4a0692459314e90b0ed06e82db4286..ee536db4db0bf2830102e5b0b7c8d460031e46d6 100644 (file)
--- a/src/tex2lyx/context.C
+++ b/src/tex2lyx/context.C
@@ -36,13 +36,13 @@ void end_layout(ostream & os)
 
 void begin_deeper(ostream & os)
 {
-       os << "\n\\begin_deeper \n";
+       os << "\n\\begin_deeper\n";
 }
 
 
 void end_deeper(ostream & os)
 {
-       os << "\n\\end_deeper \n";
+       os << "\n\\end_deeper\n";
 }
 
 }

diff --git a/src/tex2lyx/preamble.C b/src/tex2lyx/preamble.C
index cd61b2f5838270477308f0f44cffaeb4e1580c33..5b59053747b6b4a98b206530f24c7dd023618890 100644 (file)
--- a/src/tex2lyx/preamble.C
+++ b/src/tex2lyx/preamble.C
@@ -225,7 +225,7 @@ void handle_package(string const & name, string const & opts)
 
 void end_preamble(ostream & os, LyXTextClass const & /*textclass*/)
 {
-       os << "#LyX file created by  tex2lyx 0.1.2 \n"
+       os << "#LyX file created by  tex2lyx 0.1.2\n"
           << "\\lyxformat 235\n"
           << "\\textclass " << h_textclass << "\n"
           << "\\begin_preamble\n" << h_preamble.str() << "\n\\end_preamble\n";

diff --git a/src/tex2lyx/table.C b/src/tex2lyx/table.C
index 05e1122c52cd2cf568cb138f864f1e5e9e0d208a..2e51d50fb8031960ff66f56f151ac30057179967 100644 (file)
--- a/src/tex2lyx/table.C
+++ b/src/tex2lyx/table.C
@@ -528,7 +528,7 @@ void handle_tabular(Parser & p, ostream & os,
                           << ">"
                           << "\n\\begin_inset Text\n"
                           << cell.content
-                          << "\n\\end_inset \n"
+                          << "\n\\end_inset\n"
                           << "</cell>\n";
                }
                os << "</row>\n";

diff --git a/src/tex2lyx/text.C b/src/tex2lyx/text.C
index 4c369e48380d1d0f92d597c0d19fb5c2410ed966..1084ca725d869ac21a2365ee9194233e5399e80f 100644 (file)
--- a/src/tex2lyx/text.C
+++ b/src/tex2lyx/text.C
@@ -331,7 +331,7 @@ void begin_inset(ostream & os, string const & name)
 
 void end_inset(ostream & os)
 {
-       os << "\n\\end_inset \n\n";
+       os << "\n\\end_inset\n\n";
 }
 
 
@@ -360,9 +360,9 @@ void handle_ert(ostream & os, string const & s, Context & context, bool check_la
        newcontext.check_layout(os);
        for (string::const_iterator it = s.begin(), et = s.end(); it != et; ++it) {
                if (*it == '\\')
-                       os << "\n\\backslash \n";
+                       os << "\n\\backslash\n";
                else if (*it == '\n')
-                       os << "\n\\newline \n";
+                       os << "\n\\newline\n";
                else
                        os << *it;
        }
@@ -380,7 +380,7 @@ void handle_comment(ostream & os, string const & s, Context & context)
        newcontext.check_layout(os);
        for (string::const_iterator it = s.begin(), et = s.end(); it != et; ++it) {
                if (*it == '\\')
-                       os << "\n\\backslash \n";
+                       os << "\n\\backslash\n";
                else
                        os << *it;
        }
@@ -840,10 +840,10 @@ void parse_text_attributes(Parser & p, ostream & os, unsigned flags, bool outer,
        context.check_layout(os);
        string oldvalue = currentvalue;
        currentvalue = newvalue;
-       os << '\n' << attribute << ' ' << newvalue << " \n";
+       os << '\n' << attribute << ' ' << newvalue << "\n";
        parse_text_snippet(p, os, flags, outer, context);
        currentvalue = oldvalue;
-       os << '\n' << attribute << ' ' << oldvalue << " \n";
+       os << '\n' << attribute << ' ' << oldvalue << "\n";
 }
 
 
@@ -1008,22 +1008,22 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                                // s will change the size, so we must reset
                                // it here
                                os << s << "\n\\size " << context.font.size
-                                  << " \n";
+                                  << "\n";
                        else if (is_known(next.cs(), known_font_families))
                                // s will change the font family, so we must
                                // reset it here
                                os << s << "\n\\family "
-                                  << context.font.family << " \n";
+                                  << context.font.family << "\n";
                        else if (is_known(next.cs(), known_font_series))
                                // s will change the font series, so we must
                                // reset it here
                                os << s << "\n\\series "
-                                  << context.font.series << " \n";
+                                  << context.font.series << "\n";
                        else if (is_known(next.cs(), known_font_shapes))
                                // s will change the font shape, so we must
                                // reset it here
                                os << s << "\n\\shape "
-                                  << context.font.shape << " \n";
+                                  << context.font.shape << "\n";
                        else if (is_known(next.cs(), known_old_font_families) ||
                                 is_known(next.cs(), known_old_font_series) ||
                                 is_known(next.cs(), known_old_font_shapes))
@@ -1031,9 +1031,9 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                                // and shape, so we must reset it here
                                os << s
                                   <<  "\n\\family " << context.font.family
-                                  << " \n\\series " << context.font.series
-                                  << " \n\\shape "  << context.font.shape
-                                  << " \n";
+                                  << "\n\\series " << context.font.series
+                                  << "\n\\shape "  << context.font.shape
+                                  << "\n";
                        else {
                                handle_ert(os, "{", context, false);
                                // s will end the current layout and begin a
@@ -1334,7 +1334,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 
                else if (t.cs() == "hfill") {
                        context.check_layout(os);
-                       os << "\n\\hfill \n";
+                       os << "\n\\hfill\n";
                        skip_braces(p);
                        p.skip_spaces();
                }
@@ -1431,31 +1431,31 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                        Font oldFont = context.font;
                        context.font.init();
                        context.font.size = oldFont.size;
-                       os << "\n\\family " << context.font.family << " \n";
-                       os << "\n\\series " << context.font.series << " \n";
-                       os << "\n\\shape " << context.font.shape << " \n";
+                       os << "\n\\family " << context.font.family << "\n";
+                       os << "\n\\series " << context.font.series << "\n";
+                       os << "\n\\shape " << context.font.shape << "\n";
                        if (t.cs() == "textnormal") {
                                parse_text_snippet(p, os, FLAG_ITEM, outer, context);
                                context.font = oldFont;
-                               os << "\n\\shape " << oldFont.shape << " \n";
-                               os << "\n\\series " << oldFont.series << " \n";
-                               os << "\n\\family " << oldFont.family << " \n";
+                               os << "\n\\shape " << oldFont.shape << "\n";
+                               os << "\n\\series " << oldFont.series << "\n";
+                               os << "\n\\family " << oldFont.family << "\n";
                        } else
                                eat_whitespace(p, os, context, false);
                }
 
                else if (t.cs() == "underbar") {
                        context.check_layout(os);
-                       os << "\n\\bar under \n";
+                       os << "\n\\bar under\n";
                        parse_text_snippet(p, os, FLAG_ITEM, outer, context);
-                       os << "\n\\bar default \n";
+                       os << "\n\\bar default\n";
                }
 
                else if (t.cs() == "emph" || t.cs() == "noun") {
                        context.check_layout(os);
-                       os << "\n\\" << t.cs() << " on \n";
+                       os << "\n\\" << t.cs() << " on\n";
                        parse_text_snippet(p, os, FLAG_ITEM, outer, context);
-                       os << "\n\\" << t.cs() << " default \n";
+                       os << "\n\\" << t.cs() << " default\n";
                }
 
                else if (use_natbib &&
@@ -1618,9 +1618,9 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                        context.font.size = oldsize;
                        context.font.family =
                                known_coded_font_families[where - known_old_font_families];
-                       os << "\n\\family " << context.font.family << " \n"
-                          <<   "\\series " << context.font.series << " \n"
-                          <<   "\\shape "  << context.font.shape  << " \n";
+                       os << "\n\\family " << context.font.family << "\n"
+                          <<   "\\series " << context.font.series << "\n"
+                          <<   "\\shape "  << context.font.shape  << "\n";
                        eat_whitespace(p, os, context, false);
                }
 
@@ -1633,9 +1633,9 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                        context.font.size = oldsize;
                        context.font.series =
                                known_coded_font_series[where - known_old_font_series];
-                       os << "\n\\family " << context.font.family << " \n"
-                          <<   "\\series " << context.font.series << " \n"
-                          <<   "\\shape "  << context.font.shape  << " \n";
+                       os << "\n\\family " << context.font.family << "\n"
+                          <<   "\\series " << context.font.series << "\n"
+                          <<   "\\shape "  << context.font.shape  << "\n";
                        eat_whitespace(p, os, context, false);
                }
 
@@ -1648,9 +1648,9 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                        context.font.size = oldsize;
                        context.font.shape =
                                known_coded_font_shapes[where - known_old_font_shapes];
-                       os << "\n\\family " << context.font.family << " \n"
-                          <<   "\\series " << context.font.series << " \n"
-                          <<   "\\shape "  << context.font.shape  << " \n";
+                       os << "\n\\family " << context.font.family << "\n"
+                          <<   "\\series " << context.font.series << "\n"
+                          <<   "\\shape "  << context.font.shape  << "\n";
                        eat_whitespace(p, os, context, false);
                }
 
@@ -1710,7 +1710,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 
                else if (t.cs() == "textbackslash") {
                        context.check_layout(os);
-                       os << "\n\\backslash \n";
+                       os << "\n\\backslash\n";
                        skip_braces(p);
                }
 
@@ -1783,7 +1783,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                                handle_ert(os, "\\\\*" + p.getOpt(), context);
                        }
                        else {
-                               os << "\n\\newline \n";
+                               os << "\n\\newline\n";
                        }
                }