Output cosmetics, mostly. Get the newlines better.

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

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index e712130afc2ccc4d4d2f5f73f648f13107cc4f65..92706f0c46009347c227d9ee58c55ac6b1e15dc8 100644 (file)
--- 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 b4bf21bef2e5015c78f2993aac800809846a7a68..816ac1c01e37eefa4b141bbc25fb3a91839f1ae2 100644 (file)
--- 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;