* lily/staff-spacing.cc: move same-direction-correction to note-spacing-interface

* lily/font-config.cc (init_fontconfig): add operator pacification
message.

diff --git a/ChangeLog b/ChangeLog
index 7dbb9690a6a7b5d0ea0f457ccb80c4beba35605d..07e6c15e3a9cc607555a464c060d250cac0389d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-04-06  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/staff-spacing.cc: move same-direction-correction to note-spacing-interface
+
        * scm/lily.scm (lilypond-main): use variable argument count for
        exception handler.
 

diff --git a/lily/font-config.cc b/lily/font-config.cc
index 531a76df7643d65738f82f870494f5d53b69cb40..08378da3a7ac736d9052fa5ab1a258dc177d3f4b 100644 (file)
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -11,7 +11,7 @@
 #ifdef HAVE_FONTCONFIG
 
 #include <fontconfig/fontconfig.h>
-
+#include <sys/stat.h>
 #include "file-path.hh"
 #include "main.hh"
 #include "warn.hh"
@@ -28,8 +28,9 @@ init_fontconfig ()
   FcConfig *fcc = FcConfigGetCurrent ();
 
   Array<String> dirs;
-  dirs.push (prefix_directory + "/fonts/otf/");
   dirs.push (prefix_directory + "/mf/out/");
+  
+  dirs.push (prefix_directory + "/fonts/otf/");
   dirs.push (prefix_directory + "/fonts/type1/");
   dirs.push (prefix_directory + "/fonts/cff/");
 

diff --git a/lily/note-spacing.cc b/lily/note-spacing.cc
index ac1942ed12c9bbda61f8be4966d32493bd5f914e..9e34006967f78a9429317ade4ebd8ada16f0803f 100644 (file)
--- a/lily/note-spacing.cc
+++ b/lily/note-spacing.cc
@@ -440,5 +440,5 @@ Note_spacing::stem_dir_correction (Grob *me, Item *rcolumn,
 
 ADD_INTERFACE (Note_spacing, "note-spacing-interface",
               "This object calculates spacing wishes for individual voices.",
-              "left-items right-items stem-spacing-correction knee-spacing-correction");
+              "left-items right-items stem-spacing-correction same-direction-correction knee-spacing-correction");
 

diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc
index 4aed2ddb2b36cea3768c710fe1f6b8602ed1aaf8..90e6882ea2614d61e583893e55acfecaa4950061 100644 (file)
--- a/lily/staff-spacing.cc
+++ b/lily/staff-spacing.cc
@@ -238,4 +238,4 @@ ADD_INTERFACE (Staff_spacing, "staff-spacing-interface",
               "This object calculates spacing details from a "
               " breakable symbol (left) to another object. For example, it takes care "
               " of  optical spacing from  a bar lines to a note.",
-              "same-direction-correction stem-spacing-correction left-items right-items");
+              "stem-spacing-correction left-items right-items");