*
* \author Lars Gullik Bjønnes
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "Lsstream.h"
#include "support/lstrings.h"
+#include "support/LAssert.h"
#include "insets/insetoptarg.h"
#include "insets/insetcommandparams.h"
#include "insets/insethfill.h"
#include "insets/insetnewline.h"
-extern string bibitemWidest(Buffer const *);
+extern string bibitemWidest(Buffer const &);
using namespace lyx::support;
using std::ostream;
+namespace {
+
+bool moveItem(Paragraph & from, Paragraph & to,
+ BufferParams const & params, pos_type i, pos_type j)
+{
+ char const tmpchar = from.getChar(i);
+ LyXFont tmpfont = from.getFontSettings(params, i);
+
+ if (tmpchar == Paragraph::META_INSET) {
+ InsetOld * tmpinset = 0;
+ if (from.getInset(i)) {
+ // the inset is not in a paragraph anymore
+ tmpinset = from.insetlist.release(i);
+ }
+
+ if (!to.insetAllowed(tmpinset->lyxCode()))
+ return false;
+ to.insertInset(j, tmpinset, tmpfont);
+ } else {
+ if (!to.checkInsertChar(tmpfont))
+ return false;
+ to.insertChar(j, tmpchar, tmpfont);
+ }
+ return true;
+}
+
+}
+
+
void breakParagraph(BufferParams const & bparams,
ParagraphList & paragraphs,
ParagraphList::iterator par,
pos_type j = pos;
for (; i <= pos_end; ++i) {
- Change::Type change(par->lookupChange(i));
- par->cutIntoMinibuffer(bparams, i);
- if (tmp->insertFromMinibuffer(j - pos)) {
+ Change::Type change = par->lookupChange(i);
+ if (moveItem(*par, *tmp, bparams, i, j - pos)) {
tmp->setChange(j - pos, change);
++j;
}
}
- for (i = pos_end; i >= pos; --i) {
+
+ for (i = pos_end; i >= pos; --i)
par->eraseIntern(i);
- }
}
if (pos)
// paragraph
pos_type pos_end = par->size() - 1;
- for (pos_type i = pos, j = pos; i <= pos_end; ++i) {
- par->cutIntoMinibuffer(bparams, i);
- if (tmp->insertFromMinibuffer(j - pos))
+ for (pos_type i = pos, j = pos; i <= pos_end; ++i)
+ if (moveItem(*par, *tmp, bparams, i, j - pos))
++j;
- }
- for (pos_type k = pos_end; k >= pos; --k) {
+ for (pos_type k = pos_end; k >= pos; --k)
par->erase(k);
- }
}
}
pos_type pos_insert = par->size();
// ok, now copy the paragraph
- for (pos_type i = 0, j = 0; i <= pos_end; ++i) {
- the_next->cutIntoMinibuffer(bparams, i);
- if (par->insertFromMinibuffer(pos_insert + j))
+ for (pos_type i = 0, j = 0; i <= pos_end; ++i)
+ if (moveItem(*the_next, *par, bparams, i, pos_insert + j))
++j;
- }
paragraphs.erase(the_next);
}
if (newpit != beg)
--newpit;
- while (newpit != beg && newpit->getDepth() > depth) {
+ while (newpit != beg && newpit->getDepth() > depth) {
--newpit;
}
namespace {
ParagraphList::iterator
-TeXEnvironment(Buffer const * buf,
+TeXEnvironment(Buffer const & buf,
ParagraphList const & paragraphs,
ParagraphList::iterator pit,
ostream & os, TexRow & texrow,
LatexRunParams const & runparams);
ParagraphList::iterator
-TeXOnePar(Buffer const * buf,
+TeXOnePar(Buffer const & buf,
ParagraphList const & paragraphs,
ParagraphList::iterator pit,
ostream & os, TexRow & texrow,
ParagraphList::iterator
-TeXDeeper(Buffer const * buf,
+TeXDeeper(Buffer const & buf,
ParagraphList const & paragraphs,
ParagraphList::iterator pit,
ostream & os, TexRow & texrow,
ParagraphList::iterator
-TeXEnvironment(Buffer const * buf,
+TeXEnvironment(Buffer const & buf,
ParagraphList const & paragraphs,
ParagraphList::iterator pit,
ostream & os, TexRow & texrow,
{
lyxerr[Debug::LATEX] << "TeXEnvironment... " << &*pit << endl;
- BufferParams const & bparams = buf->params;
+ BufferParams const & bparams = buf.params;
LyXLayout_ptr const & style = pit->layout();
ParagraphList::iterator
-TeXOnePar(Buffer const * buf,
+TeXOnePar(Buffer const & buf,
ParagraphList const & paragraphs,
ParagraphList::iterator pit,
ostream & os, TexRow & texrow,
LatexRunParams const & runparams,
string const & everypar)
{
- lyxerr[Debug::LATEX] << "TeXOnePar... " << &*pit << " '" << everypar
-<< "'" << endl;
- BufferParams const & bparams = buf->params;
+ lyxerr[Debug::LATEX] << "TeXOnePar... " << &*pit << " '"
+ << everypar << "'" << endl;
+ BufferParams const & bparams = buf.params;
InsetOld const * in = pit->inInset();
bool further_blank_line = false;
LyXLayout_ptr style;
// well we have to check if we are in an inset with unlimited
- // lenght (all in one row) if that is true then we don't allow
+ // 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
// any environment other then "Standard" to be valid!
- if ((in == 0) || !in->forceDefaultParagraphs(in)) {
+ if (in == 0 || !in->forceDefaultParagraphs(in)) {
style = pit->layout();
if (pit->params().startOfAppendix()) {
}
}
- if ((in == 0) || !in->forceDefaultParagraphs(in)) {
+ if (in == 0 || !in->forceDefaultParagraphs(in)) {
further_blank_line = false;
if (pit->params().lineBottom()) {
os << "\\lyxline{\\" << font.latexSize() << '}';
//
// LaTeX all paragraphs from par to endpar, if endpar == 0 then to the end
//
-void latexParagraphs(Buffer const * buf,
+void latexParagraphs(Buffer const & buf,
ParagraphList const & paragraphs,
ostream & os,
TexRow & texrow,
{
bool was_title = false;
bool already_title = false;
- LyXTextClass const & tclass = buf->params.getLyXTextClass();
+ LyXTextClass const & tclass = buf.params.getLyXTextClass();
ParagraphList::iterator par = const_cast<ParagraphList&>(paragraphs).begin();
ParagraphList::iterator endpar = const_cast<ParagraphList&>(paragraphs).end();
// 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
// any environment other then "Standard" to be valid!
- if ((in == 0) || !in->forceDefaultParagraphs(in)) {
+ if (in == 0 || !in->forceDefaultParagraphs(in)) {
LyXLayout_ptr const & layout = par->layout();
if (layout->intitle) {
for (; cit != token.end(); ++cit) {
par.insertChar(par.size(), (*cit), font, change);
}
- } else if (token == "\\layout") {
+ } else if (token == "\\begin_layout") {
lex.eatLine();
string layoutname = lex.getString();
} else if (token == "\\end_layout") {
lyxerr << "Solitary \\end_layout in line " << lex.getLineNo() << "\n"
- << "Missing \\layout?.\n";
+ << "Missing \\begin_layout?.\n";
} else if (token == "\\end_inset") {
lyxerr << "Solitary \\end_inset in line " << lex.getLineNo() << "\n"
<< "Missing \\begin_inset?.\n";
inset = new InsetSpecialChar;
else
inset = new InsetSpace;
- inset->read(&buf, lex);
+ inset->read(buf, lex);
par.insertInset(par.size(), inset, font, change);
}
} else if (token == "\\i") {
InsetOld * inset = new InsetLatexAccent;
- inset->read(&buf, lex);
+ 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") {
InsetOld * inset = new InsetNewline;
- inset->read(&buf, lex);
+ inset->read(buf, lex);
par.insertInset(par.size(), inset, font, change);
} else if (token == "\\LyXTable") {
InsetOld * inset = new InsetTabular(buf);
- inset->read(&buf, lex);
+ inset->read(buf, lex);
par.insertInset(par.size(), inset, font, change);
} else if (token == "\\bibitem") {
InsetCommandParams p("bibitem", "dummy");
InsetBibitem * inset = new InsetBibitem(p);
- inset->read(&buf, lex);
+ inset->read(buf, lex);
par.insertInset(par.size(), inset, font, change);
} else if (token == "\\hfill") {
- par.insertInset(par.size(), new InsetHFill(), font, change);
+ par.insertInset(par.size(), new InsetHFill, font, change);
} else if (token == "\\change_unchanged") {
// Hack ! Needed for empty paragraphs :/
// FIXME: is it still ??
lyxerr[Debug::PARSER] << "Handling paragraph token: `"
<< token << '\'' << endl;
- if (token == "\\layout" || token == "\\the_end"
+ if (token == "\\begin_layout" || token == "\\end_document"
|| token == "\\end_inset" || token == "\\begin_deeper"
|| token == "\\end_deeper") {
lex.pushToken(token);
}
-LyXFont const realizeFont(LyXFont const & font,
- BufferParams const & params)
+ParagraphList::iterator outerPar(Buffer const & buf, InsetOld const * inset)
{
- LyXTextClass const & tclass = params.getLyXTextClass();
- LyXFont tmpfont(font);
- tmpfont.realize(tclass.defaultfont());
- return tmpfont;
+ ParIterator pit = const_cast<Buffer &>(buf).par_iterator_begin();
+ ParIterator end = const_cast<Buffer &>(buf).par_iterator_end();
+ for ( ; pit != end; ++pit) {
+
+ ParagraphList * plist;
+ // the second '=' below is intentional
+ for (int i = 0; (plist = inset->getParagraphs(i)); ++i)
+ if (plist == &pit.plist())
+ return pit.outerPar();
+
+ InsetList::iterator ii = pit->insetlist.begin();
+ InsetList::iterator iend = pit->insetlist.end();
+ for ( ; ii != iend; ++ii)
+ if (ii->inset == inset)
+ return pit.outerPar();
+ }
+ lyxerr << "outerPar: should not happen" << endl;
+ Assert(false);
+ return const_cast<Buffer &>(buf).paragraphs.end(); // shut up compiler
+}
+
+
+Paragraph const & ownerPar(Buffer const & buf, InsetOld const * inset)
+{
+ ParConstIterator pit = buf.par_iterator_begin();
+ ParConstIterator end = buf.par_iterator_end();
+ for ( ; pit != end; ++pit) {
+ ParagraphList * plist;
+ // the second '=' below is intentional
+ for (int i = 0; (plist = inset->getParagraphs(i)); ++i)
+ if (plist == &pit.plist())
+ return *pit.pit();
+
+ InsetList::const_iterator ii = pit->insetlist.begin();
+ InsetList::const_iterator iend = pit->insetlist.end();
+ for ( ; ii != iend; ++ii)
+ if (ii->inset == inset)
+ return *pit.pit();
+ }
+ lyxerr << "ownerPar: should not happen" << endl;
+ Assert(false);
+ return buf.paragraphs.front(); // shut up compiler
}
projects / lyx.git / blobdiff