Re: A working InsetVSpace

2003-12-02 Thread Andre Poenitz
On Mon, Dec 01, 2003 at 09:20:33PM +, Angus Leeming wrote: Cheers, Georg. Applied, although I suspect that someone will now try and factorize all these pieces of code handling 'end_inset'... At least making the LyXLex interface a bit similar to the std::streams would make me feel better.

Re: A working InsetVSpace

2003-12-02 Thread Angus Leeming
Andre Poenitz wrote: At least making the LyXLex interface a bit similar to the std::streams would make me feel better. Patch attached. +/// file is open and end of file is not reached +operator void *() const; I don't like this. We already have problems catching implicit

Re: A working InsetVSpace

2003-12-02 Thread Andre Poenitz
On Tue, Dec 02, 2003 at 09:17:31AM +, Angus Leeming wrote: Andre Poenitz wrote: At least making the LyXLex interface a bit similar to the std::streams would make me feel better. Patch attached. +/// file is open and end of file is not reached +operator void *()

Re: A working InsetVSpace

2003-12-02 Thread Angus Leeming
Andre Poenitz wrote: +if (lex) +vspace = VSpace(vsp); However, this isn't std::stream-like. Of course it is. 27.4.5.3 basic_ios iostate flags functions [lib.iostate.flags] operator void*() const Returns: If fail() then a null pointer;

Re: A working InsetVSpace

2003-12-02 Thread Andre Poenitz
On Tue, Dec 02, 2003 at 09:52:47AM +, Angus Leeming wrote: Btw, I forgot to implement bool operator!() const. So, now you need two operators to replace a single isOk()... That's what the std::streams do. Usage is more concise, btw. Andre'

Re: A working InsetVSpace

2003-12-02 Thread Andre Poenitz
On Mon, Dec 01, 2003 at 09:20:33PM +, Angus Leeming wrote: > Cheers, Georg. Applied, although I suspect that someone will now try > and factorize all these pieces of code handling 'end_inset'... At least making the LyXLex interface a bit similar to the std::streams would make me feel better.

Re: A working InsetVSpace

2003-12-02 Thread Angus Leeming
Andre Poenitz wrote: > At least making the LyXLex interface a bit similar to the > std::streams would make me feel better. > > Patch attached. > +/// file is open and end of file is not reached > +operator void *() const; I don't like this. We already have problems catching

Re: A working InsetVSpace

2003-12-02 Thread Andre Poenitz
On Tue, Dec 02, 2003 at 09:17:31AM +, Angus Leeming wrote: > Andre Poenitz wrote: > > At least making the LyXLex interface a bit similar to the > > std::streams would make me feel better. > > > > Patch attached. > > > +/// file is open and end of file is not reached > > +

Re: A working InsetVSpace

2003-12-02 Thread Angus Leeming
Andre Poenitz wrote: >> +if (lex) >> +vspace = VSpace(vsp); >> >> However, this isn't std::stream-like. > > Of course it is. > > 27.4.5.3 basic_ios iostate flags functions > [lib.iostate.flags] > > operator void*() const > > Returns: > If fail()

Re: A working InsetVSpace

2003-12-02 Thread Andre Poenitz
On Tue, Dec 02, 2003 at 09:52:47AM +, Angus Leeming wrote: > > Btw, I forgot to implement bool operator!() const. > > So, now you need two operators to replace a single isOk()... That's what the std::streams do. Usage is more concise, btw. Andre'

Re: A working InsetVSpace

2003-12-01 Thread Georg Baum
Am Montag, 1. Dezember 2003 14:10 schrieb Andre Poenitz: Sounds like the inset scheme is still a bit too complex if copy paste introduces errors... Why is an inset supposed to read the \end_inset token? Isn't that 'data belonging to a level above'? I would think so. But nevertheless, adding

Re: A working InsetVSpace

2003-12-01 Thread Angus Leeming
Georg Baum wrote: Sounds like the inset scheme is still a bit too complex if copy paste introduces errors... Why is an inset supposed to read the \end_inset token? Isn't that 'data belonging to a level above'? I would think so. But nevertheless, adding something like the following in

Re: A working InsetVSpace

2003-12-01 Thread Martin Vermeer
On Sun, Nov 30, 2003 at 10:01:07PM +0100, Georg Baum spake thusly: Am Sonntag, 30. November 2003 10:00 schrieb Juergen Spitzmueller: Georg Baum wrote: Apart from that, I get error messages like Paragraph ended in line 31 Missing \end_layout. if I use the VSpace inset (see

Re: [Devel] Re: A working InsetVSpace

2003-12-01 Thread Andre Poenitz
On Fri, Nov 28, 2003 at 09:04:42PM +0100, Juergen Spitzmueller wrote: Angus Leeming wrote: 5. Qt: I got rid of the VSpace stuff from the Paragraph dialog but have not written QVSpace. Done (patch attached). Thanks a lot. - is there any special reason why you have removed keep (i.e.

Re: A working InsetVSpace

2003-12-01 Thread Andre Poenitz
On Mon, Dec 01, 2003 at 08:59:58AM +0200, Martin Vermeer wrote: On Sun, Nov 30, 2003 at 10:01:07PM +0100, Georg Baum spake thusly: Am Sonntag, 30. November 2003 10:00 schrieb Juergen Spitzmueller: Georg Baum wrote: Apart from that, I get error messages like Paragraph ended in

Re: A working InsetVSpace

2003-12-01 Thread Angus Leeming
Martin Vermeer wrote: The paragraph reading code readParagraph() in paragraph_funcs.C shouldn't be handling the \end_inset token... that's for the VSpace inset itself to do. Something fishy here. Ok, makes sense. Remember, André doesn't write many of these 'normal' insets, so you should be

Re: A working InsetVSpace

2003-12-01 Thread Andre Poenitz
On Mon, Dec 01, 2003 at 10:17:43AM +, Angus Leeming wrote: Martin Vermeer wrote: The paragraph reading code readParagraph() in paragraph_funcs.C shouldn't be handling the \end_inset token... that's for the VSpace inset itself to do. Something fishy here. Ok, makes sense. Remember,

Re: A working InsetVSpace

2003-12-01 Thread Martin Vermeer
On Sun, Nov 30, 2003 at 10:01:07PM +0100, Georg Baum spake thusly: > Am Sonntag, 30. November 2003 10:00 schrieb Juergen Spitzmueller: > > Georg Baum wrote: > > > Apart from that, I get error messages like > > > > > > Paragraph ended in line 31 > > > Missing \end_layout. > > > > > > if I use the

Re: [Devel] Re: A working InsetVSpace

2003-12-01 Thread Andre Poenitz
On Fri, Nov 28, 2003 at 09:04:42PM +0100, Juergen Spitzmueller wrote: > Angus Leeming wrote: > > 5. Qt: I got rid of the VSpace stuff from the Paragraph dialog but have not > > written QVSpace. > > Done (patch attached). Thanks a lot. > - is there any special reason why you have removed "keep"

Re: A working InsetVSpace

2003-12-01 Thread Andre Poenitz
On Mon, Dec 01, 2003 at 08:59:58AM +0200, Martin Vermeer wrote: > On Sun, Nov 30, 2003 at 10:01:07PM +0100, Georg Baum spake thusly: > > Am Sonntag, 30. November 2003 10:00 schrieb Juergen Spitzmueller: > > > Georg Baum wrote: > > > > Apart from that, I get error messages like > > > > > > > >

Re: A working InsetVSpace

2003-12-01 Thread Angus Leeming
Martin Vermeer wrote: > The paragraph reading code readParagraph() in paragraph_funcs.C > shouldn't be handling the \end_inset token... that's for the VSpace > inset itself to do. Something fishy here. Ok, makes sense. Remember, André doesn't write many of these 'normal' insets, so you should be

Re: A working InsetVSpace

2003-12-01 Thread Andre Poenitz
On Mon, Dec 01, 2003 at 10:17:43AM +, Angus Leeming wrote: > Martin Vermeer wrote: > > The paragraph reading code readParagraph() in paragraph_funcs.C > > shouldn't be handling the \end_inset token... that's for the VSpace > > inset itself to do. Something fishy here. > > Ok, makes sense.

Re: A working InsetVSpace

2003-12-01 Thread Georg Baum
Am Montag, 1. Dezember 2003 14:10 schrieb Andre Poenitz: > Sounds like the inset scheme is still a bit too complex if copy & paste > introduces errors... Why is an inset supposed to read the \end_inset > token? Isn't that 'data belonging to a level above'? I would think so. But nevertheless,

Re: A working InsetVSpace

2003-12-01 Thread Angus Leeming
Georg Baum wrote: >> Sounds like the inset scheme is still a bit too complex if copy & >> paste introduces errors... Why is an inset supposed to read the >> \end_inset token? Isn't that 'data belonging to a level above'? > > I would think so. But nevertheless, adding something like the >

Re: A working InsetVSpace

2003-11-30 Thread Juergen Spitzmueller
Georg Baum wrote: The dialog works, but there seems to be an encoding problem, the umlauts in your and Andrés names appear as question marks. I have fixed this (eventually I must consider using a *real* editor).. Apart from that, I get error messages like Paragraph ended in line 31 Missing

Re: A working InsetVSpace

2003-11-30 Thread Georg Baum
Am Sonntag, 30. November 2003 10:00 schrieb Juergen Spitzmueller: Georg Baum wrote: Apart from that, I get error messages like Paragraph ended in line 31 Missing \end_layout. if I use the VSpace inset (see attached example). Is this expected (CVS from this morning)? I checked the

Re: A working InsetVSpace

2003-11-30 Thread Juergen Spitzmueller
Georg Baum wrote: > The dialog works, but there seems to be an encoding problem, the umlauts in > your and Andrés names appear as question marks. I have fixed this (eventually I must consider using a *real* editor).. > Apart from that, I get error messages like > > Paragraph ended in line 31 >

Re: A working InsetVSpace

2003-11-30 Thread Georg Baum
Am Sonntag, 30. November 2003 10:00 schrieb Juergen Spitzmueller: > Georg Baum wrote: > > Apart from that, I get error messages like > > > > Paragraph ended in line 31 > > Missing \end_layout. > > > > if I use the VSpace inset (see attached example). Is this expected (CVS > > from this morning)? I

Re: A working InsetVSpace

2003-11-29 Thread Georg Baum
Am Freitag, 28. November 2003 21:04 schrieb Juergen Spitzmueller: Angus Leeming wrote: 5. Qt: I got rid of the VSpace stuff from the Paragraph dialog but have not written QVSpace. Done (patch attached). If noone objects, I'll commit this tomorrow. The dialog works, but there seems to be an

Re: A working InsetVSpace

2003-11-29 Thread Georg Baum
Am Freitag, 28. November 2003 21:04 schrieb Juergen Spitzmueller: > Angus Leeming wrote: > > 5. Qt: I got rid of the VSpace stuff from the Paragraph dialog but have > > not written QVSpace. > > Done (patch attached). If noone objects, I'll commit this tomorrow. The dialog works, but there seems

A working InsetVSpace

2003-11-28 Thread Angus Leeming
There, I didn't think that it should be so hard. Things I've changed: 1. stdmenus.ui now dispatches dialog-show-new-inset vspace rather than insert-vspace. LFUN_INSERT_VSPACE no longer exists. Rationale: when I insert a vspace from the menu, I want the dialog to pop up so that I can specify the

Re: A working InsetVSpace

2003-11-28 Thread Andre Poenitz
On Fri, Nov 28, 2003 at 01:12:07PM +, Angus Leeming wrote: There, I didn't think that it should be so hard. Well, it was for me. Thank you. Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson or B.

Re: A working InsetVSpace

2003-11-28 Thread Angus Leeming
On Friday 28 November 2003 1:12 pm, Angus Leeming wrote: There, I didn't think that it should be so hard. I forgot to 'cvs add' the new files. This patch has everything. Angus vspace.diff.bz2 Description: BZip2 compressed data

Re: A working InsetVSpace

2003-11-28 Thread Andre Poenitz
On Fri, Nov 28, 2003 at 01:23:37PM +, Angus Leeming wrote: On Friday 28 November 2003 1:12 pm, Angus Leeming wrote: There, I didn't think that it should be so hard. I forgot to 'cvs add' the new files. This patch has everything. Could you please commit the Qt parts yourself? Andre' --

Re: A working InsetVSpace

2003-11-28 Thread Juergen Spitzmueller
Angus Leeming wrote: 5. Qt: I got rid of the VSpace stuff from the Paragraph dialog but have not written QVSpace. Done (patch attached). If noone objects, I'll commit this tomorrow. BTW: - is there any special reason why you have removed keep (i.e. \vspace*) in the xforms dialog? I have

A working InsetVSpace

2003-11-28 Thread Angus Leeming
There, I didn't think that it should be so hard. Things I've changed: 1. stdmenus.ui now dispatches "dialog-show-new-inset vspace" rather than "insert-vspace". LFUN_INSERT_VSPACE no longer exists. Rationale: when I insert a vspace from the menu, I want the dialog to pop up so that I can specify

Re: A working InsetVSpace

2003-11-28 Thread Andre Poenitz
On Fri, Nov 28, 2003 at 01:12:07PM +, Angus Leeming wrote: > There, I didn't think that it should be so hard. Well, it was for me. Thank you. Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson or B.

Re: A working InsetVSpace

2003-11-28 Thread Angus Leeming
On Friday 28 November 2003 1:12 pm, Angus Leeming wrote: > There, I didn't think that it should be so hard. I forgot to 'cvs add' the new files. This patch has everything. Angus vspace.diff.bz2 Description: BZip2 compressed data

Re: A working InsetVSpace

2003-11-28 Thread Andre Poenitz
On Fri, Nov 28, 2003 at 01:23:37PM +, Angus Leeming wrote: > On Friday 28 November 2003 1:12 pm, Angus Leeming wrote: > > There, I didn't think that it should be so hard. > > I forgot to 'cvs add' the new files. This patch has everything. Could you please commit the Qt parts yourself?

Re: A working InsetVSpace

2003-11-28 Thread Juergen Spitzmueller
Angus Leeming wrote: > 5. Qt: I got rid of the VSpace stuff from the Paragraph dialog but have not > written QVSpace. Done (patch attached). If noone objects, I'll commit this tomorrow. BTW: - is there any special reason why you have removed "keep" (i.e. \vspace*) in the xforms dialog? I have