summaryrefslogtreecommitdiff
path: root/lily/include
diff options
context:
space:
mode:
authorJan Nieuwenhuizen <janneke@gnu.org>2000-08-13 15:50:59 +0200
committerJan Nieuwenhuizen <janneke@gnu.org>2000-08-13 15:50:59 +0200
commit51f16c19ef686979a6a36709226ec6022eb86c0a (patch)
tree0ba475ad461333af092f6e2e2bbb14178954f5d4 /lily/include
parent4f6b4a6446a913f89760e63b7f65c8bdb223a3a5 (diff)
patch::: 1.3.77.jcn2
* fixed problem with HaraKiri * fixed problem with dynamicDirection * fixed problem with nonEmptyText --- Generated by janneke@gnu.org, From = lilypond-1.3.77.jcn1, To = lilypond-1.3.77.jcn2 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.77.jcn2.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure
Diffstat (limited to 'lily/include')
-rw-r--r--lily/include/hara-kiri-group-spanner.hh5
-rw-r--r--lily/include/score-element.hh2
2 files changed, 7 insertions, 0 deletions
diff --git a/lily/include/hara-kiri-group-spanner.hh b/lily/include/hara-kiri-group-spanner.hh
index b2ddc79a08..9f42879107 100644
--- a/lily/include/hara-kiri-group-spanner.hh
+++ b/lily/include/hara-kiri-group-spanner.hh
@@ -24,11 +24,16 @@
items-worth-living -- list of interesting items. If empty in a particular system,
clear this line
+
+ todo: naming
*/
class Hara_kiri_group_spanner
{
public:
static Real force_hara_kiri_callback (Score_element * , Axis);
+ static Interval y_extent (Score_element * , Axis);
+ static Real force_hara_kiri_in_parent_callback (Score_element * , Axis);
+ static void add_element (Score_element *me, Score_element *e);
static void set_interface (Score_element*me);
static bool has_interface (Score_element*);
static void consider_suicide (Score_element*me);
diff --git a/lily/include/score-element.hh b/lily/include/score-element.hh
index 85ff5e8774..f1a86dee28 100644
--- a/lily/include/score-element.hh
+++ b/lily/include/score-element.hh
@@ -187,9 +187,11 @@ public:
Score_element*common_refpoint (Score_element const* s, Axis a) const;
Score_element*common_refpoint (SCM elt_list, Axis a) const;
+ // duh. slim down interface here. (todo)
bool has_offset_callback_b (Offset_callback, Axis)const;
void add_offset_callback (Offset_callback, Axis);
bool has_extent_callback_b (Extent_callback, Axis)const;
+ bool has_extent_callback_b (Axis) const;
void set_extent_callback (Extent_callback , Axis);
/**