* 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/

diff --git a/ChangeLog b/ChangeLog
index befd3d7fbc47be6808cc83bc7353c7cf232e4146..64a0b363e1afa1ab74b53d8c4b35c5c14dde6428 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+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.
@@ -15,6 +28,9 @@
 
 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.
 

diff --git a/lily/font-config.cc b/lily/font-config.cc
index ff2cb3f9ab46e28fa7ce2f6a8b3e2c1de08594f7..f46beaffd2442ee876e23f2ec51e69c9e79064b1 100644 (file)
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -26,10 +26,10 @@ init_fontconfig ()
   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++)
     {

diff --git a/lily/main.cc b/lily/main.cc
index 1f4a1a5e3016de284ba53e609a3c1c3be311c9f6..2cd13eb5b05d368a91a0a860b46ffa29555791cc 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -233,7 +233,8 @@ setup_paths ()
 
   /* 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++)

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index a8271110bd8db7c3763a30370a8eb9fc9e0e7af0..a16d2217d9fc3c1fd479ed3f1e8f972d458795c2 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -92,7 +92,7 @@ INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/tex
 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
@@ -107,13 +107,13 @@ INSTALLATION_OUT_FILES5=$(PFA_FILES)
 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)
 
 

diff --git a/scm/font.scm b/scm/font.scm
index d0ffe6565567d250213ead8555bd2309382ff875..90cfcceeef6e0a97e60635200f6c75f9c8f7592d 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -322,7 +322,7 @@
                (font-encoding . latin1) ;; ugh.
                )
              
-             `(,(ly:pt (* factor 12.0))
+             `(,(ly:pt (* factor 11.0))
                . #(,(cons
                     (ly:pt 12)
                     (ly:make-pango-description-string

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 3c954609e837ea32f85cc9f56d099de1738ac1f1..a2c2f53f8701cf5bc80423060690b4e856d63390 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -234,7 +234,13 @@
                       ((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))

diff --git a/stepmake/stepmake/executable-targets.make b/stepmake/stepmake/executable-targets.make
index 0e2c987af43c3f50a671326415c92d5b4b374d0a..edf282ab0a31308bd54f4d2c8704f1207b260781 100644 (file)
--- a/stepmake/stepmake/executable-targets.make
+++ b/stepmake/stepmake/executable-targets.make
@@ -10,8 +10,7 @@ installexe: all
        -$(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