anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-13 01:08:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* insetbranch.C (textString): implement, so that branches appear

Browse Source 
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
This commit is contained in:
Jean-Marc Lasgouttes 2007-01-19 16:16:28 +00:00
parent 6672307cdc
commit 23c6d0089f
6 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -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

5
src/insets/ChangeLog
View File

@ -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

7
src/insets/insetbranch.C
View File

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

5
src/insets/insetbranch.h
View File

@ -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;
///

8
src/output_plaintext.C
View File

@ -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)) {

4
status.14x
View File

@ -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