anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* insetref.C:

Browse Source 
* insetcommand.[Ch]:
	* insetpagebreak.[Ch]: fix plaintext(); some header cleanup


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17209 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Michael Schmitt 2007-02-15 23:28:31 +00:00
parent 517fdc10c3
commit bfef2cba5e
5 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/insets/insetcommand.C
View File

@ -84,7 +84,7 @@ void InsetCommand::setParams(InsetCommandParams const & p)
int InsetCommand::latex(Buffer const &, odocstream & os, int InsetCommand::latex(Buffer const &, odocstream & os,
OutputParams const &) const OutputParams const &) const
{ {
os << getCommand(); os << getCommand();
return 0; return 0;
@ -92,14 +92,14 @@ int InsetCommand::latex(Buffer const &, odocstream & os,
int InsetCommand::plaintext(Buffer const &, odocstream &, int InsetCommand::plaintext(Buffer const &, odocstream &,
OutputParams const &) const OutputParams const &) const
{ {
return 0; return 0;
} }
int InsetCommand::docbook(Buffer const &, odocstream &, int InsetCommand::docbook(Buffer const &, odocstream &,
OutputParams const &) const OutputParams const &) const
{ {
return 0; return 0;
} }

9
src/insets/insetcommand.h
View File

@ -48,14 +48,11 @@ public:
virtual void read(Buffer const &, LyXLex & lex) virtual void read(Buffer const &, LyXLex & lex)
{ p_.read(lex); } { p_.read(lex); }
/// ///
virtual int latex(Buffer const &, odocstream &, int latex(Buffer const &, odocstream &, OutputParams const &) const;
OutputParams const &) const;
/// ///
int plaintext(Buffer const &, odocstream &, int plaintext(Buffer const &, odocstream &, OutputParams const &) const;
OutputParams const &) const;
/// ///
virtual int docbook(Buffer const &, odocstream &, int docbook(Buffer const &, odocstream &, OutputParams const & runparams) const;
OutputParams const & runparams) const;
/// ///
InsetBase::Code lyxCode() const { return InsetBase::NO_CODE; } InsetBase::Code lyxCode() const { return InsetBase::NO_CODE; }

9
src/insets/insetpagebreak.C
View File

@ -17,6 +17,7 @@
#include "LColor.h" #include "LColor.h"
#include "lyxtext.h" #include "lyxtext.h"
#include "metricsinfo.h" #include "metricsinfo.h"
#include "outputparams.h"
#include "TextMetrics.h" #include "TextMetrics.h"
#include "frontends/FontMetrics.h" #include "frontends/FontMetrics.h"
@ -79,7 +80,7 @@ void InsetPagebreak::draw(PainterInfo & pi, int x, int y) const
int InsetPagebreak::latex(Buffer const &, odocstream & os, int InsetPagebreak::latex(Buffer const &, odocstream & os,
OutputParams const &) const OutputParams const &) const
{ {
os << from_ascii(getCmdName()) << "{}"; os << from_ascii(getCmdName()) << "{}";
return 0; return 0;
@ -87,15 +88,15 @@ int InsetPagebreak::latex(Buffer const &, odocstream & os,
int InsetPagebreak::plaintext(Buffer const &, odocstream & os, int InsetPagebreak::plaintext(Buffer const &, odocstream & os,
OutputParams const &) const OutputParams const & runparams) const
{ {
os << '\n'; os << '\n';
return 0; return runparams.linelen;
} }
int InsetPagebreak::docbook(Buffer const &, odocstream & os, int InsetPagebreak::docbook(Buffer const &, odocstream & os,
OutputParams const &) const OutputParams const &) const
{ {
os << '\n'; os << '\n';
return 0; return 0;

8
src/insets/insetpagebreak.h
View File

@ -29,14 +29,14 @@ public:
void draw(PainterInfo & pi, int x, int y) const; void draw(PainterInfo & pi, int x, int y) const;
virtual int latex(Buffer const &, odocstream &, int latex(Buffer const &, odocstream &,
OutputParams const &) const; OutputParams const &) const;
int plaintext(Buffer const &, odocstream &, int plaintext(Buffer const &, odocstream &,
OutputParams const &) const; OutputParams const &) const;
int docbook(Buffer const &, odocstream &, int docbook(Buffer const &, odocstream &,
OutputParams const &) const; OutputParams const &) const;
void read(Buffer const &, LyXLex & lex); void read(Buffer const &, LyXLex & lex);

11
src/insets/insetref.C
View File

@ -84,7 +84,7 @@ docstring const InsetRef::getScreenLabel(Buffer const &) const
int InsetRef::latex(Buffer const &, odocstream & os, int InsetRef::latex(Buffer const &, odocstream & os,
OutputParams const &) const OutputParams const &) const
{ {
// Don't output p_["name"], this is only used in docbook // Don't output p_["name"], this is only used in docbook
InsetCommandParams p(getCmdName()); InsetCommandParams p(getCmdName());
@ -95,15 +95,16 @@ int InsetRef::latex(Buffer const &, odocstream & os,
int InsetRef::plaintext(Buffer const &, odocstream & os, int InsetRef::plaintext(Buffer const &, odocstream & os,
OutputParams const &) const OutputParams const &) const
{ {
os << '[' << getParam("reference") << ']'; docstring str = getParam("reference");
return 0; os << '[' << str << ']';
return 2 + str.size();
} }
int InsetRef::docbook(Buffer const & buf, odocstream & os, int InsetRef::docbook(Buffer const & buf, odocstream & os,
OutputParams const & runparams) const OutputParams const & runparams) const
{ {
docstring const & name = getParam("name"); docstring const & name = getParam("name");
if (name.empty()) { if (name.empty()) {