* lily/tuplet-bracket.cc (calc_positions): multiply with

staff-space for beam case. This fixes tuplets+beams on scaled
staves.

* config.hh.in: remove all Kpathsea related defines.

* lily/dot-column.cc (side_position): reach stem via dots->
head->stem. Inspect all stems for dot collisions.

diff --git a/ChangeLog b/ChangeLog
index b6cb5d0f774639f6eaeaed3fd6eb74c8fe89bd95..eb35424092438f31b9e5d7b0157700d6cf1353ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-02-15  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/tuplet-bracket.cc (calc_positions): multiply with
+       staff-space for beam case. This fixes tuplets+beams on scaled
+       staves.
+
+       * config.hh.in: remove all Kpathsea related defines.
+
        * lily/dot-column.cc (side_position): reach stem via dots->
        head->stem. Inspect all stems for dot collisions. 
 

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index 12afb9dab1ea47dddede15c566e8943475652025..dd7f37e520ef8dc476628a152e710ee3508cfbb9 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -63,6 +63,7 @@ which scares away people.
 * only show user-visible changes. 
 
 @end ignore
+
 @item Newly created contexts may also be named with the following
 syntax,
 

diff --git a/config.hh.in b/config.hh.in
index 7b90ae3444685265d32a46ce701dd08243a15d55..47a83f2831e554c8965ea321223c68bbe431abe7 100644 (file)
--- a/config.hh.in
+++ b/config.hh.in
@@ -55,21 +55,9 @@
 /* define if you have yyFlexLexer.yy_current_buffer */
 #undef HAVE_FLEXLEXER_YY_CURRENT_BUFFER
 
-/* define if you want KPATHSEA */
-#define KPATHSEA @KPATHSEA@
-
 /* define if you have grp header */
 #define HAVE_GRP_H 0
 
-/* define if you have kpatsea header */
-#define HAVE_KPATHSEA_KPATHSEA_H 0
-
-/* define if you have kpse_find_file */
-#define HAVE_KPSE_FIND_FILE 0
-
-/* define if you have kpse_find_tfm */
-#define HAVE_KPSE_FIND_TFM 0
-
 /* define if you have pwd header */
 #define HAVE_PWD_H 0
 
@@ -110,8 +98,5 @@
 /* define if you have pango FT2 binding */
 #define HAVE_PANGO_FT2 0
 
-/* define if you have libkpathsea.so */
-#define HAVE_LIBKPATHSEA_SO 0
-
 /* define if you have utf8/wchar.h */
 #define HAVE_UTF8_WCHAR_H 0

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index 1248b9cd6be1ae0368e559b9fcf85ef07e79d258..8246f400f9400ef2a13a0e76505b7b0036e423ce 100644 (file)
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -644,9 +644,6 @@ Tuplet_bracket::calc_positions (SCM smob)
       Real lp = scm_to_double (scm_car (ps));
       Real rp = scm_to_double (scm_cdr (ps));
 
-      /*
-       duh. magic.
-      */
       Real ss = Staff_symbol_referencer::staff_space (me);
       
       offset = lp + dir * (0.5 + scm_to_double (me->get_property ("padding")));

diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 49e8a20d6e6bdfc7f1d75fc5d2a9fe5cdb191282..fcd6efa237ce5132a0464ee8e3f217a35a7ee289 100644 (file)
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -481,6 +481,7 @@ function is to protect objects from being garbage collected.")
      (direction-source ,ly:grob? "in case side-relative-direction is
 set, which grob to get the direction from .")
      (dot ,ly:grob? "reference to Dots object.")
+     (dots ,ly:grob-array? "multiple Dots objects.")
      (figures ,ly:grob-array? "Figured bass objects for continuation line.")
      (glyph-name ,string? "a name of character within font.")
      (pedal-text ,ly:grob? "Pointer to the text of a mixed-style piano pedal.")