From f7da4ac7b4ee9e357f0afc3b8bdbc19c27f54a78 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 11 Jan 1999 13:45:50 +0100 Subject: [PATCH] release: 1.1.20 --- NEWS | 21 +-- TODO | 37 +++-- VERSION | 4 +- input/bugs/oeps.ly | 277 +++++++++++++++++++++++++++++++++++++ input/praeludium-fuga-E.ly | 14 +- lily/beam-engraver.cc | 1 + make/lilypond-vars.make | 2 +- make/out/lelievijver.lsm | 8 +- make/out/lilypond.lsm | 8 +- make/out/lilypond.spec | 4 +- 10 files changed, 323 insertions(+), 53 deletions(-) create mode 100644 input/bugs/oeps.ly diff --git a/NEWS b/NEWS index 7baf3c440b..5df616f269 100644 --- a/NEWS +++ b/NEWS @@ -1,24 +1,13 @@ ---- ../lilypond-1.1.19.jcn4/NEWS Sat Jan 9 21:11:06 1999 -++ b/NEWS Sun Jan 10 22:05:13 1999 -@@ -1,3 +1,6 @@ +pl 20 + + pl 19.jcn5 - interstaff beams v0: see beam-interstaff.ly and wtk1-fugue2.ly - pl 19.jcn4 - - new stem/beam parameters - - bf: forced stem shorten--- ../lilypond-1.1.19.jcn3/NEWS Sat Jan 9 16:03:22 1999 -++ b/NEWS Sat Jan 9 21:11:06 1999 -@@ -1,3 +1,7 @@ pl 19.jcn4 - new stem/beam parameters - bf: forced stem shorten - pl 19.jcn3 - - dehairification of beam code; cleanup and bugfixes - * stemlength--- ../lilypond-1.1.19.jcn2/NEWS Fri Jan 8 18:01:10 1999 -++ b/NEWS Sat Jan 9 16:03:22 1999 -@@ -1,4 +1,12 @@ --pl 19.jcn1 pl 19.jcn3 - dehairification of beam code; cleanup and bugfixes * stemlength @@ -28,14 +17,12 @@ pl 19.jcn3 * catch for silly beams: input/test/beam-suspect.ly pl 19.jcn2 - - multi-measure-rest is now spanner SkipBars=0 is broken - - pl 19.jcn1pl 19.jcn2 - multi-measure-rest is now spanner SkipBars=0 is broken pl 19.jcn1 - hmm, almost centered whole-bar rests -- NOT +******** pl 18.jcn5 - bf: beamtrend - bf: vv-duet diff --git a/TODO b/TODO index 2b1245e000..f01020231f 100644 --- a/TODO +++ b/TODO @@ -6,20 +6,29 @@ done, or is an idea that I want to think about Most of the items are marked in the code as well, with full explanation. grep for TODO and ugh/ugr/urg -> I have changed Mark_engraver to use the G_... classes. -> My implementation has the following shortcomings at the -> moment. -> -> - markScriptPadding is not supported, since G_staff_side_item does not -> support padding. -> -> - markBreakPriority is not supported. -> -> - Mostly, you want the marks aligned with the bar lines. I don't -> really understand how to implement that feature. -> -> - You get lots of warnings about missing 'number' and 'Large' -> + + > I have changed Mark_engraver to use the G_... classes. + > My implementation has the following shortcomings at the + > moment. + > + > - markScriptPadding is not supported, since G_staff_side_item does not + > support padding. + > + > - markBreakPriority is not supported. + > + > - Mostly, you want the marks aligned with the bar lines. I don't + > really understand how to implement that feature. + > + > - You get lots of warnings about missing 'number' and 'Large' + + + *{ \voiceone [g''8 fis'' e''] d''4 |} + and=20 + { \voicetwo d'4 d'2.*2/3 } spacing + + * tied notes for MIDI + + * sharp /flat on trills (in MIDI ??) * scm-ify \property values. - The direction of textual scripts ('^' or '_') is ignored. diff --git a/VERSION b/VERSION index 705b1d3fb3..d648aa5100 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 -PATCH_LEVEL=19 -MY_PATCH_LEVEL=jcn5 +PATCH_LEVEL=20 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/bugs/oeps.ly b/input/bugs/oeps.ly new file mode 100644 index 0000000000..2d90ea8816 --- /dev/null +++ b/input/bugs/oeps.ly @@ -0,0 +1,277 @@ + +\header{ +filename="Sinfonia.ly"; +title="Sinfonia"; +subtitle="G major"; +composer="Leopold Mozart"; +arranger="(1719-1787)"; +copyright="public domain"; +enteredby="Maarten Storm"; +} + + +global = \notes{ + \key G; + \time 2/4; + s2*4 \break + s2*5 \break + s2*5 \break + s2*5 \break + s2*5 \break + s2*5 \break + s2*5 \break + s2*5 \break + s2*5 \break + s2*5 \break + s2*6 \bar ":|"; \break + \bar "|:"; s2*6 + s2*5 \break + s2*5 \break + s2*5 \break + s2*5 \break + +} + +tempi = \notes{ + \property Voice.textstyle = "large" + s8^"Allegro" + +} + +dynamics = \notes{ +% \type Voice=i +} + + +violinoi = \notes \relative c'{ + \type Voice=i + \clef "violin"; + [ g'' g g] | [g16 a b a] [g a b a] | + [ g'' g g] | [g16 a b a] [g a b a] | +%5 + [ g'' g g] | [g16 d c b] [a g fis g] | + [e' fis g fis] [g e d c] | [b c d c] [d b a g] | + [e' fis g fis] [g e d c] | [b c d c] [d b a g] | +%11 + [fis g a b] [c a g fis] | [g a b c] [d b a g] | + [a b c d] [e c b a] | [b c d c] [d b a g] | +%15 + [fis g a g] [fis e d c] | [b a g8] r4 | + [ g'' g g] | \times 2/3 {[g8 d c] [b a g] | + [g'8\p d c] [b a g] | +%20 + [f'\f d c] [b a g]} | + [ e' e e] | | + [ a'' a a] | + \times 2/3 {[a8 e d] [cis b a] | [a'\p e d] [cis b a] | +%26 + [g'\f e d] [cis b a]} | [ fis' fis fis] | + | \times 2/3 {[b'8 c d] [e fis g] | + [g fis g] [b, a g] | [a b cis] [d e fis] | +%32 + [fis e fis] [a, g fis] | [g a b] [cis d e] | + [e d e] [g, fis e]} +%35 + [fis16 d e d] [e d e d] | [g d e d] [e d e d] | + [a' d, e d] [e d e d] | [b' d, e d] [e d e d] | + [cis' a b a] [b a b a] | [d a b a] [b a b a] | + [e' a, b a] [a b a b] | [fis' a, b a] [a b a b] | +%43 + \times 2/3 {[g'8 b a] [g fis e] | [a d, cis] [d cis d] | + [g, b a] [g fis e] | [a d, cis] [d cis d]} | +%47 + [b''16 g fis e] [a fis e d] | [g e d cis] [fis d cis b] | gis,2 | +%50 + a4 g'! | [fis16 fis e d] e4 | d d' | r8 r16 gis,16 a4 | + r8 [fis g! a] | d,2 + [d'8\p e f a,] | [gis a] r4 | + \times 2/3 {[f8\f e d] [c b a]} | [gis a] r4 | +%60 + [c'8\p d e g,?] | [fis g] r4 | + \times 2/3 {[d8\f a' c] [b a b]} | [b a] r4 | +%64 : reprise + [ g'' g g] | [g16 a b a] [g a b a] | + [ g'' g g] | [g16 a b a] [g a b a] | + [ g'' g g] | [g16 d c b] [a g fis g] | +%70 + [e' fis g fis] [g e d c] | [b c d c] [d b a g] | + [fis g a g] [fis e d c] | [b a g8] r4 | + [ g'' g g] | \times 2/3 {[g8 d c] [b a g] | + [f\f d c] [b a g]} | [e' c] r4 | +%78 + [ a'' a a] | + \times 2/3 {[a8 e d] [cis b a] | + [g e d] [cis b a]} | [fis' d] r4 | +} + +violinoii = \notes \relative c'{ + \type Voice=i + \clef "violin"; + [ g'' g g] | [b,16 c d c] [b c d c] | + [ g'' g g] | [b,16 c d c] [b c d c] | +%5 + [ g'' g g] | [g16 d c b] [a g fis g] | + [e' fis g fis] [g e d c] | [b c d c] [d b a g] | + [e' fis g fis] [g e d c] | [b c d c] [d b a g] | +%11 + [fis g a b] [c a g fis] | [g a b c] [d b a g] | + [a b c d] [e c b a] | [b c d c] [d b a g] | +%15 + [fis g a g] [fis e d c] | [b a g8] r4 | + [ g'' g g] | \times 2/3 {[g8 d c] [b a g] | + [g'8\p d c] [b a g] | [f'\f d c] [b a g]} | +%21 + [ e' e e] | | + [ a'' a a] | + \times 2/3 {[a8 e d] [cis b a] | [a'\p e d] [cis b a] | +%26 + [g'\f e d] [cis b a]} | [ fis' fis fis] | + | \times 2/3 {[b'8 c d] [e fis g] | + [g fis g] [b, a g] | [a b cis] [d e fis] | +%32 + [fis e fis] [a, g fis] | [g a b] [cis d e] | + [e d e] [g, fis e]} +%35 + [fis16 d e d] [e d e d] | [g d e d] [e d e d] | + [a' d, e d] [e d e d] | [b' d, e d] [e d e d] | + [cis' a b a] [b a b a] | [d a b a] [b a b a] | + [e' a, b a] [a b a b] | [fis' a, b a] [a b a b] | +%43 + \times 2/3 {[g'8 b a] [g fis e] | [a d, cis] [d cis d] | + [g, b a] [g fis e] | [a d, cis] [d cis d]} | +%47 + [b''16 g fis e] [a fis e d] | [g e d cis] [fis d cis b] | gis,2 | +%50 + a4 g'! | [fis16 fis e d] e4 | d d' | r8 r16 g,16 a4 | + r8 [fis g! a] | d,2 + f4\p r8 f | [e-. ~ e-.] r4 | + \times 2/3 {[f8\f e d] [c b a]} | [gis a] r4 | +%60 + e'4\p r8 e | [d-. ~ d-.] r4 | + \times 2/3 {[d8\f a' c] [b a b]} | [b a] r4 | +%64 : reprise + [ g'' g g] | [b,16 c d c] [b c d c] | + [ g'' g g] | [b,16 c d c] [b c d c] | + [ g'' g g] | [g16 d c b] [a g fis g] | +%70 + [e' fis g fis] [g e d c] | [b c d c] [d b a g] | + [fis g a g] [fis e d c] | [b a g8] r4 | + [ g'' g g] | \times 2/3 {[g8 d c] [b a g] | + [f\f d c] [b a g]} | [e' c] r4 | +%78 + [ a'' a a] | + \times 2/3 {[a8 e d] [cis b a] | + [g e d] [cis b a]} | [fis' d] r4 | + +} + +viola = \notes \relative c'{ + \type Voice=i + \clef "alto"; + [b16 c d c] [b c d c] | [b8 b b b] | + [b16 c d c] [b c d c] | [b8 b b b] | +%5 + [b16 c d c] [b c d c] | b4 r | + r8 [e g a] | [d, b b d] | [g, e' g a] | +%10 + [d, b d e] | [a, fis'16 g] [a fis e d] | + [d8 d d d] | r [a' a a] | [d, b d e] | + [a, d d a] | [g16 g' fis e] [d c b a] | + [g b d c] [b c d c] | b4 r | d d | d d | +%21 + [e16 f? g f] [e f g f] | [g8 e e d] | + [cis16 d e d] [cis d e d] | cis4 r | +%25 + e\p e | e\f e | [fis16 g a g] [fis g a g] | + [fis8 fis a a] | d4 b | b g' | cis,? a | + a fis' b, g' | a a, | +%35 + [a8 fis' fis fis] | r [g g g] | r [a a a] | + r [b, b b] | r [cis cis cis] | r [d d d] | r [e e e] | + r [fis fis fis] | +%43 + \times 2/3 {[e g fis] | [e fis g]} | fis4 r | + \times 2/3 {[e8 g fis] | [e fis g]} | fis4 r | +%47 + [d8 g d fis] | r [e a, d] | r b [b cis16 d] | + [e8 d e cis] | [d d d cis] | d4 d' | r8 r16 gis, a4 | + r8 [fis8 g! a] | d,2 + [d8\p d d d] | [d c!] r4 | + \times 2/3 {[f8\f e d] [c b a]} | [gis a] r4 | +%60 + [c8\p c c c] | [c b] r4 | [a8 fis e g] | [g fis] r4 | +%64 : reprise + [b,16 c d c] [b c d c] | [b8 b b b] | + [b16 c d c] [b c d c] | [b8 b b b] | +%68 + [b16 c d c] [b c d c] | b4 r | + r8 [e g a] | [d b] r e | [a, a a a] | +%73 + [g16 b c d] [e fis g a] | [b c d c] [b c d c] | b4 r | + d, d | g, r | [cis16 d e d] [cis d e d] | cis 4 r | +%80 + e4 e | [a,8 fis'16 g] [fis8 d] | +} + +bassocontinuo = \notes \relative c'{ + \type Voice=i + \clef "bass"; + [g16 a b a] [g a b a] | [g8 g, g g'] | + [g16 a b a] [g a b a] | [g8 g, g g'] | +%5 + [g16 a b a] [g a b a] | [g8 g,] r4 | + [c'8 c,] [e_"6" fis_"6"_"5" | [g g g b,_"6"] | + [c c] [e_"6" fis_"6"_"5" | [g g b_"6" c] | +%11 + [d d d c_"2"] | [b_"6" b b b] | [fis_"6"_"5" fis fis fis] | + [g g b_"6" c] | [d fis,_"6"_"5" fis fis] | [g16 g fis e] [d c b a] | +%17 + [g g' b a] [g a b a] | g4 r | b, b | b b | +%21 + [c16 d e d] [c d e d] | [c8 e' c a] | [a16 b cis b] [a b cis b] + a4 r | cis, cis | cis cis | +%27 + [d16 e fis e] [d e fis e] | [d8 d fis fis] | g4 g | + e e | fis fis | d d | e e | cis cis | +%35 + d2:8 | e2:8 | fis2:8 | g2:8 | a2:8 | b2:8 | [cis8 cis,? cis cis] | + d2:8 | cis4 cis | d r | cis cis | d r | +%47 + g8 r fis r | e r d r | r [e e d] | [cis b cis a] | [d fis g a] | + d,4 d' | r8 r16 gis, a4 | r8 [fis g! a] | d,2 + r2 | r | + \times 2/3 {[f8\f e d] [c b a]} | [gis a] r4 | +%60 + r2 | r | + [f'8 d g g,] | [d' d'] [d16 c b a] | +%64 : reprise + [g16 a b a] [g a b a] | [g8 g, g g'] | + [g16 a b a] [g a b a] | [g8 g, g g'] | +%68 + [g16 a b a] [g a b a] | g4 r | + [c8 c,] [e fis] | [g g b c] | [e fis fis fis] | +%73 + [g16 g, a b] [c d e fis] | [g a b a] [g a b a] | g4 r | + b, b | [c8 c'16 d] [e d cis b] | [a b cis b] [a b cis b] | +%79 + a4 r | cis,4 cis | [d8 d'16 e] [d8 b] | + +} + + +\score{ + \type StaffGroup < + \type Staff = i < \tempi \global \dynamics \violinoi > + \type Staff = ii < \global \dynamics \violinoii > + \type Staff = iii < \global \dynamics \viola > + \type Staff = iv < \global \dynamics \bassocontinuo > + > + \paper{ + %\translator { \OrchestralScoreContext } + } + \midi{ \tempo 4 = 100; } +} + + + + diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly index d9c5e8dbd8..93495cf179 100644 --- a/input/praeludium-fuga-E.ly +++ b/input/praeludium-fuga-E.ly @@ -127,13 +127,13 @@ fugaII_right = \notes \relative c'' { > | %16 \type Staff < - { \stemup dis2 dis4 | + \type VoiceOne { dis2 dis4 | cis2 cis4 | b4. [cis8 dis e] } - { \stemup \shifton [b8 fis] b2 ~ | + \type VoiceThree { \stemup \shifton [b8 fis] b2 ~ | [b8 a!16 gis] a2 ~ | a4 gis2 } - { \stemdown fis2. ~ | + \type VoiceTwo { \stemdown fis2. ~ | fis ~ | fis4 e2 } > | @@ -146,9 +146,9 @@ fugaII_left = \notes { %15 \type Staff < - { \stemdown b2 \stemup ais4 | + \type VoiceTwo { \stemdown b2 \stemup ais4 | b2 b4 } - { \stemdown s2 e4 | + \type VoiceTwo { \stemdown s2 e4 | fis2 fis4 } > \stemdown cis2 e4 | @@ -188,10 +188,6 @@ breakmusic = \notes { > \paper { - \translator { - \VoiceContext - \name "BLA"; - } \translator { \VoiceContext \name "VoiceOne"; diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index a2f315962b..3165cf6660 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -146,6 +146,7 @@ Beam_engraver::acknowledge_element (Score_element_info info) if (rhythmic_req->duration_.durlog_i_<= 2) { rhythmic_req->warning (_ ("stem doesn't fit in beam")); + reqs_drul_[LEFT]->warning (_("beam was started here")); return; } diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index 7fb3e57e33..8809726e7c 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -1,6 +1,6 @@ export PATH:=$(topdir)/lily/out:$(topdir)/buildscripts/out:$(PATH) export MFINPUTS:=$(topdir)/mf/$(PATHSEP)$(MFINPUTS)$(PATHSEP)$(PATHSEP) -export TEXINPUTS:=$(topdir)/tex/$(PATHSEP)$(TEXINPUTS)$(PATHSEP)$(PATHSEP) +export TEXINPUTS:=$(topdir)/tex/$(PATHSEP)$(topdir)/ps/$(PATHSEP)$(TEXINPUTS)$(PATHSEP)$(PATHSEP) export LILYINCLUDE:=$(topdir)/scm$(PATHSEP)$(topdir)/init$(PATHSEP)$(topdir)/mf/out$(PATHSEP)$(LILYINCLUDE) diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm index 4a2b6ddf6c..dc3ad56585 100644 --- a/make/out/lelievijver.lsm +++ b/make/out/lelievijver.lsm @@ -1,15 +1,15 @@ Begin3 Titel: LilyPond -Versie: 1.1.19 -Inschrijf datum: 07JAN99 +Versie: 1.1.20 +Inschrijf datum: 11JAN99 Beschrijving: @FLAPTEKST@ Trefwoorden: muziek typezetten midi notatie Auteur: hanwen@stack.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Onderhouden door: hanwen@cs.ruu.nl (Han-Wen Nienhuys) Voornaamste plek: sunsite.unc.edu /pub/Linux/apps - 770k lilypond-1.1.19.tar.gz + 770k lilypond-1.1.20.tar.gz Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.1.19.tar.gz + 770k lilypond-1.1.20.tar.gz Copi-eer voorwaarden: GPL End diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 34d4c2ee80..4ad90c375c 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 1.1.19 -Entered-date: 07JAN99 +Version: 1.1.20 +Entered-date: 11JAN99 Description: LilyPond is the GNU Project music typesetter. This program can print beautiful sheet music from a music definition file. It can also play @@ -14,8 +14,8 @@ Author: hanwen@cs.ruu.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 770k lilypond-1.1.19.tar.gz + 770k lilypond-1.1.20.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.1.19.tar.gz + 770k lilypond-1.1.20.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index c482d4b52a..15baf5d75c 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 1.1.19 +Version: 1.1.20 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.19.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.20.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys -- 2.39.2