From: Richard Heck <rgheck@lyx.org>
Date: Mon, 18 Mar 2013 22:56:38 +0000 (-0400)
Subject: I'm not absolutely sure about this, but it seems to me as if we
X-Git-Tag: 2.1.0beta1~531
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=9548274f3933e14e11bb105e9d52f07bf17f0a8b;p=features.git

I'm not absolutely sure about this, but it seems to me as if we
need the master buffer here, too: in looking up fonts during XHTML
output.

I'm half tempted to pass the master buffer to these routines, though
there are times, I think, when we want the actual buffer: e.g., when
looking up branches.
---

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 8df7ab7026..e803ac5036 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -2861,7 +2861,7 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
 		if (isDeleted(i))
 			continue;
 
-		Font font = getFont(buf.params(), i, outerfont);
+		Font font = getFont(buf.masterBuffer()->params(), i, outerfont);
 
 		// emphasis
 		if (font_old.emph() != font.fontInfo().emph()) {
@@ -2895,7 +2895,7 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
 				retval += inset->xhtml(xs, np);
 			}
 		} else {
-			char_type c = getUChar(buf.params(), i);
+			char_type c = getUChar(buf.masterBuffer()->params(), i);
 
 			if (style.pass_thru || runparams.pass_thru)
 				xs << c;