From: Han-Wen Nienhuys Date: Fri, 7 Jun 2002 16:51:40 +0000 (+0000) Subject: * scripts/convert-ly.py: add tuplet-X-visibility rules. X-Git-Tag: release/1.5.61~24 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=70aedb06b1a254b359bf5025ca83a3833c7e9ba1;p=lilypond.git * scripts/convert-ly.py: add tuplet-X-visibility rules. * Documentation/user/refman.itely (Tuplets): update tuplet-X-visibility properties. --- diff --git a/ChangeLog b/ChangeLog index 0be7d5f194..afd46f802f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-06-07 Han-Wen Nienhuys + + * scripts/convert-ly.py: add tuplet-X-visibility rules. + + * Documentation/user/refman.itely (Tuplets): update + tuplet-X-visibility properties. + 2002-06-05 Han-Wen Nienhuys * lily/beam.cc (shift_region_to_valid): fix stupido bug. @@ -27,12 +34,6 @@ after slope-damping and concaveness check, so that short-stems are not violated. -2002-06-01 Jan Nieuwenhuizen - - * lily/beam.cc (quanting): Increase REGION_SIZE to 4 by default. - While we'd rather not pay the performance penalty, we certainly - don't want silly bugs. This should be looked into. - 2002-05-31 Jan Nieuwenhuizen * stepmake/aclocal.m4: Fix for ash as /bin/sh. diff --git a/Documentation/regression-test.tely b/Documentation/regression-test.tely index b7ad78bc7d..09f8a83b9a 100644 --- a/Documentation/regression-test.tely +++ b/Documentation/regression-test.tely @@ -208,8 +208,13 @@ Grace note do weird things with timing. Fragile. @lilypondfile[printfilename]{tie-accidental.ly} + +@section Tuplets + @lilypondfile[printfilename]{tup.ly} +@lilypondfile[printfilename]{tuplet-properties.ly} + @lilypondfile[printfilename]{tuplet-beam.ly} @lilypondfile[printfilename]{tuplet-staffline-collision.ly} diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index b1c1725405..678cbcb84c 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -471,18 +471,18 @@ denominator, but if you set it to the Scheme function instead. The typesetting of brackets and numbers is controlled by the properties -@code{tuplet-bracket-visibility} and @code{tuplet-number-visibility}. +@code{bracket-visibility} and @code{number-visibility}. @lilypond[fragment, relative, singleline, verbatim] -\property Voice.TupletBracket \set #'tuplet-bracket-visibility = ##t +\property Voice.TupletBracket \set #'bracket-visibility = ##t \times 2/3{c'8 d e} \times 2/3{d4 e8} -\property Voice.TupletBracket \set #'tuplet-bracket-visibility = #'if-no-beam +\property Voice.TupletBracket \set #'bracket-visibility = #'if-no-beam \times 2/3{c d e} \times 2/3{d4 e8} -\property Voice.TupletBracket \set #'tuplet-bracket-visibility = ##f +\property Voice.TupletBracket \set #'bracket-visibility = ##f \times 2/3{c d e} \times 2/3{d4 e8} -\property Voice.TupletBracket \set #'tuplet-number-visibility = ##f +\property Voice.TupletBracket \set #'number-visibility = ##f \times 2/3{c d e} \times 2/3{d4 e8} -\property Voice.TupletBracket \set #'tuplet-number-visibility = #'if-no-beam +\property Voice.TupletBracket \set #'number-visibility = #'if-no-beam \times 2/3{c d e} \times 2/3{d4 e8} @end lilypond diff --git a/VERSION b/VERSION index 5489b6484c..fe54cb1f68 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 PATCH_LEVEL=59 -MY_PATCH_LEVEL=mb1 +MY_PATCH_LEVEL=uu1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/regression/tuplet-properties.ly b/input/regression/tuplet-properties.ly new file mode 100644 index 0000000000..1f1df6987f --- /dev/null +++ b/input/regression/tuplet-properties.ly @@ -0,0 +1,43 @@ +\header { +texidoc = "Tuplet bracket formatting supports numerous options: +NB should have no bracket, B should have bracket. +" +} + + +\version "1.5.50" + + +\score { + \context Voice \notes\relative c'' { + + \times 2/3 { c'8 c,, c } + \times 2/3 { c'8 c'' c,, } + + + \times 2/3 { [c8^"NB" c c] } + + \times 2/3 { c8^"B" [c c] } + \times 2/4 { r8_"B" [c, c'] r8 } + + \property Voice.TupletBracket \override #'bracket-visibility = #'if-no-beam + \times 2/3 { [c8 c c] } + + \property Voice.TupletBracket \override #'direction = #1 + \property Voice.TupletBracket \override #'number-visibility = ##f + \times 2/3 { c8^""^""^"up, no digit" [c c] } + \property Voice.TupletBracket \revert #'number-visibility + + \property Voice.TupletBracket \override #'bracket-visibility = ##t + \property Voice.TupletBracket \override #'edge-height = #'(0.0 . 0.0) + \property Voice.TupletBracket \override #'shorten-pair = #'(2.0 . 2.0) + \times 4/6 { c_"shorter, no edges" f b b f c} + \property Voice.TupletBracket \revert #'edge-height + \property Voice.TupletBracket \revert #'shorten-pair + \property Voice.TupletBracket \override #'edge-width = #'(-0.5 . 0.5) + \times 2/3 { b^""^""^"angled edges" b b } + \property Voice.TupletBracket \revert #'direction + \times 2/3 { b b b } + + } +} diff --git a/input/test/tuplet.ly b/input/test/tuplet.ly deleted file mode 100644 index 4c9ab55589..0000000000 --- a/input/test/tuplet.ly +++ /dev/null @@ -1,38 +0,0 @@ -\version "1.5.50" - - -\score { - \context Voice \notes\relative c'' { - - \times 2/3 { c'8 c,, c } - \times 2/3 { c'8 c'' c,, } - - - \times 2/3 { [c8 c c] } - \times 2/3 { c8 [c c] } - - \times 2/3 { [c8 c c] } - \times 2/4 { r8 [c, c'] r8 } - - - - \property Voice.TupletBracket \override #'bracket-visibility = #'if-no-beam - \times 2/3 { [c8 c c] } - \property Voice.TupletBracket \override #'direction = #1 - \property Voice.TupletBracket \override #'number-visibility = ##f - \times 2/3 { c8 [c c] } - \property Voice.TupletBracket \revert #'number-visibility - - \property Voice.TupletBracket \override #'bracket-visibility = ##t - \property Voice.TupletBracket \override #'edge-height = #'(0.0 . 0.0) - \property Voice.TupletBracket \override #'shorten-pair = #'(2.0 . 2.0) - \times 4/6 { c f b b f c} - \property Voice.TupletBracket \revert #'edge-height - \property Voice.TupletBracket \revert #'shorten-pair - \property Voice.TupletBracket \override #'edge-width = #'(-0.5 . 0.5) - \times 2/3 { b b b } - \property Voice.TupletBracket \revert #'direction - \times 2/3 { b b b } - - } -} diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index d389789d3a..0c02fb9349 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -62,7 +62,10 @@ public: }; - +/* + Hmm. this isn't necessary, since grace beams and normal beams are + always nested. + */ bool Beam_engraver::valid_start_moment() { diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index c05e3e0f61..02453aeeab 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -848,6 +848,13 @@ if 1: conversions.append (((1,5,49), conv, 'noAutoBeaming -> autoBeaming')) +if 1: + def conv (str): + str = re.sub ('tuplet-bracket-visibility', 'bracket-visibility', str) + str = re.sub ('tuplet-number-visibility', 'number-visibility', str) + return str + + conversions.append (((1,5,52), conv, 'tuplet-X-visibility -> X-visibility')) if 1: def conv (str): @@ -855,7 +862,7 @@ if 1: return str - conversions.append (((1,5,56), conv, 'Pitch::transpose->ly-transpose-pitch')) + conversions.append (((1,5,56), conv, 'Pitch::transpose -> ly-transpose-pitch')) if 1: def conv (str):