From 207c3df3b77d5ec25d7db3bbc6ba830d12ee9f85 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 30 Nov 2005 11:42:01 +0000
Subject: [PATCH] (all-grob-descriptions): set thickness to 1.0.
 (all-grob-descriptions): don't shift RehearsalMark arbitrarily.

---
 ChangeLog                       |  6 ++++++
 lily/GNUmakefile                |  2 +-
 lily/mark-engraver.cc           |  7 +++++--
 lily/side-position-interface.cc |  2 +-
 scm/define-grobs.scm            | 13 +++++--------
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3136b30807..473c816d3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-30  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* scm/define-grobs.scm (all-grob-descriptions): set thickness to
+	1.0.
+	(all-grob-descriptions): don't shift RehearsalMark arbitrarily.
+
 2005-11-29  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* configure.in (LINK_GXX_STATICALLY): remove kpathsea checks.
diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 18a7b8b52e..f1a5535fa0 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -4,7 +4,7 @@ depth = ..
 NAME = lilypond
 SUBDIRS = include
 
-MODULE_LIBS=  $(depth)/flower   $(depth)/kpath-guile 
+MODULE_LIBS=$(depth)/flower
 MODULE_INCLUDES= $(depth)/flower/include 
 
 # need this to convert between function pointers and member function pointers.
diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 2ffdc696d2..e1044aff92 100644
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -9,13 +9,15 @@
 #include <cctype>
 using namespace std;
 
+#include "engraver.hh"
+
 #include "bar-line.hh"
 #include "context.hh"
-#include "engraver-group.hh"
 #include "item.hh"
 #include "warn.hh"
 #include "text-interface.hh"
 #include "grob-array.hh"
+#include "axis-group-interface.hh"
 
 /**
    put stuff over or next to  bars.  Examples: bar numbers, marginal notes,
@@ -51,7 +53,8 @@ Mark_engraver::acknowledge_break_aligned (Grob_info inf)
   Grob *s = inf.grob ();
   if (text_
       && (get_property ("rehearsalMarkAlignSymbol")
-	  == s->get_property ("break-align-symbol")))
+	  == s->get_property ("break-align-symbol"))
+      && Axis_group_interface::has_interface (s))
     {
       /*
 	RehearsalMark cannot be break-aligned, since the width of the
diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index 081b6559e9..1467c96368 100644
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -145,7 +145,7 @@ Side_position_interface::y_aligned_side (SCM smob)
 }
 
 SCM
-Side_position_interface::aligned_side (Grob*me, Axis a)
+Side_position_interface::aligned_side (Grob *me, Axis a)
 {
   Direction dir = get_grob_direction (me);
 
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index dbd1edb04a..4ebab5b02f 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1232,17 +1232,14 @@
 
     (RehearsalMark
      . (
-
 	(stencil . ,Text_interface::print)
-
 	(X-offset . ,(ly:make-simple-closure
-		      `(,+ ,(ly:make-simple-closure `(,Self_alignment_interface::x_aligned_on_self))
-			   ,(ly:make-simple-closure `(,Self_alignment_interface::centered_on_x_parent)))
+		      `(,+ ,(ly:make-simple-closure
+			     `(,Self_alignment_interface::x_aligned_on_self))
+			   ,(ly:make-simple-closure
+			     `(,Self_alignment_interface::centered_on_x_parent)))
 		      ))
 	(Y-offset . ,Side_position_interface::y_aligned_side)
-
-	(after-line-breaking . ,shift-right-at-line-begin)
-
 	(self-alignment-X . 0)
 	(direction . 1)
 	(breakable . #t)
@@ -1606,7 +1603,7 @@
 	(direction . ,LEFT)
 	(stencil . ,System_start_delimiter::print)
 	(style . line-bracket)
-	(thickness . 0.45)
+	(thickness . 1.0)
 	(meta . ((class . Spanner)
 		 (interfaces . (font-interface
 				side-position-interface
-- 
2.39.5