* src/insets/insetspace.[Ch]:

* src/insets/insetoptarg.[Ch]:
	* src/insets/insetlabel.C: fix plaintext()


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17210 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Michael Schmitt 2007-02-15 23:44:33 +00:00
parent bfef2cba5e
commit 922dbdb1db
5 changed files with 28 additions and 38 deletions

View File

@ -86,7 +86,7 @@ void InsetLabel::doDispatch(LCursor & cur, FuncRequest & cmd)
int InsetLabel::latex(Buffer const &, odocstream & os,
OutputParams const &) const
OutputParams const &) const
{
os << escape(getCommand());
return 0;
@ -94,15 +94,16 @@ int InsetLabel::latex(Buffer const &, odocstream & os,
int InsetLabel::plaintext(Buffer const &, odocstream & os,
OutputParams const &) const
OutputParams const &) const
{
os << '<' << getParam("name") << '>';
return 0;
docstring str = getParam("name");
os << '<' << str << '>';
return 2 + str.size();
}
int InsetLabel::docbook(Buffer const & buf, odocstream & os,
OutputParams const & runparams) const
OutputParams const & runparams) const
{
os << "<!-- anchor id=\""
<< sgml::cleanID(buf, runparams, getParam("name"))

View File

@ -68,20 +68,21 @@ void InsetOptArg::write(Buffer const & buf, ostream & os) const
int InsetOptArg::latex(Buffer const &, odocstream &,
OutputParams const &) const
{
return 0;
}
int InsetOptArg::docbook(Buffer const &, odocstream &,
OutputParams const &) const
OutputParams const &) const
{
return 0;
}
int InsetOptArg::plaintext(Buffer const &, odocstream &,
OutputParams const &) const
OutputParams const &) const
{
return 0;
}
int InsetOptArg::docbook(Buffer const &, odocstream &,
OutputParams const &) const
{
return 0;
}

View File

@ -36,14 +36,13 @@ public:
/// Standard LaTeX output -- short-circuited
int latex(Buffer const &, odocstream &,
OutputParams const &) const;
/// Standard DocBook output -- short-circuited
int docbook(Buffer const &, odocstream &,
OutputParams const &) const;
OutputParams const &) const;
/// Standard plain text output -- short-circuited
int plaintext(Buffer const &, odocstream &,
OutputParams const &) const;
OutputParams const &) const;
/// Standard DocBook output -- short-circuited
int docbook(Buffer const &, odocstream &,
OutputParams const &) const;
/// Outputting the optional parameter of a LaTeX command
int latexOptional(Buffer const &, odocstream &,

View File

@ -167,7 +167,7 @@ void InsetSpace::read(Buffer const &, LyXLex & lex)
int InsetSpace::latex(Buffer const &, odocstream & os,
OutputParams const & runparams) const
OutputParams const & runparams) const
{
switch (kind_) {
case NORMAL:
@ -200,26 +200,15 @@ int InsetSpace::latex(Buffer const &, odocstream & os,
int InsetSpace::plaintext(Buffer const &, odocstream & os,
OutputParams const &) const
OutputParams const &) const
{
switch (kind_) {
case NORMAL:
case PROTECTED:
case THIN:
case QUAD:
case QQUAD:
case ENSPACE:
case ENSKIP:
case NEGTHIN:
os << ' ';
break;
}
return 0;
os << ' ';
return 1;
}
int InsetSpace::docbook(Buffer const &, odocstream & os,
OutputParams const &) const
OutputParams const &) const
{
switch (kind_) {
case NORMAL:

View File

@ -65,13 +65,13 @@ public:
void read(Buffer const &, LyXLex & lex);
///
int latex(Buffer const &, odocstream &,
OutputParams const &) const;
OutputParams const &) const;
///
int plaintext(Buffer const &, odocstream &,
OutputParams const &) const;
OutputParams const &) const;
///
int docbook(Buffer const &, odocstream &,
OutputParams const &) const;
OutputParams const &) const;
/// the string that is passed to the TOC
virtual int textString(Buffer const &, odocstream &,
OutputParams const &) const;