Uwe Stöhr wrote:
>  revert =  [
> -           [534, [revert_dashligatures]],
> +           [535, [revert_baselineskip]],
> +           [534, [revert_dashligatures, revert_baselineskip]],

why is  revert_baselineskip 2x?

  
> diff --git a/src/frontends/qt4/GuiGraphics.cpp 
> b/src/frontends/qt4/GuiGraphics.cpp
> index 7e4f9ef37b..f05e2846cf 100644
> --- a/src/frontends/qt4/GuiGraphics.cpp
> +++ b/src/frontends/qt4/GuiGraphics.cpp
> @@ -152,6 +152,9 @@ GuiGraphics::GuiGraphics(GuiView & lv)
>       connect(rotateOrderCB, SIGNAL(clicked()),
>               this, SLOT(change_adaptor()));
>  
> +     // remove baselineskip from width units
> +     widthUnit->removeUnit(Length::BLS);
> +
>       filename->setValidator(new PathValidator(true, filename));
>       setFocusProxy(filename);
>  
> diff --git a/src/frontends/qt4/GuiHSpace.cpp b/src/frontends/qt4/GuiHSpace.cpp
> index ad829ecd81..4e7d995fcd 100644
> --- a/src/frontends/qt4/GuiHSpace.cpp
> +++ b/src/frontends/qt4/GuiHSpace.cpp
> @@ -92,6 +92,9 @@ GuiHSpace::GuiHSpace(bool math_mode, QWidget * parent)
>       // initialize the length validator
>       addCheckedWidget(valueLE, valueL);
>       enableWidgets();
> +
> +     // remove baselineskip from units
> +     unitCO->removeUnit(Length::BLS);
>  }
>  
>  
> diff --git a/src/frontends/qt4/GuiTabular.cpp 
> b/src/frontends/qt4/GuiTabular.cpp
> index b021836ac0..4d5f683b38 100644
> --- a/src/frontends/qt4/GuiTabular.cpp
> +++ b/src/frontends/qt4/GuiTabular.cpp
> @@ -167,6 +167,10 @@ GuiTabular::GuiTabular(QWidget * parent)
>       decimalPointED->setInputMask("X; ");
>       decimalPointED->setMaxLength(1);
>  
> +     // remove baselineskip from width units
> +     columnWidthUnitLC->removeUnit(Length::BLS);
> +     tabularWidthUnitLC->removeUnit(Length::BLS);
> +
>       // initialize the length validator
>       addCheckedWidget(columnWidthED, columnWidthLA);
>       addCheckedWidget(multirowOffsetED, multirowOffsetLA);

This is ugly.

Unless you want to be consistent and do it for all 'senseless' combinations of
vert/horiz spacing used in opposite context drop these specific conditions
spilled all over the place.

Pavel

Reply via email to