Fix problem with branch handling. The problem was that we were not

dealing properly with the paragraph separator tag.

We really need to use that tag as a kind of general marker for which
tags we're responsible for in a given paragraph and which tags we are
not. So the changes to InsetText.cpp use the tag as that kind of marker.

Note that, as of this commit, the User Guide again exports without any
kind of error. I haven't yet checked the other manuals.

This fixes bug #8022.

src/Paragraph.cpp

@@ -2752,7 +2752,8 @@ void doFontSwitch(vector<html::FontTag> & tagsToOpen,
 docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
 				    XHTMLStream & xs,
 				    OutputParams const & runparams,
-				    Font const & outerfont,
+				    Font const & outerfont, 
+				    bool start_paragraph, bool close_paragraph,
 				    pos_type initial) const
 {
 	docstring retval;
@@ -2774,7 +2775,8 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
 
 	Layout const & style = *d->layout_;
 
-	xs.startParagraph(allowEmpty());
+	if (start_paragraph)
+		xs.startParagraph(allowEmpty());
 
 	FontInfo font_old =
 		style.labeltype == LABEL_MANUAL ? style.labelfont : style.font;
@@ -3060,7 +3062,9 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
 			if (!runparams.for_toc || inset->isInToc()) {
 				OutputParams np = runparams;
 				np.local_font = &font;
-				if (!inset->getLayout().htmlisblock())
+				// If the paragraph has size 1, then we are in the "special
+				// case" where we do not output the containing paragraph info
+				if (!inset->getLayout().htmlisblock() && size() != 1)
 					np.html_in_par = true;
 				retval += inset->xhtml(xs, np);
 			}
@@ -3071,8 +3075,13 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
 		font_old = font.fontInfo();
 	}
 
+	// FIXME XHTML
+	// I'm worried about what happens if a branch, say, is itself
+	// wrapped in some font stuff. I think that will not work.
 	xs.closeFontTags();
-	xs.endParagraph();
+	if (close_paragraph)
+		xs.endParagraph();
+
 	return retval;
 }
 

src/Paragraph.h

@@ -219,6 +219,8 @@ public:
 				 XHTMLStream & xs,
 				 OutputParams const & runparams,
 				 Font const & outerfont,
+				 bool start_paragraph = true,
+				 bool close_paragraph = true,
 				 pos_type initial = 0) const;
 
 	///

src/insets/InsetText.cpp

@@ -613,7 +613,9 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp,
 	runparams.par_end = text().paragraphs().size();
 	
 	if (undefined()) {
+		xs.startParagraph(false);
 		xhtmlParagraphs(text_, buffer(), xs, runparams);
+		xs.endParagraph();
 		return docstring();
 	}
 
@@ -647,7 +649,9 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp,
 	if (il.isPassThru())
 		runparams.pass_thru = true;
 
+	xs.startParagraph(false);
 	xhtmlParagraphs(text_, buffer(), xs, runparams);
+	xs.endParagraph();
 
 	if (opts & WriteInnerTag)
 		xs << html::EndTag(il.htmlinnertag());

src/output_xhtml.cpp

@@ -835,25 +835,26 @@ ParagraphList::const_iterator makeParagraphs(Buffer const & buf,
 		if (!lay.counter.empty())
 			buf.masterBuffer()->params().
 			    documentClass().counters().step(lay.counter, OutputUpdate);
+
 		// FIXME We should see if there's a label to be output and
 		// do something with it.
 		if (par != pbegin)
 			xs << html::CR();
 
-		// If we are already in a paragraph, and this is the first one, then we
-		// do not want to open the paragraph tag.
-		// we also do not want to open it if the current layout does not permit
-		// multiple paragraphs.
-		bool const opened = runparams.html_make_pars &&
-			(par != pbegin || !runparams.html_in_par);
-		bool const make_parid = !runparams.for_toc && runparams.html_make_pars;
+		// We want to open the paragraph tag if:
+		//   (i) the current layout permits multiple paragraphs
+		//  (ii) we are either not already inside a paragraph (HTMLIsBlock) OR
+		//       we are, but this is not the first paragraph
+		// But we do not want to open the paragraph tag if this paragraph contains
+		// only one item, and that item is "inline", i.e., not HTMLIsBlock (such 
+		// as a branch). That is the "special case" we handle first.
+		Inset const * specinset = par->size() == 1 ? par->getInset(0) : 0;
+		bool const special_case =  
+			specinset && !specinset->getLayout().htmlisblock();
 
-		if (opened)
-			openParTag(xs, lay, par->params(),
-			           make_parid ? par->magicLabel() : "");
-
-		docstring const deferred =
-			par->simpleLyXHTMLOnePar(buf, xs, runparams, text.outerFont(distance(begin, par)));
+		bool const opened = runparams.html_make_pars
+			&& (!runparams.html_in_par || par != pbegin)
+			&& !special_case;
 
 		// We want to issue the closing tag if either:
 		//   (i)  We opened it, and either html_in_par is false,
@@ -865,13 +866,25 @@ ParagraphList::const_iterator makeParagraphs(Buffer const & buf,
 		bool const needclose =
 			(opened && (!runparams.html_in_par || nextpar != pend))
 			|| (!opened && runparams.html_in_par && par == pbegin && nextpar != pend);
+
+		if (opened) {
+			// We do not issue the paragraph id if we are doing 
+			// this for the TOC (or some similar purpose)
+			openParTag(xs, lay, par->params(),
+			           runparams.for_toc ? "" : par->magicLabel());
+		}
+
+		docstring const deferred = par->simpleLyXHTMLOnePar(buf, xs, 
+			runparams, text.outerFont(distance(begin, par)),
+			opened, needclose);
+
+		if (!deferred.empty()) {
+			xs << XHTMLStream::ESCAPE_NONE << deferred << html::CR();
+		}
 		if (needclose) {
 			closeTag(xs, lay);
 			xs << html::CR();
 		}
-		if (!deferred.empty()) {
-			xs << XHTMLStream::ESCAPE_NONE << deferred << html::CR();
-		}
 	}
 	return pend;
 }
@@ -998,7 +1011,7 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
 					openItemTag(xs, style, par->params());
 
 				par->simpleLyXHTMLOnePar(buf, xs, runparams,
-					text.outerFont(distance(begin, par)), sep);
+					text.outerFont(distance(begin, par)), true, true, sep);
 				++par;
 
 				// We may not want to close the tag yet, in particular: