bool) const;
///
- void latexInset(Buffer const &, BufferParams const &,
+ void latexInset(BufferParams const &,
odocstream &,
TexRow & texrow, OutputParams &,
Font & running_font,
}
-void Paragraph::Private::latexInset(Buffer const & buf,
+void Paragraph::Private::latexInset(
BufferParams const & bparams,
odocstream & os,
TexRow & texrow,
BOOST_ASSERT(inset);
if (style.pass_thru) {
- inset->plaintext(buf, os, runparams);
+ inset->plaintext(os, runparams);
return;
}
}
}
- int tmp = inset->latex(buf, os, runparams);
+ int tmp = inset->latex(os, runparams);
if (close) {
if (running_font.language()->lang() == "farsi")
}
-void Paragraph::write(Buffer const & buf, ostream & os,
- BufferParams const & bparams,
- depth_type & dth) const
+void Paragraph::write(ostream & os, BufferParams const & bparams,
+ depth_type & dth) const
{
// The beginning or end of a deeper (i.e. nested) area?
if (dth != d->params_.depth()) {
// international char, let it write
// code directly so it's shorter in
// the file
- inset->write(buf, os);
+ inset->write(os);
} else {
if (i)
os << '\n';
os << "\\begin_inset ";
- inset->write(buf, os);
+ inset->write(os);
os << "\n\\end_inset\n\n";
column = 0;
}
docstring Paragraph::expandLabel(LayoutPtr const & layout,
BufferParams const & bparams, bool process_appendix) const
{
- TextClass const & tclass = bparams.textClass();
+ DocumentClass const & tclass = bparams.documentClass();
docstring fmt;
if (process_appendix && d->params_.appendix())
// This one spits out the text of the paragraph
-bool Paragraph::latex(Buffer const & buf,
- BufferParams const & bparams,
+bool Paragraph::latex(BufferParams const & bparams,
Font const & outerfont,
odocstream & os, TexRow & texrow,
OutputParams const & runparams) const
bool asdefault = forceEmptyLayout();
if (asdefault)
- style = bparams.textClass().defaultLayout();
+ style = bparams.documentClass().emptyLayout();
else
style = d->layout_;
// Handle here those cases common to both modes
// and then split to handle the two modes separately.
if (c == META_INSET)
- d->latexInset(buf, bparams, os,
+ d->latexInset(bparams, os,
texrow, rp, running_font,
basefont, outerfont, open_font,
runningChange, *style, i, column);
}
-string Paragraph::getID(Buffer const & buf, OutputParams const & runparams) const
+string Paragraph::getID(Buffer const & buf, OutputParams const & runparams)
+ const
{
for (pos_type i = 0; i < size(); ++i) {
if (Inset const * inset = getInset(i)) {
}
-pos_type Paragraph::getFirstWord(Buffer const & buf, odocstream & os, OutputParams const & runparams) const
+pos_type Paragraph::firstWord(odocstream & os, OutputParams const & runparams)
+ const
{
pos_type i;
for (i = 0; i < size(); ++i) {
if (Inset const * inset = getInset(i)) {
- inset->docbook(buf, os, runparams);
+ inset->docbook(os, runparams);
} else {
char_type c = d->text_[i];
if (c == ' ')
}
if (Inset const * inset = getInset(i)) {
- inset->docbook(buf, os, runparams);
+ inset->docbook(os, runparams);
} else {
char_type c = d->text_[i];
}
-// Convert the paragraph to a string.
-// Used for building the table of contents
-docstring const Paragraph::asString(Buffer const & buffer, bool label) const
+docstring Paragraph::asString(bool label) const
{
- return asString(buffer, 0, size(), label);
+ return asString(0, size(), label);
}
-docstring const Paragraph::asString(Buffer const & buffer,
- pos_type beg, pos_type end, bool label) const
+docstring Paragraph::asString(pos_type beg, pos_type end, bool label) const
{
odocstringstream os;
if (isPrintable(c))
os.put(c);
else if (c == META_INSET)
- getInset(i)->textString(buffer, os);
+ getInset(i)->textString(os);
}
return os.str();
}
-void Paragraph::setEmptyOrDefaultLayout(TextClass const & tclass)
+void Paragraph::setEmptyOrDefaultLayout(DocumentClass const & tclass)
{
if (useEmptyLayout())
setLayout(tclass.emptyLayout());
}
-int Paragraph::checkBiblio(bool track_changes)
+int Paragraph::checkBiblio(Buffer const & buffer)
{
- //FIXME From JS:
- //This is getting more and more a mess. ...We really should clean
- //up this bibitem issue for 1.6. See also bug 2743.
+ // FIXME From JS:
+ // This is getting more and more a mess. ...We really should clean
+ // up this bibitem issue for 1.6. See also bug 2743.
// Add bibitem insets if necessary
if (d->layout_->labeltype != LABEL_BIBLIO)
&& d->text_[0] == META_INSET
&& d->insetlist_.begin()->inset->lyxCode() == BIBITEM_CODE;
+ bool track_changes = buffer.params().trackChanges;
+
docstring oldkey;
docstring oldlabel;
break;
}
- //There was an InsetBibitem at the beginning, and we didn't
- //have to erase one.
+ // There was an InsetBibitem at the beginning, and we didn't
+ // have to erase one.
if (hasbibitem && erasedInsetPosition < 0)
return 0;
- //There was an InsetBibitem at the beginning and we did have to
- //erase one. So we give its properties to the beginning inset.
+ // There was an InsetBibitem at the beginning and we did have to
+ // erase one. So we give its properties to the beginning inset.
if (hasbibitem) {
InsetBibitem * inset =
static_cast<InsetBibitem *>(d->insetlist_.begin()->inset);
return -erasedInsetPosition;
}
- //There was no inset at the beginning, so we need to create one with
- //the key and label of the one we erased.
- InsetBibitem * inset(new InsetBibitem(InsetCommandParams(BIBITEM_CODE)));
+ // There was no inset at the beginning, so we need to create one with
+ // the key and label of the one we erased.
+ InsetBibitem * inset = new InsetBibitem(InsetCommandParams(BIBITEM_CODE));
+ inset->setBuffer(const_cast<Buffer &>(buffer));
// restore values of previously deleted item in this par.
if (!oldkey.empty())
inset->setParam("key", oldkey);
from.text()->getWord(from, to, WHOLE_WORD);
if (to.pos() - from.pos() < 6)
continue;
- docstring word
- = asString(buf, from.pos(), to.pos(), false);
+ docstring word = asString(from.pos(), to.pos(), false);
d->words_.insert(word);
//lyxerr << word << " ";
}
projects / lyx.git / blobdiff