Re: [LyX/master] Properly define MultiPar status of caption in the layout definition.

2015-03-12 Thread Jürgen Spitzmüller
2015-03-11 21:07 GMT+01:00 Georg Baum: > Sorry, my fault. I did not check whether the old tex2lyx output was > correct, > but simply assumed that. You are of course right, and your change did also > fix a previously not known tex2lyx bug. When you integrate this into branch > please run > > make u

Re: [LyX/master] Properly define MultiPar status of caption in the layout definition.

2015-03-12 Thread Georg Baum
Juergen Spitzmueller wrote: > commit 9d824a04d11c3223db26d2fe146e86e90a432a6e > Author: Juergen Spitzmueller > Date: Tue Mar 10 18:31:55 2015 +0100 > > Properly define MultiPar status of caption in the layout definition. > > Also remove hardcoded paragraph break disabling. >

Re: [LyX/master] Properly define MultiPar status of caption in the layout definition.

2015-03-11 Thread Georg Baum
Georg Baum wrote: > I still need to investigate why the old tex2lyx output was wrong (I > suspect that it will be wrong in other places as well). Found it. The reason was that InsetCaption uses a hard coded plain layout for the InsetText constructor, and this was not consistent with the old cap

Re: [LyX/master] Properly define MultiPar status of caption in the layout definition.

2015-03-11 Thread Georg Baum
Jürgen Spitzmüller wrote: > Georg Baum wrote: > >> The tex2lyx tests fail now because captions produce "Plain Layout" >> instead of "Standard". If this is wanted then a file format change and >> lyx2lyx conversion are missing. If the plain layout is an unwanted side >> effect then some other fix

Re: [LyX/master] Properly define MultiPar status of caption in the layout definition.

2015-03-11 Thread Jürgen Spitzmüller
Georg Baum wrote: > The tex2lyx tests fail now because captions produce "Plain Layout" instead > of "Standard". If this is wanted then a file format change and lyx2lyx > conversion are missing. If the plain layout is an unwanted side effect then > some other fix is needed. > I do not understand.

Re: [LyX/master] Properly define MultiPar status of caption in the layout definition.

2015-03-10 Thread Richard Heck
On 03/10/2015 04:08 PM, Georg Baum wrote: Juergen Spitzmueller wrote: commit 9d824a04d11c3223db26d2fe146e86e90a432a6e Author: Juergen Spitzmueller Date: Tue Mar 10 18:31:55 2015 +0100 Properly define MultiPar status of caption in the layout definition. Also remove hardcoded