From 1afeb2e34f6e2b9f774c0dd7d14d9bdcaa5575e2 Mon Sep 17 00:00:00 2001 From: Michael Schmitt Date: Sat, 17 Feb 2007 15:28:50 +0000 Subject: [PATCH] * src/insets/insetfloatlist.C: fix plaintex() * src/insets/insetfloatlist.h: * src/insets/insetcharstyle.[Ch]: code formatting git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17232 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/insetcharstyle.C | 18 +++++++++--------- src/insets/insetcharstyle.h | 10 +++++----- src/insets/insetfloatlist.C | 7 +++---- src/insets/insetfloatlist.h | 6 +++--- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/insets/insetcharstyle.C b/src/insets/insetcharstyle.C index 4c6472dcbc..34f0baf64a 100644 --- a/src/insets/insetcharstyle.C +++ b/src/insets/insetcharstyle.C @@ -284,7 +284,7 @@ bool InsetCharStyle::getStatus(LCursor & cur, FuncRequest const & cmd, int InsetCharStyle::latex(Buffer const & buf, odocstream & os, - OutputParams const & runparams) const + OutputParams const & runparams) const { if (!undefined()) { // FIXME UNICODE @@ -300,8 +300,15 @@ int InsetCharStyle::latex(Buffer const & buf, odocstream & os, } +int InsetCharStyle::plaintext(Buffer const & buf, odocstream & os, + OutputParams const & runparams) const +{ + return InsetText::plaintext(buf, os, runparams); +} + + int InsetCharStyle::docbook(Buffer const & buf, odocstream & os, - OutputParams const & runparams) const + OutputParams const & runparams) const { ParagraphList::const_iterator beg = paragraphs().begin(); ParagraphList::const_iterator par = paragraphs().begin(); @@ -325,13 +332,6 @@ int InsetCharStyle::docbook(Buffer const & buf, odocstream & os, } -int InsetCharStyle::plaintext(Buffer const & buf, odocstream & os, - OutputParams const & runparams) const -{ - return InsetText::plaintext(buf, os, runparams); -} - - void InsetCharStyle::textString(Buffer const & buf, odocstream & os) const { os << paragraphs().begin()->asString(buf, true); diff --git a/src/insets/insetcharstyle.h b/src/insets/insetcharstyle.h index 39231e9a57..5966a5de15 100644 --- a/src/insets/insetcharstyle.h +++ b/src/insets/insetcharstyle.h @@ -77,13 +77,13 @@ public: bool forceDefaultParagraphs(idx_type) const { return true; } /// int latex(Buffer const &, odocstream &, - OutputParams const &) const; - /// - int docbook(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; /// the string that is passed to the TOC virtual void textString(Buffer const &, odocstream &) const; /// diff --git a/src/insets/insetfloatlist.C b/src/insets/insetfloatlist.C index 6d11d93aa0..fb66694054 100644 --- a/src/insets/insetfloatlist.C +++ b/src/insets/insetfloatlist.C @@ -99,7 +99,7 @@ void InsetFloatList::read(Buffer const & buf, LyXLex & lex) int InsetFloatList::latex(Buffer const & buf, odocstream & os, - OutputParams const &) const + OutputParams const &) const { FloatList const & floats = buf.params().getLyXTextClass().floats(); FloatList::const_iterator cit = floats[to_ascii(getParam("type"))]; @@ -129,14 +129,13 @@ int InsetFloatList::latex(Buffer const & buf, odocstream & os, int InsetFloatList::plaintext(Buffer const & buffer, odocstream & os, - OutputParams const &) const + OutputParams const & runparams) const { os << getScreenLabel(buffer) << "\n\n"; buffer.tocBackend().writePlaintextTocList(to_ascii(getParam("type")), os); - os << "\n"; - return 0; + return runparams.linelen; // start with column 0 in new line } diff --git a/src/insets/insetfloatlist.h b/src/insets/insetfloatlist.h index 0808119bf6..7d9a236040 100644 --- a/src/insets/insetfloatlist.h +++ b/src/insets/insetfloatlist.h @@ -40,13 +40,13 @@ public: void read(Buffer const &, LyXLex &); /// int latex(Buffer const &, odocstream &, - OutputParams const &) const; + OutputParams const &) const; /// int docbook(Buffer const &, odocstream &, - OutputParams const &) const { return 0; } + OutputParams const &) const { return 0; } /// int plaintext(Buffer const &, odocstream &, - OutputParams const & runparams) const; + OutputParams const & runparams) const; /// void validate(LaTeXFeatures & features) const; private: -- 2.39.5