From 4516c9ff0c6b1cfc9b0245486a37a90cf487318e Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 17 Jun 2005 12:34:07 +0000 Subject: [PATCH] ($(outdir)/fonts.cache-1): create font cache for outdir. (install-fc-cache): insatll font cache in installation directories. --- ChangeLog | 6 ++++++ Documentation/user/introduction.itely | 10 +++++----- Documentation/user/lily-flat-bw.png | Bin 1997 -> 4620 bytes lily/font-config.cc | 19 +++++-------------- mf/GNUmakefile | 9 ++++++++- 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 745aef39b1..7866304e39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-06-17 Han-Wen Nienhuys + + * mf/GNUmakefile ($(outdir)/fonts.cache-1): create font cache for + outdir. + (install-fc-cache): insatll font cache in installation directories. + 2005-06-17 Jan Nieuwenhuizen * scm/editor.scm (editor-command-template-alist): Use char iso diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely index fdae1d65dc..39fad96e90 100644 --- a/Documentation/user/introduction.itely +++ b/Documentation/user/introduction.itely @@ -58,23 +58,23 @@ computer edition. @item @tab @ifnotinfo @iftex -@image{henle-flat-bw,4cm} +@image{henle-flat-gray,,8cm} @end iftex @ifnottex -@image{henle-flat-bw,,,png} +@image{henle-flat-gray,,,png} @end ifnottex @tab @iftex -@image{baer-flat-bw,4cm} +@image{baer-flat-gray,,8.4cm} @end iftex @ifnottex -@image{baer-flat-bw,,,png} +@image{baer-flat-gray,,,png} @end ifnottex @tab @iftex -@image{lily-flat-bw,4cm} +@image{lily-flat-bw,,8cm} @end iftex @ifnottex @image{lily-flat-bw,,,png} diff --git a/Documentation/user/lily-flat-bw.png b/Documentation/user/lily-flat-bw.png index 23de1a42033f5c5bd95bd007ae7b99e4a464a7cf..b67c626a475bc918cc4b06b0ae8846cca95934af 100644 GIT binary patch literal 4620 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 diff --git a/lily/font-config.cc b/lily/font-config.cc index 8954c809f4..2c1dfb0a34 100644 --- a/lily/font-config.cc +++ b/lily/font-config.cc @@ -16,6 +16,8 @@ #include "main.hh" #include "warn.hh" +FcConfig *font_config_global = 0; + void init_fontconfig () { @@ -23,22 +25,11 @@ init_fontconfig () message (_ ("Initializing FontConfig...")); if (!FcInit ()) - error (_ ("initializing FontConfig")); - - FcConfig *fcc = FcConfigGetCurrent (); + error (_ ("initializing FontConfig failed")); -#if 0 - /* - Hmm. the cache is always out of date??! - */ - FcChar8 *cache = FcConfigGetCache (fcc); - if (!FcDirCacheValid (cache)) - { - warning (_ ("FontConfig cache out of date. Rebuilding may take some time.")); - } -#endif + font_config_global = FcConfigGetCurrent (); Array dirs; struct stat statbuf; String builddir = prefix_directory + "/mf/out/"; @@ -55,7 +46,7 @@ init_fontconfig () for (int i = 0; i < dirs.size (); i++) { String dir = dirs[i]; - if (!FcConfigAppFontAddDir (fcc, (FcChar8 *)dir.to_str0 ())) + if (!FcConfigAppFontAddDir (font_config_global, (FcChar8 *)dir.to_str0 ())) error (_f ("adding font directory: %s", dir.to_str0 ())); else if (be_verbose_global) message (_f ("adding font directory: %s", dir.to_str0 ())); diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 00076c5f62..cee0de6fa6 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -125,13 +125,20 @@ $(outdir)/aybabtu.subfonts: $(PE_SCRIPTS): $(buildscript-dir)/gen-emmentaler-scripts.py $(PYTHON) $< --dir=$(outdir) +$(outdir)/fonts.cache-1: $(PFA_OTF_FILES) $(PFA_FILES) $(OTF_FILES) + cd $(outdir) ; fc-cache . + +local-install: install-fc-cache + +install-fc-cache: + fc-cache $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff))) ALL_FONTS = $(FETA_FONTS) $(SAUTER_FONTS) PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa) $(PFA_OTF_FILES) # Make tfm files first, log files last, # so that normally log files aren't made twice -ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(FETA_LIST_FILES) $(OTF_TABLES) $(PFA_FILES) $(OTF_FILES) $(SVG_FILES) +ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(FETA_LIST_FILES) $(OTF_TABLES) $(PFA_FILES) $(OTF_FILES) $(SVG_FILES) $(outdir)/font.cache-1 #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)" INSTALLATION_DIR=$(local_lilypond_datadir)/fonts/source -- 2.39.2