From d8fd1b7a24691a3118ff79f193ebfc981c3d15e9 Mon Sep 17 00:00:00 2001 From: Michael Schmitt Date: Tue, 20 Feb 2007 19:14:55 +0000 Subject: [PATCH] * src/insets/insetinclude.[Ch]: fix plaintext(); code formatting git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17281 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/insetinclude.C | 20 ++++++++++++-------- src/insets/insetinclude.h | 6 +++--- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C index c4cfdc685b..0eaf0d5437 100644 --- a/src/insets/insetinclude.C +++ b/src/insets/insetinclude.C @@ -369,7 +369,7 @@ bool loadIfNeeded(Buffer const & buffer, InsetCommandParams const & params) int InsetInclude::latex(Buffer const & buffer, odocstream & os, - OutputParams const & runparams) const + OutputParams const & runparams) const { string incfile(to_utf8(params_["filename"])); @@ -491,22 +491,26 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os, int InsetInclude::plaintext(Buffer const & buffer, odocstream & os, - OutputParams const &) const + OutputParams const &) const { if (isVerbatim(params_)) { + os << '[' << getScreenLabel(buffer) << '\n'; // FIXME: We don't know the encoding of the file - docstring const str = from_utf8( - getFileContents(includedFilename(buffer, params_))); + docstring const str = + from_utf8(getFileContents(includedFilename(buffer, params_))); os << str; - // Return how many newlines we issued. - return int(lyx::count(str.begin(), str.end(), '\n')); + os << "\n]"; + return PLAINTEXT_NEWLINE + 1; // one char on a separate line + } else { + docstring str = '[' + getScreenLabel(buffer) + ']'; + os << str; + return str.size(); } - return 0; } int InsetInclude::docbook(Buffer const & buffer, odocstream & os, - OutputParams const & runparams) const + OutputParams const & runparams) const { string incfile = to_utf8(params_["filename"]); diff --git a/src/insets/insetinclude.h b/src/insets/insetinclude.h index c42159e30c..8267e1b6cd 100644 --- a/src/insets/insetinclude.h +++ b/src/insets/insetinclude.h @@ -82,13 +82,13 @@ public: void read(Buffer const &, LyXLex &); /// 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; /// void validate(LaTeXFeatures &) const; /// -- 2.39.2