From: hanwen <hanwen>
Date: Fri, 25 Nov 2005 18:20:06 +0000 (+0000)
Subject: * lily/figured-bass-engraver.cc (process_music): check
X-Git-Tag: release/2.7.20~19
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b673a589a5a5a76ab8cfa7532b9a01a499c18e42;p=lilypond.git

* 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 bdb425472d..fe7a235bbc 100644
--- 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 0146cd0ec4..9eea29fbe0 100644
--- 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 16132f778a..455152ec25 100644
--- 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 312acb5949..9c4866a9ac 100644
--- 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))