diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-09-22 17:14:56 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-09-24 12:08:26 +0200 |
| commit | e79f1261549d9c497a38ea1af8843a86883b02cd (patch) | |
| tree | 408e9b52591659c531af3a44088049aeeddbffca /external/more_fonts | |
| parent | 57357260250a9f5ae59ea346db03f94f76cce42b (diff) | |
Compensate for loss of Type 1 "Standard Symbols L" substitute for "Symbol"
At least for me on Linux since LO 5.3, 'soffice
sw/qa/extras/rtfexport/data/fdo72031.rtf' shows "Å" (rendered in "DejaVu Sans")
instead of "⊕" (rendered in "Standard Symbols L"). That's presumably because
47ea13ef8dc8ab9aeded6121845e3ebd1d28b292 "Kill the old Unix layout engines"
removed support for Type 1 fonts (see "Ignore Type 1 fonts" in
FontCfgWrapper::addFontSet, vcl/unx/generic/fontmanager/fontconfig.cxx), and my
(Fedora 25) /usr/share/fonts/default/Type1/s050000l.pfb "Standard Symbols L" is
a Type 1 font. So we fell back to fontconfig's generic (weak) suggestion of
"DejaVu Sans" as a substitute for "Symbol".
So extend our fc_local.conf to suggest our "OpenSymbol" as a substitute for
"Symbol".
As that fc_local.conf was originally brought along by --with-fonts, which is
enabled by default but can be disabled, compilation of fc_local.conf from the
various snippets is moved to postprocess.
macOS and Windows were never affected, as they both come with a "Symbol" font
installed in the system. (And we don't install fc_local.conf on Windows at
all.)
Change-Id: I8d6d87f24974577fd66f5f3989f606237ebb3d75
Reviewed-on: https://gerrit.libreoffice.org/42670
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/more_fonts')
| -rw-r--r-- | external/more_fonts/Module_more_fonts.mk | 1 | ||||
| -rw-r--r-- | external/more_fonts/Package_conf.mk | 14 | ||||
| -rw-r--r-- | external/more_fonts/fc_local.snippet (renamed from external/more_fonts/fonts/fc_local.conf) | 6 |
3 files changed, 0 insertions, 21 deletions
diff --git a/external/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk index eb2f3216c57a..6e5224752fe6 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -10,7 +10,6 @@ $(eval $(call gb_Module_Module,more_fonts)) $(eval $(call gb_Module_add_targets,more_fonts,\ - $(if $(filter-out WNT,$(OS)),Package_conf) \ ExternalPackage_caladea \ ExternalPackage_carlito \ ExternalPackage_dejavu \ diff --git a/external/more_fonts/Package_conf.mk b/external/more_fonts/Package_conf.mk deleted file mode 100644 index 2d259c2175c3..000000000000 --- a/external/more_fonts/Package_conf.mk +++ /dev/null @@ -1,14 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_Package_Package,more_fonts_conf,$(SRCDIR)/external/more_fonts/fonts)) - -$(eval $(call gb_Package_add_file,more_fonts_conf,$(LIBO_SHARE_FOLDER)/fonts/truetype/fc_local.conf,fc_local.conf)) - -# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/fonts/fc_local.conf b/external/more_fonts/fc_local.snippet index 6af763c0b0f0..cb49929b0a4a 100644 --- a/external/more_fonts/fonts/fc_local.conf +++ b/external/more_fonts/fc_local.snippet @@ -1,7 +1,3 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "/etc/fonts/conf.d/fonts.dtd"> -<fontconfig> - <!-- Alias similar/metric-compatible families from various sources: --> <alias binding="same"> @@ -31,5 +27,3 @@ <family>Caladea</family> </accept> </alias> - -</fontconfig> |