From 23c6d0089f48924e904123e578d12b4852693267 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 19 Jan 2007 16:16:28 +0000 Subject: [PATCH] * insetbranch.C (textString): implement, so that branches appear in the ToC. * output_plaintext.C (asciiParagraph): output things in the right order when there is an inset and runparams.linelen == 0. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@16764 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 5 +++++ src/insets/ChangeLog | 5 +++++ src/insets/insetbranch.C | 7 +++++++ src/insets/insetbranch.h | 5 ++++- src/output_plaintext.C | 8 +++----- status.14x | 4 ++++ 6 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index ffd4f5a07e..ccc3d3b591 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-01-19 Jean-Marc Lasgouttes + + * output_plaintext.C (asciiParagraph): output things in the right + order when there is an inset and runparams.linelen == 0. + 2007-01-19 Jean-Marc Lasgouttes * lyx_main.C (readUIFile): when reading an include file which name diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 61e0254c5b..00c71142ca 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,8 @@ +2007-01-19 Jean-Marc Lasgouttes + + * insetbranch.C (textString): implement, so that branches appear + in the ToC. + 2007-01-09 Jürgen Spitzmüller * insetcite.C (getNatbibLabels): correct check for updating the diff --git a/src/insets/insetbranch.C b/src/insets/insetbranch.C index a18bf41d4f..bc0989ffa6 100644 --- a/src/insets/insetbranch.C +++ b/src/insets/insetbranch.C @@ -249,6 +249,13 @@ int InsetBranch::plaintext(Buffer const & buf, std::ostream & os, } +int InsetBranch::textString(Buffer const & buf, ostream & os, + OutputParams const & runparams) const +{ + return plaintext(buf, os, runparams); +} + + void InsetBranch::validate(LaTeXFeatures & features) const { InsetText::validate(features); diff --git a/src/insets/insetbranch.h b/src/insets/insetbranch.h index 44c2786627..ddaf1d6043 100644 --- a/src/insets/insetbranch.h +++ b/src/insets/insetbranch.h @@ -63,7 +63,10 @@ public: OutputParams const & runparams) const; /// int plaintext(Buffer const &, std::ostream &, - OutputParams const & runparams) const; + OutputParams const & runparams) const; + /// + int textString(Buffer const &, std::ostream & os, + OutputParams const & runparams) const; /// void validate(LaTeXFeatures &) const; /// diff --git a/src/output_plaintext.C b/src/output_plaintext.C index 5c7c32c390..516d6cecb8 100644 --- a/src/output_plaintext.C +++ b/src/output_plaintext.C @@ -200,11 +200,9 @@ void asciiParagraph(Buffer const & buf, switch (c) { case Paragraph::META_INSET: { InsetBase const * inset = par.getInset(i); - if (runparams.linelen > 0) { - os << word; - currlinelen += word.length(); - word.erase(); - } + os << word; + currlinelen += word.length(); + word.erase(); OutputParams rp = runparams; rp.depth = par.params().depth(); if (inset->plaintext(buf, os, rp)) { diff --git a/status.14x b/status.14x index ba8aa4171f..80505740b6 100644 --- a/status.14x +++ b/status.14x @@ -152,6 +152,10 @@ What's new - Give a better error message for missing layout include files. +- Show contents of branches in the ToC. + +- Fix wrong ordering of insets in ToC entries. + - Don't show starred sections in Document->Numbering & TOC (bug 2910). - Make sure that the size changing shortcuts ``M-s '' work on a