* 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

@@ -1,3 +1,8 @@
+2007-01-19  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* 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  <lasgouttes@lyx.org>
 
 	* lyx_main.C (readUIFile): when reading an include file which name

src/insets/ChangeLog

@@ -1,3 +1,8 @@
+2007-01-19  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* insetbranch.C (textString): implement, so that branches appear
+	in the ToC.
+
 2007-01-09  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
 	* insetcite.C (getNatbibLabels): correct check for updating the 

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);

src/insets/insetbranch.h

@@ -65,6 +65,9 @@ public:
 	int plaintext(Buffer const &, std::ostream &,
 		      OutputParams const & runparams) const;
 	///
+	int textString(Buffer const &, std::ostream & os,
+		       OutputParams const & runparams) const;
+	///
 	void validate(LaTeXFeatures &) const;
 	///
 	InsetBranchParams const & params() const { return params_; }

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();
-			}
 			OutputParams rp = runparams;
 			rp.depth = par.params().depth();
 			if (inset->plaintext(buf, os, rp)) {

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 <digit>'' work on a