anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-30 05:12:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Paragraph: erase unused some method and move some members to Paragraph::Private.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21148 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2007-10-23 13:25:05 +00:00
parent 5ead1beb71
commit e6f3d34556
2 changed files with 53 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
src/Paragraph.cpp
View File

@ -109,6 +109,15 @@ public:
/// \return the number of characters written. /// \return the number of characters written.
int knownLangChars(odocstream & os, value_type c, string & preamble, int knownLangChars(odocstream & os, value_type c, string & preamble,
Change &, Encoding const &, pos_type &); Change &, Encoding const &, pos_type &);
/// This could go to ParagraphParameters if we want to.
int startTeXParParams(BufferParams const &, odocstream &, TexRow &,
bool) const;
/// This could go to ParagraphParameters if we want to.
int endTeXParParams(BufferParams const &, odocstream &, TexRow &,
bool) const;
/// ///
void latexInset(Buffer const &, BufferParams const &, void latexInset(Buffer const &, BufferParams const &,
odocstream &, odocstream &,
@ -181,6 +190,12 @@ public:
/// ///
InsetList insetlist_; InsetList insetlist_;
///
LayoutPtr layout_;
/// end of label
pos_type begin_of_body_;
}; };
@ -216,16 +231,16 @@ size_t const phrases_nr = sizeof(special_phrases)/sizeof(special_phrase);
Paragraph::Private::Private(Paragraph * owner) Paragraph::Private::Private(Paragraph * owner)
: owner_(owner) : owner_(owner), inset_owner_(0), begin_of_body_(0)
{ {
inset_owner_ = 0;
id_ = paragraph_id++; id_ = paragraph_id++;
} }
Paragraph::Private::Private(Private const & p, Paragraph * owner) Paragraph::Private::Private(Private const & p, Paragraph * owner)
: owner_(owner), inset_owner_(p.inset_owner_), fontlist_(p.fontlist_), : owner_(owner), inset_owner_(p.inset_owner_), fontlist_(p.fontlist_),
params_(p.params_), changes_(p.changes_), insetlist_(p.insetlist_) params_(p.params_), changes_(p.changes_), insetlist_(p.insetlist_),
layout_(p.layout_), begin_of_body_(p.begin_of_body_)
{ {
id_ = paragraph_id++; id_ = paragraph_id++;
} }
@ -1034,7 +1049,7 @@ void Paragraph::Private::validate(LaTeXFeatures & features,
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
Paragraph::Paragraph() Paragraph::Paragraph()
: begin_of_body_(0), d(new Paragraph::Private(this)) : d(new Paragraph::Private(this))
{ {
itemdepth = 0; itemdepth = 0;
d->params_.clear(); d->params_.clear();
@ -1043,9 +1058,7 @@ Paragraph::Paragraph()
Paragraph::Paragraph(Paragraph const & par) Paragraph::Paragraph(Paragraph const & par)
: itemdepth(par.itemdepth), : itemdepth(par.itemdepth), text_(par.text_),
layout_(par.layout_),
text_(par.text_), begin_of_body_(par.begin_of_body_),
d(new Paragraph::Private(*par.d, this)) d(new Paragraph::Private(*par.d, this))
{ {
} }
@ -1056,9 +1069,7 @@ Paragraph & Paragraph::operator=(Paragraph const & par)
// needed as we will destroy the private part before copying it // needed as we will destroy the private part before copying it
if (&par != this) { if (&par != this) {
itemdepth = par.itemdepth; itemdepth = par.itemdepth;
layout_ = par.layout();
text_ = par.text_; text_ = par.text_;
begin_of_body_ = par.begin_of_body_;
delete d; delete d;
d = new Private(*par.d, this); d = new Private(*par.d, this);
@ -1332,9 +1343,9 @@ Font const Paragraph::getFont(BufferParams const & bparams, pos_type pos,
pos_type const body_pos = beginOfBody(); pos_type const body_pos = beginOfBody();
if (pos < body_pos) if (pos < body_pos)
font.realize(layout_->labelfont); font.realize(d->layout_->labelfont);
else else
font.realize(layout_->font); font.realize(d->layout_->font);
font.realize(outerfont); font.realize(outerfont);
font.realize(bparams.getFont()); font.realize(bparams.getFont());
@ -1570,14 +1581,14 @@ void Paragraph::applyLayout(LayoutPtr const & new_layout)
pos_type Paragraph::beginOfBody() const pos_type Paragraph::beginOfBody() const
{ {
return begin_of_body_; return d->begin_of_body_;
} }
void Paragraph::setBeginOfBody() void Paragraph::setBeginOfBody()
{ {
if (layout()->labeltype != LABEL_MANUAL) { if (layout()->labeltype != LABEL_MANUAL) {
begin_of_body_ = 0; d->begin_of_body_ = 0;
return; return;
} }
@ -1605,20 +1616,7 @@ void Paragraph::setBeginOfBody()
} }
} }
begin_of_body_ = i; d->begin_of_body_ = i;
}
// returns -1 if inset not found
int Paragraph::getPositionOfInset(Inset const * inset) const
{
// Find the entry.
InsetList::const_iterator it = d->insetlist_.begin();
InsetList::const_iterator end = d->insetlist_.end();
for (; it != end; ++it)
if (it->inset == inset)
return it->pos;
return -1;
} }
@ -1691,21 +1689,20 @@ void adjust_row_column(string const & str, TexRow & texrow, int & column)
} // namespace anon } // namespace anon
// This could go to ParagraphParameters if we want to int Paragraph::Private::startTeXParParams(BufferParams const & bparams,
int Paragraph::startTeXParParams(BufferParams const & bparams,
odocstream & os, TexRow & texrow, odocstream & os, TexRow & texrow,
bool moving_arg) const bool moving_arg) const
{ {
int column = 0; int column = 0;
if (params().noindent()) { if (params_.noindent()) {
os << "\\noindent "; os << "\\noindent ";
column += 10; column += 10;
} }
LyXAlignment const curAlign = params().align(); LyXAlignment const curAlign = params_.align();
if (curAlign == layout()->align) if (curAlign == layout_->align)
return column; return column;
switch (curAlign) { switch (curAlign) {
@ -1732,25 +1729,25 @@ int Paragraph::startTeXParParams(BufferParams const & bparams,
break; break;
case LYX_ALIGN_LEFT: { case LYX_ALIGN_LEFT: {
string output; string output;
if (getParLanguage(bparams)->babel() != "hebrew") if (owner_->getParLanguage(bparams)->babel() != "hebrew")
output = corrected_env("\\begin", "flushleft", ownerCode()); output = corrected_env("\\begin", "flushleft", owner_->ownerCode());
else else
output = corrected_env("\\begin", "flushright", ownerCode()); output = corrected_env("\\begin", "flushright", owner_->ownerCode());
os << from_ascii(output); os << from_ascii(output);
adjust_row_column(output, texrow, column); adjust_row_column(output, texrow, column);
break; break;
} case LYX_ALIGN_RIGHT: { } case LYX_ALIGN_RIGHT: {
string output; string output;
if (getParLanguage(bparams)->babel() != "hebrew") if (owner_->getParLanguage(bparams)->babel() != "hebrew")
output = corrected_env("\\begin", "flushright", ownerCode()); output = corrected_env("\\begin", "flushright", owner_->ownerCode());
else else
output = corrected_env("\\begin", "flushleft", ownerCode()); output = corrected_env("\\begin", "flushleft", owner_->ownerCode());
os << from_ascii(output); os << from_ascii(output);
adjust_row_column(output, texrow, column); adjust_row_column(output, texrow, column);
break; break;
} case LYX_ALIGN_CENTER: { } case LYX_ALIGN_CENTER: {
string output; string output;
output = corrected_env("\\begin", "center", ownerCode()); output = corrected_env("\\begin", "center", owner_->ownerCode());
os << from_ascii(output); os << from_ascii(output);
adjust_row_column(output, texrow, column); adjust_row_column(output, texrow, column);
break; break;
@ -1761,14 +1758,13 @@ int Paragraph::startTeXParParams(BufferParams const & bparams,
} }
// This could go to ParagraphParameters if we want to int Paragraph::Private::endTeXParParams(BufferParams const & bparams,
int Paragraph::endTeXParParams(BufferParams const & bparams,
odocstream & os, TexRow & texrow, odocstream & os, TexRow & texrow,
bool moving_arg) const bool moving_arg) const
{ {
int column = 0; int column = 0;
switch (params().align()) { switch (params_.align()) {
case LYX_ALIGN_NONE: case LYX_ALIGN_NONE:
case LYX_ALIGN_BLOCK: case LYX_ALIGN_BLOCK:
case LYX_ALIGN_LAYOUT: case LYX_ALIGN_LAYOUT:
@ -1784,7 +1780,7 @@ int Paragraph::endTeXParParams(BufferParams const & bparams,
break; break;
} }
switch (params().align()) { switch (params_.align()) {
case LYX_ALIGN_NONE: case LYX_ALIGN_NONE:
case LYX_ALIGN_BLOCK: case LYX_ALIGN_BLOCK:
case LYX_ALIGN_LAYOUT: case LYX_ALIGN_LAYOUT:
@ -1792,25 +1788,25 @@ int Paragraph::endTeXParParams(BufferParams const & bparams,
break; break;
case LYX_ALIGN_LEFT: { case LYX_ALIGN_LEFT: {
string output; string output;
if (getParLanguage(bparams)->babel() != "hebrew") if (owner_->getParLanguage(bparams)->babel() != "hebrew")
output = corrected_env("\n\\par\\end", "flushleft", ownerCode()); output = corrected_env("\n\\par\\end", "flushleft", owner_->ownerCode());
else else
output = corrected_env("\n\\par\\end", "flushright", ownerCode()); output = corrected_env("\n\\par\\end", "flushright", owner_->ownerCode());
os << from_ascii(output); os << from_ascii(output);
adjust_row_column(output, texrow, column); adjust_row_column(output, texrow, column);
break; break;
} case LYX_ALIGN_RIGHT: { } case LYX_ALIGN_RIGHT: {
string output; string output;
if (getParLanguage(bparams)->babel() != "hebrew") if (owner_->getParLanguage(bparams)->babel() != "hebrew")
output = corrected_env("\n\\par\\end", "flushright", ownerCode()); output = corrected_env("\n\\par\\end", "flushright", owner_->ownerCode());
else else
output = corrected_env("\n\\par\\end", "flushleft", ownerCode()); output = corrected_env("\n\\par\\end", "flushleft", owner_->ownerCode());
os << from_ascii(output); os << from_ascii(output);
adjust_row_column(output, texrow, column); adjust_row_column(output, texrow, column);
break; break;
} case LYX_ALIGN_CENTER: { } case LYX_ALIGN_CENTER: {
string output; string output;
output = corrected_env("\n\\par\\end", "center", ownerCode()); output = corrected_env("\n\\par\\end", "center", owner_->ownerCode());
os << from_ascii(output); os << from_ascii(output);
adjust_row_column(output, texrow, column); adjust_row_column(output, texrow, column);
break; break;
@ -1885,7 +1881,7 @@ bool Paragraph::latex(Buffer const & buf,
++column; ++column;
} }
if (!asdefault) if (!asdefault)
column += startTeXParParams(bparams, os, texrow, column += d->startTeXParParams(bparams, os, texrow,
runparams.moving_arg); runparams.moving_arg);
} }
@ -1915,7 +1911,7 @@ bool Paragraph::latex(Buffer const & buf,
} }
if (!asdefault) if (!asdefault)
column += startTeXParParams(bparams, os, column += d->startTeXParParams(bparams, os,
texrow, texrow,
runparams.moving_arg); runparams.moving_arg);
} }
@ -2068,7 +2064,7 @@ bool Paragraph::latex(Buffer const & buf,
} }
if (!asdefault) { if (!asdefault) {
column += endTeXParParams(bparams, os, texrow, column += d->endTeXParParams(bparams, os, texrow,
runparams.moving_arg); runparams.moving_arg);
} }
@ -2378,13 +2374,13 @@ int Paragraph::id() const
LayoutPtr const & Paragraph::layout() const LayoutPtr const & Paragraph::layout() const
{ {
return layout_; return d->layout_;
} }
void Paragraph::layout(LayoutPtr const & new_layout) void Paragraph::layout(LayoutPtr const & new_layout)
{ {
layout_ = new_layout; d->layout_ = new_layout;
} }

21
src/Paragraph.h
View File

@ -79,8 +79,6 @@ public:
}; };
/// ///
typedef char_type value_type; typedef char_type value_type;
///
typedef std::vector<value_type> TextContainer;
/// ///
Paragraph(); Paragraph();
@ -93,7 +91,6 @@ public:
/// ///
int id() const; int id() const;
/// ///
Language const * getParLanguage(BufferParams const &) const; Language const * getParLanguage(BufferParams const &) const;
/// ///
@ -118,15 +115,6 @@ public:
/// ///
void validate(LaTeXFeatures &) const; void validate(LaTeXFeatures &) const;
///
int startTeXParParams(BufferParams const &, odocstream &, TexRow &,
bool) const;
///
int endTeXParParams(BufferParams const &, odocstream &, TexRow &,
bool) const;
/// ///
bool latex(Buffer const &, BufferParams const &, bool latex(Buffer const &, BufferParams const &,
Font const & outerfont, odocstream &, Font const & outerfont, odocstream &,
@ -345,9 +333,6 @@ public:
/// Note that digits in particular are considered as letters /// Note that digits in particular are considered as letters
bool isLetter(pos_type pos) const; bool isLetter(pos_type pos) const;
/// returns -1 if inset not found
int getPositionOfInset(Inset const * inset) const;
/// returns true if at least one line break or line separator has been deleted /// returns true if at least one line break or line separator has been deleted
/// at the beginning of the paragraph (either physically or logically) /// at the beginning of the paragraph (either physically or logically)
bool stripLeadingSpaces(bool trackChanges); bool stripLeadingSpaces(bool trackChanges);
@ -381,15 +366,13 @@ public:
int numberOfOptArgs() const; int numberOfOptArgs() const;
private: private:
///
LayoutPtr layout_;
/** /**
* Keeping this here instead of in the pimpl makes LyX >10% faster * Keeping this here instead of in the pimpl makes LyX >10% faster
* for average tasks as buffer loading/switching etc. * for average tasks as buffer loading/switching etc.
*/ */
typedef std::vector<value_type> TextContainer;
///
TextContainer text_; TextContainer text_;
/// end of label
pos_type begin_of_body_;
/// Pimpl away stuff /// Pimpl away stuff
class Private; class Private;