]> git.lyx.org Git - features.git/commitdiff
I'm not absolutely sure about this, but it seems to me as if we
authorRichard Heck <rgheck@lyx.org>
Mon, 18 Mar 2013 22:56:38 +0000 (18:56 -0400)
committerRichard Heck <rgheck@lyx.org>
Mon, 18 Mar 2013 22:56:38 +0000 (18:56 -0400)
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.

src/Paragraph.cpp

index 8df7ab70262af0a02e9f3d925bd5ef6c6311b3d4..e803ac50365688fc2ec6ec4cec777f6379412385 100644 (file)
@@ -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;