#include <config.h>
#include "paragraph_pimpl.h"
-#include "LaTeXFeatures.h"
-#include "texrow.h"
-#include "language.h"
+
#include "bufferparams.h"
+#include "debug.h"
#include "encoding.h"
+#include "language.h"
+#include "LaTeXFeatures.h"
+#include "latexrunparams.h"
#include "lyxrc.h"
-#include "debug.h"
#include "paragraph_funcs.h"
+#include "texrow.h"
#include "support/LAssert.h"
}
-Paragraph::Pimpl::Pimpl(Pimpl const & p, Paragraph * owner, bool same_ids)
+Paragraph::Pimpl::Pimpl(Pimpl const & p, Paragraph * owner)
: params(p.params), owner_(owner)
{
inset_owner = p.inset_owner;
text = p.text;
fontlist = p.fontlist;
- if (same_ids)
- id_ = p.id_;
- else
- id_ = paragraph_id++;
+ id_ = paragraph_id++;
if (p.tracking())
changes_.reset(new Changes(*p.changes_.get()));
&& getChar(i - 1) != ' '
&& (i < size() - 1)
// same in FreeSpacing mode
- && !style.free_spacing
- && !owner_->isFreeSpacing()
+ && !owner_->isFreeSpacing()
// In typewriter mode, we want to avoid
// ! . ? : at the end of a line
&& !(font.family() == LyXFont::TYPEWRITER_FAMILY
|| getChar(i - 1) == '!'))) {
os << '\n';
texrow.newline();
- texrow.start(owner_, i + 1);
+ texrow.start(owner_->id(), i + 1);
column = 0;
} else if (style.free_spacing) {
os << '~';
BufferParams const & bparams,
ostream & os,
TexRow & texrow,
- bool moving_arg,
+ LatexRunParams const & runparams,
LyXFont & font,
LyXFont & running_font,
LyXFont & basefont,
if (font.family() == LyXFont::TYPEWRITER_FAMILY)
os << '~';
- if (moving_arg)
+ if (runparams.moving_arg)
os << "\\protect ";
os << "\\\\\n";
}
texrow.newline();
- texrow.start(owner_, i + 1);
+ texrow.start(owner_->id(), i + 1);
column = 0;
break;
}
running_font = basefont;
}
- int tmp = inset->latex(buf, os, moving_arg,
- style.free_spacing);
+ int tmp = inset->latex(buf, os, runparams);
if (close)
os << '}';
for (int j = 0; j < tmp; ++j) {
texrow.newline();
}
- texrow.start(owner_, i + 1);
+ texrow.start(owner_->id(), i + 1);
column = 0;
} else {
column += int(os.tellp()) - len;
InsetList::iterator icit = owner_->insetlist.begin();
InsetList::iterator iend = owner_->insetlist.end();
for (; icit != iend; ++icit) {
- if (icit.getInset()) {
- icit.getInset()->validate(features);
+ if (icit->inset) {
+ icit->inset->validate(features);
if (layout.needprotect &&
- icit.getInset()->lyxCode() == Inset::FOOT_CODE)
+ icit->inset->lyxCode() == Inset::FOOT_CODE)
features.require("NeedLyXFootnoteCode");
}
}