#include "insets/insetoptarg.h"
#include "insets/insetcommandparams.h"
#include "insets/insetbibitem.h"
+#include "insets/insetspace.h"
#include "insets/insetspecialchar.h"
#include "insets/insetlatexaccent.h"
#include "insets/insettabular.h"
#include "insets/insethfill.h"
-#include "insets/inseterror.h"
#include "insets/insetnewline.h"
extern string bibitemWidest(Buffer const *);
+using namespace lyx::support;
+
using lyx::pos_type;
//using lyx::layout_type;
using std::endl;
using std::ostream;
+
void breakParagraph(BufferParams const & bparams,
ParagraphList & paragraphs,
ParagraphList::iterator par,
{
// create a new paragraph, and insert into the list
ParagraphList::iterator tmp = paragraphs.insert(boost::next(par),
- new Paragraph);
+ Paragraph());
// without doing that we get a crash when typing <Return> at the
// end of a paragraph
tmp->setLabelWidthString(par->params().labelWidthString());
}
- bool const isempty = (par->layout()->keepempty && par->empty());
+ bool const isempty = (par->allowEmpty() && par->empty());
if (!isempty && (par->size() > pos || par->empty() || flag == 2)) {
tmp->layout(par->layout());
{
// create a new paragraph
ParagraphList::iterator tmp = paragraphs.insert(boost::next(par),
- new Paragraph);
+ Paragraph());
tmp->makeSameLayout(*par);
// When can pos > size()?
Paragraph::depth_type depth)
{
ParagraphList::iterator newpit = pit;
- ParagraphList::iterator beg = plist.begin();
+ ParagraphList::iterator beg = const_cast<ParagraphList&>(plist).begin();
if (newpit != beg)
--newpit;
ParagraphList const & plist)
{
if (!pit->getDepth())
- return plist.end();
+ return const_cast<ParagraphList&>(plist).end();
return depthHook(pit, plist,
Paragraph::depth_type(pit->getDepth() - 1));
}
{
ParagraphList::iterator pit = p;
Paragraph::depth_type par_depth = p->getDepth();
- while (pit != plist.end()) {
+ while (pit != const_cast<ParagraphList&>(plist).end()) {
LyXLayout_ptr const & layout = pit->layout();
int const endlabeltype = layout->endlabeltype;
if (endlabeltype != END_LABEL_NO_LABEL) {
- if (boost::next(p) == plist.end())
+ if (boost::next(p) == const_cast<ParagraphList&>(plist).end())
return endlabeltype;
Paragraph::depth_type const next_depth = boost::next(p)->getDepth();
if (par_depth == 0)
break;
pit = outerHook(pit, plist);
- if (pit != plist.end())
+ if (pit != const_cast<ParagraphList&>(plist).end())
par_depth = pit->getDepth();
}
return END_LABEL_NO_LABEL;
TeXEnvironment(Buffer const * buf,
ParagraphList const & paragraphs,
ParagraphList::iterator pit,
- ostream & os, TexRow & texrow);
+ ostream & os, TexRow & texrow,
+ LatexRunParams const & runparams);
ParagraphList::iterator
TeXOnePar(Buffer const * buf,
ParagraphList const & paragraphs,
ParagraphList::iterator pit,
ostream & os, TexRow & texrow,
- bool moving_arg,
+ LatexRunParams const & runparams,
string const & everypar = string());
TeXDeeper(Buffer const * buf,
ParagraphList const & paragraphs,
ParagraphList::iterator pit,
- ostream & os, TexRow & texrow)
+ ostream & os, TexRow & texrow,
+ LatexRunParams const & runparams)
{
lyxerr[Debug::LATEX] << "TeXDeeper... " << &*pit << endl;
ParagraphList::iterator par = pit;
- while (par != paragraphs.end() &&
+ while (par != const_cast<ParagraphList&>(paragraphs).end() &&
par->params().depth() == pit->params().depth()) {
if (par->layout()->isEnvironment()) {
par = TeXEnvironment(buf, paragraphs, par,
- os, texrow);
+ os, texrow, runparams);
} else {
par = TeXOnePar(buf, paragraphs, par,
- os, texrow, false);
+ os, texrow, runparams);
}
}
lyxerr[Debug::LATEX] << "TeXDeeper...done " << &*par << endl;
TeXEnvironment(Buffer const * buf,
ParagraphList const & paragraphs,
ParagraphList::iterator pit,
- ostream & os, TexRow & texrow)
+ ostream & os, TexRow & texrow,
+ LatexRunParams const & runparams)
{
lyxerr[Debug::LATEX] << "TeXEnvironment... " << &*pit << endl;
Language const * language = pit->getParLanguage(bparams);
Language const * doc_language = bparams.language;
Language const * previous_language =
- (pit != paragraphs.begin())
+ (pit != const_cast<ParagraphList&>(paragraphs).begin())
? boost::prior(pit)->getParLanguage(bparams)
: doc_language;
if (language->babel() != previous_language->babel()) {
}
ParagraphList::iterator par = pit;
do {
- par = TeXOnePar(buf, paragraphs, par, os, texrow, false);
+ par = TeXOnePar(buf, paragraphs, par, os, texrow, runparams);
- if (par != paragraphs.end()&& par->params().depth() > pit->params().depth()) {
+ if (par != const_cast<ParagraphList&>(paragraphs).end() && par->params().depth() > pit->params().depth()) {
if (par->layout()->isParagraph()) {
// Thinko!
os << '\n';
texrow.newline();
}
- par = TeXDeeper(buf, paragraphs, par, os, texrow);
+ par = TeXDeeper(buf, paragraphs, par, os, texrow,
+ runparams);
}
- } while (par != paragraphs.end()
+ } while (par != const_cast<ParagraphList&>(paragraphs).end()
&& par->layout() == pit->layout()
&& par->params().depth() == pit->params().depth()
&& par->params().leftIndent() == pit->params().leftIndent());
InsetOptArg * optArgInset(Paragraph const & par)
{
// Find the entry.
- InsetList::iterator it = par.insetlist.begin();
- InsetList::iterator end = par.insetlist.end();
+ InsetList::const_iterator it = par.insetlist.begin();
+ InsetList::const_iterator end = par.insetlist.end();
for (; it != end; ++it) {
- Inset * ins = it.getInset();
- if (ins->lyxCode() == Inset::OPTARG_CODE) {
+ InsetOld * ins = it->inset;
+ if (ins->lyxCode() == InsetOld::OPTARG_CODE) {
return static_cast<InsetOptArg *>(ins);
}
}
ParagraphList const & paragraphs,
ParagraphList::iterator pit,
ostream & os, TexRow & texrow,
- bool moving_arg,
+ LatexRunParams const & runparams,
string const & everypar)
{
lyxerr[Debug::LATEX] << "TeXOnePar... " << &*pit << " '" << everypar
<< "'" << endl;
BufferParams const & bparams = buf->params;
- Inset const * in = pit->inInset();
+ InsetOld const * in = pit->inInset();
bool further_blank_line = false;
LyXLayout_ptr style;
}
if (!pit->params().spacing().isDefault()
- && (pit == paragraphs.begin() || !boost::prior(pit)->hasSameLayout(*pit))) {
+ && (pit == const_cast<ParagraphList&>(paragraphs).begin() || !boost::prior(pit)->hasSameLayout(*pit))) {
os << pit->params().spacing().writeEnvirBegin() << '\n';
texrow.newline();
}
Language const * language = pit->getParLanguage(bparams);
Language const * doc_language = bparams.language;
Language const * previous_language =
- (pit != paragraphs.begin())
+ (pit != const_cast<ParagraphList&>(paragraphs).begin())
? boost::prior(pit)->getParLanguage(bparams)
: doc_language;
if (language->babel() != previous_language->babel()
// check if we already put language command in TeXEnvironment()
&& !(style->isEnvironment()
- && (pit == paragraphs.begin() ||
+ && (pit == const_cast<ParagraphList&>(paragraphs).begin() ||
(boost::prior(pit)->layout() != pit->layout() &&
boost::prior(pit)->getDepth() <= pit->getDepth())
|| boost::prior(pit)->getDepth() < pit->getDepth())))
if (style->optionalargs == 1) {
InsetOptArg * it = optArgInset(*pit);
if (it)
- it->latexOptional(buf, os, false, false);
+ it->latexOptional(buf, os, runparams);
}
else
os << style->latexparam();
os << everypar;
bool need_par = pit->simpleTeXOnePar(buf, bparams,
outerFont(pit, paragraphs),
- os, texrow, moving_arg);
+ os, texrow, runparams);
// Make sure that \\par is done with the font of the last
// character if this has another size as the default.
bool is_command = style->isCommand();
if (style->resfont.size() != font.size()
- && boost::next(pit) != paragraphs.end()
+ && boost::next(pit) != const_cast<ParagraphList&>(paragraphs).end()
&& !is_command) {
if (!need_par)
os << '{';
switch (style->latextype) {
case LATEX_ITEM_ENVIRONMENT:
case LATEX_LIST_ENVIRONMENT:
- if (boost::next(pit) != paragraphs.end()
+ if (boost::next(pit) != const_cast<ParagraphList&>(paragraphs).end()
&& (pit->params().depth() < boost::next(pit)->params().depth())) {
os << '\n';
texrow.newline();
}
break;
- case LATEX_ENVIRONMENT:
+ case LATEX_ENVIRONMENT: {
// if its the last paragraph of the current environment
// skip it otherwise fall through
- if (boost::next(pit) != paragraphs.end()
- && (boost::next(pit)->layout() != pit->layout()
- || boost::next(pit)->params().depth() != pit->params().depth()))
+ ParagraphList::iterator next = boost::next(pit);
+
+ if (next != const_cast<ParagraphList&>(paragraphs).end()
+ && (next->layout() != pit->layout()
+ || next->params().depth() != pit->params().depth()))
break;
+ }
+
// fall through possible
default:
// we don't need it for the last paragraph!!!
- if (boost::next(pit) != paragraphs.end()) {
+ if (boost::next(pit) != const_cast<ParagraphList&>(paragraphs).end()) {
os << '\n';
texrow.newline();
}
}
if (!pit->params().spacing().isDefault()
- && (boost::next(pit) == paragraphs.end()|| !boost::next(pit)->hasSameLayout(*pit))) {
+ && (boost::next(pit) == const_cast<ParagraphList&>(paragraphs).end()|| !boost::next(pit)->hasSameLayout(*pit))) {
os << pit->params().spacing().writeEnvirEnd() << '\n';
texrow.newline();
}
}
// we don't need it for the last paragraph!!!
- if (boost::next(pit) != paragraphs.end()) {
+ if (boost::next(pit) != const_cast<ParagraphList&>(paragraphs).end()) {
os << '\n';
texrow.newline();
} else {
ParagraphList const & paragraphs,
ostream & os,
TexRow & texrow,
- bool moving_arg,
- string const & everypar)
+ LatexRunParams const & runparams,
+ string const & everypar)
{
bool was_title = false;
bool already_title = false;
LyXTextClass const & tclass = buf->params.getLyXTextClass();
- ParagraphList::iterator par = paragraphs.begin();
- ParagraphList::iterator endpar = paragraphs.end();
+ ParagraphList::iterator par = const_cast<ParagraphList&>(paragraphs).begin();
+ ParagraphList::iterator endpar = const_cast<ParagraphList&>(paragraphs).end();
// if only_body
while (par != endpar) {
- Inset * in = par->inInset();
+ InsetOld * in = par->inInset();
// well we have to check if we are in an inset with unlimited
// length (all in one row) if that is true then we don't allow
// any special options in the paragraph and also we don't allow
if (layout->is_environment) {
par = TeXOnePar(buf, paragraphs, par, os, texrow,
- moving_arg, everypar);
+ runparams, everypar);
} else if (layout->isEnvironment() ||
!par->params().leftIndent().zero())
{
- par = TeXEnvironment(buf, paragraphs, par, os, texrow);
+ par = TeXEnvironment(buf, paragraphs, par, os,
+ texrow, runparams);
} else {
par = TeXOnePar(buf, paragraphs, par, os, texrow,
- moving_arg, everypar);
+ runparams, everypar);
}
} else {
par = TeXOnePar(buf, paragraphs, par, os, texrow,
- moving_arg, everypar);
+ runparams, everypar);
}
}
// It might be that we only have a title in this document
istringstream is(ss.str());
LyXLex tmplex(0, 0);
tmplex.setStream(is);
- Inset * inset = new InsetCaption;
+ InsetOld * inset = new InsetCaption;
inset->Read(this, tmplex);
par.insertInset(pos, inset, font);
++pos;
// But insets should read it, it is a part of
// the inset isn't it? Lgb.
} else if (token == "\\begin_inset") {
- Inset * i = readInset(lex, buf);
+ InsetOld * i = readInset(lex, buf);
par.insertInset(par.size(), i, font, change);
} else if (token == "\\family") {
lex.next();
} else if (token == "\\color") {
lex.next();
font.setLyXColor(lex.getString());
- } else if (token == "\\SpecialChar") {
- LyXLayout_ptr const & layout = par.layout();
+ } else if (token == "\\InsetSpace" || token == "\\SpecialChar") {
// Insets don't make sense in a free-spacing context! ---Kayvan
- if (layout->free_spacing || par.isFreeSpacing()) {
- if (lex.isOK()) {
+ if (par.isFreeSpacing()) {
+ if (token == "\\InsetSpace")
+ par.insertChar(par.size(), ' ', font, change);
+ else if (lex.isOK()) {
lex.next();
string const next_token = lex.getString();
- if (next_token == "\\-") {
+ if (next_token == "\\-")
par.insertChar(par.size(), '-', font, change);
- } else if (next_token == "~") {
- par.insertChar(par.size(), ' ', font, change);
- } else {
+ else {
lex.printError("Token `$$Token' "
"is in free space "
"paragraph layout!");
}
}
} else {
- Inset * inset = new InsetSpecialChar;
+ InsetOld * inset = 0;
+ if (token == "\\SpecialChar" )
+ inset = new InsetSpecialChar;
+ else
+ inset = new InsetSpace;
inset->read(&buf, lex);
par.insertInset(par.size(), inset, font, change);
}
} else if (token == "\\i") {
- Inset * inset = new InsetLatexAccent;
+ InsetOld * inset = new InsetLatexAccent;
inset->read(&buf, lex);
par.insertInset(par.size(), inset, font, change);
} else if (token == "\\backslash") {
par.insertChar(par.size(), '\\', font, change);
} else if (token == "\\newline") {
- Inset * inset = new InsetNewline;
+ InsetOld * inset = new InsetNewline;
inset->read(&buf, lex);
par.insertInset(par.size(), inset, font, change);
} else if (token == "\\LyXTable") {
- Inset * inset = new InsetTabular(buf);
+ InsetOld * inset = new InsetTabular(buf);
inset->read(&buf, lex);
par.insertInset(par.size(), inset, font, change);
} else if (token == "\\bibitem") {
lex.eatLine();
string const s = bformat(_("Unknown token: %1$s %2$s\n"),
token, lex.getString());
- // we can do this here this way because we're actually reading
- // the buffer and don't care about LyXText right now.
- par.insertInset(par.size(), new InsetError(s), font);
+
+ buf.error(ErrorItem(_("Unknown token"), s,
+ par.id(), 0, par.size()));
return 1;
}
return 0;
LyXFont tmpfont(LyXFont::ALL_INHERIT);
// Resolve against environment font information
- while (pit != plist.end() &&
+ while (pit != const_cast<ParagraphList&>(plist).end() &&
par_depth && !tmpfont.resolved()) {
pit = outerHook(pit, plist);
- if (pit != plist.end()) {
+ if (pit != const_cast<ParagraphList&>(plist).end()) {
tmpfont.realize(pit->layout()->font);
par_depth = pit->getDepth();
}
projects / lyx.git / blobdiff