#include "support/debug.h"
+#include "support/assert.h"
#include <boost/next_prior.hpp>
using namespace std;
tmp->setInsetOwner(par.inInset());
// without doing that we get a crash when typing <Return> at the
// end of a paragraph
- if (par.useEmptyLayout())
- tmp->layout(bparams.getTextClass().emptyLayout());
- else
- tmp->layout(bparams.getTextClass().defaultLayout());
+ tmp->setEmptyOrDefaultLayout(bparams.documentClass());
// layout stays the same with latex-environments
if (keep_layout) {
- tmp->layout(par.layout());
+ tmp->setLayout(par.layout());
tmp->setLabelWidthString(par.params().labelWidthString());
tmp->params().depth(par.params().depth());
} else if (par.params().depth() > 0) {
Paragraph const & hook = pars[outerHook(par_offset, pars)];
- tmp->layout(hook.layout());
+ tmp->setLayout(hook.layout());
// not sure the line below is useful
tmp->setLabelWidthString(par.params().labelWidthString());
tmp->params().depth(hook.params().depth());
bool const isempty = (par.allowEmpty() && par.empty());
if (!isempty && (par.size() > pos || par.empty())) {
- tmp->layout(par.layout());
+ tmp->setLayout(par.layout());
tmp->params().align(par.params().align());
tmp->setLabelWidthString(par.params().labelWidthString());
par.params().clear();
// do not lose start of appendix marker (bug 4212)
par.params().startOfAppendix(soa);
- par.layout(bparams.getTextClass().defaultLayout());
+ par.setEmptyOrDefaultLayout(bparams.documentClass());
}
// layout stays the same with latex-environments
if (keep_layout) {
- par.layout(tmp->layout());
+ par.setLayout(tmp->layout());
par.setLabelWidthString(tmp->params().labelWidthString());
par.params().depth(tmp->params().depth());
}
tmp.makeSameLayout(par);
- BOOST_ASSERT(pos <= par.size());
+ LASSERT(pos <= par.size(), /**/);
if (pos < par.size()) {
// move everything behind the break position to the new paragraph
pit_type pit = p;
depth_type par_depth = pars[p].getDepth();
while (pit != pit_type(pars.size())) {
- LayoutPtr const & layout = pars[pit].layout();
- int const endlabeltype = layout->endlabeltype;
+ Layout const & layout = pars[pit].layout();
+ int const endlabeltype = layout.endlabeltype;
if (endlabeltype != END_LABEL_NO_LABEL) {
if (p + 1 == pit_type(pars.size()))
&& !tmpfont.resolved()) {
par_offset = outerHook(par_offset, pars);
if (par_offset != pit_type(pars.size())) {
- tmpfont.realize(pars[par_offset].layout()->font);
+ tmpfont.realize(pars[par_offset].layout().font);
par_depth = pars[par_offset].getDepth();
}
}