release commit

diff --git a/ChangeLog b/ChangeLog
index ac32d83b302c165638d598ffefc71813cb570cf9..2be760c2f9b116e3141e29fb3f6881b4eb14b2c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-07-04  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * VERSION: release 2.2.4
+       
+       * ly/engraver-init.ly: add Volta_engraver.
+
+       * debian/GNUmakefile (EXTRA_DIST_FILES): remove lilypond.dirs.
+
        * scripts/lilypond-book.py (Lilypond_snippet.output_texinfo): add
        \n to texidoc.
 

diff --git a/VERSION b/VERSION
index 59056eba364c58ff48a95728f9a5c8a3ad296621..1ab1bd0c93c84941e9cde2472632916b8af5b5b3 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=2
-PATCH_LEVEL=3
+PATCH_LEVEL=4
 MY_PATCH_LEVEL=
 

diff --git a/debian/GNUmakefile b/debian/GNUmakefile
index b089240b76fa7df9c628a292c42de9615557aa2d..e4c6cf3a9e8a01d11db0a721b9b754f2e113f615 100644 (file)
--- a/debian/GNUmakefile
+++ b/debian/GNUmakefile
@@ -26,7 +26,6 @@ EXTRA_DIST_FILES = $(CONF_FILES)\
  lilypond-doc.doc-base\
  lilypond-doc.postinst\
  lilypond-doc.prerm\
- lilypond.dirs\
  lilypond.doc-base\
  lilypond.install\
  lilypond1.3.copyright\

diff --git a/input/test/volta-chord-names.ly b/input/test/volta-chord-names.ly
index 07ac7a626ebc603c96e47efbaae06debb1837598..acaeac964385abda683109481ba67dfd2078e7ff 100644 (file)
--- a/input/test/volta-chord-names.ly
+++ b/input/test/volta-chord-names.ly
@@ -7,7 +7,8 @@ requires adding an engraver to @code{ChordNames}, and setting
 }
 
 \version "2.2.3"
-<<
+\score {
+    <<
   \new ChordNames \with {
       voltaOnThisStaff = ##t
   } \chords {
@@ -15,7 +16,8 @@ requires adding an engraver to @code{ChordNames}, and setting
   }
   \new Staff \with {
       voltaOnThisStaff = ##f
-  } {
+  } \notes {
    \repeat volta 2 { c'1 } \alternative { c' }
   }
 >>
+}

diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc
index 515fb49fe5b534b8b386f55f1104e209c6192cfe..e05a798713900ee181d591064e5f122beed05f7f 100644 (file)
--- a/lily/volta-bracket.cc
+++ b/lily/volta-bracket.cc
@@ -54,7 +54,7 @@ Volta_bracket_interface::print (SCM smob)
   if (gh_string_p (glyph))
     str = ly_scm2string (glyph);
   else
-    return "|";
+    str = "|";
   
   const char* cs = str.to_str0 ();
   no_vertical_end |=

diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc
index 50574ac8b5d157ff8205c3ff61d6eda8b95ff39d..f13672122febca2de5f2a4c188013fdde02b4771 100644 (file)
--- a/lily/volta-engraver.cc
+++ b/lily/volta-engraver.cc
@@ -61,7 +61,7 @@ bool
 Volta_engraver::staff_eligible ()
 {
   SCM doit =get_property ("voltaOnThisStaff");
-  if (ly_c_boolean_p (doit))
+  if (gh_boolean_p (doit))
     {
       return to_boolean (doit);
     }
@@ -83,7 +83,7 @@ Volta_engraver::staff_eligible ()
     volta engraver in score context or somesuch.
        
   */
-  if (!ly_c_pair_p (staffs))
+  if (!gh_pair_p (staffs))
     {
       programming_error ("Huh? Volta engraver can't find staffs?");
       return false;

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 49245a2fbe6e8b14c4e657a14e22e84924ab837c..929b031e92fea996e07ac560fd408802e8682ceb 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -357,14 +357,16 @@ printing of a single line of lyrics.  "
     \type "Engraver_group_engraver"
     \name ChordNames
     \description "Typesets chord names."
-    
+
+    \consists "Volta_engraver"
     \consists "Rest_swallow_translator" 
     \consists "Output_property_engraver"       
     \consists "Separating_line_group_engraver"
     \consists "Chord_name_engraver"
     \consists "Skip_event_swallow_translator"
     \consistsend "Hara_kiri_engraver"
-    
+
+    voltaOnThisStaff = ##f
     minimumVerticalExtent = #'(0 . 2.5)
     extraVerticalExtent = ##f
     \override SeparatingGroupSpanner #'padding = #0.8

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index e9f5457cec4978d467018203d83e07ea7ce95245..c3d497b3ec53d9d0fea688e8b292ea71f58d671a 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -686,7 +686,7 @@
        (print-function . ,Text_item::print)
 
        ;; no Y dimensions, because of lyrics under tenor clef.
-       (Y-extent-callback . (0 . 0))
+       (Y-extent . (0 . 0))
        (font-shape . italic)
        (padding . 0.6)
        (staff-padding . 0.2)