fonts/{otf,type1,cff} to path.
* lily/main.cc (setup_paths): add fonts/{otf,svg,tfm,cff} to path
* mf/GNUmakefile (Module): install all fonts under otf/
* scm/framework-ps.scm (Module): read fonts from fonts/extension,
replace /fonts/otf/ by /ps/
+2005-03-09 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+ * lily/font-config.cc (init_fontconfig): add
+ fonts/{otf,type1,cff} to path.
+
+ * lily/main.cc (setup_paths): add fonts/{otf,svg,tfm,cff} to path
+
+ * mf/GNUmakefile (Module): install all fonts under otf/
+
+ * scm/framework-ps.scm (Module): read fonts from fonts/extension,
+ replace /fonts/otf/ by /ps/
+
+
2005-03-09 Jan Nieuwenhuizen <janneke@gnu.org>
* lily/paper-book.cc (classic_output): Reinstate header_0_ hack.
2005-03-09 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ * stepmake/stepmake/executable-targets.make (installexe): don't
+ strip installed executables
+
* lily/font-select.cc (get_font_by_design_size): revert
pango_description_string as well.
FcConfig *fcc = FcConfigGetCurrent ();
Array<String> dirs;
- dirs.push (prefix_directory + "/otf/");
+ dirs.push (prefix_directory + "/fonts/otf/");
dirs.push (prefix_directory + "/mf/out/");
- dirs.push (prefix_directory + "/type1/");
- dirs.push (prefix_directory + "/cff/");
+ dirs.push (prefix_directory + "/fonts/type1/");
+ dirs.push (prefix_directory + "/fonts/cff/");
for (int i = 0; i < dirs.size (); i++)
{
/* Adding mf/out make lilypond unchanged source directory, when setting
LILYPONDPREFIX to lilypond-x.y.z */
- char *suffixes[] = {"ly", "cff", "otf", "mf/out", "scm", "tfm", "ps", "svg",
+ char *suffixes[] = {"ly", "fonts/cff", "fonts/otf", "mf/out", "scm",
+ "fonts/tfm", "ps", "fonts/svg",
0};
for (char **s = suffixes; *s; s++)
INSTALLATION_OUT_FILES1=$(TEXTABLES)
# must not be installed with .cff, pango/fontconfig does not like .cff fonts
-INSTALLATION_OUT_DIR2=$(local_lilypond_datadir)/otf
+INSTALLATION_OUT_DIR2=$(local_lilypond_datadir)/fonts/otf
INSTALLATION_OUT_FILES2=$(OTF_FILES)
INSTALLATION_OUT_DIR3=$(local_lilypond_datadir)/fonts/tfm
INSTALLATION_OUT_DIR6=$(local_lilypond_datadir)/fonts/map
INSTALLATION_OUT_FILES6=$(outdir)/lilypond.map
-INSTALLATION_OUT_DIR7=$(local_lilypond_datadir)/cff/
+INSTALLATION_OUT_DIR7=$(local_lilypond_datadir)/fonts/cff/
INSTALLATION_OUT_FILES7=$(CFF_FILES)
INSTALLATION_OUT_DIR7=$(local_lilypond_datadir)/ps/
INSTALLATION_OUT_FILES7=$(ENC_FILES)
-INSTALLATION_OUT_DIR9=$(local_lilypond_datadir)/svg
+INSTALLATION_OUT_DIR9=$(local_lilypond_datadir)/fonts/svg
INSTALLATION_OUT_FILES9=$(SVG_FILES)
(font-encoding . latin1) ;; ugh.
)
- `(,(ly:pt (* factor 12.0))
+ `(,(ly:pt (* factor 11.0))
. #(,(cons
(ly:pt 12)
(ly:make-pango-description-string
((and bare-file-name
(string-match "\\.(otf|cff)" bare-file-name))
- (cached-file-contents (string-regexp-substitute "(otf|cff)" "cff.ps" bare-file-name)))
+ (for-each (lambda (tup) (set! bare-file-name
+ (string-regexp-substitute (car tup) (cdr tup) bare-file-name)))
+ '(("/fonts/otf/" . "/ps/")
+ ("/fonts/cff/" . "/cff/")
+ ("\\.(otf|cff)" . ".cff.ps")))
+
+ (cached-file-contents bare-file-name))
((and bare-file-name (string-match "\\.ttf" bare-file-name))
(ly:ttf->pfa bare-file-name))
(bare-file-name (cached-file-contents bare-file-name))
-$(INSTALL) -d $(DESTDIR)$(bindir)
$(foreach a, $(EXECUTABLES), \
$(INSTALL) -m 755 $(outdir)/$(a) \
- $(DESTDIR)$(bindir)/$(program_prefix)$(a)$(program_suffix) && \
- strip $(bindir)/$(program_prefix)$(a)$(program_suffix) && ) true
+ $(DESTDIR)$(bindir)/$(program_prefix)$(a)$(program_suffix) && ) true
$(foreach a, $(SEXECUTABLES), \
$(INSTALL) -m 755 $(outdir)/$(a) $(DESTDIR)$(bindir) &&) true