vcl/source/gdi/CommonSalLayout.cxx | 6 ++++++ 1 file changed, 6 insertions(+)
New commits: commit 82ec493928ae35d224ffdc735fd8e427c390610c Author: Caolán McNamara <[email protected]> AuthorDate: Tue Jun 22 17:13:39 2021 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Thu Jun 24 11:00:04 2021 +0200 disable ligatures for monospace fonts we don't want e.g. a ffi ligature for Courier/Nimbus Mono PS Change-Id: I292c6e2ea217b511b4affcd8dab4a4bda85ab5da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117644 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> (cherry picked from commit 744e964619b5c49870ceab7f59daf1272f24cf75) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117713 Reviewed-by: Michael Stahl <[email protected]> diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx index 998e07169c51..3ff45ef722b7 100644 --- a/vcl/source/gdi/CommonSalLayout.cxx +++ b/vcl/source/gdi/CommonSalLayout.cxx @@ -333,6 +333,12 @@ bool GenericSalLayout::LayoutText(ImplLayoutArgs& rArgs, const SalLayoutGlyphs* maFeatures.push_back({ HB_TAG('k','e','r','n'), 0, 0, static_cast<unsigned int>(-1) }); } + if (rFontSelData.GetPitch() == PITCH_FIXED) + { + SAL_INFO("vcl.harfbuzz", "Disabling ligatures for font: " << rFontSelData.maTargetName); + maFeatures.push_back({ HB_TAG('l','i','g','a'), 0, 0, static_cast<unsigned int>(-1) }); + } + ParseFeatures(rFontSelData.maTargetName); double nXScale = 0; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
