anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 02:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* insets/insetbase.h (textString): Simplify the signature

Browse Source 
* insets/insetquotes.C (textString):
	* insets/insetcharstyle.C (textString):
	* mathed/InsetMathHull.C (textString): adapt.

	* insets/insetquote.C (plaintext, textString): output disString 
	instead of a raw quote.

	* paragraph.C: adapt and remove unused methods.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16766 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2007-01-19 16:23:13 +00:00
parent 76dc838dfe
commit b7518c3c95
9 changed files with 16 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/insets/insetbase.h
View File

@ -202,8 +202,7 @@ public:
virtual int docbook(Buffer const &, odocstream & os,
OutputParams const &) const;
/// the string that is passed to the TOC
virtual int textString(Buffer const &, odocstream &,
OutputParams const &) const { return 0; };
virtual void textString(Buffer const &, odocstream &) const {}
/** This enum indicates by which means the inset can be modified:
- NOT_EDITABLE: the inset's content cannot be modified at all

5
src/insets/insetcharstyle.C
View File

@ -332,10 +332,9 @@ int InsetCharStyle::plaintext(Buffer const & buf, odocstream & os,
}
int InsetCharStyle::textString(Buffer const & buf, odocstream & os,
OutputParams const & op) const
void InsetCharStyle::textString(Buffer const & buf, odocstream & os) const
{
return plaintext(buf, os, op);
os << paragraphs().begin()->asString(buf, true);
}

3
src/insets/insetcharstyle.h
View File

@ -85,8 +85,7 @@ public:
int plaintext(Buffer const &, odocstream &,
OutputParams const &) const;
/// the string that is passed to the TOC
virtual int textString(Buffer const &, odocstream &,
OutputParams const &) const;
virtual void textString(Buffer const &, odocstream &) const;
///
void validate(LaTeXFeatures &) const;

11
src/insets/insetquotes.C
View File

@ -328,10 +328,10 @@ int InsetQuotes::latex(Buffer const &, odocstream & os,
}
int InsetQuotes::plaintext(Buffer const &, odocstream & os,
OutputParams const &) const
int InsetQuotes::plaintext(Buffer const & buf, odocstream & os,
OutputParams const &) const
{
os << '"';
os << dispString(buf.params().language);
return 0;
}
@ -354,10 +354,9 @@ int InsetQuotes::docbook(Buffer const &, odocstream & os,
}
int InsetQuotes::textString(Buffer const & buf, odocstream & os,
OutputParams const & op) const
void InsetQuotes::textString(Buffer const & buf, odocstream & os) const
{
return plaintext(buf, os, op);
os << dispString(buf.params().language);
}

3
src/insets/insetquotes.h
View File

@ -93,8 +93,7 @@ public:
int docbook(Buffer const &, odocstream &, OutputParams const &) const;
/// the string that is passed to the TOC
virtual int textString(Buffer const &, odocstream &,
OutputParams const &) const;
virtual void textString(Buffer const &, odocstream &) const;
///
void validate(LaTeXFeatures &) const;

5
src/mathed/InsetMathHull.C
View File

@ -1508,10 +1508,9 @@ int InsetMathHull::docbook(Buffer const & buf, odocstream & os,
}
int InsetMathHull::textString(Buffer const & buf, odocstream & os,
OutputParams const & op) const
void InsetMathHull::textString(Buffer const & buf, odocstream & os) const
{
return plaintext(buf, os, op);
plaintext(buf, os, OutputParams());
}

3
src/mathed/InsetMathHull.h
View File

@ -109,8 +109,7 @@ public:
int docbook(Buffer const &, odocstream &,
OutputParams const &) const;
/// the string that is passed to the TOC
virtual int textString(Buffer const &, odocstream &,
OutputParams const &) const;
virtual void textString(Buffer const &, odocstream &) const;
/// get notification when the cursor leaves this inset
bool notifyCursorLeaves(LCursor & cur);

46
src/paragraph.C
View File

@ -1400,38 +1400,7 @@ bool Paragraph::isMultiLingual(BufferParams const & bparams) const
// Used for building the table of contents
docstring const Paragraph::asString(Buffer const & buffer, bool label) const
{
OutputParams runparams;
return asString(buffer, runparams, label);
}
docstring const Paragraph::asString(Buffer const & buffer,
OutputParams const & runparams,
bool label) const
{
#if 0
string s;
if (label && !params().labelString().empty())
s += params().labelString() + ' ';
for (pos_type i = 0; i < size(); ++i) {
value_type c = getChar(i);
if (isPrintable(c))
s += c;
else if (c == META_INSET &&
getInset(i)->lyxCode() == InsetBase::MATH_CODE) {
ostringstream os;
getInset(i)->plaintext(buffer, os, runparams);
s += subst(STRCONV(os.str()),'\n',' ');
}
}
return s;
#else
// This should really be done by the caller and not here.
docstring ret = asString(buffer, runparams, 0, size(), label);
return subst(ret, '\n', ' ');
#endif
return asString(buffer, 0, size(), label);
}
@ -1439,16 +1408,7 @@ docstring const Paragraph::asString(Buffer const & buffer,
pos_type beg, pos_type end, bool label) const
{
OutputParams const runparams;
return asString(buffer, runparams, beg, end, label);
}
docstring const Paragraph::asString(Buffer const & buffer,
OutputParams const & runparams,
pos_type beg, pos_type end, bool label) const
{
lyx::odocstringstream os;
odocstringstream os;
if (beg == 0 && label && !params().labelString().empty())
os << params().labelString() << ' ';
@ -1458,7 +1418,7 @@ docstring const Paragraph::asString(Buffer const & buffer,
if (isPrintable(c))
os.put(c);
else if (c == META_INSET)
getInset(i)->textString(buffer, os, runparams);
getInset(i)->textString(buffer, os);
}
return os.str();

10
src/paragraph.h
View File

@ -100,10 +100,6 @@ public:
///
bool isMultiLingual(BufferParams const &) const;
///
docstring const asString(Buffer const &,
OutputParams const & runparams,
bool label) const;
///
docstring const asString(Buffer const &, bool label) const;
///
@ -111,12 +107,6 @@ public:
pos_type beg,
pos_type end,
bool label) const;
///
docstring const asString(Buffer const &,
OutputParams const & runparams,
pos_type beg,
pos_type end,
bool label) const;
///
void write(Buffer const &, std::ostream &, BufferParams const &,