*** empty log message ***

diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index 69cade5933b574a60461cfdf6cf704c65bbcecbf..84d146fca62d858653ef59bcd1a32d4c9b4a37cc 100644 (file)
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -7,20 +7,27 @@
 
 @chapter New features in 2.1 since 2.0
 
+Unreleased:
+
 @itemize
 @item  Features of spanner contexts, like Staff, can now be changed easily:
 
 @example
-  \new Staff \with {
+  \new Staff \with @{
      StaffSymbol \set #'line-count = #4
-  }
-        { c'4 }
+  @} @{
+    c'4
+  @}
 @end example
 
 @noindent
 puts a quarter note C on a staff with 4 lines.  
 
+@end itemize
 
+Version 2.1.7
+
+@itemize @bullet
 
 @item Multi measure rests are now truly centered between the
 clefs/barlines of the staff, independent of symbols on the other staffs.

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 3296b73eefb2338a65297a9451c306b7166ee4f0..8f96a3399183879cc01d0ececbf7136f546494aa 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -7608,13 +7608,13 @@ music to be interpreted. @var{property-settings} may be any type of
 created with bigger spaces:
 
 @lilypond[relative=1,fragment]
-  \new Staff { c4 es4 g2 }
+<<  \new Staff { c4 es4 g2 }
   \new Staff \with {
         StaffSymbol \set #'staff-space = #(magstep 1.5)
-        fontSize = 1.5
+        fontSize = #1.5
   } {
         c4 es4 g2
-  }
+  } >>
 @end lilypond
 
 @refbugs

diff --git a/lily/parser.yy b/lily/parser.yy
index 54fd2e25db3ec2e97c8da0c6399bc8c5f2868d8b..cac1751847c2d903cc996f788cac4a424c4aa27e 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -2408,6 +2408,8 @@ property_op_to_music (SCM op)
        if (grob_sym != SCM_UNDEFINED)
                {
                bool itc = internal_type_checking_global_b;
+               /* UGH.
+               */
                bool autobeam = gh_equal_p (symbol, ly_symbol2scm ("autoBeamSettings"));
                if (autobeam)
                        internal_type_checking_global_b = false;

diff --git a/scm/define-translator-properties.scm b/scm/define-translator-properties.scm
index f40bb957edddd3581d4a9480432ead873121b209..e8b561adaca3e01e299622302472908e7f518c93 100644 (file)
--- a/scm/define-translator-properties.scm
+++ b/scm/define-translator-properties.scm
@@ -250,7 +250,7 @@ another non-natural.
 (translator-property-description 'finalizations list? "List of expressions to evaluate before proceeding to next time step. Internal variable.")
 (translator-property-description 'followVoice boolean?
                                 "if set, note heads are tracked  across staff switches by a thin line")
-(translator-property-description 'fontSize integer?
+(translator-property-description 'fontSize number?
                                 "Used to set the relative size of all grobs
 in a context. This is done using the @code{Font_size_engraver}.")