release commit

diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index 7e9799b7459f846df5f496a09b7588b9a732aec7..155fce522c827457ee8b9c6940b1885254b74b1e 100644 (file)
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -29,6 +29,8 @@ it is possible to tweak @code{Score} as follows:
   @}
 @end example
 
+@item The number of staff lines  in Tablature notation is now
+automatically deduced from the @code{stringTunings} property.
 
 @item The program reference has been cleaned up and revised.
 

diff --git a/Documentation/user/internals.itely b/Documentation/user/internals.itely
index 37ed08eced0aa0554a18f19eafdd4ab7bf2e4d13..d4e04069c2d53de02ff17fe617568060e5d1e04f 100644 (file)
--- a/Documentation/user/internals.itely
+++ b/Documentation/user/internals.itely
@@ -376,7 +376,7 @@ and without a @code{Clef_engraver}.
 @refbugs
 
 The command @code{\with} has no effect on contexts that already
-exist. Neither can it be used for @internalsref{Score} contexts.
+exist. 
 
 
 @node Engravers and performers

diff --git a/VERSION b/VERSION
index ef10a17901ac0f96f56ac7dce093a24aa8b8e877..23e535e786469bd387101bb2cf59d77e7ba47698 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=1
-PATCH_LEVEL=23
-MY_PATCH_LEVEL=hwn2
+PATCH_LEVEL=24
+MY_PATCH_LEVEL=
 

diff --git a/input/regression/beam-multiple-cross-staff.ly b/input/regression/beam-multiple-cross-staff.ly
index f17506390116226ff364a6d648a3c481a2ecf5f4..2d308d81d73ec13c271ddb41268db7431269a66b 100644 (file)
--- a/input/regression/beam-multiple-cross-staff.ly
+++ b/input/regression/beam-multiple-cross-staff.ly
@@ -3,7 +3,7 @@
 
     texidoc = "Kneed beams (often happens with cross-staff beams)
 should look good when there are multiple beams: all the beams should
-go on continuously at the staff change. Stems in both staffs reach up
+go on continuously at the staff change. Stems in both staves reach up
 to the last beam.
 "
 }

diff --git a/input/regression/grace-staff-length.ly b/input/regression/grace-staff-length.ly
index 309f3ff5dfc84cffd76cb6e7170c0be99dd579f2..8e9e4114795ca4982a3f9e5800367ec332329275 100644 (file)
--- a/input/regression/grace-staff-length.ly
+++ b/input/regression/grace-staff-length.ly
@@ -1,6 +1,6 @@
 \version "2.1.22"
 \header{
-texidoc = "Stripped version of trip.ly.  Staffs should be of correct length."
+texidoc = "Stripped version of trip.ly.  Staves should be of correct length."
 }
 
     \paper { raggedright= ##t }

diff --git a/input/regression/rhythmic-staff.ly b/input/regression/rhythmic-staff.ly
index 94d7db72269006c3173ff8c5bb4a38a483136879..5fcd235a4fd65a67b0b80596ef8babcc5a9b7193 100644 (file)
--- a/input/regression/rhythmic-staff.ly
+++ b/input/regression/rhythmic-staff.ly
@@ -2,7 +2,7 @@
 \header
 {
 
-    texidoc = "In rhythmic staffs, stems should go up, and bar lines have the size for a  5 line staff. The whole note hangs from the rhythmic staff."
+    texidoc = "In rhythmic staves stems should go up, and bar lines have the size for a  5 line staff. The whole note hangs from the rhythmic staff."
 }
 
 \score { \notes \context RhythmicStaff

diff --git a/input/regression/spacing-accidental-staffs.ly b/input/regression/spacing-accidental-staffs.ly
index 48dd67b3293a10760f86eca300917aae5714f478..f9a0a6089115245719b5cc8dc17539217ab73860 100644 (file)
--- a/input/regression/spacing-accidental-staffs.ly
+++ b/input/regression/spacing-accidental-staffs.ly
@@ -1,7 +1,7 @@
 \version "2.1.22"
 
 \header { 
-texidoc = "Accidentals in different staffs don't effect the
+texidoc = "Accidentals in different staves don't effect the
 spacing of the quarter notes here."
 }
 

diff --git a/input/regression/staff-mixed-size.ly b/input/regression/staff-mixed-size.ly
index 37820499dd934933d4880677c7e2953d1b1074c9..c6661b9486602a9d76214f56393b7435971fbb50 100644 (file)
--- a/input/regression/staff-mixed-size.ly
+++ b/input/regression/staff-mixed-size.ly
@@ -1,11 +1,12 @@
 \header {
     
-texidoc = "Staffs may be present in several sizes within a score.
-This is achieved with an internal scaling factor. When code forgets
-factor, objects generally become too thick or too large.
-"
+texidoc = "Staves may be present in several sizes within a score.
+This is achieved with an internal scaling factor. When code forgets to
+take into account the scaling factor, objects generally become too
+thick or too large on smaller staves."
 
 }
+
 \version "2.1.23"
 
 \score {

diff --git a/input/regression/volta-multi-staff.ly b/input/regression/volta-multi-staff.ly
index e0e6e7c77813e781e17914a134ab7309b69dca9e..c9171fd6749f9386f6909b62a268e1108629bd49 100644 (file)
--- a/input/regression/volta-multi-staff.ly
+++ b/input/regression/volta-multi-staff.ly
@@ -1,6 +1,7 @@
 \header {
 
-    texidoc = "By setting @code{voltaOnThisStaff}, repeats can be put on more staffs in a score."
+    texidoc = "By setting @code{voltaOnThisStaff}, repeats can be put
+    on more staves in a score."
 
 }
 \version "2.1.22"

diff --git a/lily/translator-scheme.cc b/lily/translator-scheme.cc
index ab010a067961fb39299e28f664fa7755e10757b1..5ec875cc11affdc41770a1fa68f70cbd42d91afe 100644 (file)
--- a/lily/translator-scheme.cc
+++ b/lily/translator-scheme.cc
@@ -47,10 +47,6 @@ Translator::print_smob (SCM s, SCM port, scm_print_state *)
      
   scm_puts ("#<Translator ", port);
   scm_puts (classname (sc), port);
-
-  /*
-    don't try to print properties, that is too much hassle.
-   */
   scm_puts (" >", port);
   
   return 1;

diff --git a/ly/drumpitch-init.ly b/ly/drumpitch-init.ly
index bf6bca07443989aba2b678d648a2afc26b92feeb..92d43716dfeaa8df9289a0b27652b69d1e14b192 100644 (file)
--- a/ly/drumpitch-init.ly
+++ b/ly/drumpitch-init.ly
@@ -1,4 +1,6 @@
 
+\version "2.1.24"
+
 drumPitchNames =
 #'((acousticbassdrum . acousticbassdrum)
    (bassdrum . bassdrum)

diff --git a/ly/generic-paper-init.ly b/ly/generic-paper-init.ly
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/ly/generic-paper-init.ly
+++ /dev/null
@@ -1 +0,0 @@
-