#include "LyXRC.h"
#include "OutputParams.h"
#include "Paragraph.h"
-#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
#include "TextClass.h"
#include "TexRow.h"
ParagraphList const & paragraphs = text.paragraphs();
+ bool const force_plain_layout = text.inset().forcePlainLayout();
while (par != paragraphs.end() &&
par->params().depth() == pit->params().depth()) {
// FIXME This test should not be necessary.
// We should perhaps issue an error if it is.
- Layout const & style = par->forcePlainLayout() ?
- buf.params().documentClass().plainLayout() : par->layout();
+ Layout const & style = force_plain_layout
+ ? buf.params().documentClass().plainLayout() : par->layout();
if (style.isEnvironment()) {
par = TeXEnvironment(buf, text, par,
os, texrow, runparams);
// FIXME This test should not be necessary.
// We should perhaps issue an error if it is.
- Layout const & style = pit->forcePlainLayout() ?
+ Layout const & style = text.inset().forcePlainLayout() ?
bparams.documentClass().plainLayout() : pit->layout();
ParagraphList const & paragraphs = text.paragraphs();
if (runparams.verbatim) {
int const dist = distance(paragraphs.begin(), pit);
- Font const outerfont = outerFont(dist, paragraphs);
+ Font const outerfont = text.outerFont(dist);
// No newline if only one paragraph in this lyxtext
if (dist > 0) {
// FIXME This check should not really be needed.
// Perhaps we should issue an error if it is.
- Layout const style = pit->forcePlainLayout() ?
+ Layout const style = text.inset().forcePlainLayout() ?
bparams.documentClass().plainLayout() : pit->layout();
runparams.moving_arg |= style.needprotect;
break;
}
- Font const outerfont = outerFont(distance(paragraphs.begin(), pit),
- paragraphs);
+ Font const outerfont = text.outerFont(distance(paragraphs.begin(), pit));
// FIXME UNICODE
os << from_utf8(everypar);
lastpar = par;
// FIXME This check should not be needed. We should
// perhaps issue an error if it is.
- Layout const & layout = par->forcePlainLayout() ?
+ Layout const & layout = text.inset().forcePlainLayout() ?
tclass.plainLayout() : par->layout();
if (layout.intitle) {