From c9c98473e9e5f5dfef0de988099a40ce1bdcf05e Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 27 Mar 2002 00:41:15 +0000 Subject: [PATCH] lilypond-1.3.111 --- input/bugs/dotted-collision.ly | 58 ----------- input/bugs/grace-skip.ly | 11 --- input/bugs/knee.ly | 8 -- input/bugs/non-empty-text.ly | 23 ----- input/bugs/script-collide.ly | 2 - input/bugs/stem-dir.ly | 16 ---- input/bugs/text-dynamics.ly | 144 ---------------------------- input/bugs/tuplet-space.ly | 9 -- input/bugs/volta-instrument-name.ly | 41 -------- lily/grob-callback.cc | 56 ----------- lily/music-iterator-ctor.cc | 65 ------------- 11 files changed, 433 deletions(-) delete mode 100644 input/bugs/dotted-collision.ly delete mode 100644 input/bugs/grace-skip.ly delete mode 100644 input/bugs/knee.ly delete mode 100644 input/bugs/non-empty-text.ly delete mode 100644 input/bugs/script-collide.ly delete mode 100644 input/bugs/stem-dir.ly delete mode 100644 input/bugs/text-dynamics.ly delete mode 100644 input/bugs/tuplet-space.ly delete mode 100644 input/bugs/volta-instrument-name.ly delete mode 100644 lily/grob-callback.cc delete mode 100644 lily/music-iterator-ctor.cc diff --git a/input/bugs/dotted-collision.ly b/input/bugs/dotted-collision.ly deleted file mode 100644 index bba8b8bdab..0000000000 --- a/input/bugs/dotted-collision.ly +++ /dev/null @@ -1,58 +0,0 @@ -\header{ -enteredby = "Donat Wullschleger"; -} - -\version "1.3.93"; - -\include "paper16.ly"; -\include "deutsch.ly"; - -righthandfirstvoice = \notes \relative c'' - \context Voice = upper { - \key b \major; - \time 6/8; - - r8. r8. r8. r8. | - r4. r4. | - r2. | - - \bar "|."; -} - -lefthandfirstvoice = \notes \relative c - \context Voice = upper { - \voiceOne - \key b \major; - \clef bass; - - as4. [g8 a16 h c8] | - as4. [g8 a16 h c8] | - as4. [g8 a16 h c8] | -} - -lefthandsecondvoice = \notes \relative c - \context Voice = lower { - \voiceTwo - r2. | - r4. r4. | - r8. r8. r8. r8. | -} - -\score{ - \context PianoStaff \notes < - \context Staff = top < - \righthandfirstvoice - > - \context Staff = bottom < - \lefthandfirstvoice - \lefthandsecondvoice - > - > - - \paper{ - \translator{ - \OrchestralScoreContext - } - - } -} diff --git a/input/bugs/grace-skip.ly b/input/bugs/grace-skip.ly deleted file mode 100644 index 665fb7d98e..0000000000 --- a/input/bugs/grace-skip.ly +++ /dev/null @@ -1,11 +0,0 @@ -% dumps core: 1.3.93 -\score{ - \notes{ - \grace { - s16 s s s s32 s s s - s - s - } - - } -} diff --git a/input/bugs/knee.ly b/input/bugs/knee.ly deleted file mode 100644 index 3b86f0c937..0000000000 --- a/input/bugs/knee.ly +++ /dev/null @@ -1,8 +0,0 @@ -\version "1.3.93"; -\score{ - \notes\relative c'{ - [c16 \stemDown c'' \stemBoth c,, d] - \stemDown [d'' a \stemBoth c,, g,] - \stemUp [g c' \stemBoth a'' d'] - } -} diff --git a/input/bugs/non-empty-text.ly b/input/bugs/non-empty-text.ly deleted file mode 100644 index 6244598991..0000000000 --- a/input/bugs/non-empty-text.ly +++ /dev/null @@ -1,23 +0,0 @@ -% -% Try this file with 1.2.17: it works -% 1.2 had a different default, and uses textEmptyDimension scalar property -% -\score{ - \notes\relative c''{ - %\property Staff.textEmptyDimension=1 - a-"This text has no" - a - a - a-"width; the default" - \break - \property Staff.textNonEmpty=##t - %\property Staff.textEmptyDimension=0 - a-"This text" - a-"is fat: notes are spaced" - a-"far apart and text" - a-"does not collide" - } - \paper{ - linewidth=80.\mm; - } -} diff --git a/input/bugs/script-collide.ly b/input/bugs/script-collide.ly deleted file mode 100644 index 3167a77c85..0000000000 --- a/input/bugs/script-collide.ly +++ /dev/null @@ -1,2 +0,0 @@ - -\score { \notes { c4-1-2-3 }} diff --git a/input/bugs/stem-dir.ly b/input/bugs/stem-dir.ly deleted file mode 100644 index 0233a1b700..0000000000 --- a/input/bugs/stem-dir.ly +++ /dev/null @@ -1,16 +0,0 @@ -% -% must push 0 to get 'stemboth', popping alone doesn't work -% -\score{ - \notes\relative c''{ - c4 - \property Voice.basicStemProperties \push #'direction = #1 - c - %\property Voice.basicStemProperties \pop #'direction - \property basicStemProperties \pop #'direction - c - % burp? - \property Voice.basicStemProperties \push #'direction = #0 - c - } -} diff --git a/input/bugs/text-dynamics.ly b/input/bugs/text-dynamics.ly deleted file mode 100644 index 03dfeee77c..0000000000 --- a/input/bugs/text-dynamics.ly +++ /dev/null @@ -1,144 +0,0 @@ -\header{ -Composer="Sergej Rachmaninov (1873-1943)"; -Title="Elegie"; -Subtitle="À Monsieur A. Arensky"; -Opus="Opus 3 Nr 1"; -Note="Small fragment to show Pedal and Dynamics problems"; -Enteredby="JCN"; -} - -% -% Arg. -% How to remove dynamics from Voice/Staff, but still show fingering? -% When Dynamic_engraver is removed, the Text_engraver happily engraves -% the dynamic markings. -% When the Text_engraver is removed, it can't engrave the fingerings. -% - -global = \notes{ - \key es \minor; - \time 4/4; -} - -upperMusic = \context Voice\notes\relative c'' { - %1 - R1 - R1 - r2 ges'2--~ -} - -upperDynamics = \context Voice\notes { - %1 - s1\pp - s1 - s2 s2\mf -} - -upperFingering = \context Voice\notes { - %1 - s1 - s1 - s2 s2-4 -} - -lowerMusic = \context Voice\notes\relative c { - %1 - bes' ges' es' bes' es, ges,)bes, - bes' ges' es' bes' es, ges,)bes, - bes' ges' es' bes' es, ges,)bes, -} - -lowerPedal = \context Voice\notes { - %1 - %1 - s8\unachorda\sustaindown s8 s4 s2 - s8\sustaindown\sustainup s8 s4 s2 - s8\sustaindown\sustainup s8 s4 s2\trechorde -} - -lowerDynamics = \context Voice\notes { - %1 -} - -lowerFingering = \context Voice\notes { - %1 - s8 s8-5 s-2 s-1 s-2 s-1 s-2 s - s1 - s1 -} - -\score{ - \context PianoStaff < - \context UpperStaff=upper < - \global - \upperMusic - \upperDynamics - \upperFingering - \lowerPedal - > - \context LowerStaff=lower < - \global - \clef bass; - \lowerMusic - \lowerPedal - \lowerDynamics - \lowerFingering - \upperDynamics - > - > - \paper{ - % Hmm - \translator { - \VoiceContext - \remove "Piano_pedal_engraver"; - \remove "Dynamic_engraver"; - % AAAARGH! - \remove "Text_engraver"; - } - \translator { - \StaffContext - \name "UpperStaff"; - \consists "Dynamic_engraver"; - dynamicPadding = #3 % urg, in \pt - dynamicMinimumSpace = #6 % urg, in \pt - } - \translator { - \StaffContext - \name "LowerStaff"; - \consists "Piano_pedal_engraver"; - startSustain = #"Ped." - stopSustain = #"*" - stopStartSustain = #"-P" - startUnaChorda = #"una chorda" - stopUnaChorda = #"tre chorde" - textScriptPadding = #3.0 - } - \translator { - \PianoStaffContext - \accepts "UpperStaff"; - \accepts "LowerStaff"; - } - \translator { - \ScoreContext - timeSignatureStyle = #"C" - } - } - \midi{ - % Zucht - \translator { - \StaffContext - \name "UpperStaff"; - } - \translator { - \StaffContext - \name "LowerStaff"; - } - \translator { - \ScoreContext - \accepts "UpperStaff"; - \accepts "LowerStaff"; - } - \tempo 4 = 88; - } -} - diff --git a/input/bugs/tuplet-space.ly b/input/bugs/tuplet-space.ly deleted file mode 100644 index f2ae9e8919..0000000000 --- a/input/bugs/tuplet-space.ly +++ /dev/null @@ -1,9 +0,0 @@ -% using \times amongst space notes dumps core -\score{ - \context Staff \notes\relative c''< - \times 2/3{ a8 b c } - \times 2/3{ s8\p s s\f } - > - \paper{ - } -} diff --git a/input/bugs/volta-instrument-name.ly b/input/bugs/volta-instrument-name.ly deleted file mode 100644 index 2bdcfa2bc6..0000000000 --- a/input/bugs/volta-instrument-name.ly +++ /dev/null @@ -1,41 +0,0 @@ - -voice4 = \notes { -\clef bass; - \property Staff.instrument = "Bass" - \property Staff.instr = "B" - \time 4/4; f,2 ( ) f,8 r8 f8 e8 -\repeat volta 2 -{ - d8. d16 e8. f16 f8 c8 c16 c8. -} -\alternative -{ - { f,2 ( ) f,8 r8 f8 e8 \break } - { f,2. r8 c16 c16 | - } -} -} -voicedefault = \notes { - \property Staff.timeSignatureStyle="C" - \time 4/4; \key f; - \tempo 4 = 200; -} -\score{ - \notes < - - - \context Staff="4" - { - \$voicedefault - \$voice4 - } - - > - \paper { - font_normal = 12.; - \translator { - \StaffContext - \consists Instrument_name_engraver; - } - } -} diff --git a/lily/grob-callback.cc b/lily/grob-callback.cc deleted file mode 100644 index d9625b34f1..0000000000 --- a/lily/grob-callback.cc +++ /dev/null @@ -1,56 +0,0 @@ -#if 0 -/* - grob-callback.cc -- implement Callback smob. - - source file of the GNU LilyPond music typesetter - - (c) 2000 Han-Wen Nienhuys - - */ - -#include "grob-callback.hh" - -static SCM callback_tag; - -static -SCM mark_smob (SCM) -{ - return SCM_EOL; -} - -static int -print_smob (SCM, SCM port, scm_print_state *) -{ - scm_puts ("#", port); - return 1; -} - -static -scm_sizet free_smob (SCM) -{ - return 0; -} - -static -void start_callback_smobs() -{ - callback_tag = scm_make_smob_type_mfpe ("callback", 0, - mark_smob, free_smob, - print_smob, 0); -} - - -SCM -smobify_callback (Grob_callback cb ) -{ - SCM z; - - SCM_NEWCELL(z); - SCM_SETCDR (z, (SCM)cb); - SCM_SETCAR (z, (SCM)callback_tag); - - return z; -} - -ADD_SCM_INIT_FUNC(callback, start_callback_smobs); -#endif diff --git a/lily/music-iterator-ctor.cc b/lily/music-iterator-ctor.cc deleted file mode 100644 index bb13173717..0000000000 --- a/lily/music-iterator-ctor.cc +++ /dev/null @@ -1,65 +0,0 @@ -/* - grob-callback.cc -- implement Callback smob. - - source file of the GNU LilyPond music typesetter - - (c) 2000 Han-Wen Nienhuys - - */ - -#include "music-iterator-ctor.hh" -#include "ly-smobs.icc" - -static long callback_tag; - -static -SCM mark_smob (SCM) -{ - return SCM_EOL; -} - -static int -print_smob (SCM, SCM port, scm_print_state *) -{ - scm_puts ("#", port); - return 1; -} - -static -scm_sizet free_smob (SCM) -{ - return 0; -} - - -void init_cxx_function_smobs() -{ - callback_tag = scm_make_smob_type_mfpe ("callback", 0, - mark_smob, free_smob, - print_smob, 0); -} - -SCM -smobify_cxx_function (Cxx_function cb ) -{ - SCM z; - - SCM_NEWCELL(z); - SCM_SETCDR (z, (SCM)cb); - SCM_SETCAR (z, (SCM)callback_tag); - - return z; -} - - -Cxx_function -unsmob_cxx_function (SCM x) -{ - if (SCM_CELL_TYPE(x) == callback_tag) - return (Cxx_function) SCM_CELL_WORD_1(x); - else - return 0; -} - - - -- 2.39.5