Jean-Marc Lasgouttes wrote: > Juergen> The major (multicolumn) bug was a new regression in 1.3 Bug > Juergen> 572 is a rather minor annoyance. It's not urgent, but I could > Juergen> backport it if requested. > > So we can live without it, then. However, if you do it, I'll apply it.
Here it comes. Please apply the the second patch to 1.3, it fixes a stupid typo introduced by /me (with fix for bug 572). thanks, Jürgen.
Index: src/frontends/xforms/ChangeLog =================================================================== RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/ChangeLog,v retrieving revision 1.381.2.27 diff -u -r1.381.2.27 ChangeLog --- src/frontends/xforms/ChangeLog 2002/12/19 11:02:04 1.381.2.27 +++ src/frontends/xforms/ChangeLog 2003/01/07 08:00:29 @@ -1,3 +1,7 @@ +2003-01-07 Juergen Spitzmueller <[EMAIL PROTECTED]> + + * FormTabular.C: fix bug 572. + 2002-12-18 Juergen Spitzmueller <[EMAIL PROTECTED]> * xforms_helpers.C: (updateWidgetsFromLength) Index: src/frontends/xforms/FormTabular.C =================================================================== RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/FormTabular.C,v retrieving revision 1.46 diff -u -r1.46 FormTabular.C --- src/frontends/xforms/FormTabular.C 2002/03/21 21:18:03 1.46 +++ src/frontends/xforms/FormTabular.C 2003/01/07 08:00:31 @@ -232,12 +232,16 @@ } pwidth = tabular->GetMColumnPWidth(cell); align = tabular->GetAlignment(cell); - if (!pwidth.zero() || (align == LYX_ALIGN_LEFT)) - fl_set_button(cell_options_->radio_align_left, 1); - else if (align == LYX_ALIGN_RIGHT) + // set the horiz. alignment, default is left here + fl_set_button(cell_options_->radio_align_left, 0); + fl_set_button(cell_options_->radio_align_right, 0); + fl_set_button(cell_options_->radio_align_center, 0); + if (!pwidth.zero() || (align == LYX_ALIGN_RIGHT)) fl_set_button(cell_options_->radio_align_right, 1); - else + else if (align == LYX_ALIGN_CENTER) fl_set_button(cell_options_->radio_align_center, 1); + else + fl_set_button(cell_options_->radio_align_left, 1); align = tabular->GetVAlignment(cell); fl_set_button(cell_options_->radio_valign_top, 0);
Index: src/frontends/xforms/ChangeLog =================================================================== RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/ChangeLog,v retrieving revision 1.648 diff -u -r1.648 ChangeLog --- src/frontends/xforms/ChangeLog 2003/01/06 14:02:22 1.648 +++ src/frontends/xforms/ChangeLog 2003/01/07 08:19:18 @@ -1,3 +1,7 @@ +2002-01-07 Jürgen Spitzmüller <[EMAIL PROTECTED]> + + * FormTabular.C: typo. + 2003-01-06 Michael Schmitt <[EMAIL PROTECTED]> * FormGraphics.C: Index: src/frontends/xforms/FormTabular.C =================================================================== RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/FormTabular.C,v retrieving revision 1.64 diff -u -r1.64 FormTabular.C --- src/frontends/xforms/FormTabular.C 2003/01/06 14:02:22 1.64 +++ src/frontends/xforms/FormTabular.C 2003/01/07 08:19:20 @@ -189,9 +189,9 @@ pwidth = tabular->GetMColumnPWidth(cell); align = tabular->GetAlignment(cell); // set the horiz. alignment, default is left here - fl_set_button(column_options_->radio_align_left, 0); - fl_set_button(column_options_->radio_align_right, 0); - fl_set_button(column_options_->radio_align_center, 0); + fl_set_button(cell_options_->radio_align_left, 0); + fl_set_button(cell_options_->radio_align_right, 0); + fl_set_button(cell_options_->radio_align_center, 0); if (align == LYX_ALIGN_RIGHT) fl_set_button(cell_options_->radio_align_right, 1); else if (align == LYX_ALIGN_CENTER)
