From 6d2a7787248bc0a07a070e97051d4b7d5ac8e84c Mon Sep 17 00:00:00 2001 From: Michael Schmitt Date: Sat, 17 Feb 2007 11:30:58 +0000 Subject: [PATCH] * insetgraphics.[Ch]: * insetquotes.C: fix plaintext(); WS changes git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17230 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/insetgraphics.C | 14 ++++++++------ src/insets/insetgraphics.h | 6 +++--- src/insets/insetquotes.C | 11 ++++++----- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C index 49b8ecec5e..407de303d1 100644 --- a/src/insets/insetgraphics.C +++ b/src/insets/insetgraphics.C @@ -738,7 +738,7 @@ string const InsetGraphics::prepareFile(Buffer const & buf, int InsetGraphics::latex(Buffer const & buf, odocstream & os, - OutputParams const & runparams) const + OutputParams const & runparams) const { // If there is no file specified or not existing, // just output a message about it in the latex output. @@ -808,7 +808,7 @@ int InsetGraphics::latex(Buffer const & buf, odocstream & os, int InsetGraphics::plaintext(Buffer const &, odocstream & os, - OutputParams const &) const + OutputParams const &) const { // No graphics in ascii output. Possible to use gifscii to convert // images to ascii approximation. @@ -817,10 +817,12 @@ int InsetGraphics::plaintext(Buffer const &, odocstream & os, // at least we send the filename // FIXME UNICODE // FIXME: We have no idea what the encoding of the filename is - os << '<' << bformat(_("Graphics file: %1$s"), - from_utf8(params().filename.absFilename())) - << ">\n"; - return 0; + + docstring str = bformat(_("Graphics file: %1$s"), + from_utf8(params().filename.absFilename())); + os << '<' << str << '>'; + + return 2 + str.size(); } diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h index 51ffe31ca2..49811a2da6 100644 --- a/src/insets/insetgraphics.h +++ b/src/insets/insetgraphics.h @@ -48,13 +48,13 @@ public: fragile commands by adding a #\protect# before. */ 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; /** Tell LyX what the latex features you need i.e. what latex packages you need to be included. diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C index eb7c87e454..b9d1957be0 100644 --- a/src/insets/insetquotes.C +++ b/src/insets/insetquotes.C @@ -296,7 +296,7 @@ void InsetQuotes::read(Buffer const &, LyXLex & lex) int InsetQuotes::latex(Buffer const &, odocstream & os, - OutputParams const & runparams) const + OutputParams const & runparams) const { const int quoteind = quote_index[side_][language_]; string qstr; @@ -329,15 +329,16 @@ int InsetQuotes::latex(Buffer const &, odocstream & os, int InsetQuotes::plaintext(Buffer const & buf, odocstream & os, - OutputParams const &) const + OutputParams const &) const { - os << dispString(buf.params().language); - return 0; + docstring str = dispString(buf.params().language); + os << str; + return str.size(); } int InsetQuotes::docbook(Buffer const &, odocstream & os, - OutputParams const &) const + OutputParams const &) const { if (times_ == DoubleQ) { if (side_ == LeftQ) -- 2.39.2