From d17bb7b871927d54723cda56494b88f78cc36a08 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 22:24:11 +0000 Subject: [PATCH] lilypond-1.1.65 --- Documentation/BLURB.in | 4 ++-- input/bugs/spacing-very-tight.ly | 11 +++++++++++ input/test/stem-direction-down.ly | 8 ++++++++ lily/include/stem.hh | 3 +-- lily/tie.cc | 4 +++- mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly | 3 +-- 6 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 input/bugs/spacing-very-tight.ly create mode 100644 input/test/stem-direction-down.ly diff --git a/Documentation/BLURB.in b/Documentation/BLURB.in index 0d7df0a9d9..591817db35 100644 --- a/Documentation/BLURB.in +++ b/Documentation/BLURB.in @@ -1,5 +1,5 @@ LilyPond is a music typesetter. It produces beautiful sheet music -using a high level description file as input. It is part of the GNU -project. +using a high level description file as input. LilyPond is part of +the GNU Project. diff --git a/input/bugs/spacing-very-tight.ly b/input/bugs/spacing-very-tight.ly new file mode 100644 index 0000000000..c903f74af8 --- /dev/null +++ b/input/bugs/spacing-very-tight.ly @@ -0,0 +1,11 @@ +% when tightly spaced, hinterfleisch -> 0 (and not: -> note-width) +% we need a mininum of about a note-width/interline space before +% bar line + +% set rediculously tight +\score { + \notes { \time 2/2; c'2 c'2 \time 2/2; } + \paper { linewidth = 2.0 \cm; + indent = 0.0; + } +} diff --git a/input/test/stem-direction-down.ly b/input/test/stem-direction-down.ly new file mode 100644 index 0000000000..3834e272bd --- /dev/null +++ b/input/test/stem-direction-down.ly @@ -0,0 +1,8 @@ +\score{ + \notes\relative c{ + \include "stem-direction.sly"; + } + \paper{ + stem_default_neutral_direction=-1.0; + } +} diff --git a/lily/include/stem.hh b/lily/include/stem.hh index 4a59ac6911..14fe13c22a 100644 --- a/lily/include/stem.hh +++ b/lily/include/stem.hh @@ -48,11 +48,10 @@ class Stem : public Item, public Staff_symbol_referencer { */ Drul_array yextent_drul_; -public: // urg, autobeamer needs to know if there are (only) rests here? +public: Link_array head_l_arr_; Link_array rest_l_arr_; -public: /// log of the duration. Eg. 4 -> 16th note -> 2 flags int flag_i_; diff --git a/lily/tie.cc b/lily/tie.cc index e6c1902d77..1bd0d1cdee 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -39,11 +39,13 @@ Tie::get_default_dir () const { int m = (head_l_drul_[LEFT]->position_i_ + head_l_drul_[RIGHT]->position_i_) /2; + /* If dir is not determined: inverse of stem: down (see stem::get_default_dir ()) */ - return (m <= 0)? DOWN : UP; + Direction neutral_dir = (int)paper_l ()->get_var ("stem_default_neutral_direction"); + return (m == 0) ? other_dir (neutral_dir) : (m < 0) ? DOWN : UP; } void diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly index 7f9b4df710..dbc6e7b2d8 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly @@ -186,8 +186,7 @@ prelude_slurs = \notes{ prelude_a = \notes< \$prelude_notes - % Han-Wen: help: adding slurs breaks auto-beaming?? - %\$prelude_slurs + \$prelude_slurs > prelude = \context Staff \notes< -- 2.39.5