#include <csignal>
#include <ctime>
+using namespace lyx::support;
+
using std::ostream;
using std::endl;
using std::fstream;
char minibuffer_char;
LyXFont minibuffer_font;
-Inset * minibuffer_inset;
+InsetOld * minibuffer_inset;
} // namespace anon
// this is because of the dummy layout of the paragraphs that
// follow footnotes
layout_ = lp.layout();
- buffer_ = lp.buffer_;
// copy everything behind the break-position to the new paragraph
insetlist = lp.insetlist;
InsetList::iterator it = insetlist.begin();
InsetList::iterator end = insetlist.end();
for (; it != end; ++it) {
- it->inset = it->inset->clone(**buffer_);
+ // currently we hold Inset*, not InsetBase*
+ it->inset = static_cast<InsetOld*>(it->inset->clone().release());
// tell the new inset who is the boss now
it->inset->parOwner(this);
}
}
+void Paragraph::operator=(Paragraph const & lp)
+{
+ // needed as we will destroy the pimpl_ before copying it
+ if (&lp != this)
+ return;
+ lyxerr << "Paragraph::operator=()\n";
+ delete pimpl_;
+ pimpl_ = new Pimpl(*lp.pimpl_, this);
+
+ enumdepth = lp.enumdepth;
+ itemdepth = lp.itemdepth;
+ // this is because of the dummy layout of the paragraphs that
+ // follow footnotes
+ layout_ = lp.layout();
+
+ // copy everything behind the break-position to the new paragraph
+ insetlist = lp.insetlist;
+ InsetList::iterator it = insetlist.begin();
+ InsetList::iterator end = insetlist.end();
+ for (; it != end; ++it) {
+ it->inset = static_cast<InsetOld*>(it->inset->clone().release());
+ // tell the new inset who is the boss now
+ it->inset->parOwner(this);
+ }
+}
+
// the destructor removes the new paragraph from the list
Paragraph::~Paragraph()
{
switch (c) {
case META_INSET:
{
- Inset const * inset = getInset(i);
+ InsetOld const * inset = getInset(i);
if (inset)
if (inset->directWrite()) {
// international char, let it write
}
Changes::lyxMarkChange(os, column, curtime,
running_change, Change(Change::UNCHANGED));
+
+ os << "\n\\end_layout\n";
}
minibuffer_inset = 0;
if (minibuffer_char == Paragraph::META_INSET) {
if (getInset(pos)) {
- minibuffer_inset = getInset(pos)->clone(buffer);
+ minibuffer_inset = static_cast<InsetOld *>(getInset(pos)->clone().release());
} else {
minibuffer_inset = 0;
minibuffer_char = ' ';
}
-void Paragraph::insertInset(pos_type pos, Inset * inset)
+void Paragraph::insertInset(pos_type pos, InsetOld * inset)
{
LyXFont const f(LyXFont::ALL_INHERIT);
insertInset(pos, inset, f);
}
-void Paragraph::insertInset(pos_type pos, Inset * inset, LyXFont const & font, Change change)
+void Paragraph::insertInset(pos_type pos, InsetOld * inset, LyXFont const & font, Change change)
{
pimpl_->insertInset(pos, inset, font, change);
}
-bool Paragraph::insetAllowed(Inset::Code code)
+bool Paragraph::insetAllowed(InsetOld::Code code)
{
//lyxerr << "Paragraph::InsertInsetAllowed" << endl;
if (pimpl_->inset_owner)
}
-Inset * Paragraph::getInset(pos_type pos)
+InsetOld * Paragraph::getInset(pos_type pos)
{
- lyx::Assert(pos < size());
+ Assert(pos < size());
return insetlist.get(pos);
}
-Inset const * Paragraph::getInset(pos_type pos) const
+InsetOld const * Paragraph::getInset(pos_type pos) const
{
- lyx::Assert(pos < size());
+ Assert(pos < size());
return insetlist.get(pos);
}
LyXFont const Paragraph::getFontSettings(BufferParams const & bparams,
pos_type pos) const
{
- lyx::Assert(pos <= size());
+ Assert(pos <= size());
Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
Pimpl::FontList::const_iterator end = pimpl_->fontlist.end();
return retfont;
}
+lyx::pos_type
+Paragraph::getEndPosOfFontSpan(lyx::pos_type pos) const
+{
+ Assert(pos <= size());
+
+ Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
+ Pimpl::FontList::const_iterator end = pimpl_->fontlist.end();
+ for (; cit != end; ++cit) {
+ if (cit->pos() >= pos)
+ return cit->pos();
+ }
+ // This should not happen, but if so, we take no chances.
+ return pos;
+}
+
// Gets uninstantiated font setting at position 0
LyXFont const Paragraph::getFirstFontSettings() const
LyXFont const Paragraph::getFont(BufferParams const & bparams, pos_type pos,
LyXFont const & outerfont) const
{
- lyx::Assert(pos >= 0);
+ Assert(pos >= 0);
LyXLayout_ptr const & lout = layout();
LyXFont tmpfont = getFontSettings(bparams, pos);
tmpfont.realize(layoutfont);
tmpfont.realize(outerfont);
+ tmpfont.realize(bparams.getLyXTextClass().defaultfont());
- return realizeFont(tmpfont, bparams);
+ return tmpfont;
}
LyXFont tmpfont = lout->labelfont;
tmpfont.setLanguage(getParLanguage(bparams));
tmpfont.realize(outerfont);
+ tmpfont.realize(bparams.getLyXTextClass().defaultfont());
- return realizeFont(tmpfont, bparams);
+ return tmpfont;
}
LyXFont tmpfont = lout->font;
tmpfont.setLanguage(getParLanguage(bparams));
tmpfont.realize(outerfont);
+ tmpfont.realize(bparams.getLyXTextClass().defaultfont());
- return realizeFont(tmpfont, bparams);
+ return tmpfont;
}
void Paragraph::setFont(pos_type pos, LyXFont const & font)
{
- lyx::Assert(pos <= size());
+ Assert(pos <= size());
// First, reduce font against layout/label font
// Update: The SetCharFont() routine in text2.C already
int Paragraph::stripLeadingSpaces()
{
- if (layout()->free_spacing || isFreeSpacing())
+ if (isFreeSpacing())
return 0;
int i = 0;
// returns -1 if inset not found
-int Paragraph::getPositionOfInset(Inset const * inset) const
+int Paragraph::getPositionOfInset(InsetOld const * inset) const
{
// Find the entry.
InsetList::const_iterator it = insetlist.begin();
InsetBibitem * Paragraph::bibitem() const
{
InsetList::const_iterator it = insetlist.begin();
- if (it != insetlist.end() && it->inset->lyxCode() == Inset::BIBTEX_CODE)
+ if (it != insetlist.end() && it->inset->lyxCode() == InsetOld::BIBTEX_CODE)
return static_cast<InsetBibitem *>(it->inset);
return 0;
}
bool Paragraph::isHfill(pos_type pos) const
{
return IsInsetChar(getChar(pos))
- && getInset(pos)->lyxCode() == Inset::HFILL_CODE;
+ && getInset(pos)->lyxCode() == InsetOld::HFILL_CODE;
}
bool Paragraph::isNewline(pos_type pos) const
{
return IsInsetChar(getChar(pos))
- && getInset(pos)->lyxCode() == Inset::NEWLINE_CODE;
+ && getInset(pos)->lyxCode() == InsetOld::NEWLINE_CODE;
}
Language const *
Paragraph::getParLanguage(BufferParams const & bparams) const
{
- if (!empty()) {
+ if (!empty())
return getFirstFontSettings().language();
#warning FIXME we should check the prev par as well (Lgb)
-#if 0
- } else if (previous_) {
- return previous_->getParLanguage(bparams);
-#endif
- }else
- return bparams.language;
+ return bparams.language;
}
return lyxrc.rtl_support
&& getParLanguage(bparams)->RightToLeft()
&& !(inInset() && inInset()->owner() &&
- inInset()->owner()->lyxCode() == Inset::ERT_CODE);
+ inInset()->owner()->lyxCode() == InsetOld::ERT_CODE);
}
// Used for building the table of contents
string const Paragraph::asString(Buffer const * buffer, bool label) const
{
+#if 0
string s;
if (label && !params().labelString().empty())
s += params().labelString() + ' ';
if (IsPrintable(c))
s += c;
else if (c == META_INSET &&
- getInset(i)->lyxCode() == Inset::MATH_CODE) {
+ getInset(i)->lyxCode() == InsetOld::MATH_CODE) {
ostringstream ost;
getInset(i)->ascii(buffer, ost);
s += subst(STRCONV(ost.str()),'\n',' ');
}
return s;
+#else
+ // This should really be done by the caller and not here.
+ string ret(asString(buffer, 0, size(), label));
+ return subst(ret, '\n', ' ');
+#endif
}
}
-void Paragraph::setInsetOwner(Inset * i)
+void Paragraph::setInsetOwner(UpdatableInset * inset)
{
- pimpl_->inset_owner = i;
+ pimpl_->inset_owner = inset;
InsetList::iterator it = insetlist.begin();
InsetList::iterator end = insetlist.end();
for (; it != end; ++it)
if (it->inset)
- it->inset->setOwner(i);
+ it->inset->setOwner(inset);
}
void Paragraph::deleteInsetsLyXText(BufferView * bv)
{
- // then the insets
insetlist.deleteInsetsLyXText(bv);
}
void Paragraph::resizeInsetsLyXText(BufferView * bv)
{
- // then the insets
insetlist.resizeInsetsLyXText(bv);
}
Change::Type Paragraph::lookupChange(lyx::pos_type pos) const
{
- lyx::Assert(!size() || pos < size());
+ Assert(!size() || pos < size());
return pimpl_->lookupChange(pos);
}
Change const Paragraph::lookupChangeFull(lyx::pos_type pos) const
{
- lyx::Assert(!size() || pos < size());
+ Assert(!size() || pos < size());
return pimpl_->lookupChangeFull(pos);
}
LyXLayout_ptr const & Paragraph::layout() const
{
- Inset * inset = inInset();
- if (inset && inset->lyxCode() == Inset::ENVIRONMENT_CODE)
+/*
+ InsetOld * inset = inInset();
+ if (inset && inset->lyxCode() == InsetOld::ENVIRONMENT_CODE)
return static_cast<InsetEnvironment*>(inset)->layout();
+*/
return layout_;
}
}
-Inset * Paragraph::inInset() const
+UpdatableInset * Paragraph::inInset() const
{
return pimpl_->inset_owner;
}
bool Paragraph::isFreeSpacing() const
{
+ if (layout()->free_spacing)
+ return true;
+
// for now we just need this, later should we need this in some
- // other way we can always add a function to Inset::() too.
+ // other way we can always add a function to InsetOld::() too.
+ if (pimpl_->inset_owner && pimpl_->inset_owner->owner())
+ return (pimpl_->inset_owner->owner()->lyxCode() == InsetOld::ERT_CODE);
+ return false;
+}
+
+
+bool Paragraph::allowEmpty() const
+{
+ if (layout()->keepempty)
+ return true;
if (pimpl_->inset_owner && pimpl_->inset_owner->owner())
- return (pimpl_->inset_owner->owner()->lyxCode() == Inset::ERT_CODE);
+ return (pimpl_->inset_owner->owner()->lyxCode() == InsetOld::ERT_CODE);
return false;
}
projects / lyx.git / blobdiff