From a281aedda8d5ea550f8b851822315cf154acee52 Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 27 Mar 2002 02:56:08 +0000 Subject: [PATCH] lilypond-1.5.47 --- input/bugs/accents.ly | 13 --- input/bugs/ancient-font.ly | 132 ------------------------------ input/bugs/beaming.ly | 9 -- input/bugs/clefsp.ly | 20 ----- input/bugs/context-weirdness.ly | 52 ------------ input/bugs/first-midi-tie.ly | 31 ------- input/bugs/first-tie.ly | 11 --- input/bugs/grace-finger.ly | 10 --- input/bugs/partial-beam.ly | 28 ------- input/bugs/prefatory-spacing.ly | 15 ---- input/bugs/ties.ly | 22 ----- input/bugs/triplets.ly | 32 -------- lily/include/scope.hh | 41 ---------- lily/include/volta-spanner.hh | 27 ------ lily/line-group-group-engraver.cc | 70 ---------------- lily/scope.cc | 63 -------------- lily/volta-spanner.cc | 129 ----------------------------- 17 files changed, 705 deletions(-) delete mode 100644 input/bugs/accents.ly delete mode 100644 input/bugs/ancient-font.ly delete mode 100644 input/bugs/beaming.ly delete mode 100644 input/bugs/clefsp.ly delete mode 100644 input/bugs/context-weirdness.ly delete mode 100644 input/bugs/first-midi-tie.ly delete mode 100644 input/bugs/first-tie.ly delete mode 100644 input/bugs/grace-finger.ly delete mode 100644 input/bugs/partial-beam.ly delete mode 100644 input/bugs/prefatory-spacing.ly delete mode 100644 input/bugs/ties.ly delete mode 100644 input/bugs/triplets.ly delete mode 100644 lily/include/scope.hh delete mode 100644 lily/include/volta-spanner.hh delete mode 100644 lily/line-group-group-engraver.cc delete mode 100644 lily/scope.cc delete mode 100644 lily/volta-spanner.cc diff --git a/input/bugs/accents.ly b/input/bugs/accents.ly deleted file mode 100644 index 6d26098115..0000000000 --- a/input/bugs/accents.ly +++ /dev/null @@ -1,13 +0,0 @@ -\version "1.3.148" -\score { - \context Staff \notes\relative c''< - \context Voice=one { - \voiceOne - e2-> - } - \context Voice=two { - \voiceTwo - f,2-> - } - > -} \ No newline at end of file diff --git a/input/bugs/ancient-font.ly b/input/bugs/ancient-font.ly deleted file mode 100644 index 6aef817e6b..0000000000 --- a/input/bugs/ancient-font.ly +++ /dev/null @@ -1,132 +0,0 @@ -\version "1.3.148" -\header { -texidoc="setting staff symbol properties the normal way is broken" - title = "ancient font test" - date = "2000" -} - - - -\include "paper26.ly" - -global = \notes { - \property Score.timing = ##f -% \property Staff.TimeSignature \override #'style = #'old -} - -upperVoice = \context Staff = upperVoice < - \global - \property Staff.StaffSymbol \override #'line-count = #4 - \notes \transpose c' { - \property Voice.NoteHead \override #'style = #'mensural - \property Voice.Stem \override #'stem-centered = ##t - \property Staff.Custos \override #'style = #'vaticana - \clef "vaticana_fa2" - c2 d e f g - -% \property Staff.clefGlyph = #"clefs-vaticana_do" -% \property Staff.clefPosition = #1 -% \property Staff.clefOctavation = #0 - \clef "vaticana_do2" - - a b c' - b a g f - \clef "vaticana_fa1" - e d c1 \bar "|" - - \property Staff.Custos \override #'style = #'medicaea - \clef "medicaea_fa2" - c2 d e f g - \clef "medicaea_do2" - a b c' - b a g f - \clef "medicaea_fa1" - e d c1 \bar "|" - - \property Staff.Custos \override #'style = #'hufnagel - \clef "hufnagel_fa2" - c2 d e f g - \clef "hufnagel_do2" - a b c' - b a g f - \clef "hufnagel_fa1" - e d c1 \bar "||" - } -> - -lowerVoice = \context Staff = lowerNotes < - \global - \property Staff.StaffSymbol \override #'line-count = #5 - \notes \transpose c' { - \property Voice.NoteHead \override #'style = #'mensural - \property Voice.Stem \override #'stem-centered = ##t - \property Staff.Custos \override #'style = #'mensural - \clef "mensural1_c2" - c2 d e f g - \property Staff.forceClef = ##t - \clef "mensural1_c2" - a b c' - b a g f - \clef "mensural2_c2" - e d c1 \bar "|" - - \clef "mensural2_c2" - c2 d e f g - \property Staff.forceClef = ##t - \clef "mensural3_c2" - a b c' - b a g f - \clef "mensural3_c2" - e d c1 \bar "|" - - \clef "mensural1_f" - c2 d e f g - \property Staff.forceClef = ##t - \clef "mensural1_f" - a b c' - b a g f - \clef "mensural2_f" - e d c1 \bar "|" - - \property Staff.forceClef = ##t - \clef "mensural2_f" - c2 d e f g - \clef "mensural_g" - a' b' c'' - b' a' g' f' - \property Staff.forceClef = ##t - \clef "mensural_g" - e' d' c'1 \bar "|" - - \property Staff.forceClef = ##t - \clef "mensural_g" - c'2 d' e' f' g' - \clef "hufnagel_do_fa" - a b c' - b a g f - \property Staff.forceClef = ##t - \clef "hufnagel_do_fa" - e d c1 \bar "||" - } -> - -\score { - \context ChoirStaff < - \upperVoice - \lowerVoice - > - \paper { -% \paperTwentysix - linewidth = 17.25\cm - textheight = 26.0\cm - indent = 0.0 - \translator { - \StaffContext - \consists Custos_engraver -% Custos \override #'style = #'mensural - \remove Time_signature_engraver -% StaffSymbol \override #'line-count = #4 - } - } -} - diff --git a/input/bugs/beaming.ly b/input/bugs/beaming.ly deleted file mode 100644 index 54d1d38f9b..0000000000 --- a/input/bugs/beaming.ly +++ /dev/null @@ -1,9 +0,0 @@ -\header { -texidoc="Automatic beamer behaves differently in different measuere locations." -} -\version "1.3.148" - -\score { \notes { - - [\times 2/3 {c16 c c} c8] - [\times 2/3 {c16 c c} c8]}} diff --git a/input/bugs/clefsp.ly b/input/bugs/clefsp.ly deleted file mode 100644 index 91f8fe49f6..0000000000 --- a/input/bugs/clefsp.ly +++ /dev/null @@ -1,20 +0,0 @@ - - - -\score{< - \notes \relative c'' \context Staff=violin{ - \time 3/4 -s2. - \grace a b4 - } - \notes \relative c'' \context Staff=violoncello{ - \time 3/4 - \clef tenor -s2. \clef bass b4 - } -> -\paper{ - linewidth=-1 -} -} - diff --git a/input/bugs/context-weirdness.ly b/input/bugs/context-weirdness.ly deleted file mode 100644 index b7f4a6e8eb..0000000000 --- a/input/bugs/context-weirdness.ly +++ /dev/null @@ -1,52 +0,0 @@ -\header { -texidoc = "context level weirdness. after some commands, explicit - \context Voice commands must be inserted; otherwise subsequent property - settings fail silently" -} - -% from les-nereides.ly - - #(define (make-text-checker text) - (lambda (elt) (equal? text (ly-get-grob-property elt 'text)))) - -\score { - \context PianoStaff < - \context Staff=upper \notes\relative c' { - \property Score.timing = ##f - - \outputproperty #(make-text-checker "foe") #'extra-offset = #'(-2 . 4) - c-"foe" - - \translator Staff=lower - - % staff switch moves us - % implicitely to staff level: text-checker won't see "foe" - \outputproperty #(make-text-checker "foe") #'extra-offset = #'(-2 . 4) - c-"foe" - - % get back to Voice level: it works again - \context Voice - \outputproperty #(make-text-checker "foe") #'extra-offset = #'(-2 . 4) - c-"foe" - - \clef treble - - % clef change moves us - % implicitely to staff level: text-checker won't see "foe" - \outputproperty #(make-text-checker "foe") #'extra-offset = #'(-2 . 4) - c-"foe" - - % get back to Voice level: it works again - \context Voice - \outputproperty #(make-text-checker "foe") #'extra-offset = #'(-2 . 4) - c-"foe" - - } - \context Staff=lower \notes\relative c' { - s - } - > - \paper { - linewidth = -1.0 - } -} \ No newline at end of file diff --git a/input/bugs/first-midi-tie.ly b/input/bugs/first-midi-tie.ly deleted file mode 100644 index 1fe7b0c92d..0000000000 --- a/input/bugs/first-midi-tie.ly +++ /dev/null @@ -1,31 +0,0 @@ -\header { - -texidoc=" - - Interpreting music... - m.ly:3:14: warning: No ties were created!: - ~ - - - MIDI output to `m.midi'... -" -} - -chordexamples = \notes \relative c' { - ~ - ~ - ~<\context Voice = x {} e'> - ~ -} - -\score { - \context PianoStaff < - \context Staff = upper < - \clef treble - \context Voice = i { \voiceOne \chordexamples } - > - > - \paper { } - \midi { \tempo 4 = 120 } -} - diff --git a/input/bugs/first-tie.ly b/input/bugs/first-tie.ly deleted file mode 100644 index f04fb2f951..0000000000 --- a/input/bugs/first-tie.ly +++ /dev/null @@ -1,11 +0,0 @@ -\header{ - texidoc="no tie is generated for first chord of score. workaround: begin -with s1*0 spacer note." - } - -\score { - \context Staff \notes { - % s1*0 - ~ - } -} \ No newline at end of file diff --git a/input/bugs/grace-finger.ly b/input/bugs/grace-finger.ly deleted file mode 100644 index 9fffe3a84e..0000000000 --- a/input/bugs/grace-finger.ly +++ /dev/null @@ -1,10 +0,0 @@ -\version "1.3.148" - - - % ? - -\score { -\notes \context Voice = VA \relative c'' { - \grace {[b8^1 c^2]} d4^3 -} -\paper {linewidth = -1. }} diff --git a/input/bugs/partial-beam.ly b/input/bugs/partial-beam.ly deleted file mode 100644 index 44898ea28b..0000000000 --- a/input/bugs/partial-beam.ly +++ /dev/null @@ -1,28 +0,0 @@ -\version "1.3.148" -%docme -- geen id, lijkt ok? - -\include "paper20.ly" -Sopnotes = \notes { - \time 4/4 - \key g \major - \clef treble - \partial 8 * 3 - e'8 f'8 g'8 | - d'8 d'16 d'16 e'8. e'16 g'8 g'8 f'8 f'8 -} - -\score { - \notes - < - \context Staff="sop" - < - \Sopnotes - > - > - \paper { - \translator { - \StaffContext - autoBeamSettings \override #'(end * * * * ) = #(make-moment 1 8) - } - } -} diff --git a/input/bugs/prefatory-spacing.ly b/input/bugs/prefatory-spacing.ly deleted file mode 100644 index 06e718bc2a..0000000000 --- a/input/bugs/prefatory-spacing.ly +++ /dev/null @@ -1,15 +0,0 @@ -\version "1.3.148" - -\header { texidoc= "Spacing after clef/key should be stretched -equidistantly for large stretching, but should stay clear of prefatory -matter for small stretching. Support in the spacing engine for -separate spring constants for stretching/shrinking is needed" -} - -foo = \notes\relative c'' { \key as \major f } - -\score { - - < \foo - > -} diff --git a/input/bugs/ties.ly b/input/bugs/ties.ly deleted file mode 100644 index cbd12e9913..0000000000 --- a/input/bugs/ties.ly +++ /dev/null @@ -1,22 +0,0 @@ -\version "1.3.148" - -\header { - texidoc="Positioning of last ties is incorrect ties between 2-1 and 1-1 - durations differ." -} - -\score { - \context Staff < - \context Voice = a \notes\relative c'' { - \voiceOne - r2 a2 a1~a - } - \context Voice = y \notes\relative c' { - \voiceTwo - r2 a2~a1~a - } - > - \paper { - linewidth = 100 * \staffspace - } -} diff --git a/input/bugs/triplets.ly b/input/bugs/triplets.ly deleted file mode 100644 index 0d0e62923a..0000000000 --- a/input/bugs/triplets.ly +++ /dev/null @@ -1,32 +0,0 @@ -\version "1.3.148" - -\header { -texidoc = "Simple beams. This broke somewhere < 1.3.110 -" - title = "Gammes Chromatiques" - composer = "" - filename = "gammes_chromatiques.ly" -} - -%{ - - At bar 3 of 2nd score, stems are too big (or the beams are - badly positionned) -%} - -exI = \notes \relative c' { - \repeat "volta" 2 { - \times 2/3 {c8( cis d} \times 2/3 {dis e f} - \times 2/3 {fis g gis} \times 2/3 {a bes b} | - \property Voice.TupletBracket \override #'tuplet-number-visibility = ##f - \property Voice.TupletBracket \override #'tuplet-bracket-visibility = ##f - \times 2/3 {c8 cis d} \times 2/3 {dis e f} - \times 2/3 {fis g gis} \times 2/3 {a bes b} | - \times 2/3 {c b bes} \times 2/3 {a aes g} - \times 2/3 {fis f e} \times 2/3 {ees d des} | - \times 2/3 {c b bes} \times 2/3 {a aes g} - \times 2/3 {fis f e} \times 2/3 {ees d )des} - } - c1 || \break -} - -\score { \context Staff { \notes { \exI } } } diff --git a/lily/include/scope.hh b/lily/include/scope.hh deleted file mode 100644 index adabc40499..0000000000 --- a/lily/include/scope.hh +++ /dev/null @@ -1,41 +0,0 @@ -/* - scope.hh -- declare Scope - - source file of the GNU LilyPond music typesetter - - (c) 1998--2002 Han-Wen Nienhuys - - */ - -#ifndef SCOPE_HH -#define SCOPE_HH - -#include "lily-proto.hh" -#include "lily-guile.hh" - -class Scheme_hash_table; - -/* - Junk this almost-void class. - */ -class Scope { - Scheme_hash_table *id_dict_; - Scope (Scope const &); -public: - SCM to_alist () const; - bool elem_b (String ) const; - bool elem_b (SCM s) const; - - bool try_retrieve (SCM key, SCM *val) const; - - SCM scm_elem (String) const; - SCM scm_elem (SCM) const; - - - void set (String, SCM); - Scope (Scheme_hash_table*); - - friend class Scope_iter; -}; -#endif /* SCOPE_HH */ - diff --git a/lily/include/volta-spanner.hh b/lily/include/volta-spanner.hh deleted file mode 100644 index 874a62f258..0000000000 --- a/lily/include/volta-spanner.hh +++ /dev/null @@ -1,27 +0,0 @@ -/* - volta-spanner.hh -- part of GNU LilyPond - - (c) 1997--2002 Jan Nieuwenhuizen -*/ - -#ifndef VOLTA_SPANNER_HH -#define VOLTA_SPANNER_HH - - -#include "spanner.hh" - -/** -*/ - -class Volta_spanner -{ -public: - static void set_interface (Grob*); - static bool has_interface (Grob*); - DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM )); - static void add_column (Grob*, Grob*col); - static void add_bar (Grob*me, Item*bar); -}; - -#endif // VOLTA_SPANNER_HH - diff --git a/lily/line-group-group-engraver.cc b/lily/line-group-group-engraver.cc deleted file mode 100644 index 0ef6a7d81d..0000000000 --- a/lily/line-group-group-engraver.cc +++ /dev/null @@ -1,70 +0,0 @@ -/* - line-group-engraver-group.cc -- implement Line_group_engraver - - source file of the GNU LilyPond music typesetter - - (c) 1997--2002 Han-Wen Nienhuys -*/ - -#include "command-request.hh" -#include "bar-line.hh" -#include "debug.hh" -#include "line-group-group-engraver.hh" -#include "paper-column.hh" -#include "axis-group-interface.hh" -#include "spanner.hh" - - -Line_group_engraver_group::Line_group_engraver_group () -{ - staffline_p_ =0; -} - - -void -Line_group_engraver_group::typeset_grob (Grob *elem) -{ - if (!elem->get_parent (Y_AXIS)) - Axis_group_interface::add_element (staffline_p_, elem); - Engraver_group_engraver::typeset_grob (elem); -} - - -void -Line_group_engraver_group::finalize () -{ - Engraver_group_engraver::finalize (); - Grob * it - = unsmob_grob (get_property ("currentCommandColumn")); - - staffline_p_->set_bound (RIGHT,it); - Engraver_group_engraver::typeset_grob (staffline_p_); - staffline_p_ = 0; -} - -void -Line_group_engraver_group::initialize () -{ - create_line_spanner (); - Grob * it - = unsmob_grob (get_property ("currentCommandColumn")); - staffline_p_->set_bound (LEFT,it); - - Engraver::announce_grob (staffline_p_, SCM_EOL); -} - -void -Line_group_engraver_group::create_line_spanner () -{ - staffline_p_ = new Spanner (SCM_EOL); - Axis_group_interface::set_interface (staffline_p_); - Axis_group_interface::set_axes (staffline_p_, Y_AXIS,Y_AXIS); -} - -ENTER_DESCRIPTION(Line_group_engraver_group, - "", - "", - "", - "", - ""); - diff --git a/lily/scope.cc b/lily/scope.cc deleted file mode 100644 index a4a1c34d0a..0000000000 --- a/lily/scope.cc +++ /dev/null @@ -1,63 +0,0 @@ -/* - scope.cc -- implement Scope - - source file of the GNU LilyPond music typesetter - - (c) 1998--2002 Han-Wen Nienhuys - - */ - -#include "scope.hh" -#include "string.hh" -#include "scm-hash.hh" - -Scope::Scope (Scheme_hash_table * st) -{ - assert (st); - id_dict_ =st; -} - -bool -Scope::elem_b (String s) const -{ - return id_dict_->elem_b (ly_symbol2scm (s.ch_C ())); -} - -bool -Scope::elem_b (SCM s) const -{ - return id_dict_->elem_b (s); -} - - -SCM -Scope::scm_elem (SCM s)const -{ - return id_dict_->get (s); -} - -SCM -Scope::scm_elem (String s) const -{ - return scm_elem (ly_symbol2scm (s.ch_C ())); -} - - -void -Scope::set (String s, SCM id) -{ - return id_dict_->set (ly_symbol2scm (s.ch_C ()), id); -} - -SCM -Scope::to_alist () const -{ - return id_dict_->to_alist (); -} - -bool -Scope::try_retrieve (SCM k , SCM *v)const -{ - return id_dict_->try_retrieve (k, v); -} - diff --git a/lily/volta-spanner.cc b/lily/volta-spanner.cc deleted file mode 100644 index 8b3faa777b..0000000000 --- a/lily/volta-spanner.cc +++ /dev/null @@ -1,129 +0,0 @@ -/* - volta-spanner.cc -- implement Volta_spanner - - source file of the GNU LilyPond music typesetter - - (c) 1997--2002 Jan Nieuwenhuizen -*/ - -#include - -#include "box.hh" -#include "debug.hh" -#include "font-interface.hh" -#include "molecule.hh" -#include "paper-column.hh" -#include "paper-def.hh" -#include "text-item.hh" -#include "volta-spanner.hh" -#include "group-interface.hh" -#include "side-position-interface.hh" -#include "directional-element-interface.hh" - - -void -Volta_spanner::set_interface (Grob*) -{ -} - -/* - this is too complicated. Yet another version of side-positioning, - badly implemented. - - -- - - * Should look for system_start_delim to find left edge of staff. - -*/ - -MAKE_SCHEME_CALLBACK (Volta_spanner,brew_molecule,1); -SCM -Volta_spanner::brew_molecule (SCM smob) -{ - Grob *me = unsmob_grob (smob); - Link_array bar_arr - = Pointer_group_interface__extract_grobs (me, (Item*)0, "bars"); - - if (!bar_arr.size ()) - return SCM_EOL; - - Spanner *orig_span = dynamic_cast (me->original_l_); - - bool first_bracket = orig_span && (orig_span->broken_into_l_arr_[0] == (Spanner*)me); - - bool last_bracket = orig_span && (orig_span->broken_into_l_arr_.top () == (Spanner*)me); - - bool no_vertical_start = orig_span && !first_bracket; - bool no_vertical_end = orig_span && !last_bracket; - SCM bars = me->get_grob_property ("bars"); - Grob * endbar = unsmob_grob (ly_car (bars)); - SCM glyph = endbar->get_grob_property("glyph"); - String str = ly_scm2string(glyph); - const char* cs = str.ch_C(); - no_vertical_end |= - (strcmp(cs,":|")!=0 && strcmp(cs,"|:")!=0 && strcmp(cs,"|.")!=0 - && strcmp(cs,":|:")!=0 && strcmp(cs,".|")!=0); - - Real staff_thick = me->paper_l ()->get_var ("stafflinethickness"); - Real half_space = 0.5; - - Item * bound = dynamic_cast (me)->get_bound (LEFT); - - /* - not a start, but really broken in two - */ - Real left =0.; - if (bound->break_status_dir () == RIGHT) - { - Paper_column *pc = bound->column_l (); - left = pc->extent (pc, X_AXIS)[RIGHT] - bound->relative_coordinate (pc, X_AXIS); - } - else - { - /* - the volta spanner is attached to the bar-line, which is moved - to the right. We don't need to compensate for the left edge. - */ - } - - Real w = dynamic_cast (me)->spanner_length () - left - half_space; - Real h = gh_scm2double (me->get_grob_property ("height")); - Real t = staff_thick * gh_scm2double (me->get_grob_property ("thickness")); - - /* - ugh: should build from line segments. - */ - SCM at = (scm_list_n (ly_symbol2scm ("volta"), - gh_double2scm (h), - gh_double2scm (w), - gh_double2scm (t), - gh_int2scm (no_vertical_start), - gh_int2scm (no_vertical_end), - SCM_UNDEFINED)); - - Box b (Interval (0, w), Interval (0, h)); - Molecule mol (b, at); - SCM text = me->get_grob_property ("text"); - SCM properties = scm_list_n (me->mutable_property_alist_, me->immutable_property_alist_,SCM_UNDEFINED); - Molecule num = Text_item::text2molecule (me, text, properties); - - mol.add_at_edge (X_AXIS, LEFT, num, - num.extent (X_AXIS).length () - - 1.0); - mol.translate_axis (left, X_AXIS); - return mol.smobbed_copy (); -} - - -void -Volta_spanner::add_bar (Grob *me, Item* b) -{ - Pointer_group_interface::add_grob (me, ly_symbol2scm ("bars"), b); - Side_position_interface::add_support (me,b); - add_bound_item (dynamic_cast (me), b); -} - -void -Volta_spanner::add_column (Grob*me, Grob* c) -{ - Side_position_interface::add_support (me,c); -} -- 2.39.5