From 6ae13c5fc5b28efeb1f6b75d4f6574bae20af37c Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Mon, 3 Jul 2023 10:56:31 +0300 Subject: Rename and move header next to other font headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I5485817b5a6c2e9538ed6fb00893663d09e7fa26 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153869 Tested-by: Jenkins Reviewed-by: خالد حسني --- vcl/headless/svptext.cxx | 2 +- vcl/inc/font/FontMetricData.hxx | 156 +++++++++++++++++++++++++++++ vcl/inc/font/LogicalFontInstance.hxx | 2 +- vcl/inc/headless/svpgdi.hxx | 2 +- vcl/inc/impfontmetricdata.hxx | 156 ----------------------------- vcl/inc/quartz/salgdi.h | 2 +- vcl/inc/salgdi.hxx | 2 +- vcl/inc/unx/glyphcache.hxx | 2 +- vcl/quartz/salgdi.cxx | 2 +- vcl/source/font/fontmetric.cxx | 2 +- vcl/unx/generic/gdi/freetypetextrender.cxx | 2 +- vcl/unx/generic/print/genpspgraphics.cxx | 2 +- vcl/win/gdi/salfont.cxx | 2 +- 13 files changed, 167 insertions(+), 167 deletions(-) create mode 100644 vcl/inc/font/FontMetricData.hxx delete mode 100644 vcl/inc/impfontmetricdata.hxx (limited to 'vcl') diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx index 427504fe18ea..297523b8b356 100644 --- a/vcl/headless/svptext.cxx +++ b/vcl/headless/svptext.cxx @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include void SvpSalGraphics::SetFont(LogicalFontInstance* pIFSD, int nFallbackLevel) diff --git a/vcl/inc/font/FontMetricData.hxx b/vcl/inc/font/FontMetricData.hxx new file mode 100644 index 000000000000..000a5a250bbd --- /dev/null +++ b/vcl/inc/font/FontMetricData.hxx @@ -0,0 +1,156 @@ +/* -*- 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 . + */ + +#pragma once + +#include + +#include +#include +#include +#include + +#include + +class FontMetricData; +typedef tools::SvRef FontMetricDataRef; + +class OutputDevice; +namespace vcl::font +{ +class FontSelectPattern; +} +class LogicalFontInstance; + +class VCL_DLLPUBLIC FontMetricData final : public FontAttributes, public SvRefBase +{ +public: + explicit FontMetricData( const vcl::font::FontSelectPattern& ); + + // font instance attributes from the font request + tools::Long GetWidth() const { return mnWidth; } + Degree10 GetOrientation() const { return mnOrientation; } + + void SetWidth(tools::Long nWidth) { mnWidth=nWidth; } + void SetOrientation(Degree10 nOrientation) { mnOrientation=nOrientation; } + + // font metrics measured for the font instance + tools::Long GetAscent() const { return mnAscent; } + tools::Long GetDescent() const { return mnDescent; } + tools::Long GetInternalLeading() const { return mnIntLeading; } + tools::Long GetExternalLeading() const { return mnExtLeading; } + int GetSlant() const { return mnSlant; } + tools::Long GetMinKashida() const { return mnMinKashida; } + tools::Long GetHangingBaseline() const { return mnHangingBaseline; } + + void SetSlant(int nSlant) { mnSlant=nSlant; } + void SetMinKashida( tools::Long nMinKashida ) { mnMinKashida=nMinKashida; } + + // font attributes queried from the font instance + bool IsFullstopCentered() const { return mbFullstopCentered; } + tools::Long GetBulletOffset() const { return mnBulletOffset; } + + void SetFullstopCenteredFlag(bool bFullstopCentered) { mbFullstopCentered = bFullstopCentered; } + + // font metrics that are usually derived from the measurements + tools::Long GetUnderlineSize() const { return mnUnderlineSize; } + tools::Long GetUnderlineOffset() const { return mnUnderlineOffset; } + tools::Long GetBoldUnderlineSize() const { return mnBUnderlineSize; } + tools::Long GetBoldUnderlineOffset() const { return mnBUnderlineOffset; } + tools::Long GetDoubleUnderlineSize() const { return mnDUnderlineSize; } + tools::Long GetDoubleUnderlineOffset1() const { return mnDUnderlineOffset1; } + tools::Long GetDoubleUnderlineOffset2() const { return mnDUnderlineOffset2; } + tools::Long GetWavelineUnderlineSize() const { return mnWUnderlineSize; } + tools::Long GetWavelineUnderlineOffset() const { return mnWUnderlineOffset; } + tools::Long GetAboveUnderlineSize() const { return mnAboveUnderlineSize; } + tools::Long GetAboveUnderlineOffset() const { return mnAboveUnderlineOffset; } + tools::Long GetAboveBoldUnderlineSize() const { return mnAboveBUnderlineSize; } + tools::Long GetAboveBoldUnderlineOffset() const { return mnAboveBUnderlineOffset; } + tools::Long GetAboveDoubleUnderlineSize() const { return mnAboveDUnderlineSize; } + tools::Long GetAboveDoubleUnderlineOffset1() const { return mnAboveDUnderlineOffset1; } + tools::Long GetAboveDoubleUnderlineOffset2() const { return mnAboveDUnderlineOffset2; } + tools::Long GetAboveWavelineUnderlineSize() const { return mnAboveWUnderlineSize; } + tools::Long GetAboveWavelineUnderlineOffset() const { return mnAboveWUnderlineOffset; } + tools::Long GetStrikeoutSize() const { return mnStrikeoutSize; } + tools::Long GetStrikeoutOffset() const { return mnStrikeoutOffset; } + tools::Long GetBoldStrikeoutSize() const { return mnBStrikeoutSize; } + tools::Long GetBoldStrikeoutOffset() const { return mnBStrikeoutOffset; } + tools::Long GetDoubleStrikeoutSize() const { return mnDStrikeoutSize; } + tools::Long GetDoubleStrikeoutOffset1() const { return mnDStrikeoutOffset1; } + tools::Long GetDoubleStrikeoutOffset2() const { return mnDStrikeoutOffset2; } + + void ImplInitTextLineSize( const OutputDevice* pDev ); + void ImplInitAboveTextLineSize( const OutputDevice* pDev ); + void ImplInitFlags( const OutputDevice* pDev ); + void ImplCalcLineSpacing(LogicalFontInstance *pFontInstance); + void ImplInitBaselines(LogicalFontInstance *pFontInstance); + +private: + bool ShouldNotUseUnderlineMetrics() const; + bool ImplInitTextLineSizeHarfBuzz(LogicalFontInstance *pFontInstance); + bool ShouldUseWinMetrics(int, int, int, int, int, int) const; + + // font instance attributes from the font request + tools::Long mnHeight; // Font size + tools::Long mnWidth; // Reference Width + Degree10 mnOrientation; // Rotation in 1/10 degrees + + // font metrics measured for the font instance + tools::Long mnAscent; // Ascent + tools::Long mnDescent; // Descent + tools::Long mnIntLeading; // Internal Leading + tools::Long mnExtLeading; // External Leading + int mnSlant; // Slant (Italic/Oblique) + tools::Long mnMinKashida; // Minimal width of kashida (Arabic) + tools::Long mnHangingBaseline; // Offset of hanging baseline to Romn baseline + + // font attributes queried from the font instance + bool mbFullstopCentered; + tools::Long mnBulletOffset; // Offset to position non-print character + + // font metrics that are usually derived from the measurements + tools::Long mnUnderlineSize; // Lineheight of Underline + tools::Long mnUnderlineOffset; // Offset from Underline to Baseline + tools::Long mnBUnderlineSize; // Height of bold underline + tools::Long mnBUnderlineOffset; // Offset from bold underline to baseline + tools::Long mnDUnderlineSize; // Height of double underline + tools::Long mnDUnderlineOffset1; // Offset from double underline to baseline + tools::Long mnDUnderlineOffset2; // Offset from double underline to baseline + tools::Long mnWUnderlineSize; // Height of WaveLine underline + tools::Long mnWUnderlineOffset; // Offset from WaveLine underline to baseline, but centrered to WaveLine + tools::Long mnAboveUnderlineSize; // Height of single underline (for Vertical Right) + tools::Long mnAboveUnderlineOffset; // Offset from single underline to baseline (for Vertical Right) + tools::Long mnAboveBUnderlineSize; // Height of bold underline (for Vertical Right) + tools::Long mnAboveBUnderlineOffset; // Offset from bold underline to baseline (for Vertical Right) + tools::Long mnAboveDUnderlineSize; // Height of double underline (for Vertical Right) + tools::Long mnAboveDUnderlineOffset1; // Offset from double underline to baseline (for Vertical Right) + tools::Long mnAboveDUnderlineOffset2; // Offset from double underline to baseline (for Vertical Right) + tools::Long mnAboveWUnderlineSize; // Height of WaveLine-strike-out (for Vertical Right) + tools::Long mnAboveWUnderlineOffset; // Offset from WaveLine-strike-out to baseline, but centrered to the WaveLine (for Vertical Right) + tools::Long mnStrikeoutSize; // Height of single strike-out + tools::Long mnStrikeoutOffset; // Offset from single strike-out to baseline + tools::Long mnBStrikeoutSize; // Height of bold strike-out + tools::Long mnBStrikeoutOffset; // Offset of bold strike-out to baseline + tools::Long mnDStrikeoutSize; // Height of double strike-out + tools::Long mnDStrikeoutOffset1; // Offset of double strike-out to baseline + tools::Long mnDStrikeoutOffset2; // Offset of double strike-out to baseline + +}; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/font/LogicalFontInstance.hxx b/vcl/inc/font/LogicalFontInstance.hxx index a50df83d7c48..2261246b069b 100644 --- a/vcl/inc/font/LogicalFontInstance.hxx +++ b/vcl/inc/font/LogicalFontInstance.hxx @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index 5164a71cc51d..d341c1f8b2f9 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include diff --git a/vcl/inc/impfontmetricdata.hxx b/vcl/inc/impfontmetricdata.hxx deleted file mode 100644 index d4b44bb60101..000000000000 --- a/vcl/inc/impfontmetricdata.hxx +++ /dev/null @@ -1,156 +0,0 @@ -/* -*- 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 . - */ - -#pragma once - -#include - -#include -#include -#include -#include "fontattributes.hxx" - -#include - -class FontMetricData; -typedef tools::SvRef FontMetricDataRef; - -class OutputDevice; -namespace vcl::font -{ -class FontSelectPattern; -} -class LogicalFontInstance; - -class VCL_DLLPUBLIC FontMetricData final : public FontAttributes, public SvRefBase -{ -public: - explicit FontMetricData( const vcl::font::FontSelectPattern& ); - - // font instance attributes from the font request - tools::Long GetWidth() const { return mnWidth; } - Degree10 GetOrientation() const { return mnOrientation; } - - void SetWidth(tools::Long nWidth) { mnWidth=nWidth; } - void SetOrientation(Degree10 nOrientation) { mnOrientation=nOrientation; } - - // font metrics measured for the font instance - tools::Long GetAscent() const { return mnAscent; } - tools::Long GetDescent() const { return mnDescent; } - tools::Long GetInternalLeading() const { return mnIntLeading; } - tools::Long GetExternalLeading() const { return mnExtLeading; } - int GetSlant() const { return mnSlant; } - tools::Long GetMinKashida() const { return mnMinKashida; } - tools::Long GetHangingBaseline() const { return mnHangingBaseline; } - - void SetSlant(int nSlant) { mnSlant=nSlant; } - void SetMinKashida( tools::Long nMinKashida ) { mnMinKashida=nMinKashida; } - - // font attributes queried from the font instance - bool IsFullstopCentered() const { return mbFullstopCentered; } - tools::Long GetBulletOffset() const { return mnBulletOffset; } - - void SetFullstopCenteredFlag(bool bFullstopCentered) { mbFullstopCentered = bFullstopCentered; } - - // font metrics that are usually derived from the measurements - tools::Long GetUnderlineSize() const { return mnUnderlineSize; } - tools::Long GetUnderlineOffset() const { return mnUnderlineOffset; } - tools::Long GetBoldUnderlineSize() const { return mnBUnderlineSize; } - tools::Long GetBoldUnderlineOffset() const { return mnBUnderlineOffset; } - tools::Long GetDoubleUnderlineSize() const { return mnDUnderlineSize; } - tools::Long GetDoubleUnderlineOffset1() const { return mnDUnderlineOffset1; } - tools::Long GetDoubleUnderlineOffset2() const { return mnDUnderlineOffset2; } - tools::Long GetWavelineUnderlineSize() const { return mnWUnderlineSize; } - tools::Long GetWavelineUnderlineOffset() const { return mnWUnderlineOffset; } - tools::Long GetAboveUnderlineSize() const { return mnAboveUnderlineSize; } - tools::Long GetAboveUnderlineOffset() const { return mnAboveUnderlineOffset; } - tools::Long GetAboveBoldUnderlineSize() const { return mnAboveBUnderlineSize; } - tools::Long GetAboveBoldUnderlineOffset() const { return mnAboveBUnderlineOffset; } - tools::Long GetAboveDoubleUnderlineSize() const { return mnAboveDUnderlineSize; } - tools::Long GetAboveDoubleUnderlineOffset1() const { return mnAboveDUnderlineOffset1; } - tools::Long GetAboveDoubleUnderlineOffset2() const { return mnAboveDUnderlineOffset2; } - tools::Long GetAboveWavelineUnderlineSize() const { return mnAboveWUnderlineSize; } - tools::Long GetAboveWavelineUnderlineOffset() const { return mnAboveWUnderlineOffset; } - tools::Long GetStrikeoutSize() const { return mnStrikeoutSize; } - tools::Long GetStrikeoutOffset() const { return mnStrikeoutOffset; } - tools::Long GetBoldStrikeoutSize() const { return mnBStrikeoutSize; } - tools::Long GetBoldStrikeoutOffset() const { return mnBStrikeoutOffset; } - tools::Long GetDoubleStrikeoutSize() const { return mnDStrikeoutSize; } - tools::Long GetDoubleStrikeoutOffset1() const { return mnDStrikeoutOffset1; } - tools::Long GetDoubleStrikeoutOffset2() const { return mnDStrikeoutOffset2; } - - void ImplInitTextLineSize( const OutputDevice* pDev ); - void ImplInitAboveTextLineSize( const OutputDevice* pDev ); - void ImplInitFlags( const OutputDevice* pDev ); - void ImplCalcLineSpacing(LogicalFontInstance *pFontInstance); - void ImplInitBaselines(LogicalFontInstance *pFontInstance); - -private: - bool ShouldNotUseUnderlineMetrics() const; - bool ImplInitTextLineSizeHarfBuzz(LogicalFontInstance *pFontInstance); - bool ShouldUseWinMetrics(int, int, int, int, int, int) const; - - // font instance attributes from the font request - tools::Long mnHeight; // Font size - tools::Long mnWidth; // Reference Width - Degree10 mnOrientation; // Rotation in 1/10 degrees - - // font metrics measured for the font instance - tools::Long mnAscent; // Ascent - tools::Long mnDescent; // Descent - tools::Long mnIntLeading; // Internal Leading - tools::Long mnExtLeading; // External Leading - int mnSlant; // Slant (Italic/Oblique) - tools::Long mnMinKashida; // Minimal width of kashida (Arabic) - tools::Long mnHangingBaseline; // Offset of hanging baseline to Romn baseline - - // font attributes queried from the font instance - bool mbFullstopCentered; - tools::Long mnBulletOffset; // Offset to position non-print character - - // font metrics that are usually derived from the measurements - tools::Long mnUnderlineSize; // Lineheight of Underline - tools::Long mnUnderlineOffset; // Offset from Underline to Baseline - tools::Long mnBUnderlineSize; // Height of bold underline - tools::Long mnBUnderlineOffset; // Offset from bold underline to baseline - tools::Long mnDUnderlineSize; // Height of double underline - tools::Long mnDUnderlineOffset1; // Offset from double underline to baseline - tools::Long mnDUnderlineOffset2; // Offset from double underline to baseline - tools::Long mnWUnderlineSize; // Height of WaveLine underline - tools::Long mnWUnderlineOffset; // Offset from WaveLine underline to baseline, but centrered to WaveLine - tools::Long mnAboveUnderlineSize; // Height of single underline (for Vertical Right) - tools::Long mnAboveUnderlineOffset; // Offset from single underline to baseline (for Vertical Right) - tools::Long mnAboveBUnderlineSize; // Height of bold underline (for Vertical Right) - tools::Long mnAboveBUnderlineOffset; // Offset from bold underline to baseline (for Vertical Right) - tools::Long mnAboveDUnderlineSize; // Height of double underline (for Vertical Right) - tools::Long mnAboveDUnderlineOffset1; // Offset from double underline to baseline (for Vertical Right) - tools::Long mnAboveDUnderlineOffset2; // Offset from double underline to baseline (for Vertical Right) - tools::Long mnAboveWUnderlineSize; // Height of WaveLine-strike-out (for Vertical Right) - tools::Long mnAboveWUnderlineOffset; // Offset from WaveLine-strike-out to baseline, but centrered to the WaveLine (for Vertical Right) - tools::Long mnStrikeoutSize; // Height of single strike-out - tools::Long mnStrikeoutOffset; // Offset from single strike-out to baseline - tools::Long mnBStrikeoutSize; // Height of bold strike-out - tools::Long mnBStrikeoutOffset; // Offset of bold strike-out to baseline - tools::Long mnDStrikeoutSize; // Height of double strike-out - tools::Long mnDStrikeoutOffset1; // Offset of double strike-out to baseline - tools::Long mnDStrikeoutOffset2; // Offset of double strike-out to baseline - -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index 4b5faaab7c81..06b9b08b431d 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -48,7 +48,7 @@ #include -#include +#include #include #include diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index b273eab6434d..debdd34bb00f 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -23,7 +23,7 @@ #include -#include "impfontmetricdata.hxx" +#include "font/FontMetricData.hxx" #include "salgdiimpl.hxx" #include "sallayout.hxx" #include "SalGradient.hxx" diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx index dcb3c2be9361..cd8f31ef0df2 100644 --- a/vcl/inc/unx/glyphcache.hxx +++ b/vcl/inc/unx/glyphcache.hxx @@ -34,7 +34,7 @@ #include #include -#include +#include #include diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index 333f55113c2f..4af4b28ffa2c 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx index 0667dddf31ec..da927c8b4bb2 100644 --- a/vcl/source/font/fontmetric.cxx +++ b/vcl/source/font/fontmetric.cxx @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/vcl/unx/generic/gdi/freetypetextrender.cxx b/vcl/unx/generic/gdi/freetypetextrender.cxx index 75fa18146dd7..3a6891c7f8a8 100644 --- a/vcl/unx/generic/gdi/freetypetextrender.cxx +++ b/vcl/unx/generic/gdi/freetypetextrender.cxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx index 6cf66ac49aa3..24d0515c3b03 100644 --- a/vcl/unx/generic/print/genpspgraphics.cxx +++ b/vcl/unx/generic/print/genpspgraphics.cxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx index 37afd63123b8..f4a3029a454f 100644 --- a/vcl/win/gdi/salfont.cxx +++ b/vcl/win/gdi/salfont.cxx @@ -71,7 +71,7 @@ #include #include #include -#include +#include #include #if HAVE_FEATURE_SKIA -- cgit