From 4a71144ce67884621b652b24e47e0f5e9dc4f7ca Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 4 Jul 2004 21:00:21 +0000 Subject: [PATCH] release commit --- ChangeLog | 6 ++++++ VERSION | 2 +- debian/GNUmakefile | 1 - input/test/volta-chord-names.ly | 6 ++++-- lily/volta-bracket.cc | 2 +- lily/volta-engraver.cc | 4 ++-- ly/engraver-init.ly | 6 ++++-- scm/define-grobs.scm | 2 +- 8 files changed, 19 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac32d83b30..2be760c2f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2004-07-04 Han-Wen Nienhuys + * 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 59056eba36..1ab1bd0c93 100644 --- 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 b089240b76..e4c6cf3a9e 100644 --- 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 07ac7a626e..acaeac9643 100644 --- 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 515fb49fe5..e05a798713 100644 --- 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 50574ac8b5..f13672122f 100644 --- 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 49245a2fbe..929b031e92 100644 --- 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 e9f5457cec..c3d497b3ec 100644 --- 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) -- 2.39.5