From 630e8a2f3ab6cf78258fea9c131715e3e76dcbc7 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 10 Apr 2000 11:25:45 +0200 Subject: [PATCH] release: 1.3.43 ====== 1.3.42.j --- CHANGES | 41 +++--- Documentation/user/properties.itely | 4 +- Documentation/user/refman.itely | 2 +- VERSION | 4 +- input/test/banter-chords.ly | 2 +- input/test/bar-break.ly | 4 +- input/test/bar-scripts.ly | 2 +- input/test/beam-chord.ly | 2 +- input/test/beam-cross-staff.ly | 2 +- input/test/beam-isknee.ly | 2 +- input/test/beams.ly | 2 +- input/test/breathing-sign.ly | 2 +- input/test/broken.ly | 2 +- input/test/chord-inversion.ly | 2 +- input/test/chord-table.ly | 2 +- input/test/chords.ly | 2 +- input/test/clefs.ly | 2 +- input/test/collisions.ly | 2 +- input/test/defaultbars.ly | 2 +- input/test/extender.ly | 2 +- input/test/extra-staff.ly | 2 +- input/test/font-body.ly | 2 +- input/test/font.ly | 2 +- input/test/font16.ly | 2 +- input/test/font20.ly | 2 +- input/test/gmsusd.ly | 2 +- input/test/gourlay.ly | 2 +- input/test/hara-kiri-switch.ly | 2 +- input/test/hara-kiri.ly | 2 +- input/test/hyphen.ly | 2 +- input/test/incipit.ly | 2 +- input/test/keys.ly | 2 +- input/test/keys2.ly | 2 +- input/test/knee-mult.ly | 2 +- input/test/knee.ly | 2 +- input/test/lyric-combine.ly | 2 +- input/test/lyrics.ly | 2 +- input/test/mark.ly | 2 +- input/test/memory.ly | 2 +- input/test/multi-rest.ly | 2 +- input/test/noteheadstyle.ly | 2 +- input/test/notemode-chords.ly | 2 +- input/test/orchestscore.ly | 4 +- input/test/ossia.ly | 2 +- input/test/rest-collision.ly | 2 +- input/test/scripts.ly | 2 +- input/test/sleur.ly | 2 +- input/test/slur-cross-staff.ly | 2 +- input/test/slur-damping.ly | 2 +- input/test/slur-dash.ly | 2 +- input/test/slurs.ly | 2 +- input/test/spacing-2.ly | 2 +- input/test/spacing.ly | 2 +- input/test/span-bars.ly | 2 +- input/test/staff-margin-partial.ly | 7 +- input/test/staff-margin.ly | 6 +- input/test/staff-side-slur.ly | 4 +- input/test/staff-size.ly | 2 +- input/test/stem-tremolo.ly | 2 +- input/test/stem.ly | 2 +- input/test/tchaikovsky.ly | 2 +- input/test/thumb.ly | 2 +- input/test/title.ly | 2 +- input/test/transposition.ly | 2 +- input/test/tup.ly | 2 +- input/test/twinkle-as5.ly | 2 +- input/test/updown.ly | 2 +- input/test/vertical-align.ly | 2 +- input/test/vertical-text.ly | 2 +- input/trip.ly | 15 +++ lily/break-align-engraver.cc | 3 +- lily/instrument-name-engraver.cc | 22 +++- lily/lexer.ll | 2 +- lily/main.cc | 2 +- lily/parser.yy | 8 +- lily/score-element.cc | 7 +- lily/staff-margin-engraver.cc | 196 ---------------------------- ly/book-fragment.ly | 2 +- ly/book-init.ly | 2 +- ly/catalan.ly | 2 +- ly/center-fragment.ly | 2 +- ly/center.ly | 2 +- ly/deutsch.ly | 2 +- ly/english.ly | 2 +- ly/engraver.ly | 3 + ly/fragment.ly | 2 +- ly/init-as.fly | 2 +- ly/init-as.ly | 2 +- ly/init.fly | 2 +- ly/init.ly | 2 +- ly/init.sly | 2 +- ly/italiano.ly | 2 +- ly/norsk.ly | 2 +- ly/paper-as5.ly | 2 +- ly/paper-as9.ly | 2 +- ly/paper16.ly | 2 +- ly/paper20.ly | 2 +- ly/paper23.ly | 2 +- ly/property.ly | 6 +- ly/spanners.ly | 1 + ly/svenska.ly | 2 +- make/out/lilypond.lsm | 8 +- make/out/lilypond.spec | 8 +- scripts/convert-mudela.py | 8 ++ 104 files changed, 190 insertions(+), 337 deletions(-) diff --git a/CHANGES b/CHANGES index b928854f95..eabea191bf 100644 --- a/CHANGES +++ b/CHANGES @@ -1,26 +1,11 @@ ---- ../lilypond-1.3.42.jcn2/CHANGES Wed Apr 5 11:58:51 2000 -++ b/CHANGES Sun Apr 9 21:59:31 2000 -@@ -1,3 +1,8 @@ +1.3.43 +====== + 1.3.42.jcn3 =========== * Made a quick try at piano pedal performer, damper pedal only. - 1.3.42.jcn2 - =========== - --- ../lilypond-1.3.42/CHANGES Mon Apr 03 03:19:38 2000 -++ b/CHANGES Sun Apr 09 10:06:47 2000 -@@ -1,4 +1,8 @@ -1.3.42.jbr1 -=========== - -* Documentation/ntweb: Updated angels.ly to match current syntax. Also updated - index.texi. - 1.3.41.jcn3 - =========== - 1.3.42.jcn2 -=========== - * mf/feta-accordion.mf: Fixed strange turning paths. * mf/feta-beugel.mf: Fixed infinity errors. @@ -36,15 +21,25 @@ The logs are a target, removing them retriggers make. * stepmake/stepmake/metapost-rules.make: Remove the correct log and tfm files, ie the ones that clutter the source directory, not the target logs. +* Windows distribution: faked symlink for cmtfm. Setup.zip should now be +standalone; ie, no need for Cygnus' usertools anymore. -1.3.42.jcn1 +1.3.42.jbr1 =========== + +* Documentation/ntweb: Updated angels.ly to match current syntax. +Also updated index.texi. -* Windows distribution: faked symlink for cmtfm. Setup.zip should now be -standalone; ie, no need for Cygnus' usertools anymore. +1.3.42.uu1 +========== + +* Change all occurances of Staff_margin_engraver to +Instrument_name_engraver, add a convert-mudela rule -* break-align-engraver.cc (acknowledge_element): Added missing axes -property to edge element. +* Change status == busy assert into programming a error + +1.3.42 +====== 1.3.41.jcn3 =========== diff --git a/Documentation/user/properties.itely b/Documentation/user/properties.itely index 15418e5a66..a73d49e5c9 100644 --- a/Documentation/user/properties.itely +++ b/Documentation/user/properties.itely @@ -480,8 +480,8 @@ no clef is printed upon creation. @item @code{instrument}, @code{instr} @propertytype{string} @indexcode{instrument}@indexcode{instr} - If @code{Staff_margin_engraver} -@cindex Staff_margin_engraver + If @code{Instrument_name_engraver} +@cindex Instrument_name_engraver is added to the Staff translator, then the @code{instrument} property is used to label the first line of the staff and the @code{instr} diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index eb8dc396e1..62540f2636 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -2759,7 +2759,7 @@ The engravers for paper output are: @item @code{Staff_group_bar_engraver}@indexcode{Staff_group_bar_engraver} - @item @code{Staff_margin_engraver}@indexcode{Staff_margin_engraver} + @item @code{Instrument_name_engraver}@indexcode{Instrument_name_engraver} Prints the name of the instrument (specified by @code{Staff.instrument} and @code{Staff.instr}) at the left of the staff. diff --git a/VERSION b/VERSION index d8cad6bcf3..5cad32c1ab 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 -PATCH_LEVEL=42 -MY_PATCH_LEVEL=jcn3 +PATCH_LEVEL=43 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/test/banter-chords.ly b/input/test/banter-chords.ly index 4fce5022c5..e397bb363b 100644 --- a/input/test/banter-chords.ly +++ b/input/test/banter-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.5"; +\version "1.3.42"; \header{ enteredby = "jcn"; diff --git a/input/test/bar-break.ly b/input/test/bar-break.ly index 5eff32f3a3..e9606a07ac 100644 --- a/input/test/bar-break.ly +++ b/input/test/bar-break.ly @@ -12,7 +12,7 @@ linewidth=150.0\mm; \translator { \StaffContext - \consists "Staff_margin_engraver"; + \consists "Instrument_name_engraver"; numberOfStaffLines = #1 marginScriptPadding = #30 % urg: this is in PT instrument = #"Foo" @@ -20,7 +20,7 @@ } \translator { \StaffGroupContext - \consists "Staff_margin_engraver"; + \consists "Instrument_name_engraver"; marginScriptPadding = #10 % urg: this is in PT instrument = #" \n \n \n \n \n \n \n \n \n \nPiano\n(For rehearsal only)" } diff --git a/input/test/bar-scripts.ly b/input/test/bar-scripts.ly index 808d7b9186..c4a4ab84df 100644 --- a/input/test/bar-scripts.ly +++ b/input/test/bar-scripts.ly @@ -1,5 +1,5 @@ -\version "1.3.5"; +\version "1.3.42"; onestaff = \context Staff = foo\notes { \property Staff.instr = instr diff --git a/input/test/beam-chord.ly b/input/test/beam-chord.ly index 26d9920c70..eeeb0062f2 100644 --- a/input/test/beam-chord.ly +++ b/input/test/beam-chord.ly @@ -1,4 +1,4 @@ -\version "1.3.5"; +\version "1.3.42"; \score{ \notes\transpose c'{ diff --git a/input/test/beam-cross-staff.ly b/input/test/beam-cross-staff.ly index 27e00e64b2..0cc40434da 100644 --- a/input/test/beam-cross-staff.ly +++ b/input/test/beam-cross-staff.ly @@ -30,4 +30,4 @@ } } -\version "1.3.5"; +\version "1.3.42"; diff --git a/input/test/beam-isknee.ly b/input/test/beam-isknee.ly index 3be056715d..626449eaa8 100644 --- a/input/test/beam-isknee.ly +++ b/input/test/beam-isknee.ly @@ -21,4 +21,4 @@ } } -\version "1.3.5"; +\version "1.3.42"; diff --git a/input/test/beams.ly b/input/test/beams.ly index d73c211332..aa6dd10886 100644 --- a/input/test/beams.ly +++ b/input/test/beams.ly @@ -6,7 +6,7 @@ copyright = "PD"; TestedFeatures = "beams and beamflags"; } -\version "1.3.5"; +\version "1.3.42"; \score{ < diff --git a/input/test/breathing-sign.ly b/input/test/breathing-sign.ly index da77f7b461..efa0424573 100644 --- a/input/test/breathing-sign.ly +++ b/input/test/breathing-sign.ly @@ -1,4 +1,4 @@ -\version "1.3.5"; +\version "1.3.42"; \score { \notes \relative c' { diff --git a/input/test/broken.ly b/input/test/broken.ly index 55d23edbed..26626169e1 100644 --- a/input/test/broken.ly +++ b/input/test/broken.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests Feta embedded slurs" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.5"; +\version "1.3.42"; shortlong = \notes{ c4()c( c c | diff --git a/input/test/chord-inversion.ly b/input/test/chord-inversion.ly index 1de6ac3c50..ab7d7e993e 100644 --- a/input/test/chord-inversion.ly +++ b/input/test/chord-inversion.ly @@ -20,4 +20,4 @@ inversions = \notes\transpose c''\chords{ > } -\version "1.3.5"; +\version "1.3.42"; diff --git a/input/test/chord-table.ly b/input/test/chord-table.ly index 04534576fa..ab5e8fb1c2 100644 --- a/input/test/chord-table.ly +++ b/input/test/chord-table.ly @@ -41,4 +41,4 @@ tab = \notes\transpose c'''\chords{ } -\version "1.3.5"; +\version "1.3.42"; diff --git a/input/test/chords.ly b/input/test/chords.ly index 9c00e7f71e..4d1383e2ad 100644 --- a/input/test/chords.ly +++ b/input/test/chords.ly @@ -1,4 +1,4 @@ -\version "1.3.5"; +\version "1.3.42"; %{ Would this be acceptable/good enough/convenient for entry? diff --git a/input/test/clefs.ly b/input/test/clefs.ly index 726e7fe9e3..227b8a931a 100644 --- a/input/test/clefs.ly +++ b/input/test/clefs.ly @@ -1,4 +1,4 @@ -\version "1.3.5"; +\version "1.3.42"; \score { \notes{ diff --git a/input/test/collisions.ly b/input/test/collisions.ly index 46e7c42e7e..ea481c472a 100644 --- a/input/test/collisions.ly +++ b/input/test/collisions.ly @@ -5,7 +5,7 @@ enteredby = "HWN,JCN"; copyright = "public domain"; Tested = "test the Collision resolution "; } -\version "1.3.5"; +\version "1.3.42"; twovoice = \context Staff \notes < \context Voice=i { \stemdown c4 d e f g2~ g4 a [c8 d e f] c2| } diff --git a/input/test/defaultbars.ly b/input/test/defaultbars.ly index 434590731f..55b9152232 100644 --- a/input/test/defaultbars.ly +++ b/input/test/defaultbars.ly @@ -1,4 +1,4 @@ -\version "1.3.5"; +\version "1.3.42"; \score { diff --git a/input/test/extender.ly b/input/test/extender.ly index cce1ba02c4..ff42bcce2b 100644 --- a/input/test/extender.ly +++ b/input/test/extender.ly @@ -5,4 +5,4 @@ > } -\version "1.3.5"; +\version "1.3.42"; diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly index ac340aed20..146e52e7ac 100644 --- a/input/test/extra-staff.ly +++ b/input/test/extra-staff.ly @@ -42,4 +42,4 @@ extra-staff.ly: } -\version "1.3.5"; +\version "1.3.42"; diff --git a/input/test/font-body.ly b/input/test/font-body.ly index c640110777..5ff097f6f9 100644 --- a/input/test/font-body.ly +++ b/input/test/font-body.ly @@ -1,4 +1,4 @@ -\version "1.3.5"; +\version "1.3.42"; FontBody= \notes\transpose c''{ \bar "|:"; diff --git a/input/test/font.ly b/input/test/font.ly index 0aef283cba..83741ed452 100644 --- a/input/test/font.ly +++ b/input/test/font.ly @@ -7,7 +7,7 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.5"; +\version "1.3.42"; \include "font-body.ly" \score{ diff --git a/input/test/font16.ly b/input/test/font16.ly index 8b0a2d1ba1..a05324fd6a 100644 --- a/input/test/font16.ly +++ b/input/test/font16.ly @@ -7,7 +7,7 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.5"; +\version "1.3.42"; \include "paper16.ly" \include "font-body.ly" diff --git a/input/test/font20.ly b/input/test/font20.ly index 60bbb05da8..4c2440e14a 100644 --- a/input/test/font20.ly +++ b/input/test/font20.ly @@ -17,5 +17,5 @@ TestedFeatures = gourlay_maxmeasures =5.; } } -\version "1.3.5"; +\version "1.3.42"; diff --git a/input/test/gmsusd.ly b/input/test/gmsusd.ly index 4e8ac8a0d9..61354761e3 100644 --- a/input/test/gmsusd.ly +++ b/input/test/gmsusd.ly @@ -3,7 +3,7 @@ % perhaps the current modifier approach is too simplistic -\version "1.3.5"; +\version "1.3.42"; gmsus=\notes\relative c \chords{ g1 diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly index 784eaff039..a3de6d41c6 100644 --- a/input/test/gourlay.ly +++ b/input/test/gourlay.ly @@ -1,4 +1,4 @@ -\version "1.3.5"; +\version "1.3.42"; %{ diff --git a/input/test/hara-kiri-switch.ly b/input/test/hara-kiri-switch.ly index 8680850bb2..0bf06da305 100644 --- a/input/test/hara-kiri-switch.ly +++ b/input/test/hara-kiri-switch.ly @@ -1,4 +1,4 @@ -\version "1.3.5"; +\version "1.3.42"; voiceOne = \notes \relative c'' { a1 a a diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly index 1981674bcd..c09fb85c82 100644 --- a/input/test/hara-kiri.ly +++ b/input/test/hara-kiri.ly @@ -1,4 +1,4 @@ -\version "1.3.5"; +\version "1.3.42"; toeter_i = \notes\relative c <{ \property Staff.instrument = #"Toeters" diff --git a/input/test/hyphen.ly b/input/test/hyphen.ly index 26558228e0..f97c78d878 100644 --- a/input/test/hyphen.ly +++ b/input/test/hyphen.ly @@ -5,7 +5,7 @@ > } -\version "1.3.5"; +\version "1.3.42"; diff --git a/input/test/incipit.ly b/input/test/incipit.ly index a64d76932c..b2cf14733f 100644 --- a/input/test/incipit.ly +++ b/input/test/incipit.ly @@ -6,7 +6,7 @@ /Mats B %} -\version "1.3.5"; +\version "1.3.42"; incipit = \notes\relative c'{ diff --git a/input/test/keys.ly b/input/test/keys.ly index f173024633..99bf45142d 100644 --- a/input/test/keys.ly +++ b/input/test/keys.ly @@ -1,4 +1,4 @@ -\version "1.3.5"; +\version "1.3.42"; %{ test key itemv breaking diff --git a/input/test/keys2.ly b/input/test/keys2.ly index bbef861b3c..944cc8fb16 100644 --- a/input/test/keys2.ly +++ b/input/test/keys2.ly @@ -1,4 +1,4 @@ -\version "1.3.5"; +\version "1.3.42"; blah = \notes { diff --git a/input/test/knee-mult.ly b/input/test/knee-mult.ly index 98eb91407c..fe6e070526 100644 --- a/input/test/knee-mult.ly +++ b/input/test/knee-mult.ly @@ -21,4 +21,4 @@ } } -\version "1.3.5"; +\version "1.3.42"; diff --git a/input/test/knee.ly b/input/test/knee.ly index eee5e3887e..b48bfd7bd8 100644 --- a/input/test/knee.ly +++ b/input/test/knee.ly @@ -1,4 +1,4 @@ -\version "1.3.5"; +\version "1.3.42"; \score{ \notes\relative c'{ [c16 \stemdown c'' \stemboth c,, d] diff --git a/input/test/lyric-combine.ly b/input/test/lyric-combine.ly index 3c63f9f257..ae6a1f405b 100644 --- a/input/test/lyric-combine.ly +++ b/input/test/lyric-combine.ly @@ -7,7 +7,7 @@ enteredby = "HWN, chords by Johan Vromans"; copyright = "public domain"; } -\version "1.3.5"; +\version "1.3.42"; m =\notes \relative c'' { \property Staff.automaticMelismata = ##t diff --git a/input/test/lyrics.ly b/input/test/lyrics.ly index 89146f1c4e..724732b04a 100644 --- a/input/test/lyrics.ly +++ b/input/test/lyrics.ly @@ -1,4 +1,4 @@ -\version "1.3.5"; +\version "1.3.42"; $somewhat_long = \lyrics{ \property Lyrics . textStyle = "roman" diff --git a/input/test/mark.ly b/input/test/mark.ly index 8d65150c37..da4369262a 100644 --- a/input/test/mark.ly +++ b/input/test/mark.ly @@ -1,4 +1,4 @@ -\version "1.3.5"; +\version "1.3.42"; global = \notes { s1 | \mark "A"; diff --git a/input/test/memory.ly b/input/test/memory.ly index ba5bead23e..ab1260b632 100644 --- a/input/test/memory.ly +++ b/input/test/memory.ly @@ -11,5 +11,5 @@ bla = \notes { > \paper { Gourlay_maxmeaures = 2.; } } -\version "1.3.5"; +\version "1.3.42"; diff --git a/input/test/multi-rest.ly b/input/test/multi-rest.ly index e6761b7fb9..f6a35de05a 100644 --- a/input/test/multi-rest.ly +++ b/input/test/multi-rest.ly @@ -1,4 +1,4 @@ -\version "1.3.5"; +\version "1.3.42"; voice_one = \notes\transpose c''{ \stemup R1 * 2 | f'4-. r r2 | R1 * 3 | diff --git a/input/test/noteheadstyle.ly b/input/test/noteheadstyle.ly index 8c05809215..813b396418 100644 --- a/input/test/noteheadstyle.ly +++ b/input/test/noteheadstyle.ly @@ -36,4 +36,4 @@ c4 c2 c8 c16 c16 c1 } } -\version "1.3.5"; +\version "1.3.42"; diff --git a/input/test/notemode-chords.ly b/input/test/notemode-chords.ly index 56e220ce04..c4d177381b 100644 --- a/input/test/notemode-chords.ly +++ b/input/test/notemode-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.5"; +\version "1.3.42"; \score{ \notes \transpose c''{ diff --git a/input/test/orchestscore.ly b/input/test/orchestscore.ly index 0cfe57e936..d13b04c84a 100644 --- a/input/test/orchestscore.ly +++ b/input/test/orchestscore.ly @@ -1,4 +1,4 @@ -\version "1.3.5"; +\version "1.3.42"; m = \notes \relative c''{ c1 | c2 c | c c | c c | \break c c | c c | c c | c c | @@ -92,7 +92,7 @@ c1 | c2 c | c c | c c | \break c c | c c | c c | c c | minVerticalAlign = 2.2*\staffheight; } \translator { \StaffContext - \consists "Staff_margin_engraver"; + \consists "Instrument_name_engraver"; marginScriptPadding = 15.0; } } diff --git a/input/test/ossia.ly b/input/test/ossia.ly index 6fcd07e08f..de27172cf2 100644 --- a/input/test/ossia.ly +++ b/input/test/ossia.ly @@ -1,4 +1,4 @@ -\version "1.3.5"; +\version "1.3.42"; \score { diff --git a/input/test/rest-collision.ly b/input/test/rest-collision.ly index de22b4a611..05dc23fbdf 100644 --- a/input/test/rest-collision.ly +++ b/input/test/rest-collision.ly @@ -38,4 +38,4 @@ restsII = \context Staff \notes { } } -\version "1.3.5"; +\version "1.3.42"; diff --git a/input/test/scripts.ly b/input/test/scripts.ly index 73eb6c0455..a84dfc2700 100644 --- a/input/test/scripts.ly +++ b/input/test/scripts.ly @@ -1,5 +1,5 @@ -\version "1.3.5"; +\version "1.3.42"; blah = \notes{ \transpose c'' { diff --git a/input/test/sleur.ly b/input/test/sleur.ly index 66d3d96948..6eddcb7cf7 100644 --- a/input/test/sleur.ly +++ b/input/test/sleur.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests Feta embedded slurs" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.5"; +\version "1.3.42"; shortlong = \notes{ c4()c( c c | diff --git a/input/test/slur-cross-staff.ly b/input/test/slur-cross-staff.ly index e0eca072b6..914afd1fe5 100644 --- a/input/test/slur-cross-staff.ly +++ b/input/test/slur-cross-staff.ly @@ -36,4 +36,4 @@ } } -\version "1.3.5"; +\version "1.3.42"; diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly index 4a505be00b..4372acc205 100644 --- a/input/test/slur-damping.ly +++ b/input/test/slur-damping.ly @@ -1,5 +1,5 @@ % test damping -\version "1.3.5"; +\version "1.3.42"; \score{ \notes\relative c'{ diff --git a/input/test/slur-dash.ly b/input/test/slur-dash.ly index 45fc046019..9ae3325894 100644 --- a/input/test/slur-dash.ly +++ b/input/test/slur-dash.ly @@ -1,4 +1,4 @@ -\version "1.3.5"; +\version "1.3.42"; \score{ \notes{ diff --git a/input/test/slurs.ly b/input/test/slurs.ly index 0c956ea94c..03debe0993 100644 --- a/input/test/slurs.ly +++ b/input/test/slurs.ly @@ -1,5 +1,5 @@ -\version "1.3.5"; +\version "1.3.42"; \score{ \notes\transpose c'{ diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly index 0488af9387..89ff29ad66 100644 --- a/input/test/spacing-2.ly +++ b/input/test/spacing-2.ly @@ -33,4 +33,4 @@ source = "Petits Preludes et Fugues. Urtext. Editions Henry Lemoine, Paris."; } } -\version "1.3.5"; +\version "1.3.42"; diff --git a/input/test/spacing.ly b/input/test/spacing.ly index 401725c56a..15c560e909 100644 --- a/input/test/spacing.ly +++ b/input/test/spacing.ly @@ -6,7 +6,7 @@ copyright = "public domain"; TestedFeatures = "This file tests various spacings"; } -\version "1.3.5"; +\version "1.3.42"; multipart = \notes \relative c'{ \context StaffGroup < diff --git a/input/test/span-bars.ly b/input/test/span-bars.ly index e653b0b2d5..f0db341dcf 100644 --- a/input/test/span-bars.ly +++ b/input/test/span-bars.ly @@ -1,5 +1,5 @@ -\version "1.3.5"; +\version "1.3.42"; nt = \notes { c1 \break c1 c1 } stuff = \notes \relative c'' < \context Staff = stone { \nt } diff --git a/input/test/staff-margin-partial.ly b/input/test/staff-margin-partial.ly index d93efd28f7..712773b5cc 100644 --- a/input/test/staff-margin-partial.ly +++ b/input/test/staff-margin-partial.ly @@ -1,5 +1,10 @@ % test staff margin with partial measure. + +\version "1.3.42"; + \score { \notes { \property Staff.instrument = "foo" \partial 4; c4 c1 } -\paper { \translator { \StaffContext \consists Staff_margin_engraver; }} + \paper { + \translator { \StaffContext \consists Instrument_name_engraver; } + } } diff --git a/input/test/staff-margin.ly b/input/test/staff-margin.ly index 1e2ec60b60..7a79729642 100644 --- a/input/test/staff-margin.ly +++ b/input/test/staff-margin.ly @@ -1,6 +1,6 @@ -\version "1.3.5"; +\version "1.3.42"; \score { @@ -15,8 +15,8 @@ linewidth=-1.0; \translator { \ScoreContext %textVerticalAlignment = #0 } -%\translator { \StaffContext \consists "Staff_margin_engraver"; } -%\translator { \PianoStaffContext \consists "Staff_margin_engraver"; } +%\translator { \StaffContext \consists "Instrument_name_engraver"; } +%\translator { \PianoStaffContext \consists "Instrument_name_engraver"; } \translator { \StaffContext \consists "New_staff_margin_engraver"; } \translator { \PianoStaffContext \consists "New_staff_margin_engraver"; } }} diff --git a/input/test/staff-side-slur.ly b/input/test/staff-side-slur.ly index 61df82d328..6ee2f1ad75 100644 --- a/input/test/staff-side-slur.ly +++ b/input/test/staff-side-slur.ly @@ -11,11 +11,11 @@ \translator { \OrchestralScoreContext } \translator { \StaffContext - \consists "Staff_margin_engraver"; + \consists "Instrument_name_engraver"; marginHangOnClef = 1; } } } -\version "1.3.5"; +\version "1.3.42"; diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly index 43a7e19095..48beef13b1 100644 --- a/input/test/staff-size.ly +++ b/input/test/staff-size.ly @@ -14,4 +14,4 @@ > \paper { linewidth = -1.; } } -\version "1.3.5"; +\version "1.3.42"; diff --git a/input/test/stem-tremolo.ly b/input/test/stem-tremolo.ly index 022a9ae644..9ed889d5f1 100644 --- a/input/test/stem-tremolo.ly +++ b/input/test/stem-tremolo.ly @@ -1,5 +1,5 @@ -\version "1.3.5"; +\version "1.3.42"; \score{ \context Voice\notes \relative c''{ %%? diff --git a/input/test/stem.ly b/input/test/stem.ly index 5621c4302e..1ccb9c5978 100644 --- a/input/test/stem.ly +++ b/input/test/stem.ly @@ -8,7 +8,7 @@ of beams"; } -\version "1.3.5"; +\version "1.3.42"; beamintervals = \notes{ \time 7/4; diff --git a/input/test/tchaikovsky.ly b/input/test/tchaikovsky.ly index 5a53e73286..dc61889f27 100644 --- a/input/test/tchaikovsky.ly +++ b/input/test/tchaikovsky.ly @@ -7,7 +7,7 @@ enteredby = "Maarten Storm"; instrument= "Violoncello"; } -\version "1.3.5"; +\version "1.3.42"; % this is an example of extreme dynamics diff --git a/input/test/thumb.ly b/input/test/thumb.ly index 795af1647f..acd3319b8d 100644 --- a/input/test/thumb.ly +++ b/input/test/thumb.ly @@ -7,7 +7,7 @@ % the thumb-script is used in cello music to indicate a note that should % be played with your thumb. -\version "1.3.5"; +\version "1.3.42"; \score { \notes \relative c'' { [ <)b_\thumb b'-3> diff --git a/input/test/title.ly b/input/test/title.ly index c20c9741f8..261668a4fa 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -10,7 +10,7 @@ source = "urtext"; instrument= "Instrument"; } -\version "1.3.5"; +\version "1.3.42"; \score{ \notes diff --git a/input/test/transposition.ly b/input/test/transposition.ly index 6c4d9b0e2c..93aa108473 100644 --- a/input/test/transposition.ly +++ b/input/test/transposition.ly @@ -22,7 +22,7 @@ copyright = "public domain"; } -\version "1.3.5"; +\version "1.3.42"; vOne = \notes \relative c''{ \clef"violin"; diff --git a/input/test/tup.ly b/input/test/tup.ly index e228bfac84..8c1d54b4c3 100644 --- a/input/test/tup.ly +++ b/input/test/tup.ly @@ -8,4 +8,4 @@ } } -\version "1.3.5"; +\version "1.3.42"; diff --git a/input/test/twinkle-as5.ly b/input/test/twinkle-as5.ly index b4321d3762..0ec7feb0d0 100644 --- a/input/test/twinkle-as5.ly +++ b/input/test/twinkle-as5.ly @@ -6,7 +6,7 @@ enteredby = "hwn and jcn"; copyright = "public domain"; } -\version "1.3.25"; +\version "1.3.42"; \include "paper-as5.ly" diff --git a/input/test/updown.ly b/input/test/updown.ly index f21e78a109..9b19cefadd 100644 --- a/input/test/updown.ly +++ b/input/test/updown.ly @@ -10,7 +10,7 @@ {\voicetwo c}> - \version "1.0.21"; + \version "1.3.42"; } \paper { } diff --git a/input/test/vertical-align.ly b/input/test/vertical-align.ly index 67f85f575f..23ab328f83 100644 --- a/input/test/vertical-align.ly +++ b/input/test/vertical-align.ly @@ -1,5 +1,5 @@ -\version "1.3.5"; +\version "1.3.42"; \score { \notes < diff --git a/input/test/vertical-text.ly b/input/test/vertical-text.ly index 5a4f991628..53a6aaf636 100644 --- a/input/test/vertical-text.ly +++ b/input/test/vertical-text.ly @@ -15,4 +15,4 @@ } } -\version "1.3.5"; +\version "1.3.42"; diff --git a/input/trip.ly b/input/trip.ly index 89d41edeeb..09ef7e35d8 100644 --- a/input/trip.ly +++ b/input/trip.ly @@ -159,6 +159,12 @@ fugaIIPedal = \notes \relative c { \context Score \notes < \context PianoStaff < \context Staff = treble { + \property Staff.instrument = #"right" + \property Staff.instr = #"rt" + \property PianoStaff.instrument = #"hands" + \property PianoStaff.instr = #"hs" + + \property Score.midiInstrument = "church organ" \praeludiumRight r1 \fugaIIRight } \context Staff = bass { @@ -166,6 +172,9 @@ fugaIIPedal = \notes \relative c { > \context Staff = pedal \relative c < { + \property Staff.instrument = #"left" + \property Staff.instr = #"lt" + \time 4/4; \key e; \clef bass; @@ -189,6 +198,12 @@ fugaIIPedal = \notes \relative c { \paper { \translator { \OrchestralScoreContext } + \translator { \PianoStaffContext + \consists "Instrument_name_engraver"; + } + \translator { \StaffContext + \consists "Instrument_name_engraver"; + } } \midi { diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc index 56d708ba51..9f2047dfda 100644 --- a/lily/break-align-engraver.cc +++ b/lily/break-align-engraver.cc @@ -101,10 +101,9 @@ Break_align_engraver::acknowledge_element (Score_element_info inf) Item * edge = new Item; - SCM edge_sym = ly_symbol2scm ("Left_edge_item"); + SCM edge_sym = ly_symbol2scm ("Left_edge_item"); edge->set_elt_property ("break-align-symbol", edge_sym); - Axis_group_interface (edge).set_axes (X_AXIS,X_AXIS); /* If the element is empty, it will be ignored in the break alignment stuff. diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc index e16a53c927..584d0d9cd7 100644 --- a/lily/instrument-name-engraver.cc +++ b/lily/instrument-name-engraver.cc @@ -1,3 +1,4 @@ + /* new-staff-margin-engraver.cc -- implement Instrument_name_engraver @@ -10,11 +11,13 @@ #include "engraver.hh" #include "text-item.hh" #include "bar.hh" -#include "span-bar.hh" +#include "system-start-delimiter.hh" +#include "side-position-interface.hh" class Instrument_name_engraver : public Engraver { Text_item *text_; + System_start_delimiter * delim_ ; void create_text (SCM s); public: @@ -30,6 +33,7 @@ ADD_THIS_TRANSLATOR(Instrument_name_engraver); Instrument_name_engraver::Instrument_name_engraver () { text_ = 0; + delim_ =0; } @@ -38,6 +42,9 @@ Instrument_name_engraver::do_pre_move_processing () { if (text_) { + text_->add_offset_callback (Side_position_interface::centered_on_parent, + Y_AXIS); + typeset_element (text_); text_ = 0; } @@ -59,6 +66,9 @@ Instrument_name_engraver::create_text (SCM txt) text_->set_elt_property ("visibility-lambda", scm_eval (ly_symbol2scm ("begin-of-line-visible"))); + if (delim_) + text_->set_parent (delim_, Y_AXIS); + announce_element (Score_element_info (text_,0)); } } @@ -76,12 +86,14 @@ Instrument_name_engraver::acknowledge_element (Score_element_info i) if (Bar* b= dynamic_cast (i.elem_l_)) { create_text (s); - if (Span_bar* s= dynamic_cast (b)) - { - text_->set_parent (s, Y_AXIS); - } } } + + if (dynamic_cast (i.elem_l_) + && i.origin_trans_l_->daddy_trans_l_ == daddy_trans_l_) + { + delim_ = dynamic_cast (i.elem_l_); + } } diff --git a/lily/lexer.ll b/lily/lexer.ll index cbe754c5c3..1f75b5d39b 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -38,8 +38,8 @@ #include "main.hh" #include "musical-request.hh" #include "identifier.hh" -#include "mudela-version.hh" #include "version.hh" +#include "mudela-version.hh" void strip_trailing_white (String&); void strip_leading_white (String&); diff --git a/lily/main.cc b/lily/main.cc index d0f568c836..fcbd09e5c6 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -129,7 +129,7 @@ _( "localedir: `" DIR_LOCALEDIR "'\n" "\n"; - print_mudela_versions (cout); + cout << endl; cout << _f ("Report bugs to %s", "bug-gnu-music@gnu.org") << endl; diff --git a/lily/parser.yy b/lily/parser.yy index 8f3762b595..39019cbe26 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -42,15 +42,16 @@ #include "auto-change-music.hh" #include "output-property.hh" -// mmm -Mudela_version oldest_version ("1.3.4"); - bool is_duration_b (int t) { return t == 1 << intlog2(t); } + +// mmm JUNKME ? +Mudela_version oldest_version ("1.3.42"); + void print_mudela_versions (ostream &os) { @@ -58,6 +59,7 @@ print_mudela_versions (ostream &os) << endl; } + // needed for bison.simple's malloc() and free() #include diff --git a/lily/score-element.cc b/lily/score-element.cc index 447426519b..868cc82aff 100644 --- a/lily/score-element.cc +++ b/lily/score-element.cc @@ -239,7 +239,12 @@ Score_element::calculate_dependencies (int final, int busy, if (status_i_ >= final) return; - assert (status_i_!= busy); + if (status_i_== busy) + { + programming_error ("Element is busy, come back later"); + return; + } + status_i_= busy; for (SCM d= get_elt_property ("dependencies"); d != SCM_EOL; d = gh_cdr (d)) diff --git a/lily/staff-margin-engraver.cc b/lily/staff-margin-engraver.cc index d200746bed..e69de29bb2 100644 --- a/lily/staff-margin-engraver.cc +++ b/lily/staff-margin-engraver.cc @@ -1,196 +0,0 @@ -/* - staff-margin-engraver.cc -- implement Staff_margin_engraver - - source file of the GNU LilyPond music typesetter - - (c) 1998--2000 Jan Nieuwenhuizen -*/ - -#include "translator.hh" -#include "engraver.hh" -#include "bar.hh" -#include "span-bar.hh" -#include "dimension-cache.hh" -#include "directional-element-interface.hh" -#include "timing-translator.hh" -#include "text-item.hh" -#include "side-position-interface.hh" -#include "bar-script-engraver.hh" -#include "staff-symbol-referencer.hh" -#include "staff-symbol.hh" - -/* - TODO: - - * align over full score - * text aligment: left, centred, right - * merge with/derive from/add functionality to Bar_script_engraver - */ - - -/** - put (instrument) text to left of line - */ -class Staff_margin_engraver : public Engraver -{ -public: - VIRTUAL_COPY_CONS (Translator); - Staff_margin_engraver (); - -protected: - virtual void do_pre_move_processing (); - virtual void acknowledge_element (Score_element_info); - -private: - String type_; - Text_item* text_p_; - Item* left_edge_p_; - void create_text (SCM); -}; - -ADD_THIS_TRANSLATOR (Staff_margin_engraver); - - -Staff_margin_engraver::Staff_margin_engraver () -{ - type_ = "margin"; - text_p_ = 0; - left_edge_p_ = 0; -} - -void -Staff_margin_engraver::acknowledge_element (Score_element_info info) -{ - SCM s = get_property ("instrument"); - - if (now_mom () > Moment (0)) - s = get_property ("instr"); - - if (gh_string_p (s)) - { - if (Bar* b= dynamic_cast (info.elem_l_)) - { - create_text (s); - if (Span_bar* s= dynamic_cast (b)) - { - text_p_->set_parent (s, Y_AXIS); - } - } - } -} - -void -Staff_margin_engraver::create_text (SCM text) -{ - if (!text_p_) - { - assert (!left_edge_p_); - left_edge_p_ = new Item; - left_edge_p_->set_elt_property ("breakable", SCM_BOOL_T); - left_edge_p_->set_elt_property ("break-align-symbol", ly_symbol2scm ("Left_edge_item")); - - announce_element (Score_element_info (left_edge_p_, 0)); - - Staff_symbol_referencer_interface sl (left_edge_p_); - sl.set_interface (); - - Text_item* t = new Text_item; - - t->set_elt_property ("self-alignment-Y", gh_int2scm (0)); - t->add_offset_callback (Side_position_interface::aligned_on_self, Y_AXIS); - - t->set_parent (left_edge_p_, X_AXIS); - t->set_parent (left_edge_p_, Y_AXIS); - - // 'just to be sure': see Clef_item::do_add_processing - left_edge_p_->add_dependency (t); - - - /* - Hmm. - In almost every score that uses "instrument" and "instr" - we need two different paddings. - Let's try one of those first: - instrumentScriptPadding/instrScriptPadding - */ - SCM s = get_property (String (now_mom () ? "instr" : "instrument") - + "ScriptPadding"); - if (!gh_number_p (s)) - s = get_property (type_ + "ScriptPadding"); - - Real padding = 0; - if (gh_number_p (s)) - padding = gh_scm2double (s); - - s = get_property (type_ + "ScriptTextStyle"); - if (gh_string_p (s)) - t->set_elt_property ("style", s); - - s = get_property (type_ + "ScriptHorizontalAlignment"); - /* - Allow centred, - */ - if (gh_number_p (s) && !gh_scm2int (s)) - { - t->set_elt_property ("self-alignment-X", gh_int2scm (0)); - t->add_offset_callback (Side_position_interface::aligned_on_self, X_AXIS); - /* -% Centred is still broken, it always requires proper padding. - */ - padding *= -1; - if (padding) - t->translate_axis (padding, X_AXIS); - } - /* - left or right alignment. - */ - else - { - side_position (t).set_axis (X_AXIS); - side_position (t).add_support (left_edge_p_); - - Direction d; - if (isdir_b (s)) - d = to_dir (s); - /* - By default, align at left edge of Left_edge_item, - (which makes text right-aligned) - so that we don't collide with staff. - */ - else - d = LEFT; - - directional_element (t).set (d); - padding *= -d; - if (padding) - t->set_elt_property ("padding", gh_double2scm (padding)); - } - - - announce_element (Score_element_info (t, 0)); - text_p_ = t; - } - - - text_p_->set_elt_property ("text", text); -} - -void -Staff_margin_engraver::do_pre_move_processing () -{ - if (text_p_) - { - /* - Let's not allow user settings for visibility function (yet). - Although end-of-line would work, to some extent, we should - make a properly ordered Right_edge_item, if that need arises. - */ - text_p_->set_elt_property("visibility-lambda", - scm_eval (ly_symbol2scm ("begin-of-line-visible"))); - typeset_element (text_p_); - text_p_ = 0; - - typeset_element (left_edge_p_); - left_edge_p_ = 0; - } -} diff --git a/ly/book-fragment.ly b/ly/book-fragment.ly index ed54d15b10..d5c12324ca 100644 --- a/ly/book-fragment.ly +++ b/ly/book-fragment.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.4"; +\version "1.3.42"; \include "declarations.ly" diff --git a/ly/book-init.ly b/ly/book-init.ly index 8c75bf5d8c..09c7f6601d 100644 --- a/ly/book-init.ly +++ b/ly/book-init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.4"; +\version "1.3.42"; \include "declarations.ly"; diff --git a/ly/catalan.ly b/ly/catalan.ly index a2f842c2f3..d8545e00a4 100644 --- a/ly/catalan.ly +++ b/ly/catalan.ly @@ -71,4 +71,4 @@ -\version "1.3.38"; +\version "1.3.42"; diff --git a/ly/center-fragment.ly b/ly/center-fragment.ly index 94c7377708..32688fd45a 100644 --- a/ly/center-fragment.ly +++ b/ly/center-fragment.ly @@ -1,7 +1,7 @@ % Toplevel initialisation file. -\version "1.3.4"; +\version "1.3.42"; \include "declarations.ly" diff --git a/ly/center.ly b/ly/center.ly index 6bc0ab2825..e08c2114bc 100644 --- a/ly/center.ly +++ b/ly/center.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.4"; +\version "1.3.42"; \include "declarations.ly" diff --git a/ly/deutsch.ly b/ly/deutsch.ly index 9c0902ba00..f39aa16a33 100644 --- a/ly/deutsch.ly +++ b/ly/deutsch.ly @@ -49,4 +49,4 @@ } -\version "1.3.38"; +\version "1.3.42"; diff --git a/ly/english.ly b/ly/english.ly index 52022eb097..1a611b9d08 100644 --- a/ly/english.ly +++ b/ly/english.ly @@ -77,5 +77,5 @@ (bss . ( -1 6 2 )) ) -\version "1.3.38"; +\version "1.3.42"; diff --git a/ly/engraver.ly b/ly/engraver.ly index e9a17f134f..68a8c9df2e 100644 --- a/ly/engraver.ly +++ b/ly/engraver.ly @@ -18,6 +18,9 @@ StaffContext=\translator { voltaPadding = #5 % urg, in \pt voltaMinimumSpace = #25 % urg, in \pt + + StaffMinimumVerticalExtent = #(cons -4.0 4.0) + \consists "Repeat_engraver"; diff --git a/ly/fragment.ly b/ly/fragment.ly index 93722c224f..ca24d7eb51 100644 --- a/ly/fragment.ly +++ b/ly/fragment.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.4"; +\version "1.3.42"; \include "declarations.ly" diff --git a/ly/init-as.fly b/ly/init-as.fly index 33e720073b..e076e4467b 100644 --- a/ly/init-as.fly +++ b/ly/init-as.fly @@ -1,6 +1,6 @@ % Toplevel AsciiScript initialisation file. -\version "1.3.24"; +\version "1.3.42"; \include "declarations-as.ly" diff --git a/ly/init-as.ly b/ly/init-as.ly index c07c5d9cbb..923aa1ba6b 100644 --- a/ly/init-as.ly +++ b/ly/init-as.ly @@ -1,6 +1,6 @@ % Toplevel AsciiScript initialisation file. -\version "1.3.24"; +\version "1.3.42"; \include "declarations-as.ly" diff --git a/ly/init.fly b/ly/init.fly index 6c9992e379..cc941a123f 100644 --- a/ly/init.fly +++ b/ly/init.fly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.5"; +\version "1.3.42"; \include "declarations.ly" diff --git a/ly/init.ly b/ly/init.ly index 748f075f3c..04c15677b7 100644 --- a/ly/init.ly +++ b/ly/init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.4"; +\version "1.3.42"; \include "declarations.ly"; diff --git a/ly/init.sly b/ly/init.sly index 294bdad3bd..af663b0138 100644 --- a/ly/init.sly +++ b/ly/init.sly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.4"; +\version "1.3.42"; \include "declarations.ly" diff --git a/ly/italiano.ly b/ly/italiano.ly index e8bd6b4884..e3752a9319 100644 --- a/ly/italiano.ly +++ b/ly/italiano.ly @@ -48,4 +48,4 @@ (sidd . ( -1 6 2 )) } -\version "1.3.38"; +\version "1.3.42"; diff --git a/ly/norsk.ly b/ly/norsk.ly index 7f28a7cb1e..f8e622086a 100644 --- a/ly/norsk.ly +++ b/ly/norsk.ly @@ -104,4 +104,4 @@ -\version "1.3.38"; +\version "1.3.42"; diff --git a/ly/paper-as5.ly b/ly/paper-as5.ly index 5c8c5d5db5..edbbdf23f6 100644 --- a/ly/paper-as5.ly +++ b/ly/paper-as5.ly @@ -1,6 +1,6 @@ % paper-as5.ly -\version "1.3.24"; +\version "1.3.42"; paper_as_five = \paper { staffheight = 5.\char; diff --git a/ly/paper-as9.ly b/ly/paper-as9.ly index 655a642f74..6e44c78abb 100644 --- a/ly/paper-as9.ly +++ b/ly/paper-as9.ly @@ -1,6 +1,6 @@ % paper-as9.ly -\version "1.3.24"; +\version "1.3.42"; paper_as_nine = \paper { staffheight = 9.\char; diff --git a/ly/paper16.ly b/ly/paper16.ly index 6d2a93da79..be59707f54 100644 --- a/ly/paper16.ly +++ b/ly/paper16.ly @@ -2,7 +2,7 @@ -\version "1.3.4"; +\version "1.3.42"; paper_sixteen = \paper { staffheight = 16.0\pt; diff --git a/ly/paper20.ly b/ly/paper20.ly index de1c7d3342..308bc86ca4 100644 --- a/ly/paper20.ly +++ b/ly/paper20.ly @@ -1,7 +1,7 @@ % paper20.ly -\version "1.3.4"; +\version "1.3.42"; paper_twenty = \paper { staffheight = 20.0\pt; diff --git a/ly/paper23.ly b/ly/paper23.ly index aa9d14dfb7..efa2d33107 100644 --- a/ly/paper23.ly +++ b/ly/paper23.ly @@ -1,7 +1,7 @@ % paper23.ly -\version "1.3.4"; +\version "1.3.42"; paper_twentythree = \paper { staffheight = 23.0\pt; diff --git a/ly/property.ly b/ly/property.ly index 306fc176c0..0599e32c31 100644 --- a/ly/property.ly +++ b/ly/property.ly @@ -8,7 +8,7 @@ SEE THE REFERENCE MANUAL FOR EXPLANATIONS. %} -\version "1.3.4"; +\version "1.3.42"; %hmm, (these) abbrevs suck, imo % i guess they're meant as some form of doco @@ -121,6 +121,6 @@ autoBeamOff = \property Voice.noAutoBeaming = ##t autoBeamOn = \property Voice.noAutoBeaming = ##f -emptyText = \property Voice.textEmptyDimension = ##t -fatText = \property Voice.textEmptyDimension = ##f +emptyText = \property Voice.textNonEmpty = ##f +fatText = \property Voice.textNonEmpty = ##t diff --git a/ly/spanners.ly b/ly/spanners.ly index 4d1025cb0a..ba90491821 100644 --- a/ly/spanners.ly +++ b/ly/spanners.ly @@ -23,6 +23,7 @@ xendcresc = { cresc = \spanrequest \start "crescendo" endcresc = \spanrequest \stop "crescendo" +% better name sustainstart/stop? sustaindown = \spanrequest \start "sustain" sustainup = \spanrequest \stop "sustain" diff --git a/ly/svenska.ly b/ly/svenska.ly index a986af1b07..2c18b3d686 100644 --- a/ly/svenska.ly +++ b/ly/svenska.ly @@ -40,4 +40,4 @@ (hiss . ( -1 6 1 )) (hississ . ( -1 6 2 )) ) -\version "1.3.38"; +\version "1.3.42"; diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 033effbf00..ae9f3ce4f1 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,15 +1,15 @@ Begin3 Title: LilyPond -Version: 1.3.42 -Entered-date: 03APR00 +Version: 1.3.43 +Entered-date: 10APR00 Description: Keywords: music notation typesetting midi fonts engraving Author: hanwen@cs.uu.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 - 1000k lilypond-1.3.42.tar.gz + 1000k lilypond-1.3.43.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 1000k lilypond-1.3.42.tar.gz + 1000k lilypond-1.3.43.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index 25644c795f..1cc5b17848 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 1.3.42 +Version: 1.3.43 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.42.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.43.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond # Icon: lilypond-icon.gif @@ -67,6 +67,10 @@ mkdir -p out/examples/ tar -cf - input/ | tar -C out/examples/ -xf- || true %ifos cygwin +# urg, this symlink doesn't come through on cygwin +# this is the way symlinks work over there, let's fake one +rm -f $RPM_BUILD_ROOT%{_prefix}/share/lilypond/cmtfm +echo '!c:\\texmf\\fonts\\tfm\\public\\cm' > $RPM_BUILD_ROOT%{_prefix}/share/lilypond/cmtfm %{fix_suffixes} %endif diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py index d64dfcddb9..1bfa4f6370 100644 --- a/scripts/convert-mudela.py +++ b/scripts/convert-mudela.py @@ -457,6 +457,14 @@ if 1: conversions.append ((1,3,41), conv, '[:16 c4 d4 ] -> \repeat "tremolo" 2 { c16 d16 }') +if 1: + def conv (str): + str = re.sub ('Staff_margin_engraver' , 'Instrument_name_engraver', str) + return str + + conversions.append ((1,3,42), conv, + 'Staff_margin_engraver deprecated, use Instrument_name_engraver') + ############################ -- 2.39.5