CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/06/17 12:34:07
Modified files:
. : ChangeLog
Documentation/user: introduction.itely lily-flat-bw.png
lily : font-config.cc
mf : GNUmakefile
Log message:
($(outdir)/fonts.cache-1): create font cache for
outdir.
(install-fc-cache): insatll font cache in installation directories.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3793&tr2=1.3794&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/introduction.itely.diff?tr1=1.140&tr2=1.141&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/lily-flat-bw.png.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/font-config.cc.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/mf/GNUmakefile.diff?tr1=1.166&tr2=1.167&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3793 lilypond/ChangeLog:1.3794
--- lilypond/ChangeLog:1.3793 Fri Jun 17 08:14:00 2005
+++ lilypond/ChangeLog Fri Jun 17 12:34:06 2005
@@ -1,3 +1,9 @@
+2005-06-17 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* scm/editor.scm (editor-command-template-alist): Use char iso
Index: lilypond/Documentation/user/introduction.itely
diff -u lilypond/Documentation/user/introduction.itely:1.140
lilypond/Documentation/user/introduction.itely:1.141
--- lilypond/Documentation/user/introduction.itely:1.140 Thu May 26
19:15:08 2005
+++ lilypond/Documentation/user/introduction.itely Fri Jun 17 12:34:06 2005
@@ -58,23 +58,23 @@
@item @tab
@ifnotinfo
@iftex
[EMAIL PROTECTED],4cm}
[EMAIL PROTECTED],,8cm}
@end iftex
@ifnottex
[EMAIL PROTECTED],,,png}
[EMAIL PROTECTED],,,png}
@end ifnottex
@tab
@iftex
[EMAIL PROTECTED],4cm}
[EMAIL PROTECTED],,8.4cm}
@end iftex
@ifnottex
[EMAIL PROTECTED],,,png}
[EMAIL PROTECTED],,,png}
@end ifnottex
@tab
@iftex
[EMAIL PROTECTED],4cm}
[EMAIL PROTECTED],,8cm}
@end iftex
@ifnottex
@image{lily-flat-bw,,,png}
Index: lilypond/Documentation/user/lily-flat-bw.png
Index: lilypond/lily/font-config.cc
diff -u lilypond/lily/font-config.cc:1.21 lilypond/lily/font-config.cc:1.22
--- lilypond/lily/font-config.cc:1.21 Thu May 26 00:09:54 2005
+++ lilypond/lily/font-config.cc Fri Jun 17 12:34:07 2005
@@ -16,6 +16,8 @@
#include "main.hh"
#include "warn.hh"
+FcConfig *font_config_global = 0;
+
void
init_fontconfig ()
{
@@ -23,22 +25,11 @@
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<String> dirs;
struct stat statbuf;
String builddir = prefix_directory + "/mf/out/";
@@ -55,7 +46,7 @@
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 ()));
Index: lilypond/mf/GNUmakefile
diff -u lilypond/mf/GNUmakefile:1.166 lilypond/mf/GNUmakefile:1.167
--- lilypond/mf/GNUmakefile:1.166 Sat Jun 11 13:40:52 2005
+++ lilypond/mf/GNUmakefile Fri Jun 17 12:34:07 2005
@@ -125,13 +125,20 @@
$(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
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
