* lily/figured-bass-engraver.cc (process_music): check

figuredBassCenterContinuations first.

* scm/translation-functions.scm (format-bass-figure): make double
sharp larger.

diff --git a/ChangeLog b/ChangeLog
index bdb425472dc03a8917392ccd4db58d4b2cdc5a04..fe7a235bbcaa6ad4bb9c5e5a588da2a46c4119ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-11-25  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/figured-bass-engraver.cc (process_music): check
+       figuredBassCenterContinuations first.
+
+       * scm/translation-functions.scm (format-bass-figure): make double
+       sharp larger. 
+
        * lily/mark-engraver.cc: read rehearsalMarkAlignSymbol to
        determine X-parent.
 

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index 0146cd0ec455cdd78329cf5cc4c5208422391887..9eea29fbe08e9e250a05264a8340343e2aff7bc6 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -46,6 +46,29 @@ This document is also available in @uref{NEWS.pdf,PDF}.
 
 @itemize @bullet
 
+@item The horizontal location of rehearsal marks can be adjusted by
+setting the @code{rehearsalMarkAlignSymbol} property,
+
+@lilypond[raggedright]
+\relative {
+  c1 \mark "foo"
+  \key cis \major
+  \clef alto
+  \set Score.rehearsalMarkAlignSymbol = #'key-signature
+  \mark "on-key"
+  cis
+ \key ces \major
+  \set Score.rehearsalMarkAlignSymbol = #'clef
+  \clef treble
+  \mark "on clef"
+  ces
+}
+@end lilypond 
+
+
+This feature was sponsored by Trevor Bača.
+
+
 @item
 It's now possible to easily create deeply nested system start
 delimiters,

diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc
index 16132f778ab0a6d7ee5fcc2ad6313d6042d60667..455152ec25750c3d1987d116d5626e10bb49ec35 100644 (file)
--- a/lily/figured-bass-engraver.cc
+++ b/lily/figured-bass-engraver.cc
@@ -356,17 +356,20 @@ Figured_bass_engraver::process_music ()
        Ugh, repeated code.
        */
       Link_array<Spanner> consecutive;
-      for (int i = 0; i <= junk_continuations.size (); i++)
+      if (to_boolean (get_property ("figuredBassCenterContinuations")))
        {
-         if (i < junk_continuations.size()
-             && (i == 0 || junk_continuations[i-1] == junk_continuations[i] - 1))
-           consecutive.push (groups_[junk_continuations[i]].continuation_line_);
-         else 
+         for (int i = 0; i <= junk_continuations.size (); i++)
            {
-             center_continuations (consecutive);
-             consecutive.clear ();
-             if (i < junk_continuations.size ())
+             if (i < junk_continuations.size()
+                 && (i == 0 || junk_continuations[i-1] == junk_continuations[i] - 1))
                consecutive.push (groups_[junk_continuations[i]].continuation_line_);
+             else 
+               {
+                 center_continuations (consecutive);
+                 consecutive.clear ();
+                 if (i < junk_continuations.size ())
+                   consecutive.push (groups_[junk_continuations[i]].continuation_line_);
+               }
            }
        }
       for (int i = 0; i < junk_continuations.size (); i++)

diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm
index 312acb5949eb7daf409e6110bf5d3f3dc8e9efcb..9c4866a9ac6999eec1dd5eae1f147d8e0d095bfc 100644 (file)
--- a/scm/translation-functions.scm
+++ b/scm/translation-functions.scm
@@ -70,7 +70,9 @@
         (alt-markup
          (if (number? alt)
              (markup
-                     #:general-align Y DOWN #:smaller #:smaller
+                     #:general-align Y DOWN #:fontsize
+                     (if (not (= alt DOUBLE-SHARP))
+                         -2 2)
                      (alteration->text-accidental-markup alt))
              
              #f))