Hi,
Attached is the patch for the new graphics dialog. Please check; test; and apply if OK.
Few remarks concerning backwards compatibility:
(see also patch to development/FORMAT)
1) Compatibility is certainly broken for the old lyxwidth/lyxheight keywords.
They don't exist anymore and we can't/shouldn't translate them into a scaling
value,
while we're reading the graphics inset. The old lyxwidth/lyxheight keyword and its
argument is ignored and lost.
2) The remaining keywords have sufficient overlap with the old ones for a
smooth reading of the 1.2.x inset keywords in most common cases.
3) For Dekel: lyx2lyx should catch a few odd cases, where values are provided for scale
or width/height, but also size_kind is set to another entry, e.g:
size_kind original
width 5in
height 10in
scale 60
The new code will end-up with setting of the last entry, i.e. scale to 60 percent.
Same problem with lyxsize_kind vs. lyxscale.
lyx2lyx has to catch the following cases:
------------------------------------------------------------------------------
old-token new-token remove
------------------------------------------------------------------------------
size_kind original / size_type 0 scale 100 width <val>
height <val>
scale <val>
size_kind width_height / size_type 1 - scale <val>
lyxsize_kind original / lyxsize_type 0 lyxscale 100 lyxscale <val>
------------------------------------------------------------------------------
[replace old-token by new-token, and remove any of subsequent tokens as listed]
If "rotate" is absent, lyx2lyx should ignore "rotateAngle <val>":
if ( "rotateAngle <val>" is there WITHOUT being preceded by the keyword
"rotate" )
then
replace "rotateAngle <val>" by "rotateAngle 0"
That's all.
Cheers,
Rob.
NewGraphicsDialog.diff.gz
Description: application/gzip
