5f4a65b7a3
Originally this was at 8%, but long ago for some reason that I couldn't find, it was changed to match superscript's 33%. This primarily affects UI for editeng. 33% was completely wrong. It puts the subscript WAY too low. The font's descent is only 20% of the total font height, so to lower the character by 33% pushes it below the line instead of towards the bottom of the line. Many export fixes that match the formula which calculated the values for DFLT_ESC_AUTO_* were made to LO6.4 for tdf#127316. Changing this default suprisingly has almost no effect. Import and export do not depend on a specific escapement to determine whether to treat it as automatic or not. That is generally handled with special keywords, or in the case of RTF with a +1 on the nPROP value. Writerfilter's use is in a never-to-be-encountered failsafe edge-case. HTML's import is affected, but for the good, so I made it into a unit test. Primarily it affects the UI dialog - suggesting 8% when automatic checkbox is cleared, and the biggest impact comes with the toolbar button for Draw/Impress which don't set "automatic" mode, so they just take the DFLT_ESC_SUB value. Looks much better now. And that was the heart of the bug report - that editeng defaults for subscript were way off. Change-Id: I6769072d483467e86fea82dfc534eb5e04802491 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88910 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org>
97 lines
3.7 KiB
C++
97 lines
3.7 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
#ifndef INCLUDED_EDITENG_ESCAPEMENTITEM_HXX
|
|
#define INCLUDED_EDITENG_ESCAPEMENTITEM_HXX
|
|
|
|
#include <svl/cenumitm.hxx>
|
|
#include <editeng/svxenum.hxx>
|
|
#include <editeng/editengdllapi.h>
|
|
|
|
// class SvxEscapementItem -----------------------------------------------
|
|
|
|
#define DFLT_ESC_SUPER 33 // 42% (100 - DFLT_ESC_PROP) of ascent (~80% of font height) = 33% of total font height
|
|
#define DFLT_ESC_SUB -8 // 42% of descent (~20% of font height) = -8%. previously -33% (pre-2020), previously 8/100 (pre-2000?)
|
|
#define DFLT_ESC_PROP 58
|
|
#define MAX_ESC_POS 13999
|
|
#define DFLT_ESC_AUTO_SUPER (MAX_ESC_POS+1)
|
|
#define DFLT_ESC_AUTO_SUB -DFLT_ESC_AUTO_SUPER
|
|
|
|
/* [Description]
|
|
|
|
This item describes the writing position.
|
|
*/
|
|
|
|
class EDITENG_DLLPUBLIC SvxEscapementItem final : public SfxEnumItemInterface
|
|
{
|
|
short nEsc;
|
|
sal_uInt8 nProp;
|
|
public:
|
|
static SfxPoolItem* CreateDefault();
|
|
|
|
explicit SvxEscapementItem( const sal_uInt16 nId );
|
|
SvxEscapementItem( const SvxEscapement eEscape,
|
|
const sal_uInt16 nId );
|
|
SvxEscapementItem( const short nEsc, const sal_uInt8 nProp,
|
|
const sal_uInt16 nId );
|
|
|
|
// "pure virtual Methods" from SfxPoolItem
|
|
virtual bool operator==( const SfxPoolItem& ) const override;
|
|
virtual bool GetPresentation( SfxItemPresentation ePres,
|
|
MapUnit eCoreMetric,
|
|
MapUnit ePresMetric,
|
|
OUString &rText, const IntlWrapper& ) const override;
|
|
|
|
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
|
|
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
|
|
|
|
virtual SvxEscapementItem* Clone( SfxItemPool *pPool = nullptr ) const override;
|
|
|
|
void SetEscapement( const SvxEscapement eNew )
|
|
{
|
|
if( SvxEscapement::Off == eNew )
|
|
{
|
|
nEsc = 0;
|
|
nProp = 100;
|
|
}
|
|
else
|
|
{
|
|
nProp = DFLT_ESC_PROP;
|
|
if( SvxEscapement::Superscript == eNew )
|
|
nEsc = DFLT_ESC_SUPER;
|
|
else
|
|
nEsc = DFLT_ESC_SUB;
|
|
}
|
|
}
|
|
SvxEscapement GetEscapement() const { return static_cast< SvxEscapement >( GetEnumValue() ); }
|
|
|
|
short &GetEsc() { return nEsc; }
|
|
short GetEsc() const { return nEsc; }
|
|
|
|
sal_uInt8 &GetProportionalHeight() { return nProp; }
|
|
sal_uInt8 GetProportionalHeight() const { return nProp; }
|
|
|
|
virtual sal_uInt16 GetValueCount() const override;
|
|
static OUString GetValueTextByPos( sal_uInt16 nPos );
|
|
virtual sal_uInt16 GetEnumValue() const override;
|
|
virtual void SetEnumValue( sal_uInt16 nNewVal ) override;
|
|
};
|
|
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|