for (InsetList::iterator it = insetlist.begin();
it != insetlist.end(); ++it) {
- delete (*it).inset;
+ delete it->inset;
}
// ale970302
for (Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
cit != pimpl_->fontlist.end(); ++cit) {
- if ((*cit).font().noun() == LyXFont::ON) {
+ if (cit->font().noun() == LyXFont::ON) {
lyxerr[Debug::LATEX] << "font.noun: "
- << (*cit).font().noun()
+ << cit->font().noun()
<< endl;
features.noun = true;
lyxerr[Debug::LATEX] << "Noun enabled. Font: "
- << (*cit).font().stateText(0)
+ << cit->font().stateText(0)
<< endl;
}
- switch ((*cit).font().color()) {
+ switch (cit->font().color()) {
case LColor::none:
case LColor::inherit:
case LColor::ignore:
default:
features.color = true;
lyxerr[Debug::LATEX] << "Color enabled. Font: "
- << (*cit).font().stateText(0)
+ << cit->font().stateText(0)
<< endl;
}
- Language const * language = (*cit).font().language();
+ Language const * language = cit->font().language();
if (language->babel() != doc_language->babel()) {
features.UsedLanguages.insert(language);
lyxerr[Debug::LATEX] << "Found language "
// then the insets
for (InsetList::const_iterator cit = insetlist.begin();
cit != insetlist.end(); ++cit) {
- if ((*cit).inset)
- (*cit).inset->validate(features);
+ if (cit->inset)
+ cit->inset->validate(features);
}
}
lower_bound(insetlist.begin(),
insetlist.end(),
search_elem, Pimpl::matchIT());
- if (it != insetlist.end() && (*it).pos == pos)
- (*it).inset = 0;
+ if (it != insetlist.end() && it->pos == pos)
+ it->inset = 0;
} else {
minibuffer_inset = 0;
minibuffer_char = ' ';
bool Paragraph::insertFromMinibuffer(Paragraph::size_type pos)
{
if ((minibuffer_char == Paragraph::META_INSET) &&
- !insertInsetAllowed(minibuffer_inset))
+ !insetAllowed(minibuffer_inset->lyxCode()))
return false;
if (minibuffer_char == Paragraph::META_INSET)
insertInset(pos, minibuffer_inset, minibuffer_font);
}
-bool Paragraph::insertInsetAllowed(Inset * inset)
+bool Paragraph::insetAllowed(Inset::Code code)
{
//lyxerr << "Paragraph::InsertInsetAllowed" << endl;
if (pimpl_->inset_owner)
- return pimpl_->inset_owner->insertInsetAllowed(inset);
+ return pimpl_->inset_owner->insetAllowed(code);
return true;
}
InsetList::iterator it = lower_bound(insetlist.begin(),
insetlist.end(),
search_inset, Pimpl::matchIT());
- if (it != insetlist.end() && (*it).pos == pos)
- return (*it).inset;
+ if (it != insetlist.end() && it->pos == pos)
+ return it->inset;
lyxerr << "ERROR (Paragraph::GetInset): "
"Inset does not exist: " << pos << endl;
InsetList::const_iterator cit = lower_bound(insetlist.begin(),
insetlist.end(),
search_inset, Pimpl::matchIT());
- if (cit != insetlist.end() && (*cit).pos == pos)
- return (*cit).inset;
+ if (cit != insetlist.end() && cit->pos == pos)
+ return cit->inset;
lyxerr << "ERROR (Paragraph::GetInset): "
"Inset does not exist: " << pos << endl;
pimpl_->fontlist.end(),
search_font, Pimpl::matchFT());
if (cit != pimpl_->fontlist.end())
- return (*cit).font();
+ return cit->font();
if (pos == size() && size())
return getFontSettings(bparams, pos - 1);
pimpl_->fontlist.end(),
start_search, Pimpl::matchFT());
cit != end_it; ++cit) {
- LyXFont::FONT_SIZE size = (*cit).font().size();
+ LyXFont::FONT_SIZE size = cit->font().size();
if (size > maxsize && size <= LyXFont::SIZE_HUGER)
maxsize = size;
}
// create a new paragraph
Paragraph * tmp = new Paragraph(this);
// remember to set the inset_owner
- tmp->setInsetOwner(InInset());
+ tmp->setInsetOwner(inInset());
// this is an idea for a more userfriendly layout handling, I will
// see what the users say
// Find the entry.
for (InsetList::const_iterator cit = insetlist.begin();
cit != insetlist.end(); ++cit) {
- if ((*cit).inset == inset) {
- return (*cit).pos;
+ if (cit->inset == inset) {
+ return cit->pos;
}
}
if (inset == bibkey)
Language const * doc_language = bparams.language;
for (Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
cit != pimpl_->fontlist.end(); ++cit)
- if ((*cit).font().language() != doc_language)
+ if (cit->font().language() != doc_language)
return true;
return false;
}
s += c;
else if (c == META_INSET &&
getInset(i)->lyxCode() == Inset::MATH_CODE) {
- std::ostringstream ost;
+ ostringstream ost;
getInset(i)->ascii(buffer, ost);
s += subst(ost.str().c_str(),'\n',' ');
}
Paragraph::size_type beg,
Paragraph::size_type end)
{
- std::ostringstream ost;
+ ostringstream ost;
if (beg == 0 && !params().labelString().empty())
ost << params().labelString() << ' ';
pimpl_->inset_owner = i;
for (InsetList::const_iterator cit = insetlist.begin();
cit != insetlist.end(); ++cit) {
- if ((*cit).inset)
- (*cit).inset->setOwner(i);
+ if (cit->inset)
+ cit->inset->setOwner(i);
}
}
// then the insets
for (InsetList::const_iterator cit = insetlist.begin();
cit != insetlist.end(); ++cit) {
- if ((*cit).inset) {
- if ((*cit).inset->isTextInset()) {
+ if (cit->inset) {
+ if (cit->inset->isTextInset()) {
static_cast<UpdatableInset *>
- ((*cit).inset)->deleteLyXText(bv, true);
+ (cit->inset)->deleteLyXText(bv, true);
}
}
}
// then the insets
for (InsetList::const_iterator cit = insetlist.begin();
cit != insetlist.end(); ++cit) {
- if ((*cit).inset) {
- if ((*cit).inset->isTextInset()) {
+ if (cit->inset) {
+ if (cit->inset->isTextInset()) {
static_cast<UpdatableInset *>
- ((*cit).inset)->resizeLyXText(bv, true);
+ (cit->inset)->resizeLyXText(bv, true);
}
}
}
}
-Inset * Paragraph::InInset() const
+Inset * Paragraph::inInset() const
{
return pimpl_->inset_owner;
}
Paragraph::inset_iterator::inset_iterator(Paragraph::InsetList::iterator const & iter)
: it(iter)
-{
-
-}
+{}
Paragraph::inset_iterator Paragraph::inset_iterator_begin()
return pimpl_->params;
}
+
ParagraphParameters const & Paragraph::params() const
{
return pimpl_->params;
}
+
Paragraph * Paragraph::getParFromID(int id) const
{
return pimpl_->getParFromID(id);