Re: Kornel's example and lyxsize_type

2002-08-13 Thread Kornel Benko

-BEGIN PGP SIGNED MESSAGE-

On Monday 12 August 2002 08:40, Andre Poenitz wrote:
 On Fri, Aug 09, 2002 at 04:29:04PM +0100, Angus Leeming wrote:
   I am not very happy with this. This document is perfectly ok with
   lyx-1.2, as far as I can see. And there are still problems with its
   math-labels and lyx-1.3.
 
  Me neither. A spurious and not-documented file format change.

 With math labels?  There shouldn't be any.

Yes, no problems with math labels any more.

Kornel

- -- 
Kornel Benko
[EMAIL PROTECTED]
-BEGIN PGP SIGNATURE-
Version: PGP 6.5.8

iQCVAwUBPVi/bbewfbDGmeqhAQFxkgQAtFruQK39BAE3Qb/1cLI39LGMKKYfoxbA
w9zDn09gkr0J3AJYRcWFrYSjm8N3xwO4MlZko7h8sUQuFObgO624I5Tgzr+FrU03
70+MIDtPSDuJZhmwgT2vqGGkP8dFw8nCWeA7NPC+DYPa68+RQlzJYgxBgUwJA1Qu
Xa/RRingTk8=
=EIx8
-END PGP SIGNATURE-




Re: Kornel's example and lyxsize_type

2002-08-13 Thread Kornel Benko

-BEGIN PGP SIGNED MESSAGE-

On Monday 12 August 2002 08:40, Andre Poenitz wrote:
> On Fri, Aug 09, 2002 at 04:29:04PM +0100, Angus Leeming wrote:
> > > I am not very happy with this. This document is perfectly ok with
> > > lyx-1.2, as far as I can see. And there are still problems with its
> > > math-labels and lyx-1.3.
> >
> > Me neither. A spurious and not-documented file format change.
>
> With math labels?  There shouldn't be any.

Yes, no problems with math labels any more.

Kornel

- -- 
Kornel Benko
[EMAIL PROTECTED]
-BEGIN PGP SIGNATURE-
Version: PGP 6.5.8

iQCVAwUBPVi/bbewfbDGmeqhAQFxkgQAtFruQK39BAE3Qb/1cLI39LGMKKYfoxbA
w9zDn09gkr0J3AJYRcWFrYSjm8N3xwO4MlZko7h8sUQuFObgO624I5Tgzr+FrU03
70+MIDtPSDuJZhmwgT2vqGGkP8dFw8nCWeA7NPC+DYPa68+RQlzJYgxBgUwJA1Qu
Xa/RRingTk8=
=EIx8
-END PGP SIGNATURE-




Re: Kornel's example and lyxsize_type

2002-08-12 Thread Andre Poenitz

On Fri, Aug 09, 2002 at 04:29:04PM +0100, Angus Leeming wrote:
  I am not very happy with this. This document is perfectly ok with lyx-1.2,
  as far as I can see. And there are still problems with its math-labels and
  lyx-1.3.
 
 Me neither. A spurious and not-documented file format change.

With math labels?  There shouldn't be any.

Andre'

-- 
Those who desire to give up Freedom in order to gain Security,
will not have, nor do they deserve, either one. (T. Jefferson)



Re: Kornel's example and lyxsize_type

2002-08-12 Thread Andre Poenitz

On Fri, Aug 09, 2002 at 04:29:04PM +0100, Angus Leeming wrote:
> > I am not very happy with this. This document is perfectly ok with lyx-1.2,
> > as far as I can see. And there are still problems with its math-labels and
> > lyx-1.3.
> 
> Me neither. A spurious and not-documented file format change.

With math labels?  There shouldn't be any.

Andre'

-- 
Those who desire to give up Freedom in order to gain Security,
will not have, nor do they deserve, either one. (T. Jefferson)



Kornel's example and lyxsize_type

2002-08-09 Thread Angus Leeming

Kornel, I notice that loading up your document gives an error

Unknown token, lyxsize_type, skipping.
Unknown token, 1, skipping.

You should fix this with

sed 's/lyxsize_type/lyxsize_kind/g'  ColMathXLII.lyx  temp
mv temp ColMathXLII.lyx

I know that you can now load the document fine, but you may have others where 
this occurs...

...of course, I still can't load the bugger ;-)

Angus



Re: Kornel's example and lyxsize_type

2002-08-09 Thread Kornel Benko

-BEGIN PGP SIGNED MESSAGE-

On Friday 09 August 2002 14:57, Angus Leeming wrote:
 Kornel, I notice that loading up your document gives an error

 Unknown token, lyxsize_type, skipping.
 Unknown token, 1, skipping.

 You should fix this with

 sed 's/lyxsize_type/lyxsize_kind/g'  ColMathXLII.lyx  temp
 mv temp ColMathXLII.lyx

I am not very happy with this. This document is perfectly ok with lyx-1.2, as far as I 
can see.
And there are still problems with its math-labels and lyx-1.3.

As a consequence this is the output of lyx-1.2:
Token: 'lyxsize_kind'
Unknown token, lyxsize_kind, skipping.
Token: '1'

 I know that you can now load the document fine, but you may have others
 where this occurs...

Yes, and, until now, I have to load the most docs with 1.2 and save before reading 
them with 1.3.

 ...of course, I still can't load the bugger ;-)

Seems to be a pretty good test-file, isn't it?

Kornel

- -- 
Kornel Benko
[EMAIL PROTECTED]
-BEGIN PGP SIGNATURE-
Version: PGP 6.5.8

iQCVAwUBPVPfN7ewfbDGmeqhAQFc9wQAyv70wqD1uSbYy6fZh00RlDfxtP+t8iAb
ChIfTi26+X5JiNhtOi4H9PoDZSuPYkr9lkDTNQ9OJK//83H3q8Fd0gD6FzDBo8q8
1TmGxg3YaITMJq66GY+vZxzrpkU3GEPjNQ24HxpO/syN9JYbd/qI+J9G882Nr6yw
dMhKPsir09k=
=MlQt
-END PGP SIGNATURE-




Re: Kornel's example and lyxsize_type

2002-08-09 Thread Angus Leeming

On Friday 09 August 2002 4:24 pm, Kornel Benko wrote:
 On Friday 09 August 2002 14:57, Angus Leeming wrote:
  Kornel, I notice that loading up your document gives an error
 
  Unknown token, lyxsize_type, skipping.
  Unknown token, 1, skipping.
 
  You should fix this with
 
  sed 's/lyxsize_type/lyxsize_kind/g'  ColMathXLII.lyx  temp
  mv temp ColMathXLII.lyx

 I am not very happy with this. This document is perfectly ok with lyx-1.2,
 as far as I can see. And there are still problems with its math-labels and
 lyx-1.3.

Me neither. A spurious and not-documented file format change.

Angus



Re: Kornel's example and lyxsize_type

2002-08-09 Thread Herbert Voss

Angus Leeming wrote:

 On Friday 09 August 2002 4:24 pm, Kornel Benko wrote:
 
On Friday 09 August 2002 14:57, Angus Leeming wrote:

Kornel, I notice that loading up your document gives an error

Unknown token, lyxsize_type, skipping.
Unknown token, 1, skipping.

You should fix this with

sed 's/lyxsize_type/lyxsize_kind/g'  ColMathXLII.lyx  temp
mv temp ColMathXLII.lyx

I am not very happy with this. This document is perfectly ok with lyx-1.2,
as far as I can see. And there are still problems with its math-labels and
lyx-1.3.

 
 Me neither. A spurious and not-documented file format change.


cool statement ...

http://www.mail-archive.com/lyx-devel%40lists.lyx.org/msg37514.html

and others ...

Herbert


-- 
http://www.lyx.org/help/




Re: Kornel's example and lyxsize_type

2002-08-09 Thread Angus Leeming

On Friday 09 August 2002 5:05 pm, Herbert Voss wrote:
 Angus Leeming wrote:
  On Friday 09 August 2002 4:24 pm, Kornel Benko wrote:
 On Friday 09 August 2002 14:57, Angus Leeming wrote:
 Kornel, I notice that loading up your document gives an error
 
 Unknown token, lyxsize_type, skipping.
 Unknown token, 1, skipping.
 
 You should fix this with
 
 sed 's/lyxsize_type/lyxsize_kind/g'  ColMathXLII.lyx  temp
 mv temp ColMathXLII.lyx
 
 I am not very happy with this. This document is perfectly ok with
  lyx-1.2, as far as I can see. And there are still problems with its
  math-labels and lyx-1.3.
 
  Me neither. A spurious and not-documented file format change.

 cool statement ...

It's not documented by being placed in the mail archive. It's not documented 
unless someone at some future date can deal with the difference between two 
versions of the LyX file format. 

Perhaps, since this one is yours, you'd add something to development/FORMAT?

Angus



Re: Kornel's example and lyxsize_type

2002-08-09 Thread Herbert Voss

Angus Leeming wrote:

 It's not documented by being placed in the mail archive. It's not documented 
 unless someone at some future date can deal with the difference between two 
 versions of the LyX file format. 
 
 Perhaps, since this one is yours, you'd add something to development/FORMAT?


there was no such file! and it's not documented, that someone
created in the meantime such a file ...

Herbert


-- 
http://www.lyx.org/help/




Re: Kornel's example and lyxsize_type

2002-08-09 Thread Angus Leeming

On Friday 09 August 2002 5:50 pm, Herbert Voss wrote:
 Angus Leeming wrote:
  It's not documented by being placed in the mail archive. It's not
  documented unless someone at some future date can deal with the
  difference between two versions of the LyX file format.
 
  Perhaps, since this one is yours, you'd add something to
  development/FORMAT?

 there was no such file! and it's not documented, that someone
 created in the meantime such a file ...

touché!

However, it looks to me like you forgot lyxsize_type when you added the 
compatibility stuff for 1.2.0 on 23 July

http://www.lyx.org/cgi-bin/viewcvs.cgi/lyx-devel/src/insets/insetgraphicsParams.C.diff?r1=texttr1=1.45r2=texttr2=1.46diff_format=h

Do you agree?

I guess therefore that a similar piece of compatibility code is needed for 
lyxsize_type and that both pieces should be documented in development/FORMAT 
so that this code can be stripped out of insetgraphicsParams.C when José 
comes to write lyxconvert_221.py

Angus



Re: Kornel's example and lyxsize_type

2002-08-09 Thread Herbert Voss

Angus Leeming wrote:

 On Friday 09 August 2002 5:50 pm, Herbert Voss wrote:
 
Angus Leeming wrote:

It's not documented by being placed in the mail archive. It's not
documented unless someone at some future date can deal with the
difference between two versions of the LyX file format.

Perhaps, since this one is yours, you'd add something to
development/FORMAT?

there was no such file! and it's not documented, that someone
created in the meantime such a file ...

 
 touché!
 
 However, it looks to me like you forgot lyxsize_type when you added the 
 compatibility stuff for 1.2.0 on 23 July
 
 
http://www.lyx.org/cgi-bin/viewcvs.cgi/lyx-devel/src/insets/insetgraphicsParams.C.diff?r1=texttr1=1.45r2=texttr2=1.46diff_format=h
 
 Do you agree?
 
 I guess therefore that a similar piece of compatibility code is needed for 
 lyxsize_type and that both pieces should be documented in development/FORMAT 
 so that this code can be stripped out of insetgraphicsParams.C when José 
 comes to write lyxconvert_221.py


http://marc.theaimsgroup.com/?l=lyx-develm=102737398526073w=2
http://marc.theaimsgroup.com/?l=lyx-develm=102741383822156w=2

Herbert



-- 
http://www.lyx.org/help/




Re: Kornel's example and lyxsize_type

2002-08-09 Thread Angus Leeming

On Friday 09 August 2002 6:52 pm, Herbert Voss wrote:
 http://marc.theaimsgroup.com/?l=lyx-develm=102737398526073w=2

No, this one is already in.

I'm talking about lyxsize_kind, not size_kind.

Is the attached patch correct? I believe that it will do the trick.

Angus




Index: src/insets/insetgraphicsParams.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetgraphicsParams.C,v
retrieving revision 1.46
diff -u -p -r1.46 insetgraphicsParams.C
--- src/insets/insetgraphicsParams.C	23 Jul 2002 12:20:21 -	1.46
+++ src/insets/insetgraphicsParams.C	9 Aug 2002 18:06:52 -
 -197,6 +197,22  string const getSizeKindStr(InsetGraphic
 	return original;
 }	
 
+// compatibility-stuff 1.20-1.3.0
+InsetGraphicsParams::sizeKind getSizeKind(int type)
+{
+	switch (type) {
+	case 1:
+		return InsetGraphicsParams::WH;
+
+	case 2:
+		return InsetGraphicsParams::SCALE;
+
+	case 0:
+	default:
+		return InsetGraphicsParams::DEFAULT_SIZE;
+	}
+}
+
 } //anon
 
 
 -282,17 +298,7  bool InsetGraphicsParams::Read(LyXLex  
 	// compatibility-stuff 1.20-1.3.0
 	} else if (token == size_type) {
 		lex.next();
-		switch (lex.getInteger()) {
-		case 0:
-			size_kind = DEFAULT_SIZE;
-			break;
-		case 1:
-			size_kind = WH;
-			break;
-		case 2:
-			size_kind = SCALE;
-			break;
-		}
+		size_kind = getSizeKind(lex.getInteger());
 	} else if (token == width) {
 		lex.next();
 		width = LyXLength(lex.getString());
 -315,6 +321,10  bool InsetGraphicsParams::Read(LyXLex  
 	} else if (token == lyxsize_kind) {
 		lex.next();
 		lyxsize_kind = getSizeKind(lex.getString());
+	// compatibility-stuff 1.20-1.3.0
+	} else if (token == lyxsize_type) {
+		lex.next();
+		lyxsize_kind = getSizeKind(lex.getInteger());
 	} else if (token == lyxwidth) {
 		lex.next();
 		lyxwidth = LyXLength(lex.getString());



Re: Kornel's example and lyxsize_type

2002-08-09 Thread Herbert Voss

Angus Leeming wrote:

 On Friday 09 August 2002 6:52 pm, Herbert Voss wrote:
 
http://marc.theaimsgroup.com/?l=lyx-develm=102737398526073w=2

 
 No, this one is already in.
 
 I'm talking about lyxsize_kind, not size_kind.
 
 Is the attached patch correct? I believe that it will do the trick.


http://marc.theaimsgroup.com/?l=lyx-develm=102742975203614w=2

Herbert




-- 
http://www.lyx.org/help/




Re: Kornel's example and lyxsize_type

2002-08-09 Thread Angus Leeming

On Friday 09 August 2002 7:22 pm, Herbert Voss wrote:
 Angus Leeming wrote:
  On Friday 09 August 2002 6:52 pm, Herbert Voss wrote:
 http://marc.theaimsgroup.com/?l=lyx-develm=102737398526073w=2
 
  No, this one is already in.
 
  I'm talking about lyxsize_kind, not size_kind.
 
  Is the attached patch correct? I believe that it will do the trick.

 http://marc.theaimsgroup.com/?l=lyx-develm=102742975203614w=2

Herbert, this is fundamentally incompatible with the existing code which 
reads a string for size_kind.

} else if (token == size_kind)  {
lex.next();
size_kind = getSizeKind(lex.getString());

So, let me ask again, does the patch I sent you fix the problem? I believe it 
does, but am rapidly reaching the don't care point.

Angus



Re: Kornel's example and lyxsize_type

2002-08-09 Thread Herbert Voss

Angus Leeming wrote:

 So, let me ask again, does the patch I sent you fix the problem? I believe it 
 does, but am rapidly reaching the don't care point.


I can't see any problem


Herbert


-- 
http://www.lyx.org/help/




Re: Kornel's example and lyxsize_type

2002-08-09 Thread Angus Leeming

On Friday 09 August 2002 7:39 pm, Herbert Voss wrote:
 Angus Leeming wrote:
  So, let me ask again, does the patch I sent you fix the problem? I
  believe it does, but am rapidly reaching the don't care point.

 I can't see any problem

Let me spell it out then:

LyX 1.3 does not parse the lyxsize_type token that was present in Kornel's 
file.

It parse's the size_type token because of the patch of yours that Jean-Marc 
applied to insetgraphicsParams.C on 23 July.

You appear to have forgotten lyxsize_kind when you made that particular patch.

All other patches you've pointed out to me in the last half our are 
incompatible with the current code base.

I've asked you, politely, if the patch I posted to you 10 mins ago would fix 
this oversight, since you are 
a) the  guy who changed the file format
b) worried about user problems as you deal with then regularly on the LyX 
User list.

As you can't see the problem, I'll leave things as they are and allow you to 
field the inevitable questions.

Good night.
Angus



Re: Kornel's example and lyxsize_type

2002-08-09 Thread Herbert Voss

Angus Leeming wrote:

 On Friday 09 August 2002 7:39 pm, Herbert Voss wrote:
 
Angus Leeming wrote:

So, let me ask again, does the patch I sent you fix the problem? I
believe it does, but am rapidly reaching the don't care point.

I can't see any problem


I meant your patch ...

Herbert


-- 
http://www.lyx.org/help/




Kornel's example and lyxsize_type

2002-08-09 Thread Angus Leeming

Kornel, I notice that loading up your document gives an error

Unknown token, lyxsize_type, skipping.
Unknown token, 1, skipping.

You should "fix" this with

sed 's/lyxsize_type/lyxsize_kind/g' < ColMathXLII.lyx > temp
mv temp ColMathXLII.lyx

I know that you can now load the document fine, but you may have others where 
this occurs...

...of course, I still can't load the bugger ;-)

Angus



Re: Kornel's example and lyxsize_type

2002-08-09 Thread Kornel Benko

-BEGIN PGP SIGNED MESSAGE-

On Friday 09 August 2002 14:57, Angus Leeming wrote:
> Kornel, I notice that loading up your document gives an error
>
> Unknown token, lyxsize_type, skipping.
> Unknown token, 1, skipping.
>
> You should "fix" this with
>
> sed 's/lyxsize_type/lyxsize_kind/g' < ColMathXLII.lyx > temp
> mv temp ColMathXLII.lyx
>
I am not very happy with this. This document is perfectly ok with lyx-1.2, as far as I 
can see.
And there are still problems with its math-labels and lyx-1.3.

As a consequence this is the output of lyx-1.2:
Token: 'lyxsize_kind'
Unknown token, lyxsize_kind, skipping.
Token: '1'

> I know that you can now load the document fine, but you may have others
> where this occurs...

Yes, and, until now, I have to load the most docs with 1.2 and save before reading 
them with 1.3.

> ...of course, I still can't load the bugger ;-)

Seems to be a pretty good test-file, isn't it?

Kornel

- -- 
Kornel Benko
[EMAIL PROTECTED]
-BEGIN PGP SIGNATURE-
Version: PGP 6.5.8

iQCVAwUBPVPfN7ewfbDGmeqhAQFc9wQAyv70wqD1uSbYy6fZh00RlDfxtP+t8iAb
ChIfTi26+X5JiNhtOi4H9PoDZSuPYkr9lkDTNQ9OJK//83H3q8Fd0gD6FzDBo8q8
1TmGxg3YaITMJq66GY+vZxzrpkU3GEPjNQ24HxpO/syN9JYbd/qI+J9G882Nr6yw
dMhKPsir09k=
=MlQt
-END PGP SIGNATURE-




Re: Kornel's example and lyxsize_type

2002-08-09 Thread Angus Leeming

On Friday 09 August 2002 4:24 pm, Kornel Benko wrote:
> On Friday 09 August 2002 14:57, Angus Leeming wrote:
> > Kornel, I notice that loading up your document gives an error
> >
> > Unknown token, lyxsize_type, skipping.
> > Unknown token, 1, skipping.
> >
> > You should "fix" this with
> >
> > sed 's/lyxsize_type/lyxsize_kind/g' < ColMathXLII.lyx > temp
> > mv temp ColMathXLII.lyx
>
> I am not very happy with this. This document is perfectly ok with lyx-1.2,
> as far as I can see. And there are still problems with its math-labels and
> lyx-1.3.

Me neither. A spurious and not-documented file format change.

Angus



Re: Kornel's example and lyxsize_type

2002-08-09 Thread Herbert Voss

Angus Leeming wrote:

> On Friday 09 August 2002 4:24 pm, Kornel Benko wrote:
> 
>>On Friday 09 August 2002 14:57, Angus Leeming wrote:
>>
>>>Kornel, I notice that loading up your document gives an error
>>>
>>>Unknown token, lyxsize_type, skipping.
>>>Unknown token, 1, skipping.
>>>
>>>You should "fix" this with
>>>
>>>sed 's/lyxsize_type/lyxsize_kind/g' < ColMathXLII.lyx > temp
>>>mv temp ColMathXLII.lyx
>>>
>>I am not very happy with this. This document is perfectly ok with lyx-1.2,
>>as far as I can see. And there are still problems with its math-labels and
>>lyx-1.3.
>>
> 
> Me neither. A spurious and not-documented file format change.


cool statement ...

http://www.mail-archive.com/lyx-devel%40lists.lyx.org/msg37514.html

and others ...

Herbert


-- 
http://www.lyx.org/help/




Re: Kornel's example and lyxsize_type

2002-08-09 Thread Angus Leeming

On Friday 09 August 2002 5:05 pm, Herbert Voss wrote:
> Angus Leeming wrote:
> > On Friday 09 August 2002 4:24 pm, Kornel Benko wrote:
> >>On Friday 09 August 2002 14:57, Angus Leeming wrote:
> >>>Kornel, I notice that loading up your document gives an error
> >>>
> >>>Unknown token, lyxsize_type, skipping.
> >>>Unknown token, 1, skipping.
> >>>
> >>>You should "fix" this with
> >>>
> >>>sed 's/lyxsize_type/lyxsize_kind/g' < ColMathXLII.lyx > temp
> >>>mv temp ColMathXLII.lyx
> >>
> >>I am not very happy with this. This document is perfectly ok with
> >> lyx-1.2, as far as I can see. And there are still problems with its
> >> math-labels and lyx-1.3.
> >
> > Me neither. A spurious and not-documented file format change.
>
> cool statement ...

It's not documented by being placed in the mail archive. It's not documented 
unless someone at some future date can "deal" with the difference between two 
versions of the LyX file format. 

Perhaps, since this one is yours, you'd add something to development/FORMAT?

Angus



Re: Kornel's example and lyxsize_type

2002-08-09 Thread Herbert Voss

Angus Leeming wrote:

> It's not documented by being placed in the mail archive. It's not documented 
> unless someone at some future date can "deal" with the difference between two 
> versions of the LyX file format. 
> 
> Perhaps, since this one is yours, you'd add something to development/FORMAT?


there was no such file! and it's not documented, that someone
created in the meantime such a file ...

Herbert


-- 
http://www.lyx.org/help/




Re: Kornel's example and lyxsize_type

2002-08-09 Thread Angus Leeming

On Friday 09 August 2002 5:50 pm, Herbert Voss wrote:
> Angus Leeming wrote:
> > It's not documented by being placed in the mail archive. It's not
> > documented unless someone at some future date can "deal" with the
> > difference between two versions of the LyX file format.
> >
> > Perhaps, since this one is yours, you'd add something to
> > development/FORMAT?
>
> there was no such file! and it's not documented, that someone
> created in the meantime such a file ...

touché!

However, it looks to me like you forgot lyxsize_type when you added the 
compatibility stuff for 1.2.0 on 23 July

http://www.lyx.org/cgi-bin/viewcvs.cgi/lyx-devel/src/insets/insetgraphicsParams.C.diff?r1=text=1.45=text=1.46_format=h

Do you agree?

I guess therefore that a similar piece of compatibility code is needed for 
lyxsize_type and that both pieces should be documented in development/FORMAT 
so that this code can be stripped out of insetgraphicsParams.C when José 
comes to write lyxconvert_221.py

Angus



Re: Kornel's example and lyxsize_type

2002-08-09 Thread Herbert Voss

Angus Leeming wrote:

> On Friday 09 August 2002 5:50 pm, Herbert Voss wrote:
> 
>>Angus Leeming wrote:
>>
>>>It's not documented by being placed in the mail archive. It's not
>>>documented unless someone at some future date can "deal" with the
>>>difference between two versions of the LyX file format.
>>>
>>>Perhaps, since this one is yours, you'd add something to
>>>development/FORMAT?
>>>
>>there was no such file! and it's not documented, that someone
>>created in the meantime such a file ...
>>
> 
> touché!
> 
> However, it looks to me like you forgot lyxsize_type when you added the 
> compatibility stuff for 1.2.0 on 23 July
> 
> 
>http://www.lyx.org/cgi-bin/viewcvs.cgi/lyx-devel/src/insets/insetgraphicsParams.C.diff?r1=text=1.45=text=1.46_format=h
> 
> Do you agree?
> 
> I guess therefore that a similar piece of compatibility code is needed for 
> lyxsize_type and that both pieces should be documented in development/FORMAT 
> so that this code can be stripped out of insetgraphicsParams.C when José 
> comes to write lyxconvert_221.py


http://marc.theaimsgroup.com/?l=lyx-devel=102737398526073=2
http://marc.theaimsgroup.com/?l=lyx-devel=102741383822156=2

Herbert



-- 
http://www.lyx.org/help/




Re: Kornel's example and lyxsize_type

2002-08-09 Thread Angus Leeming

On Friday 09 August 2002 6:52 pm, Herbert Voss wrote:
> http://marc.theaimsgroup.com/?l=lyx-devel=102737398526073=2

No, this one is already in.

I'm talking about lyxsize_kind, not size_kind.

Is the attached patch correct? I believe that it will do the trick.

Angus




Index: src/insets/insetgraphicsParams.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetgraphicsParams.C,v
retrieving revision 1.46
diff -u -p -r1.46 insetgraphicsParams.C
--- src/insets/insetgraphicsParams.C	23 Jul 2002 12:20:21 -	1.46
+++ src/insets/insetgraphicsParams.C	9 Aug 2002 18:06:52 -
@@ -197,6 +197,22 @@ string const getSizeKindStr(InsetGraphic
 	return "original";
 }	
 
+// compatibility-stuff 1.20->1.3.0
+InsetGraphicsParams::sizeKind getSizeKind(int type)
+{
+	switch (type) {
+	case 1:
+		return InsetGraphicsParams::WH;
+
+	case 2:
+		return InsetGraphicsParams::SCALE;
+
+	case 0:
+	default:
+		return InsetGraphicsParams::DEFAULT_SIZE;
+	}
+}
+
 } //anon
 
 
@@ -282,17 +298,7 @@ bool InsetGraphicsParams::Read(LyXLex & 
 	// compatibility-stuff 1.20->1.3.0
 	} else if (token == "size_type") {
 		lex.next();
-		switch (lex.getInteger()) {
-		case 0:
-			size_kind = DEFAULT_SIZE;
-			break;
-		case 1:
-			size_kind = WH;
-			break;
-		case 2:
-			size_kind = SCALE;
-			break;
-		}
+		size_kind = getSizeKind(lex.getInteger());
 	} else if (token == "width") {
 		lex.next();
 		width = LyXLength(lex.getString());
@@ -315,6 +321,10 @@ bool InsetGraphicsParams::Read(LyXLex & 
 	} else if (token == "lyxsize_kind") {
 		lex.next();
 		lyxsize_kind = getSizeKind(lex.getString());
+	// compatibility-stuff 1.20->1.3.0
+	} else if (token == "lyxsize_type") {
+		lex.next();
+		lyxsize_kind = getSizeKind(lex.getInteger());
 	} else if (token == "lyxwidth") {
 		lex.next();
 		lyxwidth = LyXLength(lex.getString());



Re: Kornel's example and lyxsize_type

2002-08-09 Thread Herbert Voss

Angus Leeming wrote:

> On Friday 09 August 2002 6:52 pm, Herbert Voss wrote:
> 
>>http://marc.theaimsgroup.com/?l=lyx-devel=102737398526073=2
>>
> 
> No, this one is already in.
> 
> I'm talking about lyxsize_kind, not size_kind.
> 
> Is the attached patch correct? I believe that it will do the trick.


http://marc.theaimsgroup.com/?l=lyx-devel=102742975203614=2

Herbert




-- 
http://www.lyx.org/help/




Re: Kornel's example and lyxsize_type

2002-08-09 Thread Angus Leeming

On Friday 09 August 2002 7:22 pm, Herbert Voss wrote:
> Angus Leeming wrote:
> > On Friday 09 August 2002 6:52 pm, Herbert Voss wrote:
> >>http://marc.theaimsgroup.com/?l=lyx-devel=102737398526073=2
> >
> > No, this one is already in.
> >
> > I'm talking about lyxsize_kind, not size_kind.
> >
> > Is the attached patch correct? I believe that it will do the trick.
>
> http://marc.theaimsgroup.com/?l=lyx-devel=102742975203614=2

Herbert, this is fundamentally incompatible with the existing code which 
reads a string for size_kind.

} else if (token == "size_kind")  {
lex.next();
size_kind = getSizeKind(lex.getString());

So, let me ask again, does the patch I sent you fix the problem? I believe it 
does, but am rapidly reaching the "don't care" point.

Angus



Re: Kornel's example and lyxsize_type

2002-08-09 Thread Herbert Voss

Angus Leeming wrote:

> So, let me ask again, does the patch I sent you fix the problem? I believe it 
> does, but am rapidly reaching the "don't care" point.


I can't see any problem


Herbert


-- 
http://www.lyx.org/help/




Re: Kornel's example and lyxsize_type

2002-08-09 Thread Angus Leeming

On Friday 09 August 2002 7:39 pm, Herbert Voss wrote:
> Angus Leeming wrote:
> > So, let me ask again, does the patch I sent you fix the problem? I
> > believe it does, but am rapidly reaching the "don't care" point.
>
> I can't see any problem

Let me spell it out then:

LyX 1.3 does not parse the lyxsize_type token that was present in Kornel's 
file.

It parse's the size_type token because of the patch of yours that Jean-Marc 
applied to insetgraphicsParams.C on 23 July.

You appear to have forgotten lyxsize_kind when you made that particular patch.

All other patches you've pointed out to me in the last half our are 
incompatible with the current code base.

I've asked you, politely, if the patch I posted to you 10 mins ago would fix 
this oversight, since you are 
a) the  guy who changed the file format
b) worried about user problems as you deal with then regularly on the LyX 
User list.

As you can't see the problem, I'll leave things as they are and allow you to 
field the inevitable questions.

Good night.
Angus



Re: Kornel's example and lyxsize_type

2002-08-09 Thread Herbert Voss

Angus Leeming wrote:

> On Friday 09 August 2002 7:39 pm, Herbert Voss wrote:
> 
>>Angus Leeming wrote:
>>
>>>So, let me ask again, does the patch I sent you fix the problem? I
>>>believe it does, but am rapidly reaching the "don't care" point.
>>>
>>I can't see any problem


I meant your patch ...

Herbert


-- 
http://www.lyx.org/help/