From a3915db54f0064336cd212e7079765ccb3386f07 Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@comcast.net>
Date: Fri, 5 Jun 2009 18:57:33 +0000
Subject: [PATCH] Output cosmetics, mostly. Get the newlines better.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29962 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/Paragraph.cpp    | 2 ++
 src/output_xhtml.cpp | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index e712130afc..92706f0c46 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -2413,6 +2413,8 @@ void Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
 						i += 1;
 					}
 				}
+				else
+					os << c;
 			} else
 				os << html::escapeChar(c);
 		}
diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index b4bf21bef2..816ac1c01e 100644
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -201,9 +201,10 @@ ParagraphList::const_iterator makeParagraphs(Buffer const & buf,
 		bool const opened = openTag(os, lay);
 		par->simpleLyXHTMLOnePar(buf, os, runparams, 
 				outerFont(distance(paragraphs.begin(), par), paragraphs));
-		if (opened)
+		if (opened) {
 			closeTag(os, lay);
-		os << '\n';
+			os << '\n';
+		}
 	}
 	return pend;
 }
@@ -338,6 +339,7 @@ void makeCommand(Buffer const & buf,
 			outerFont(distance(paragraphs.begin(), pbegin), paragraphs));
 	if (main_tag_opened)
 		closeTag(os, style);
+	os << '\n';
 }
 
 } // end anonymous namespace
@@ -377,7 +379,6 @@ void xhtmlParagraphs(ParagraphList const & paragraphs,
 		default:
 			break;
 		}
-		os << '\n';
 		// makeEnvironment may process more than one paragraphs and bypass pend
 		if (distance(lastpar, par) >= distance(lastpar, pend))
 			break;