X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_xhtml.cpp;h=fdf8681b56b8964946bbf3da2b89bbb8f2b3d412;hb=fab1494f49c0a25f46921db5dc142d7d05f17d17;hp=3fbc33907a07e7eb526bf61865e725df20023de2;hpb=f162067a6109e59cbe5b3e64ad248f471c06cd2f;p=lyx.git

diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index 3fbc33907a..fdf8681b56 100644
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -238,7 +238,6 @@ void XHTMLStream::clearTagDeque()
 		StartTag const & tag = pending_tags_.front();
 		// tabs?
 		os_ << tag.asTag();
-		cr();
 		tag_stack_.push_back(tag);
 		pending_tags_.pop_front();
 	}
@@ -381,7 +380,6 @@ XHTMLStream & XHTMLStream::operator<<(EndTag const & etag)
 	if (etag.tag_ == tag_stack_.back().tag_) {
 		// output it...
 		os_ << etag.asEndTag();
-		cr();
 		// ...and forget about it
 		tag_stack_.pop_back();
 		return *this;
@@ -424,14 +422,12 @@ XHTMLStream & XHTMLStream::operator<<(EndTag const & etag)
 		TagStack fontstack;
 		while (curtag.tag_ != etag.tag_) {
 			os_ << curtag.asEndTag();
-			cr();
 			fontstack.push_back(curtag);
 			tag_stack_.pop_back();
 			curtag = tag_stack_.back();
 		}
 		// now close our tag...
 		os_ << etag.asEndTag();
-		cr();
 		tag_stack_.pop_back();
 
 		// ...and restore the other tags.
@@ -675,7 +671,6 @@ ParagraphList::const_iterator makeEnvironmentHtml(Buffer const & buf,
 					closeItemTag(xs, *lastlay);
 					lastlay = 0;
 				}
-				bool const labelfirst = style.htmllabelfirst();
 				if (isNormalEnv(style)) {
 					// in this case, we print the label only for the first 
 					// paragraph (as in a theorem).
@@ -691,6 +686,7 @@ ParagraphList::const_iterator makeEnvironmentHtml(Buffer const & buf,
 						xs.cr();
 					}
 				}	else { // some kind of list
+					bool const labelfirst = style.htmllabelfirst();
 					if (!labelfirst)
 						openItemTag(xs, style);
 					if (style.labeltype == LABEL_MANUAL