Re: Open Patches
Alfredo Braunstein wrote: 1) leave as it is and fix the thing correctly in 1.5.1. (too risky to do that now methinks). Seems the most reasonable to me as well. I targetted bug 3600 to 1.5.1. Jürgen
Re: Open Patches
On Wed, 11 Jul 2007, Dov Feldstern wrote: Jürgen Spitzmüller wrote: Michael Gerz wrote: there are three more patches which may be subject to discussion: [patch] bug 1820 --- footnotes in different language (by Dov) As I just posted in a separate message, it turns out that (I'm pretty sure) this will require a format change in order to fix correctly; and also, now that I understand what's going on, I see that bug 3613, which is a similar issue, is actually due to a format change which happened way back when, but did not have an accompanying lyx2lyx... If possible, both these should be fixed before 1.5.0, but I don't think I can do it within a day or two :( ... So how long time would it take to do properly? If it's important enough, maybe you can get an extension from Jose'. /Christian -- Christian Ridderström, +46-8-768 39 44 http://www.md.kth.se/~chr
Re: Open Patches
On Wednesday 11 July 2007 17:51:44 Michael Gerz wrote: IIRC only Alfredo's patch #3600 This fix was delayed for 1.5.1 and the Windows font patch are not committed. Any news on this from Joost or Uwe? Michael -- José Abílio
Re: Open Patches
José Matos wrote: On Wednesday 11 July 2007 17:51:44 Michael Gerz wrote: and the Windows font patch are not committed. Any news on this from Joost or Uwe? Author: forenr Date: Wed Jul 11 13:57:58 2007 New Revision: 19038 URL: http://www.lyx.org/trac/changeset/19038 Log: Fix bug 3962 (by me, Peter, and Joost) * src/support/os_cygwin.cpp * src/support/os_win32.cpp (addFontResources): use AddFontResourceEx on Windows version supporting this API in order to mark our fonts as private. (restoreFontResources): ditto with RemoveFontResourceEx.
Re: Open Patches
On Thursday 12 July 2007 11:30:29 Abdelrazak Younes wrote: José Matos wrote: On Wednesday 11 July 2007 17:51:44 Michael Gerz wrote: and the Windows font patch are not committed. Any news on this from Joost or Uwe? Author: forenr Date: Wed Jul 11 13:57:58 2007 New Revision: 19038 URL: http://www.lyx.org/trac/changeset/19038 Log: Fix bug 3962 (by me, Peter, and Joost) * src/support/os_cygwin.cpp * src/support/os_win32.cpp (addFontResources): use AddFontResourceEx on Windows version supporting this API in order to mark our fonts as private. (restoreFontResources): ditto with RemoveFontResourceEx. Good. :-) Now my only concerns are lyx2lyx bugs and Dov 1820's. :-) -- José Abílio
Re: Open Patches
Alfredo Braunstein wrote: > 1) leave as it is and fix the thing correctly in 1.5.1. (too risky to do > that now methinks). Seems the most reasonable to me as well. I targetted bug 3600 to 1.5.1. Jürgen
Re: Open Patches
On Wed, 11 Jul 2007, Dov Feldstern wrote: Jürgen Spitzmüller wrote: Michael Gerz wrote: > there are three more patches which may be subject to discussion: > > [patch] bug 1820 --- footnotes in different language (by Dov) As I just posted in a separate message, it turns out that (I'm pretty sure) this will require a format change in order to fix correctly; and also, now that I understand what's going on, I see that bug 3613, which is a similar issue, is actually due to a format change which happened way back when, but did not have an accompanying lyx2lyx... If possible, both these should be fixed before 1.5.0, but I don't think I can do it within a day or two :( ... So how long time would it take to do properly? If it's important enough, maybe you can get an extension from Jose'. /Christian -- Christian Ridderström, +46-8-768 39 44 http://www.md.kth.se/~chr
Re: Open Patches
On Wednesday 11 July 2007 17:51:44 Michael Gerz wrote: > IIRC only Alfredo's patch #3600 This fix was delayed for 1.5.1 > and the Windows font patch are not committed. Any news on this from Joost or Uwe? > Michael -- José Abílio
Re: Open Patches
José Matos wrote: On Wednesday 11 July 2007 17:51:44 Michael Gerz wrote: and the Windows font patch are not committed. Any news on this from Joost or Uwe? Author: forenr Date: Wed Jul 11 13:57:58 2007 New Revision: 19038 URL: http://www.lyx.org/trac/changeset/19038 Log: Fix bug 3962 (by me, Peter, and Joost) * src/support/os_cygwin.cpp * src/support/os_win32.cpp (addFontResources): use AddFontResourceEx on Windows version supporting this API in order to mark our fonts as private. (restoreFontResources): ditto with RemoveFontResourceEx.
Re: Open Patches
On Thursday 12 July 2007 11:30:29 Abdelrazak Younes wrote: > José Matos wrote: > > On Wednesday 11 July 2007 17:51:44 Michael Gerz wrote: > >> and the Windows font patch are not committed. > > > > Any news on this from Joost or Uwe? > > Author: forenr > Date: Wed Jul 11 13:57:58 2007 > New Revision: 19038 > > URL: http://www.lyx.org/trac/changeset/19038 > Log: > Fix bug 3962 (by me, Peter, and Joost) > > * src/support/os_cygwin.cpp > * src/support/os_win32.cpp > (addFontResources): use AddFontResourceEx on Windows version > supporting this API in order to mark our fonts as private. > (restoreFontResources): ditto with RemoveFontResourceEx. Good. :-) Now my only concerns are lyx2lyx bugs and Dov 1820's. :-) -- José Abílio
Re: Open Patches
On Wednesday 04 July 2007 20:44:31 Michael Gerz wrote: Hi, it seems that there are still several patches that may go into 1.5.0. Since José has left us for the rest of the week, I wonder what will happen to these patches: - RTL Justification Bug (bug3889.2.patch, 26/06/07) by Dov - Bug fix #3600 (30/06/07) by Alfredo - Image Cache Fix (3819.diff, 30/06/07) by Jürgen Georg - Unicode Bug fixes (#3313 #3498, 01/07/07) by Jürgen - Toolbar patch (01/07/07) by myself - default-encoding.2.patch (01/07/07) by Dov - Current Language (#3959, 01/07/07) by Dov - Author field fix (03/07/07) by JMarc myself - Windows font patch (03/07/07) by Peter - Include file crash fix (#3970, 05/07/07) by Abdel I think some of these patches just require a second OK by a competent developer. AFAIR most have been applied already. What are the patches from this batch that did not had any comment so far? Kind regards, Michael -- José Abílio
Re: Open Patches
José Matos schrieb: On Wednesday 04 July 2007 20:44:31 Michael Gerz wrote: Hi, it seems that there are still several patches that may go into 1.5.0. Since José has left us for the rest of the week, I wonder what will happen to these patches: - RTL Justification Bug (bug3889.2.patch, 26/06/07) by Dov - Bug fix #3600 (30/06/07) by Alfredo - Image Cache Fix (3819.diff, 30/06/07) by Jürgen Georg - Unicode Bug fixes (#3313 #3498, 01/07/07) by Jürgen - Toolbar patch (01/07/07) by myself - default-encoding.2.patch (01/07/07) by Dov - Current Language (#3959, 01/07/07) by Dov - Author field fix (03/07/07) by JMarc myself - Windows font patch (03/07/07) by Peter - Include file crash fix (#3970, 05/07/07) by Abdel I think some of these patches just require a second OK by a competent developer. AFAIR most have been applied already. What are the patches from this batch that did not had any comment so far? IIRC only Alfredo's patch #3600 and the Windows font patch are not committed. Michael
Re: Open Patches
Michael Gerz schrieb: José Matos schrieb: On Wednesday 04 July 2007 20:44:31 Michael Gerz wrote: AFAIR most have been applied already. What are the patches from this batch that did not had any comment so far? José, all, there are three more patches which may be subject to discussion: [patch] fix bug 3974: crash with user defined external templates (by Bernhard) [patch] bug 1820 --- footnotes in different language (by Dov) [PATCH] bugs 3958, 3313 and 3976 lyx2lyx and unicode characters Michael
Re: Open Patches
Michael Gerz wrote: IIRC only Alfredo's patch #3600 and the Windows font patch are not committed. the font patch is in. Jürgen
Re: Open Patches
Michael Gerz wrote: there are three more patches which may be subject to discussion: [patch] fix bug 3974: crash with user defined external templates (by Bernhard) an alternative fix is in (rev 19013). [patch] bug 1820 --- footnotes in different language (by Dov) [PATCH] bugs 3958, 3313 and 3976 lyx2lyx and unicode characters the lyx2lyx bugs are the most severe issues that are left IMO. But José already announced to look into them. Jürgen
Re: Open Patches
Jürgen Spitzmüller wrote: Michael Gerz wrote: there are three more patches which may be subject to discussion: [patch] bug 1820 --- footnotes in different language (by Dov) As I just posted in a separate message, it turns out that (I'm pretty sure) this will require a format change in order to fix correctly; and also, now that I understand what's going on, I see that bug 3613, which is a similar issue, is actually due to a format change which happened way back when, but did not have an accompanying lyx2lyx... If possible, both these should be fixed before 1.5.0, but I don't think I can do it within a day or two :( ... Dov
Re: Open Patches
Michael Gerz wrote:
IIRC only Alfredo's patch #3600 and the Windows font patch are not
committed.
I didn't insist on mine because it is a bug caused by a dubious
stripLeadingSpaces call but:
- Bo already patched the code to avoid the crash
- the problem seemingly only manifests itself with leading spaces, which are
difficult to get in the first place
- the stripLeadingSpace call should go in the end as JM observed.
The patch is attached FWIW. Instead of applying the patch, I would prefer to
either:
1) leave as it is and fix the thing correctly in 1.5.1. (too risky to do
that now methinks).
2) just eliminate the call to stripLeadingSpaces.
I don't have the time to investigate the consequences test 2) exhaustively
myself, so 1) is left ;-)
A/
Index: CutAndPaste.cpp
===
--- CutAndPaste.cpp (revision 19042)
+++ CutAndPaste.cpp (working copy)
@@ -303,12 +303,6 @@
for (pit_type pit = startpit; pit != endpit + 1;) {
pos_type const left = (pit == startpit ? startpos : 0);
pos_type right = (pit == endpit ? endpos : pars[pit].size() + 1);
- // FIXME: this is a quick fix for bug 3600. It stops a crash but the problem
- // still remains unsolved (e.g. the second example in the bug report).
- // c.f. http://bugzilla.lyx.org/show_bug.cgi?id=3600
- if (right pars[pit].size() + 1)
- right = pars[pit].size() + 1;
-
bool const merge = pars[pit].isMergedOnEndOfParDeletion(params.trackChanges);
// Logically erase only, including the end-of-paragraph character
@@ -316,14 +310,17 @@
// Separate handling of paragraph break:
if (merge pit != endpit
- (pit + 1 != endpit || pars[pit].hasSameLayout(pars[pit + 1]))) {
- pos_type const thissize = pars[pit].size();
+ (pit + 1 != endpit || pars[pit].hasSameLayout(pars[endpit]))) {
+ int const nextsize = pars[pit + 1].size();
if (doclear)
pars[pit + 1].stripLeadingSpaces(params.trackChanges);
+ if (pit + 1 == endpit) {
+endpos += pars[pit].size();
+endpos -= nextsize - pars[endpit].size();
+endpos = std::max(endpos, 0);
+ }
mergeParagraph(params, pars, pit);
--endpit;
- if (pit == endpit)
-endpos += thissize;
} else
++pit;
}
Re: Open Patches
On Wednesday 04 July 2007 20:44:31 Michael Gerz wrote: > Hi, > > it seems that there are still several patches that may go into 1.5.0. > Since José has left us for the rest of the week, I wonder what will > happen to these patches: > > - RTL Justification Bug (bug3889.2.patch, 26/06/07) by Dov > - Bug fix #3600 (30/06/07) by Alfredo > - Image Cache Fix (3819.diff, 30/06/07) by Jürgen & Georg > - Unicode Bug fixes (#3313 & #3498, 01/07/07) by Jürgen > - Toolbar patch (01/07/07) by myself > - default-encoding.2.patch (01/07/07) by Dov > - Current Language (#3959, 01/07/07) by Dov > - Author field fix (03/07/07) by JMarc & myself > - Windows font patch (03/07/07) by Peter > - Include file crash fix (#3970, 05/07/07) by Abdel > > I think some of these patches "just" require a second OK by a competent > developer. AFAIR most have been applied already. What are the patches from this batch that did not had any comment so far? > Kind regards, > > Michael -- José Abílio
Re: Open Patches
José Matos schrieb: On Wednesday 04 July 2007 20:44:31 Michael Gerz wrote: Hi, it seems that there are still several patches that may go into 1.5.0. Since José has left us for the rest of the week, I wonder what will happen to these patches: - RTL Justification Bug (bug3889.2.patch, 26/06/07) by Dov - Bug fix #3600 (30/06/07) by Alfredo - Image Cache Fix (3819.diff, 30/06/07) by Jürgen & Georg - Unicode Bug fixes (#3313 & #3498, 01/07/07) by Jürgen - Toolbar patch (01/07/07) by myself - default-encoding.2.patch (01/07/07) by Dov - Current Language (#3959, 01/07/07) by Dov - Author field fix (03/07/07) by JMarc & myself - Windows font patch (03/07/07) by Peter - Include file crash fix (#3970, 05/07/07) by Abdel I think some of these patches "just" require a second OK by a competent developer. AFAIR most have been applied already. What are the patches from this batch that did not had any comment so far? IIRC only Alfredo's patch #3600 and the Windows font patch are not committed. Michael
Re: Open Patches
Michael Gerz schrieb: José Matos schrieb: On Wednesday 04 July 2007 20:44:31 Michael Gerz wrote: AFAIR most have been applied already. What are the patches from this batch that did not had any comment so far? José, all, there are three more patches which may be subject to discussion: [patch] fix bug 3974: crash with user defined external templates (by Bernhard) [patch] bug 1820 --- footnotes in different language (by Dov) [PATCH] bugs 3958, 3313 and 3976 lyx2lyx and unicode characters Michael
Re: Open Patches
Michael Gerz wrote: > IIRC only Alfredo's patch #3600 and the Windows font patch are not > committed. the font patch is in. Jürgen
Re: Open Patches
Michael Gerz wrote: > there are three more patches which may be subject to discussion: > > [patch] fix bug 3974: crash with user defined external templates (by > Bernhard) an alternative fix is in (rev 19013). > [patch] bug 1820 --- footnotes in different language (by Dov) > [PATCH] bugs 3958, 3313 and 3976 lyx2lyx and unicode characters the lyx2lyx bugs are the most severe issues that are left IMO. But José already announced to look into them. Jürgen
Re: Open Patches
Jürgen Spitzmüller wrote: Michael Gerz wrote: there are three more patches which may be subject to discussion: [patch] bug 1820 --- footnotes in different language (by Dov) As I just posted in a separate message, it turns out that (I'm pretty sure) this will require a format change in order to fix correctly; and also, now that I understand what's going on, I see that bug 3613, which is a similar issue, is actually due to a format change which happened way back when, but did not have an accompanying lyx2lyx... If possible, both these should be fixed before 1.5.0, but I don't think I can do it within a day or two :( ... Dov
Re: Open Patches
Michael Gerz wrote:
> IIRC only Alfredo's patch #3600 and the Windows font patch are not
> committed.
I didn't insist on mine because it is a bug caused by a dubious
stripLeadingSpaces call but:
- Bo already patched the code to avoid the crash
- the problem seemingly only manifests itself with leading spaces, which are
difficult to get in the first place
- the stripLeadingSpace call should go in the end as JM observed.
The patch is attached FWIW. Instead of applying the patch, I would prefer to
either:
1) leave as it is and fix the thing correctly in 1.5.1. (too risky to do
that now methinks).
2) just eliminate the call to stripLeadingSpaces.
I don't have the time to investigate the consequences & test 2) exhaustively
myself, so 1) is left ;-)
A/
Index: CutAndPaste.cpp
===
--- CutAndPaste.cpp (revision 19042)
+++ CutAndPaste.cpp (working copy)
@@ -303,12 +303,6 @@
for (pit_type pit = startpit; pit != endpit + 1;) {
pos_type const left = (pit == startpit ? startpos : 0);
pos_type right = (pit == endpit ? endpos : pars[pit].size() + 1);
- // FIXME: this is a quick fix for bug 3600. It stops a crash but the problem
- // still remains unsolved (e.g. the second example in the bug report).
- // c.f. http://bugzilla.lyx.org/show_bug.cgi?id=3600
- if (right > pars[pit].size() + 1)
- right = pars[pit].size() + 1;
-
bool const merge = pars[pit].isMergedOnEndOfParDeletion(params.trackChanges);
// Logically erase only, including the end-of-paragraph character
@@ -316,14 +310,17 @@
// Separate handling of paragraph break:
if (merge && pit != endpit &&
- (pit + 1 != endpit || pars[pit].hasSameLayout(pars[pit + 1]))) {
- pos_type const thissize = pars[pit].size();
+ (pit + 1 != endpit || pars[pit].hasSameLayout(pars[endpit]))) {
+ int const nextsize = pars[pit + 1].size();
if (doclear)
pars[pit + 1].stripLeadingSpaces(params.trackChanges);
+ if (pit + 1 == endpit) {
+endpos += pars[pit].size();
+endpos -= nextsize - pars[endpit].size();
+endpos = std::max(endpos, 0);
+ }
mergeParagraph(params, pars, pit);
--endpit;
- if (pit == endpit)
-endpos += thissize;
} else
++pit;
}
Open Patches
Hi, it seems that there are still several patches that may go into 1.5.0. Since José has left us for the rest of the week, I wonder what will happen to these patches: - RTL Justification Bug (bug3889.2.patch, 26/06/07) by Dov - Bug fix #3600 (30/06/07) by Alfredo - Image Cache Fix (3819.diff, 30/06/07) by Jürgen Georg - Unicode Bug fixes (#3313 #3498, 01/07/07) by Jürgen - Toolbar patch (01/07/07) by myself - default-encoding.2.patch (01/07/07) by Dov - Current Language (#3959, 01/07/07) by Dov - Author field fix (03/07/07) by JMarc myself - Windows font patch (03/07/07) by Peter - Include file crash fix (#3970, 05/07/07) by Abdel I think some of these patches just require a second OK by a competent developer. Kind regards, Michael
Open Patches
Hi, it seems that there are still several patches that may go into 1.5.0. Since José has left us for the rest of the week, I wonder what will happen to these patches: - RTL Justification Bug (bug3889.2.patch, 26/06/07) by Dov - Bug fix #3600 (30/06/07) by Alfredo - Image Cache Fix (3819.diff, 30/06/07) by Jürgen & Georg - Unicode Bug fixes (#3313 & #3498, 01/07/07) by Jürgen - Toolbar patch (01/07/07) by myself - default-encoding.2.patch (01/07/07) by Dov - Current Language (#3959, 01/07/07) by Dov - Author field fix (03/07/07) by JMarc & myself - Windows font patch (03/07/07) by Peter - Include file crash fix (#3970, 05/07/07) by Abdel I think some of these patches "just" require a second OK by a competent developer. Kind regards, Michael
