From: Han-Wen Nienhuys Date: Wed, 24 Sep 2003 12:28:00 +0000 (+0000) Subject: * lily/parser.yy (step_number): semitones for chord entry too. X-Git-Tag: release/2.0.0~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ca2340c558b431c64e7e649e0e2844a464a34dae;hp=c6544399495457808105187091178c023508a00f;p=lilypond.git * lily/parser.yy (step_number): semitones for chord entry too. (make_chord_step): more robust code, semitones. * input/regression/breathing-sign.ly (texidoc): split ancient and normal breathing signs. * scm/define-grobs.scm (all-grob-descriptions): swap beamed-extreme-minimum-free-lengths and beamed-minimum-free-lengths; the 'extreme' case should allow shorter stems. This fixes forced directions on beamed 32nd and shorter notes. * ly/engraver-init.ly (ScoreContext): keyAccidentalOrder is in quartertones, not semitones. (NoteNamesContext): swallow more event types * Documentation/topdocs/NEWS.texi (Top): insert close brace. --- diff --git a/ChangeLog b/ChangeLog index ed81ab4a7c..978f1a1872 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,33 @@ +2003-09-24 Han-Wen Nienhuys + + * lily/parser.yy (step_number): semitones for chord entry too. + (make_chord_step): more robust code, semitones. + + * input/regression/breathing-sign-ancient.ly (texidoc): new file. + + * input/regression/breathing-sign.ly (texidoc): split ancient and + normal breathing signs. + + * scm/define-grobs.scm (all-grob-descriptions): swap + beamed-extreme-minimum-free-lengths and + beamed-minimum-free-lengths; the 'extreme' case should allow + shorter stems. This fixes forced directions on beamed 32nd and + shorter notes. + + * ly/engraver-init.ly (ScoreContext): keyAccidentalOrder is in + quartertones, not semitones. + (NoteNamesContext): swallow more event types + + + * Documentation/topdocs/NEWS.texi (Top): insert close brace. + + * VERSION (PACKAGE_NAME): release 1.9.10 + 2003-09-23 Han-Wen Nienhuys * lily/rhythmic-column-engraver.cc (process_acknowledged_grobs): set note head as cause of note-column. This gives a better error - message + message. 2003-09-23 Jan Nieuwenhuizen diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi index be8ab195b0..bd94264729 100644 --- a/Documentation/topdocs/NEWS.texi +++ b/Documentation/topdocs/NEWS.texi @@ -67,7 +67,7 @@ alongside, but figured bass mode was not changed, i.e.: @example \markup @{ \center <@var{..list of markups..}> @} - \figure @{ <@var{figures> @} + \figure @{ <@var{figures}> @} @end example As chords the more often used than simultaneous music, this change will @@ -115,9 +115,9 @@ This will put the fingering for the lowest note below the chord, and the rest to the left. @item -The script previously known as @file{ly2dvi} has been renamed to -@file{lilypond}. The binary itself is now installed as -@file{lilypond-bin}. +The script previously known as @code{ly2dvi} has been renamed to +@code{lilypond}. The binary itself is now installed as +@code{lilypond-bin}. @item Markup text (ie. general text formatting) may now be used for lyrics too. diff --git a/GNUmakefile.in b/GNUmakefile.in index 343fe31019..5286a88108 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -149,7 +149,7 @@ rsync-web: cd out-www && mkdir web && tar -xzf web.tar.gz -C web cd out-www/web && \ chgrp -R lilypond . && \ - chmod -R g+w && \ + chmod -R g+w . && \ chmod 2775 `find -type d` . && \ rsync --delete --stats --progress -gorltvu -e ssh . x:/var/www/lilypond/doc/v1.9/ cd out-www && rm -rf web/ diff --git a/input/regression/accidentals.ly b/input/regression/accidentals.ly index 103d515851..835aa8708e 100644 --- a/input/regression/accidentals.ly +++ b/input/regression/accidentals.ly @@ -42,30 +42,8 @@ mel = \notes { \key d \major \time 4/4 \score { \notes << - \context Staff \transpose c c'' { - \mel -% \property Score.oneMeasureLazy = ##t - \property Score.autoAccidentals = #'(Staff (same-octave . 0)) - << s1^"$\\backslash$property Score.autoAccidentals = \\#'((same-octave . 0))" \mel >> - \property Score.autoAccidentals = #'(Staff (same-octave . 1)) - << s1^"$\\backslash$property Score.autoAccidentals = \\#'((same-octave . 1))" \mel >> - \property Score.autoAccidentals = #'(Staff (any-octave . 0)) - << s1^"$\\backslash$property Score.autoAccidentals = \\#'((any-octave . 0))" \mel >> - \property Score.autoAccidentals = #'(Staff (any-octave . 1)) - << s1^"$\\backslash$property Score.autoAccidentals = \\#'((any-octave . 1))" \mel >> - \modernAccidentals - << s1^"$\\backslash$modernAccidentals" \mel >> - \modernCautionaries - << s1^"$\\backslash$modernCautionaries" \mel >> - \noResetKey - << s1^"$\\backslash$noResetKey" \mel >> - \forgetAccidentals - << s1^"$\\backslash$forgetAccidentals" \mel >> - } - \context NoteNames \repeat unfold 9 \apply #no-octaves \mel + \context Staff \transpose c c'' \mel + \context NoteNames \apply #no-octaves \mel >> - \paper { - indent = 0.0 - } } diff --git a/input/regression/beam-chord.ly b/input/regression/beam-chord.ly deleted file mode 100644 index 24886c4b3d..0000000000 --- a/input/regression/beam-chord.ly +++ /dev/null @@ -1,26 +0,0 @@ -\version "1.9.8" -\header { - -texidoc = "If the first and last outer notes of a beam are the same, -the beam should be be horizontal. " - -} -\score{ - \notes \transpose c' c'{ - - a'8[ ] - a'16[ ] - a'32[ ] - a'8[ ] - a'16[ ] - a'32[ ] - a'16[ ] - c8[ ] - c16[ ] - c32[ ] - } - \paper{ - raggedright = ##t - } -} - diff --git a/input/regression/beam-default-lengths.ly b/input/regression/beam-default-lengths.ly index b59d7354bb..5f0395ed8f 100644 --- a/input/regression/beam-default-lengths.ly +++ b/input/regression/beam-default-lengths.ly @@ -2,7 +2,7 @@ \version "1.9.8" \header{ - texidoc="Beamed stems have standard lengths if possible." + texidoc="Beamed stems have standard lengths if possible. Quantization is switched off in this example." } \score{ diff --git a/input/regression/beam-manual.ly b/input/regression/beam-manual.ly deleted file mode 100644 index 7e5e12b546..0000000000 --- a/input/regression/beam-manual.ly +++ /dev/null @@ -1,22 +0,0 @@ - -\version "1.9.8" - -\header { - - texidoc = "Beam positions may be set by hand by overriding - positions. No processing (quanting, damping) whatsoever is done." - -} - -\score { - \notes\relative c'{ - \property Voice.Beam \override #'auto-knee-gap = ##f - \property Voice.Beam \override #'positions = #'(-10 . 10) - \stemUp - c16[ c'' a f] - - } - \paper{ - raggedright = ##t - } -} diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly index bcff4a0637..2ff6c1db1a 100644 --- a/input/regression/beam-position.ly +++ b/input/regression/beam-position.ly @@ -1,12 +1,12 @@ \version "1.9.8" \header{ -texidoc=" -Beams should always reach the middle staff line. The second beam -counting from the note head side, should never be lower than the -second staff line. This does not hold for grace note beams. -Override with @code{noStemExtend}. -" + +texidoc=" Beams on ledgered notes should always reach the middle staff +line. The second beam counting from the note head side, should never +be lower than the second staff line. This does not hold for grace +note beams. Override with @code{no-stem-extend}. " + } diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly index 2d3f939fa2..dbf04c1895 100644 --- a/input/regression/breathing-sign.ly +++ b/input/regression/breathing-sign.ly @@ -2,23 +2,10 @@ \version "1.9.8" \header{ texidoc=" -Breathing signs, also used for phrasing, do normally not influence -global spacing -- only if space gets tight, notes are shifted to make -room for the breathing sign. Breathing signs break beams running -through their voice. In the following example, the notes in the first -two measures all have the same distance from each other. - Breathing signs are available in different tastes: commas (default), -ticks, vees and `railroad tracks' (caesura). - -Gregorian chant notation sometimes also uses commas and ticks, but in -smaller font size (we call it 'virgula' and 'caesura'). However, the -most common breathing signs are divisio minima/maior/maxima and -finalis, the latter three looking similar to bar glyphs. +ticks, vees and `railroad tracks' (caesura)." + } -" } - -\include "gregorian-init.ly" \score { @@ -67,43 +54,5 @@ finalis, the latter three looking similar to bar glyphs. es2 r4 \bar "||" \break } } - - % - % Gregorian notation: - % - \context VaticanaStaff { - \notes \relative c' { - - % we turn bars and bar numbers off for Gregorian stuff - \property Staff.BarLine \set #'transparent = ##t - \property Score.BarNumber \set #'transparent = ##t - - % here is no \breathe - c g c - - % \virgula applies rcomma, but in a smaller font - c \virgula g c - - % \caesura applies rvarcomma, but in a smaller font - c \caesura g c - - % \divisioMinima is a simple vertical stroke through the - % uppermost staffline, just like the original implementation - % of breathing signs. - c \divisioMinima g c - - % \divisio{maior,maxima} and \finalis look like bars and are - % vertically centered on the staff; the direction property has - % no effect - c \divisioMaior g c - c \divisioMaxima g c - - % this one looks almost like a "||" type bar - \finalis - } - } - } - \paper { - \translator { \RemoveEmptyStaffContext } } } diff --git a/lily/parser.yy b/lily/parser.yy index 88a815741b..ee022a6185 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -163,10 +163,11 @@ SCM make_chord_step (int step, int alter) { if (step == 7) - alter--; + alter += FLAT; - /* ugh: fucks up above 13 */ - Pitch m(step > 7 ? 1 : 0,(step - 1) % 7, alter); + while(step < 0) + step += 7; + Pitch m((step -1) / 7 , (step - 1) % 7, alter); return m.smobbed_copy (); } @@ -2150,10 +2151,10 @@ step_number: $$ = make_chord_step ($1, 0); } | bare_unsigned '+' { - $$ = make_chord_step ($1, 1); + $$ = make_chord_step ($1, SHARP); } | bare_unsigned CHORD_MINUS { - $$ = make_chord_step ($1,-1); + $$ = make_chord_step ($1, FLAT); } ; diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 6e3a51c62b..0f70dc52a8 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -325,6 +325,10 @@ NoteNamesContext = \translator { verticalExtent = ##f + \consists "Rest_swallow_translator" + \consists "Skip_event_swallow_translator" + \consists "Tie_engraver" + \consists "Note_swallow_translator" \consists "Note_name_engraver" \consists "Separating_line_group_engraver" } @@ -480,11 +484,11 @@ ScoreContext = \translator { autoAccidentals = #'(Staff (same-octave . 0)) autoCautionaries = #'() - keyAccidentalOrder = #'( - (6 . -1) (2 . -1) (5 . -1 ) (1 . -1) (4 . -1) (0 . -1) (3 . -1) - (3 . 1) (0 . 1) (4 . 1) (1 . 1) (5 . 1) (2 . 1) (6 . 1) - (6 . -2) (2 . -2) (5 . -2 ) (1 . -2) (4 . -2) (0 . -2) (3 . -2) - (3 . 2) (0 . 2) (4 . 2) (2 . 2) (5 . 2) (2 . 2) (6 . 2) + keyAccidentalOrder = #`( + (6 . ,FLAT) (2 . ,FLAT) (5 . ,FLAT ) (1 . ,FLAT) (4 . ,FLAT) (0 . ,FLAT) (3 . ,FLAT) + (3 . ,SHARP) (0 . ,SHARP) (4 . ,SHARP) (1 . ,SHARP) (5 . ,SHARP) (2 . ,SHARP) (6 . ,SHARP) + (6 . ,DOUBLE-FLAT) (2 . ,DOUBLE-FLAT) (5 . ,DOUBLE-FLAT ) (1 . ,DOUBLE-FLAT) (4 . ,DOUBLE-FLAT) (0 . ,DOUBLE-FLAT) (3 . ,DOUBLE-FLAT) + (3 . ,DOUBLE-SHARP) (0 . ,DOUBLE-SHARP) (4 . ,DOUBLE-SHARP) (2 . ,DOUBLE-SHARP) (5 . ,DOUBLE-SHARP) (2 . ,DOUBLE-SHARP) (6 . ,DOUBLE-SHARP) ) breakAlignOrder = #'( instrument-name diff --git a/ly/scale-definitions-init.ly b/ly/scale-definitions-init.ly index f48941729b..81a2641907 100644 --- a/ly/scale-definitions-init.ly +++ b/ly/scale-definitions-init.ly @@ -70,7 +70,7 @@ lydian = #`( (0 . 0) (1 . 0) (2 . 0) - (3 . 1) + (3 . SHARP) (4 . 0) (5 . 0) (6 . 0) diff --git a/scm/chord-entry.scm b/scm/chord-entry.scm index d70e8f0a44..670ff646eb 100644 --- a/scm/chord-entry.scm +++ b/scm/chord-entry.scm @@ -14,16 +14,14 @@ Entry point for the parser. " (let* - ( - (flat-mods (flatten-list modifications)) + ((flat-mods (flatten-list modifications)) (base-chord (stack-thirds (ly:make-pitch 0 4 0) the-canonical-chord)) (complete-chord '()) (bass #f) (inversion #f) (lead-mod #f) (explicit-11 #f) - (start-additions #t) - ) + (start-additions #t)) (define (interpret-inversion chord mods) "Read /FOO part. Side effect: INVERSION is set." diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 07e382a70b..7135a0d92a 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -941,9 +941,9 @@ (beamed-lengths . (3.26 3.26 1.5)) ;; [Wanske] lists three sets of minimum lengths. One - ;; set for the nomal case, and one set for beams with `der - ;; Balkenendpunkt weiter "uber bzw. unter die Systemgrenze - ;; hinaus (bei Gruppen mit grossem Tonumfang)' and the extreme + ;; set for the nomal case, and one set for beams with "der + ;; Balkenendpunkt weiter uber bzw. unter die Systemgrenze + ;; hinaus (bei Gruppen mit grossem Tonumfang)" and the extreme ;; case. ;; Note that Wanske lists numbers lengths starting from top of @@ -953,10 +953,10 @@ ;; and the extreme minima as abolute minimum length. ;; The 'normal' minima - (beamed-minimum-free-lengths . (2.5 2.0 1.0)) + (beamed-minimum-free-lengths . (1.83 1.5 1.25)) ;; The 'extreme case' minima - (beamed-extreme-minimum-free-lengths . (1.83 1.5 1.25)) + (beamed-extreme-minimum-free-lengths . (2.5 2.0 1.0)) (X-offset-callbacks . (,Stem::off_callback)) (X-extent-callback . ,Stem::dim_callback)