Re: Potential 1.4 patches

[Jean-Marc Lasgouttes]

> "Bennett" == Bennett Helm <[EMAIL PROTECTED]> writes:

Bennett> Attached -- with nothing done to the Changelog, right? ... Or
Bennett> do you want me to do that?

I added a terse changelog entry for 1.4.x. Thanks.

JMarc

Re: [patch] Re: Potential 1.4 patches

[Juergen Spitzmueller]

Martin Vermeer wrote:
> > The attached patch fixes that. I think it could also go in 1.4.1.
> > What do you think?
>
> Looks sane.

OK, it's in trunk now.

Jürgen

Re: [patch] Re: Potential 1.4 patches

[Martin Vermeer]

On Sat, Mar 25, 2006 at 04:39:22PM +0100, Juergen Spitzmueller wrote:
> Juergen Spitzmueller wrote:
> > [1] there's one minor issue that I haven't reported yet. With the patch, my
> > "move cursor while deleting in change tracking mode" fix is limited in that
> > it now "hangs" at paragraph breaks. But this can be fixed later.
> 
> The attached patch fixes that. I think it could also go in 1.4.1.
> What do you think?

Looks sane.

- Martin
 


pgp5sbBBTHvkp.pgp
Description: PGP signature

[patch] Re: Potential 1.4 patches

[Juergen Spitzmueller]

Juergen Spitzmueller wrote:
> [1] there's one minor issue that I haven't reported yet. With the patch, my
> "move cursor while deleting in change tracking mode" fix is limited in that
> it now "hangs" at paragraph breaks. But this can be fixed later.

The attached patch fixes that. I think it could also go in 1.4.1.
What do you think?

Jürgen
Index: src/text.C
===
--- src/text.C	(Revision 13492)
+++ src/text.C	(Arbeitskopie)
@@ -1579,17 +1579,21 @@ bool LyXText::Delete(LCursor & cur)
 		recordUndo(cur, Undo::DELETE, cur.pit());
 		setCursorIntern(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
 		needsUpdate = backspace(cur);
-		Paragraph & par = cur.paragraph();
-		if (cur.pos() < par.size()
-		&& par.lookupChange(cur.pos()) == Change::DELETED)
+		if (cur.paragraph().lookupChange(cur.pos()) == Change::DELETED)
 			cur.posRight();
 	} else if (cur.pit() != cur.lastpit()) {
 		LCursor scur = cur;
 
-		setCursorIntern(cur, cur.pit()+1, 0, false, false);
+		setCursorIntern(cur, cur.pit() + 1, 0, false, false);
 		if (pars_[cur.pit()].layout() == pars_[scur.pit()].layout()) {
 			recordUndo(scur, Undo::DELETE, scur.pit());
 			needsUpdate = backspace(cur);
+			if (cur.buffer().params().tracking_changes) {
+// move forward after the paragraph break is DELETED
+Paragraph & par = cur.paragraph();
+if (par.lookupChange(par.size()) == Change::DELETED)
+	setCursorIntern(cur, cur.pit() + 1, 0);
+}
 		} else {
 			setCursorIntern(scur, scur.pit(), scur.pos(), false, scur.boundary());
 		}

Re: Potential 1.4 patches

[Jean-Marc Lasgouttes]

> "Juergen" == Juergen Spitzmueller <[EMAIL PROTECTED]> writes:

Juergen> Georg Baum wrote:
>> > When it is done, Lars parlist patch can be merged too (please
>> someone > do it).
>> 
>> I did that.

Juergen> You just beat me to it ;-)

Thanks to both of you.

>> > Do you think we could plan a release for next friday?
>> 
>> Yes.

Juergen> I think so, too.

Good. This means we have a plan.

JMarc

Re: Potential 1.4 patches

[Juergen Spitzmueller]

Juergen Spitzmueller wrote:
> > I did that.
>
> You just beat me to it ;-)

But since I have already written the ChangeLogs, I've committed them.

Jürgen

Re: Potential 1.4 patches

[Juergen Spitzmueller]

Georg Baum wrote:
> > When it is done, Lars parlist patch can be merged too (please someone
> > do it).
>
> I did that.

You just beat me to it ;-)

> > Do you think we could plan a release for next friday?
>
> Yes.

I think so, too.

Jürgen

Re: Potential 1.4 patches

[Georg Baum]

Jean-Marc Lasgouttes wrote:

> When it is done, Lars parlist patch can be merged too (please someone
> do it).

I did that.

> Then what remains is the speedup patch, and I'd be glad to see someone
> apply it too.

Since I don't know which one was meant exactly I did not touch this.
 
> Do you think we could plan a release for next friday?

Yes.


Georg

Re: Potential 1.4 patches

[Juergen Spitzmueller]

Jean-Marc Lasgouttes wrote:
> If it is OK, can you please apply it?

Done.

Jürgen

Re: Potential 1.4 patches

[Bennett Helm]

On Mar 24, 2006, at 10:48 AM, Jean-Marc Lasgouttes wrote:


"Bennett" == Bennett Helm <[EMAIL PROTECTED]> writes:


Bennett> On Mar 24, 2006, at 9:17 AM, Jean-Marc Lasgouttes wrote:

Also, what are the other bugs that we have to fix before 1.4.1? The
one I can think about now is the adaptation of 1.3 layout files to
1.4. Others?


Bennett> How about this:
Bennett>  ?

I did it. Please check.


Looks good -- thanks.


Bennett> Also for 1.4.1, there's another change that needs to be made
Bennett> to LyX/ Mac preferences for compatibility with new Intel
Bennett> Macs: /usr/local/teTeX/bin/i386-apple-darwin-current needs
Bennett> to be added to PATH prefix. I've been waiting on that until
Bennett> the patch provided in the message linked above was applied.

Please send a new patch.


Attached -- with nothing done to the Changelog, right? ... Or do you  
want me to do that?


Bennett



mac-prefs.diff
Description: Binary data

Re: Potential 1.4 patches

[Jean-Marc Lasgouttes]

> "Jean-Marc" == Jean-Marc Lasgouttes <[EMAIL PROTECTED]> writes:

> "Juergen" == Juergen Spitzmueller <[EMAIL PROTECTED]> writes:
Juergen> Georg Baum wrote:
>>> and then redo the changes in CutAndPaset.C by hand. IIRC it was
>>> only at 4 places, it took me two minutes to do that.

Juergen> Please note that if you intend the ct patch also, there are
Juergen> some additional changes in text.C (IIRC), which are not
Juergen> needed (and do not apply) without that patch. So if you
Juergen> intend to apply both, it is probably better to apply the ct
Juergen> patch first.

Jean-Marc> OK, let's apply bug880 first. I took your patch in the bug.
Jean-Marc> Is that right?

Jean-Marc> And is the following ChageLog complete?

If it is OK, can you please apply it? I have to leave now and won't
have time over the week-end.

When it is done, Lars parlist patch can be merged too (please someone
do it).

Then what remains is the speedup patch, and I'd be glad to see someone
apply it too.

Do you think we could plan a release for next friday?

JMarc

Re: Potential 1.4 patches

[Juergen Spitzmueller]

Also sprach Jean-Marc Lasgouttes:
> OK, let's apply bug880 first. I took your patch in the bug. Is that
> right?

Yes.

> And is the following ChageLog complete?

Apart from the one entry below, yes (I think).

Jürgen

> Index: src/ChangeLog
> ===
> --- src/ChangeLog   (revision 13479)
> +++ src/ChangeLog   (working copy)
> @@ -1,3 +1,34 @@

2006-03-18  Martin Vermeer  <[EMAIL PROTECTED]>

* text.C (backspace): Fix changebar non-update (Juergen)

> +2006-03-15  Martin Vermeer  <[EMAIL PROTECTED]>
> +
> +   * CutAndPaste.C (pasteSelectionHelper): comments
> +   * paragraph_funcs.C (mergeParagraph): fix Juergen's cut&paste bug
> +   * changes.h: comments
> +   * paragraph.C (stripLeadingSpaces): remove unnecessary setChange
> +   * text.C (backspace): allow deletion of inserted para break
> +   Change tracking -related bug fixes (reported by Juergen) and
> +   some documentation work
> +
> +2006-03-13  Martin Vermeer  <[EMAIL PROTECTED]>
> +
> +   * rowpainter.C (paintChangeBar): fix painting of change bar with
> +   only paragraph break changed
> +
> +2006-03-11  Martin Vermeer  <[EMAIL PROTECTED]>
> +
> +   * paragraph.[Ch] (write, lookupChange, lookupChangeFull;
> +   added setChangeFull):
> +   * paragraph_pimpl.[Ch] (trackChanges, cleanChanges, acceptChange,
> +   rejectChange, erase; added setChangeFull):
> +   * CutAndPaste.C (eraseSelectionHelper):
> +   * lyxtext.h:
> +   * text.C (readParToken, readParagraph, breakParagraph,
> +   acceptChange, rejectChange, backspace, currentState;
> +   added backspacePos0):
> +   * paragraph_funcs.C (breakParagraphConservative, mergeParagraph):
> +   * lyxfind.C (findChange, findNextChange): fix bug 880: Change
> +   tracked paragraphs should still allow a paragraph split (and
> related +   things, i.e., multi-paragraph change tracking)
> +
>
>
> JMarc

Re: Potential 1.4 patches

[Jean-Marc Lasgouttes]

> "Bennett" == Bennett Helm <[EMAIL PROTECTED]> writes:

Bennett> On Mar 24, 2006, at 9:17 AM, Jean-Marc Lasgouttes wrote:
>> Also, what are the other bugs that we have to fix before 1.4.1? The
>> one I can think about now is the adaptation of 1.3 layout files to
>> 1.4. Others?

Bennett> How about this:
Bennett>  ?

I did it. Please check.

Bennett> Also for 1.4.1, there's another change that needs to be made
Bennett> to LyX/ Mac preferences for compatibility with new Intel
Bennett> Macs: /usr/local/ teTeX/bin/i386-apple-darwin-current needs
Bennett> to be added to PATH prefix. I've been waiting on that until
Bennett> the patch provided in the message linked above was applied.

Please send a new patch. 

JMarc

Re: Potential 1.4 patches

[Bennett Helm]

On Mar 24, 2006, at 9:17 AM, Jean-Marc Lasgouttes wrote:


Also, what are the other bugs that we have to fix before 1.4.1? The
one I can think about now is the adaptation of 1.3 layout files to
1.4. Others?


How about this: ?


Also for 1.4.1, there's another change that needs to be made to LyX/ 
Mac preferences for compatibility with new Intel Macs: /usr/local/ 
teTeX/bin/i386-apple-darwin-current needs to be added to PATH prefix.  
I've been waiting on that until the patch provided in the message  
linked above was applied.


Bennett

Re: Potential 1.4 patches

[Jean-Marc Lasgouttes]

> "Juergen" == Juergen Spitzmueller <[EMAIL PROTECTED]> writes:

Juergen> Georg Baum wrote:
>> and then redo the changes in CutAndPaset.C by hand. IIRC it was
>> only at 4 places, it took me two minutes to do that.

Juergen> Please note that if you intend the ct patch also, there are
Juergen> some additional changes in text.C (IIRC), which are not
Juergen> needed (and do not apply) without that patch. So if you
Juergen> intend to apply both, it is probably better to apply the ct
Juergen> patch first.

OK, let's apply bug880 first. I took your patch in the bug. Is that
right?

And is the following ChageLog complete?

Index: src/ChangeLog
===
--- src/ChangeLog   (revision 13479)
+++ src/ChangeLog   (working copy)
@@ -1,3 +1,34 @@
+2006-03-15  Martin Vermeer  <[EMAIL PROTECTED]>
+
+   * CutAndPaste.C (pasteSelectionHelper): comments
+   * paragraph_funcs.C (mergeParagraph): fix Juergen's cut&paste bug
+   * changes.h: comments
+   * paragraph.C (stripLeadingSpaces): remove unnecessary setChange
+   * text.C (backspace): allow deletion of inserted para break
+   Change tracking -related bug fixes (reported by Juergen) and
+   some documentation work
+
+2006-03-13  Martin Vermeer  <[EMAIL PROTECTED]>
+
+   * rowpainter.C (paintChangeBar): fix painting of change bar with
+   only paragraph break changed
+
+2006-03-11  Martin Vermeer  <[EMAIL PROTECTED]>
+
+   * paragraph.[Ch] (write, lookupChange, lookupChangeFull;
+   added setChangeFull):
+   * paragraph_pimpl.[Ch] (trackChanges, cleanChanges, acceptChange,
+   rejectChange, erase; added setChangeFull):
+   * CutAndPaste.C (eraseSelectionHelper):
+   * lyxtext.h:
+   * text.C (readParToken, readParagraph, breakParagraph,
+   acceptChange, rejectChange, backspace, currentState;
+   added backspacePos0):
+   * paragraph_funcs.C (breakParagraphConservative, mergeParagraph):
+   * lyxfind.C (findChange, findNextChange): fix bug 880: Change
+   tracked paragraphs should still allow a paragraph split (and related
+   things, i.e., multi-paragraph change tracking)
+


JMarc

Re: Potential 1.4 patches

[Juergen Spitzmueller]

Georg Baum wrote:
> and then redo the changes in CutAndPaset.C by hand. IIRC it was only at 4
> places, it took me two minutes to do that.

Please note that if you intend the ct patch also, there are some additional 
changes in text.C (IIRC), which are not needed (and do not apply) without 
that patch.
So if you intend to apply both, it is probably better to apply the ct patch 
first.

Jürgen

Re: Potential 1.4 patches

[Georg Baum]

Jean-Marc Lasgouttes wrote:

> Shall I use the version you sent, or shall we try to adapt Lars'
> latest version?

I'd say use Lars' version to be sure that they are in sync:

svn merge -r13466:13467 svn+ssh://svn.lyx.org/lyx/lyx-devel/trunk

and then redo the changes in CutAndPaset.C by hand. IIRC it was only at 4
places, it took me two minutes to do that.


Georg

Re: Potential 1.4 patches

[Jean-Marc Lasgouttes]

> "Georg" == Georg Baum <[EMAIL PROTECTED]> writes:

Georg> I do use the paragraph list since some days and did not
Georg> discover problems so far (although I did no real testing). 

Shall I use the version you sent, or shall we try to adapt Lars'
latest version?

JMarc

Re: Potential 1.4 patches

[Juergen Spitzmueller]

Jean-Marc Lasgouttes wrote:
> So Michael, Juergen, Marting, Georg, others, what do you think of
> these patches? I know It is not the first time I ask, but one never
> knows :)

I told you about the ct patch already.
I have applied the paragraph list patch to my tree (1.4svn) and didn't 
encounter any problems so far. OTOH I didn't try really hard.

> Also, what are the other bugs that we have to fix before 1.4.1? The
> one I can think about now is the adaptation of 1.3 layout files to
> 1.4. Others?

If we can decide about the paste to tabular assert fix, I's vote for applying 
that and the pasteselection fix on top.

Jürgen

Re: Potential 1.4 patches

[Georg Baum]

Jean-Marc Lasgouttes wrote:

> There is a choice to do right now: either we try to get 1.4.1 out as
> soon as possible or we try to make it better. I am ready to make the
> bet that we can apply these three patches and that they will work well
> enough to be better than the current situation. But I need some advice
> first. If we decide to apply them and problems happen in testing, we
> will have to delay 1.4.1 until they are resolved.
> 
> So Michael, Juergen, Marting, Georg, others, what do you think of
> these patches? I know It is not the first time I ask, but one never
> knows :)

I don't know much of the change tracking stuff, since I don't use it. I do
use the paragraph list since some days and did not discover problems so far
(although I did no real testing).
What about putting these patches in right now, get people to test them and
simply backing them out again if problems occur? If they are in they will
receive more testing than now.

> Also, what are the other bugs that we have to fix before 1.4.1? The
> one I can think about now is the adaptation of 1.3 layout files to
> 1.4. Others?

I agree the the layout stuff should go in, this causes real trouble. I'll
finish it tonight or tomorrow. I don't think we should wait for other
stuff, there is no real show stopper, and we have accumulated enough fixes
already.


Georg

Re: Potential 1.4 patches

[Jean-Marc Lasgouttes]

> "Michael" == Michael Gerz <[EMAIL PROTECTED]> writes:

Michael> Hi, my new hobby-horse: Keeping track of patches to the trunk
Michael> that may also be relevant for LyX 1.4.X :-)

That is a very good idea. Did you apply them to a tree and test them
out? This would be even better...

Michael> Change Tracking

Michael> Performance

Michael> r13467 - LGB - ParagraphList

There is a choice to do right now: either we try to get 1.4.1 out as
soon as possible or we try to make it better. I am ready to make the
bet that we can apply these three patches and that they will work well
enough to be better than the current situation. But I need some advice
first. If we decide to apply them and problems happen in testing, we
will have to delay 1.4.1 until they are resolved.

So Michael, Juergen, Marting, Georg, others, what do you think of
these patches? I know It is not the first time I ask, but one never
knows :)


Also, what are the other bugs that we have to fix before 1.4.1? The
one I can think about now is the adaptation of 1.3 layout files to
1.4. Others?

I attach the current status.

JMarc



status.14x
Description: Binary data

Re: Potential 1.4 patches

[Juergen Spitzmueller]

Jean-Marc Lasgouttes wrote:
> What is your opinion about this patch? Is it really ready? I could be
> coaxed into putting it in 1.4.1.

Yes, my opinion is that is is ready. I have tested it quite a bit and thanks 
to Martins patience and effort, I am not aware of any major problem anymore 
in this version [1]. And of course, it's a huge usability improvement.
However, since it entails remarkable code changes, I would be slightly more 
confident if a third person (Michael?) could give it another try. After that, 
I think it could theoretically go into 1.4.1

Jürgen

[1] there's one minor issue that I haven't reported yet. With the patch, my 
"move cursor while deleting in change tracking mode" fix is limited in that 
it now "hangs" at paragraph breaks. But this can be fixed later.

Re: Potential 1.4 patches

[Jean-Marc Lasgouttes]

> "Juergen" == Juergen Spitzmueller <[EMAIL PROTECTED]> writes:

Juergen> Am Freitag, 24. März 2006 00:38 schrieb Michael Gerz:
>> Change Tracking
>> 
>> r13339 - Fix bug 880, or the multi-paragraph change tracking patch
>> r13356 - fix painting of change bar with only paragraph break
>> changed r13385 - Change tracking -related bug fixes (reported by
>> Juergen) r13408 - fix stripLeadingSpaces mechanism with change
>> tracking enabled r13422 - Fix changebar non-update (Juergen)

Juergen> This is all combined in this patch for 1.4.:
Juergen> http://bugzilla.lyx.org/attachment.cgi?id=1036&action=view
Juergen> Even if it is probably rather sheduled for 1.4.2, some
Juergen> testing (apart from what Martin I I have done) would be nice.

What is your opinion about this patch? Is it really ready? I could be
coaxed into putting it in 1.4.1.

JMarc

Re: Potential 1.4 patches

[Juergen Spitzmueller]

Am Freitag, 24. März 2006 00:38 schrieb Michael Gerz:
> Change Tracking
>
> r13339 - Fix bug 880, or the multi-paragraph change tracking patch
> r13356 - fix painting of change bar with only paragraph break changed
> r13385 - Change tracking -related bug fixes (reported by Juergen)
> r13408 - fix stripLeadingSpaces mechanism with change tracking enabled
> r13422 - Fix changebar non-update (Juergen)

This is all combined in this patch for 1.4.:
http://bugzilla.lyx.org/attachment.cgi?id=1036&action=view
Even if it is probably rather sheduled for 1.4.2, some testing (apart from 
what Martin I I have done) would be nice.

Jürgen

Potential 1.4 patches

[Michael Gerz]

Hi,

my new hobby-horse: Keeping track of patches to the trunk that may also 
be relevant for LyX 1.4.X :-)


Michael

=

Change Tracking

r13339 - Fix bug 880, or the multi-paragraph change tracking patch
r13356 - fix painting of change bar with only paragraph break changed
r13385 - Change tracking -related bug fixes (reported by Juergen)
r13408 - fix stripLeadingSpaces mechanism with change tracking enabled
r13422 - Fix changebar non-update (Juergen)

Performance

r13328 - Fix bug 2195: Slowness in rendering inside insets, especially 
on the Mac

r13415 - Changes to the within-inset row rendering caching code
r13418 - expand redrawing of current row to endpos() AGAIN
r13420 - constify; remove unneeded casts

r13467 - LGB - ParagraphList

Various

r13432 - MV - Selective expose patch
r13434 - AY - replace hard-coded "/tmp" with package().temp_dir()
=