Re: [LyX/master] Reset layout when inserting an inset over full paragraph(s)
Le 13/09/2019 à 05:00, Pavel Sanda a écrit : On Thu, Sep 12, 2019 at 10:04:19AM +0200, Jean-Marc Lasgouttes wrote: But if there is a consensus about 2.3, I am OK with it. I was not actually suggesting to push it into official 2.3.x, just wanted to know whether putting into my private patchset is likely to cause some harm... I think you can do that. There is a conflict, but it is only an indentation issue, as far as I can see. JMarc
Re: [LyX/master] Reset layout when inserting an inset over full paragraph(s)
Le 13/09/2019 à 00:55, Richard Kimberly Heck a écrit : We are sorely lacking daily builds for stable releases. If we knew how to automate these, that could be done by our CI tools. I have taken a look at the Ubuntu side of things, and ran away screaming. I do not have the time to invest in even understanding this thing. And daily build is one order of magnitude more difficulty. How can we find people who know how to get this up and running, at least when daily builds do not require manual intervention (we can afford some imperfectness here)? I take it you mean daily builds of RPMs or something of the sort? Or do you mean something else? If it's just the tarball we want, then that ought to be quite easy. I meant binaries. Even having 3 dedicated users using daily builds would help a lot to find bugs early, I think. JMarc
Re: [LyX/master] Reset layout when inserting an inset over full paragraph(s)
On Thu, Sep 12, 2019 at 10:04:19AM +0200, Jean-Marc Lasgouttes wrote: > But if there is a consensus about 2.3, I am OK with it. I was not actually suggesting to push it into official 2.3.x, just wanted to know whether putting into my private patchset is likely to cause some harm... Pavel
Re: [LyX/master] Reset layout when inserting an inset over full paragraph(s)
On 9/12/19 3:43 PM, Jean-Marc Lasgouttes wrote: > Le 12/09/2019 à 20:54, Richard Kimberly Heck a écrit : >>> But if there is a consensus about 2.3, I am OK with it. >> >> The basic idea seems correct. I've played around with this before, too. >> I haven't tested, but one question that arose when I was dealing with >> this was with lists and depth issues. > > One thing that changes with the patch is that I condition on > forcePlainLayout instead of allowMultiPar, because it seems to be the > correct condition (and allowMultipar implies forcePlainLayout by > default). > > I also removed some code that I believe to duplicate what is done in > pasteSelectionHelper. > > I have no idea about depth issues, this is typically something I could > have overlooked. > >> In any event, this seems to be a big enough change to hold it for 2.4.0 >> (which we're supposed to be moving towards, right?). > > I take this as a subtle nudge in my direction. It is well deserved :) No, not at all. I'd actually forgotten you'd taken that on. Scott has been around again... > >> I'm intending to >> get 2.2.4 under way in a week or so, once things calm down here a bit. >> We could push to 2.3.x after that, so that it got tested, and it could >> then appear in 2.3.5, whether that is the last release or not. > > I am not sure that we want to have a change we are not sure about in > our last 2.3 release. > > We are sorely lacking daily builds for stable releases. If we knew how > to automate these, that could be done by our CI tools. I have taken a > look at the Ubuntu side of things, and ran away screaming. I do not > have the time to invest in even understanding this thing. And daily > build is one order of magnitude more difficulty. How can we find > people who know how to get this up and running, at least when daily > builds do not require manual intervention (we can afford some > imperfectness here)? I take it you mean daily builds of RPMs or something of the sort? Or do you mean something else? If it's just the tarball we want, then that ought to be quite easy. Riki
Re: [LyX/master] Reset layout when inserting an inset over full paragraph(s)
Le 12/09/2019 à 20:54, Richard Kimberly Heck a écrit : But if there is a consensus about 2.3, I am OK with it. The basic idea seems correct. I've played around with this before, too. I haven't tested, but one question that arose when I was dealing with this was with lists and depth issues. One thing that changes with the patch is that I condition on forcePlainLayout instead of allowMultiPar, because it seems to be the correct condition (and allowMultipar implies forcePlainLayout by default). I also removed some code that I believe to duplicate what is done in pasteSelectionHelper. I have no idea about depth issues, this is typically something I could have overlooked. In any event, this seems to be a big enough change to hold it for 2.4.0 (which we're supposed to be moving towards, right?). I take this as a subtle nudge in my direction. It is well deserved :) I'm intending to get 2.2.4 under way in a week or so, once things calm down here a bit. We could push to 2.3.x after that, so that it got tested, and it could then appear in 2.3.5, whether that is the last release or not. I am not sure that we want to have a change we are not sure about in our last 2.3 release. We are sorely lacking daily builds for stable releases. If we knew how to automate these, that could be done by our CI tools. I have taken a look at the Ubuntu side of things, and ran away screaming. I do not have the time to invest in even understanding this thing. And daily build is one order of magnitude more difficulty. How can we find people who know how to get this up and running, at least when daily builds do not require manual intervention (we can afford some imperfectness here)? Even having daily builds on one platform would be very helpful. JMarc
Re: [LyX/master] Reset layout when inserting an inset over full paragraph(s)
On 9/12/19 4:04 AM, Jean-Marc Lasgouttes wrote: > Le 12/09/2019 à 01:38, Pavel Sanda a écrit : >> I like this patch. Is it safe to put it into my personal 2.3 patchset >> (in the terms of the patch being congruent with old 2.3 codebase >> or way too many changes were done around in 2.4?) > > I like the patch too, and I checked that it applies almost cleanly > (barring some indentation issues). I am going to work a bit with LyX > 2.3 in the coming months and having it would be good (although working > with master would be more fun). > > However, I am wary that there are workflows that I did not consider in > the patch. This happened to me when I streamlined DEPM. > > But if there is a consensus about 2.3, I am OK with it. The basic idea seems correct. I've played around with this before, too. I haven't tested, but one question that arose when I was dealing with this was with lists and depth issues. In any event, this seems to be a big enough change to hold it for 2.4.0 (which we're supposed to be moving towards, right?). I'm intending to get 2.2.4 under way in a week or so, once things calm down here a bit. We could push to 2.3.x after that, so that it got tested, and it could then appear in 2.3.5, whether that is the last release or not. Riki
Re: [LyX/master] Reset layout when inserting an inset over full paragraph(s)
Le 12/09/2019 à 01:38, Pavel Sanda a écrit : I like this patch. Is it safe to put it into my personal 2.3 patchset (in the terms of the patch being congruent with old 2.3 codebase or way too many changes were done around in 2.4?) I like the patch too, and I checked that it applies almost cleanly (barring some indentation issues). I am going to work a bit with LyX 2.3 in the coming months and having it would be good (although working with master would be more fun). However, I am wary that there are workflows that I did not consider in the patch. This happened to me when I streamlined DEPM. But if there is a consensus about 2.3, I am OK with it. JMarc
Re: [LyX/master] Reset layout when inserting an inset over full paragraph(s)
On Wed, Sep 11, 2019 at 10:26:44AM +0200, Jean-Marc Lasgouttes wrote: > commit e1be71da59e405a1c36769121b684c9d10333bff > Author: Jean-Marc Lasgouttes > Date: Wed Sep 4 16:13:22 2019 +0200 > > Reset layout when inserting an inset over full paragraph(s) > > 1/ When inserting an inset over a selection, it makes sense if the > selection covers a complete or several paragraphs to reset the layout of > the paragraph that contains the inset to plain layout. In general the > inner inset will have the needed layout information and it does not > make sense to keep this information outside. > > However, when the inset forces plain layout, it does not make sense to > do that and the outer layout is preserved. > > Some code that duplicates what is done in pasteSelectionHelper is also > removed. > > 2/ Similarly, when dissolving an inset, do not reset the layout of the > first paragraph if the inset was alone in its own paragraph. > > Note that this does not work as intended when change tracking is enabled. > > Fixes bugs #10266 and #10369. I like this patch. Is it safe to put it into my personal 2.3 patchset (in the terms of the patch being congruent with old 2.3 codebase or way too many changes were done around in 2.4?) Pavel
