From 9b40d66187029df3dca86fc5ecc65f64db315a48 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 8 Oct 2000 16:27:38 +0200 Subject: [PATCH] release: 1.3.94 ========== * Bugfix: don't crash if there is no volta bracket to end. * Move offset, dimension callbacks into Scheme. They can be initialized from basicXXXX properties using (X-offset-callbacks . (callback1 callback2 .. .)) (Y-offset-callbacks . (callback1 callback2 .. .)) (X-extent-callback . callback1) (Y-extent-callback . callback1) * naming: basicXXXProperties -> XXX, some other changes in naming; convert-mudela rules added. * naming: \voiceone -> \voiceOne and related changes. convert-mudela rules added * syntax: \property XXX \pop #'bla -> \property Context.XXX \pop #'bla * changed aclocal.m4 to have better check for guile version. (Laura Conrad) * updates for mudela-book (Tom Cato Amundsen) 1.3.93.j --- AUTHORS.txt | 4 +- CHANGES | 30 +- Documentation/ntweb/angels.ly | 2 +- Documentation/user/glossary.tely | 20 +- Documentation/user/properties.itely | 31 +- Documentation/user/refman.itely | 14 +- Documentation/user/tutorial.itely | 49 ++- VERSION | 4 +- aclocal.m4 | 12 +- configure | 62 +-- input/bugs/dotted-collision.ly | 6 +- input/bugs/knee.ly | 8 +- input/denneboom.ly | 2 +- input/example-3.ly | 2 +- input/just-friends.ly | 2 +- input/praeludium-fuga-E.ly | 48 +-- input/rhythm.ly | 2 +- input/scarlatti-properties.ly | 6 +- input/star-spangled-banner.ly | 10 +- input/test/arpeggio.ly | 20 - input/test/auto-isknee.ly | 6 +- input/test/bagpipe.ly | 1 + input/test/banter-chords.ly | 2 +- input/test/bar-scripts.ly | 2 +- input/test/beam-abbrev.ly | 7 +- input/test/beam-chord.ly | 2 +- input/test/beam-cross-staff.ly | 10 +- input/test/beam-damp.ly | 9 +- input/test/beam-extreme.ly | 3 +- input/test/beam-isknee.ly | 4 +- input/test/beam-suspect.ly | 5 +- input/test/beam-trend.ly | 3 +- input/test/beams.ly | 46 +- input/test/breathing-sign.ly | 10 +- 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/collision-merge-dotted.ly | 7 +- input/test/collisions.ly | 28 +- input/test/defaultbars.ly | 2 +- input/test/dots.ly | 5 +- input/test/drarn-chords.ly | 2 +- input/test/extra-staff.ly | 2 +- input/test/font-body.ly | 14 +- input/test/font.ly | 2 +- input/test/font16.ly | 2 +- input/test/font20.ly | 2 +- input/test/force-hshift.ly | 7 +- input/test/generic-property-override.ly | 5 +- input/test/gmsusd.ly | 2 +- input/test/gourlay.ly | 6 +- input/test/hara-kiri-short.ly | 2 +- input/test/hara-kiri-switch.ly | 2 +- input/test/hara-kiri.ly | 12 +- input/test/incipit.ly | 4 +- input/test/keys.ly | 2 +- input/test/keys2.ly | 2 +- input/test/knee-mult.ly | 4 +- input/test/knee.ly | 8 +- input/test/lyric-combine.ly | 2 +- input/test/lyric-extender.ly | 2 +- input/test/lyric-hyphen.ly | 2 +- input/test/lyric-phrasing.ly | 2 +- input/test/lyrics-multi-stanza.ly | 2 +- input/test/lyrics.ly | 2 +- input/test/mark.ly | 2 +- input/test/memory.ly | 2 +- input/test/multi-measure-rest.ly | 2 +- input/test/multi-rest.ly | 6 +- input/test/non-empty-text.ly | 12 +- input/test/noteheadstyle.ly | 4 +- input/test/notemode-chords.ly | 2 +- input/test/orchestscore.ly | 10 +- input/test/ossia.ly | 2 +- input/test/pushproperty.ly | 27 +- input/test/rest-collision.ly | 24 +- input/test/scripts.ly | 12 +- input/test/sleur.ly | 80 ++-- input/test/slur-cross-staff.ly | 20 +- input/test/slur-damping.ly | 2 +- input/test/slur-dash.ly | 2 +- input/test/slur-follow-music.ly | 11 +- input/test/slur-nice.ly | 14 +- input/test/slur-positions.ly | 8 +- input/test/slurs.ly | 6 +- input/test/spacing-2.ly | 2 +- input/test/spacing.ly | 2 +- input/test/span-bars.ly | 2 +- input/test/staff-margin-partial.ly | 2 +- input/test/staff-margin.ly | 2 +- input/test/staff-side-slur.ly | 2 +- input/test/staff-size.ly | 4 +- input/test/stem-tremolo.ly | 8 +- input/test/stem.ly | 10 +- 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/tuplet.ly | 2 +- input/test/twinkle-as5.ly | 2 +- input/test/two-slurs.ly | 5 +- input/test/updown.ly | 10 +- input/test/vertical-align.ly | 2 +- input/test/vertical-text.ly | 6 +- input/test/volta.ly | 7 +- input/trip.ly | 74 ++-- input/twinkle-pop.ly | 2 +- input/twinkle.ly | 2 +- lily/a2-engraver.cc | 2 +- lily/align-interface.cc | 2 +- lily/align-note-column-engraver.cc | 2 +- lily/arpeggio-engraver.cc | 74 ---- lily/arpeggio.cc | 50 --- lily/auto-beam-engraver.cc | 2 +- lily/axis-group-engraver.cc | 6 +- lily/axis-group-interface.cc | 32 +- lily/bar-engraver.cc | 2 +- lily/bar-number-engraver.cc | 2 +- lily/bar.cc | 3 +- lily/beam-engraver.cc | 4 +- lily/beam.cc | 7 +- lily/break-align-engraver.cc | 8 +- lily/break-align-item.cc | 3 +- lily/breathing-sign-engraver.cc | 2 +- lily/breathing-sign.cc | 7 +- lily/chord-name-engraver.cc | 2 +- lily/chord-tremolo-engraver.cc | 2 +- lily/clef-engraver.cc | 12 +- lily/collision-engraver.cc | 2 +- lily/collision.cc | 2 +- lily/dimension-cache.cc | 8 +- lily/dot-column-engraver.cc | 2 +- lily/dot-column.cc | 2 +- lily/dynamic-engraver.cc | 11 +- lily/extender-engraver.cc | 4 +- lily/group-interface.cc | 7 - lily/hara-kiri-group-spanner.cc | 43 +- lily/hyphen-engraver.cc | 4 +- lily/include/align-interface.hh | 6 +- lily/include/arpeggio.hh | 23 - lily/include/axis-group-interface.hh | 2 +- lily/include/bar.hh | 6 +- lily/include/beam.hh | 10 +- lily/include/break-align-item.hh | 8 +- lily/include/breathing-sign.hh | 4 +- lily/include/chord-name.hh | 4 +- lily/include/clef.hh | 2 +- lily/include/collision.hh | 2 +- lily/include/crescendo.hh | 2 +- lily/include/dimension-cache.hh | 15 +- lily/include/dot-column.hh | 2 +- lily/include/dots.hh | 6 +- lily/include/grace-align-item.hh | 2 +- lily/include/group-interface.hh | 4 +- lily/include/hara-kiri-group-spanner.hh | 6 +- lily/include/hyphen-spanner.hh | 2 +- lily/include/key-item.hh | 2 +- lily/include/lily-guile.hh | 12 +- lily/include/local-key-item.hh | 2 +- lily/include/lyric-extender.hh | 2 +- lily/include/multi-measure-rest.hh | 4 +- lily/include/note-head.hh | 2 +- lily/include/rest-collision.hh | 4 +- lily/include/rest.hh | 4 +- lily/include/rhythmic-head.hh | 2 +- lily/include/score-element.hh | 34 +- lily/include/script-column.hh | 2 +- lily/include/script.hh | 4 +- lily/include/separating-group-spanner.hh | 2 +- lily/include/side-position-interface.hh | 16 +- lily/include/slur.hh | 9 +- lily/include/spacing-spanner.hh | 2 +- lily/include/span-arpeggio.hh | 24 -- lily/include/span-bar.hh | 8 +- lily/include/staff-symbol-referencer.hh | 2 +- lily/include/staff-symbol.hh | 2 +- lily/include/stem-tremolo.hh | 4 +- lily/include/stem.hh | 8 +- lily/include/system-start-delimiter.hh | 4 +- lily/include/tie-column.hh | 2 +- lily/include/tie.hh | 4 +- lily/include/time-signature.hh | 2 +- lily/include/tuplet-spanner.hh | 4 +- lily/include/volta-spanner.hh | 2 +- lily/instrument-name-engraver.cc | 5 +- lily/item.cc | 4 +- lily/key-engraver.cc | 2 +- lily/line-number-engraver.cc | 105 ----- lily/local-key-engraver.cc | 2 +- lily/lyric-engraver.cc | 6 +- lily/mark-engraver.cc | 2 +- lily/multi-measure-rest-engraver.cc | 2 +- lily/my-lily-lexer.cc | 2 - lily/note-heads-engraver.cc | 8 +- lily/note-name-engraver.cc | 2 +- lily/parser.yy | 28 +- lily/piano-pedal-engraver.cc | 8 +- lily/pointer-group-interface.cc | 4 - lily/property-engraver.cc | 24 +- lily/rest-collision-engraver.cc | 2 +- lily/rest-collision.cc | 6 +- lily/rest-engraver.cc | 6 +- lily/rhythmic-column-engraver.cc | 2 +- lily/score-element.cc | 117 ++--- lily/score-engraver.cc | 6 +- lily/script-column-engraver.cc | 2 +- lily/script-engraver.cc | 27 +- lily/separating-line-group-engraver.cc | 4 +- lily/separation-item.cc | 4 +- lily/side-position-interface.cc | 8 +- lily/slur-engraver.cc | 2 +- lily/spacing-engraver.cc | 2 +- lily/spacing-spanner.cc | 4 +- lily/span-arpeggio-engraver.cc | 87 ---- lily/span-arpeggio.cc | 68 --- lily/span-bar-engraver.cc | 2 +- lily/span-bar.cc | 18 +- lily/staff-symbol-engraver.cc | 2 +- lily/staff-symbol-referencer.cc | 15 +- lily/stanza-number-engraver.cc | 2 +- lily/stem-engraver.cc | 4 +- lily/stem-tremolo.cc | 12 +- lily/stem.cc | 12 +- lily/sustain-pedal.cc | 3 +- lily/syllable-group.cc | 2 +- lily/system-start-delimiter-engraver.cc | 2 +- lily/system-start-delimiter.cc | 5 +- lily/text-engraver.cc | 13 +- lily/text-item.cc | 2 +- lily/tie-column.cc | 4 +- lily/tie-engraver.cc | 4 +- lily/time-signature-engraver.cc | 2 +- lily/translator.cc | 7 - lily/tuplet-engraver.cc | 2 +- lily/vertical-align-engraver.cc | 7 +- lily/volta-engraver.cc | 2 +- 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 | 401 +++++++++++------- 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/paper11.ly | 2 +- ly/paper13.ly | 2 +- ly/paper16.ly | 2 +- ly/paper20.ly | 2 +- ly/paper23.ly | 2 +- ly/paper26.ly | 2 +- ly/property.ly | 71 ++-- ly/svenska.ly | 2 +- make/out/lilypond.lsm | 8 +- make/out/lilypond.spec | 4 +- mutopia/Coriolan/bassi-part.ly | 2 +- mutopia/Coriolan/bassi.ly | 2 +- mutopia/Coriolan/c-midi.ly | 2 +- mutopia/Coriolan/clarinetti-part.ly | 2 +- mutopia/Coriolan/clarinetti.ly | 2 +- mutopia/Coriolan/clarinetto-1.ly | 2 +- mutopia/Coriolan/clarinetto-2.ly | 2 +- mutopia/Coriolan/contrabasso.ly | 2 +- mutopia/Coriolan/coriolan.ly | 2 +- mutopia/Coriolan/corni-part.ly | 2 +- mutopia/Coriolan/corni.ly | 2 +- mutopia/Coriolan/corno-1.ly | 2 +- mutopia/Coriolan/corno-2.ly | 2 +- mutopia/Coriolan/fagotti-part.ly | 2 +- mutopia/Coriolan/fagotti.ly | 2 +- mutopia/Coriolan/fagotto-1.ly | 2 +- mutopia/Coriolan/fagotto-2.ly | 2 +- mutopia/Coriolan/flauti-part.ly | 2 +- mutopia/Coriolan/flauti.ly | 2 +- mutopia/Coriolan/flauto-1.ly | 2 +- mutopia/Coriolan/flauto-2.ly | 2 +- mutopia/Coriolan/global.ly | 2 +- mutopia/Coriolan/oboe-1.ly | 2 +- mutopia/Coriolan/oboe-2.ly | 2 +- mutopia/Coriolan/oboi-part.ly | 2 +- mutopia/Coriolan/oboi.ly | 2 +- mutopia/Coriolan/timpani-part.ly | 2 +- mutopia/Coriolan/timpani.ly | 2 +- mutopia/Coriolan/trombe-part.ly | 2 +- mutopia/Coriolan/trombe.ly | 2 +- mutopia/Coriolan/trombo-1.ly | 2 +- mutopia/Coriolan/trombo-2.ly | 2 +- mutopia/Coriolan/viola-1.ly | 2 +- mutopia/Coriolan/viola-2.ly | 2 +- mutopia/Coriolan/violi-part.ly | 2 +- mutopia/Coriolan/violi.ly | 2 +- mutopia/Coriolan/violino-1-part.ly | 2 +- mutopia/Coriolan/violino-1.ly | 2 +- mutopia/Coriolan/violino-2-part.ly | 2 +- mutopia/Coriolan/violino-2.ly | 2 +- mutopia/Coriolan/violoncello.ly | 2 +- mutopia/D.Zipoli/verso_2.ly | 6 +- mutopia/E.Satie/gnossienne-4.ly | 6 +- mutopia/E.Satie/petite-ouverture-a-danser.ly | 10 +- mutopia/F.Schubert/standchen-16.ly | 2 +- mutopia/F.Schubert/standchen-20.ly | 2 +- mutopia/F.Schubert/standchen.ly | 2 +- mutopia/Hymns/diademata.ly | 10 +- mutopia/Hymns/laudatedom.ly | 10 +- mutopia/Hymns/maccabaeus.ly | 10 +- mutopia/Hymns/ode.ly | 10 +- mutopia/Hymns/stille.ly | 10 +- .../Cembalo-Partitas/Partita_II_Allemande.ly | 30 +- .../Cembalo-Partitas/Partita_II_Capriccio.ly | 72 ++-- .../Cembalo-Partitas/Partita_II_Sinfonia.ly | 84 ++-- mutopia/J.S.Bach/Duette/global-i.ly | 2 +- mutopia/J.S.Bach/Duette/global-ii.ly | 2 +- mutopia/J.S.Bach/Duette/viola-i.ly | 2 +- mutopia/J.S.Bach/Duette/viola-ii.ly | 2 +- mutopia/J.S.Bach/Duette/viola-part.ly | 2 +- mutopia/J.S.Bach/Duette/violino-i.ly | 2 +- mutopia/J.S.Bach/Duette/violino-ii.ly | 4 +- mutopia/J.S.Bach/Duette/violino-part.ly | 2 +- mutopia/J.S.Bach/Duette/violino-viola.ly | 2 +- .../J.S.Bach/Duette/violino-violoncello.ly | 2 +- mutopia/J.S.Bach/Duette/violoncello-i.ly | 2 +- mutopia/J.S.Bach/Duette/violoncello-ii.ly | 2 +- mutopia/J.S.Bach/Duette/violoncello-part.ly | 2 +- .../J.S.Bach/Petites-Preludes/preludes-1.ly | 26 +- .../J.S.Bach/Petites-Preludes/preludes-2.ly | 18 +- .../J.S.Bach/Petites-Preludes/preludes-3.ly | 2 +- .../J.S.Bach/Petites-Preludes/preludes-5.ly | 38 +- .../J.S.Bach/Petites-Preludes/preludes-6.ly | 34 +- .../Solo-Cello-Suites/allemande-cello.ly | 2 +- .../Solo-Cello-Suites/allemande-urtext.ly | 38 +- .../Solo-Cello-Suites/allemande-viola.ly | 2 +- .../Solo-Cello-Suites/courante-cello.ly | 2 +- .../Solo-Cello-Suites/courante-urtext.ly | 18 +- .../Solo-Cello-Suites/courante-viola.ly | 2 +- .../J.S.Bach/Solo-Cello-Suites/gigue-cello.ly | 2 +- .../Solo-Cello-Suites/gigue-urtext.ly | 26 +- .../J.S.Bach/Solo-Cello-Suites/gigue-viola.ly | 2 +- .../Solo-Cello-Suites/menuetto-cello.ly | 6 +- .../Solo-Cello-Suites/menuetto-urtext.ly | 48 +-- .../Solo-Cello-Suites/menuetto-viola.ly | 6 +- .../Solo-Cello-Suites/prelude-cello.ly | 2 +- .../Solo-Cello-Suites/prelude-urtext.ly | 12 +- .../Solo-Cello-Suites/prelude-viola.ly | 2 +- .../Solo-Cello-Suites/sarabande-cello.ly | 2 +- .../Solo-Cello-Suites/sarabande-urtext.ly | 28 +- .../Solo-Cello-Suites/sarabande-viola.ly | 2 +- mutopia/J.S.Bach/wtk1-fugue1.ly | 26 +- mutopia/J.S.Bach/wtk1-fugue2.ly | 26 +- mutopia/J.S.Bach/wtk1-prelude1.ly | 12 +- mutopia/gallina.ly | 2 +- scm/slur.scm | 2 +- scripts/convert-mudela.py | 53 ++- stepmake/aclocal.m4 | 10 +- 365 files changed, 1629 insertions(+), 1977 deletions(-) delete mode 100644 input/test/arpeggio.ly delete mode 100644 lily/arpeggio-engraver.cc delete mode 100644 lily/arpeggio.cc delete mode 100644 lily/include/arpeggio.hh delete mode 100644 lily/include/span-arpeggio.hh delete mode 100644 lily/line-number-engraver.cc delete mode 100644 lily/span-arpeggio-engraver.cc delete mode 100644 lily/span-arpeggio.cc diff --git a/AUTHORS.txt b/AUTHORS.txt index c5653944af..a0c085fed6 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -6,8 +6,8 @@ AUTHORS - who did what on GNU LilyPond? This file lists authors of GNU LilyPond, and what they wrote. This list is alphabetically ordered. - * Tom Cato Amundsen , cembalo-partita in - mudela, accordion symbols, some mudela-book.py + * Tom Cato Amundsen , cembalo-partita in mudela, + accordion symbols, some mudela-book.py * Mats Bengtsson , `http://www.s3.kth.se/~matsb/' lots of testing, fixes, general diff --git a/CHANGES b/CHANGES index 864d18f287..e414a5881f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,24 +1,34 @@ -1.3.93.jcn2 -=========== - -* Added backend framework for arpeggios. - 1.3.93.uu1 ========== -* Bugfix: don't crash if there is volta bracket to end. +* Bugfix: don't crash if there is no volta bracket to end. + +* Move offset, dimension callbacks into Scheme. They can be initialized from basicXXXX properties using + + (X-offset-callbacks . (callback1 callback2 .. .)) + (Y-offset-callbacks . (callback1 callback2 .. .)) + (X-extent-callback . callback1) + (Y-extent-callback . callback1) + +* naming: basicXXXProperties -> XXX, some other changes in naming; +convert-mudela rules added. -* Move offset callbacks into Scheme. +* naming: \voiceone -> \voiceOne and related changes. convert-mudela +rules added + +* syntax: \property XXX \pop #'bla -> \property Context.XXX \pop #'bla + +* changed aclocal.m4 to have better check for guile version. (Laura Conrad) + +* updates for mudela-book (Tom Cato Amundsen) 1.3.93.jcn1 =========== -* Try at nastiest competition piece: input/les-nereides.ly (HELP?). +* Try at nastiest competition piece: input/les-nereides.ly. * Moved Pedal_engraver to Staff context. - - 1.3.93 ====== diff --git a/Documentation/ntweb/angels.ly b/Documentation/ntweb/angels.ly index ae7d223aa2..c2e512e114 100644 --- a/Documentation/ntweb/angels.ly +++ b/Documentation/ntweb/angels.ly @@ -15,7 +15,7 @@ global = \notes { \clef treble; } -\version "1.3.59"; +\version "1.3.93"; % \include "paper16.ly" flute1 = \notes \relative c'' \context Voice = flute { diff --git a/Documentation/user/glossary.tely b/Documentation/user/glossary.tely index 056942f976..4d1ad3a606 100644 --- a/Documentation/user/glossary.tely +++ b/Documentation/user/glossary.tely @@ -171,8 +171,8 @@ An appoggiatura may have more notes preceding the main note. \grace { [as16 ( bes] } < ) c4 as > \grace { [as16 ( bes] } < ) c4 as > \bar "||"; \grace { bes16 } as8_"performance" as16 bes as8 g | - < \context Voice = va { \stemup as32 bes c8. as32 bes c8. } - \context Voice = vb { \stemdown as16 ~ as8. as16 ~ as8. } > + < \context Voice = va { \stemUp as32 bes c8. as32 bes c8. } + \context Voice = vb { \stemDown as16 ~ as8. as16 ~ as8. } > \bar "||"; } @end mudela @@ -193,11 +193,11 @@ Akkord, NL: gebroken akoord, DK: arpeggio, akkordbrydning, S: arpeggio, N: \notes\relative c' { \clef bass; < \context Voice = va { - \stemup + \stemUp r16 e8. () e4 r16 e8. () e4 | r16 d8. () d4 r16 d8. () d4 } \context Voice = vb { - \stemdown + \stemDown c2 c | c c } > } > @@ -550,13 +550,13 @@ composition methods. \time 4/4; \clef treble; < \context Voice = rha { - \stemup + \stemUp r1 | r2 r8 g'8 bes d, | cis4 d r8 e!16 f g8 f16 e | f8 g16 a bes8 a16 g a8 } \context Voice = rhb { - \stemdown + \stemDown r1 | r | r | r2 s8 } > @@ -565,13 +565,13 @@ composition methods. \clef bass; \key bes \major; < \context Voice = lha { - \stemup + \stemUp r8 d es g, fis4 g | r8 a16 bes c8 bes16 a bes4 g | r8 a16 g f8 g16 a bes8 g e! cis' | d4. e!8 f } \context Voice = lhb { - \stemdown + \stemDown r1 | r | r | r2 s8 } > } @@ -2427,10 +2427,10 @@ with figures designating the chief @w{@ar{}@strong{interval}}s and \key es \major; \clef treble; < \context Voice = rha { - \stemup + \stemUp es4 d c bes | bes } \context Voice = rhb { - \stemdown + \stemDown < bes8 g > as < as f > g < g es > f < d f > es | < g4 es > } > } diff --git a/Documentation/user/properties.itely b/Documentation/user/properties.itely index 9d8e5c1bf1..375a1d1083 100644 --- a/Documentation/user/properties.itely +++ b/Documentation/user/properties.itely @@ -212,14 +212,14 @@ the notes. In this case the chords are just simple notes. @mudela[singleline,verbatim] \score { \notes \context Staff < - \context Voice = VA { \stemup f''4^"0" } - \context Voice = VB {\stemup + \context Voice = VA { \stemUp f''4^"0" } + \context Voice = VB {\stemUp \property Voice.horizontalNoteShift = 1 d''4^" 1" } - \context Voice = VC { \stemup \property + \context Voice = VC { \stemUp \property Voice.horizontalNoteShift = 2 b'4^" 2" } - \context Voice = VD { \stemdown \property + \context Voice = VD { \stemDown \property Voice.horizontalNoteShift = 1 g'4_"1 " } - \context Voice = VE { \stemdown e'4_"0" } + \context Voice = VE { \stemDown e'4_"0" } > } @end mudela @@ -283,21 +283,8 @@ r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 Set to @code{\free} for free choice of slur direction, set to @code{\up} to force slurs up, set to @code{\down} to force slurs down. The shorthands @code{\slurup}@keyindex{slurup}, - @code{\slurdown}@keyindex{slurdown}, and - @code{\slurboth}@keyindex{slurboth} are available. - - @item @code{slurDash}@indexcode{slurDash} @propertytype{number} - Set to NIL for normal slurs, 1 for dotted slurs, and a - larger value for dashed slurs. Identifiers - @code{\slurnormal}@keyindex{slurnormal} and - @code{\slurdotted}@keyindex{slurdotted} are predefined to set the - first two settings. - -@mudela[verbatim] - c4( )d - \property Voice.slurDash = 3 - c ( )e -@end mudela + @code{\slurDown}@keyindex{slurDown}, and + @code{\slurBoth}@keyindex{slurBoth} are available. @item @code{stemLength}@indexcode{stemLength} Set length of stems. Unit is `@code{staffspace}/2', so @@ -350,8 +337,8 @@ c4^"foo" \emptyText c4^"foo" c4 ties. Set to @code{\down} to force them down, @code{\up} to force them up, or @code{\free} to let LilyPond decide. This can be used to distinguish between voices on the same staff. The - @code{\stemdown}@keyindex{stemdown}, @code{\stemup}@keyindex{stemup}, - and @code{\stemboth}@keyindex{stemboth} identifiers set this + @code{\stemDown}@keyindex{stemDown}, @code{\stemUp}@keyindex{stemUp}, + and @code{\stemBoth}@keyindex{stemBoth} identifiers set this property. diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 3cbf3e94eb..7c318a22bb 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -2973,24 +2973,24 @@ provide shorthands for some settings. Most of them are in @item @code{\right}@keyindex{right} Used for setting text alignment property. Is set to 1. - @item @code{\shiftoff}@keyindex{shiftoff} + @item @code{\shiftoff}@keyindex{shiftOff} Disable horizontal shifting of note heads that collide. Sets the @code{Voice.horizontalNoteShift} property. - @item @code{\shifton}@keyindex{shifton} + @item @code{\shiftOn}@keyindex{shiftOn} Enable note heads that collide with other note heads to be shifted horiztonally. Sets the @code{Voice.horizontalNoteShift} property. - @item @code{\slurboth}@keyindex{slurboth} + @item @code{\slurBoth}@keyindex{slurBoth} Allow slurs to be above or below notes. This sets the @code{Voice.slurVerticalDirection} property. - @item @code{\slurdown}@keyindex{slurdown} + @item @code{\slurDown}@keyindex{slurDown} Force slurs to be below notes. This sets the @code{Voice.slurVerticalDirection} property. - @item @code{\slurup}@keyindex{slurup} + @item @code{\slurUp}@keyindex{slurUp} Force slurs to be above notes. This sets the @code{Voice.slurVerticalDirection} property. @@ -2998,7 +2998,7 @@ provide shorthands for some settings. Most of them are in Allow key signatures do differ in different octaves. This sets the @code{Staff.keyoctaviation} property. - @item @code{\stemboth}@keyindex{stemboth} + @item @code{\stemBoth}@keyindex{stemBoth} Allow stems, beams, and slurs to point either upwards or downwards, decided automatically by LilyPond. This sets the @code{Voice.verticalDirection} property. @@ -3007,7 +3007,7 @@ provide shorthands for some settings. Most of them are in Force stems, beams, and slurs to point down. This sets the @code{Voice.verticalDirection} property. - @item @code{\stemup}@keyindex{stemup} + @item @code{\stemUp}@keyindex{stemUp} Force stems, beams and slurs to point up. This sets the @code{Voice.verticalDirection} property. diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index f5da04c8c7..66c915a63c 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -712,42 +712,42 @@ Sammartini. It was composed around 1740. viola = \notes \relative c' \context Voice = viola { - \property Voice.verticalDirection = \down g'8. b,16 + \stemDown g'8. b,16 s1 s2. r4 g } oboes = \notes \relative c'' \context Voice = oboe { - \stemup s4 g8. b,16 c8 r + \stemUp s4 g8. b,16 c8 r \grace \times 2/3 { } < { \times 2/3 { a8 g c } \! c2 } \context Voice = oboeTwo { - \stemdown + \stemDown \grace { - \property Grace.verticalDirection = \down + \property Grace.Stem \push #'direction = #-1 [f,16 g] } f8 e e2 } > - \stemboth + \stemBoth \grace <)b8. d8.-\trill> | [ < )f8. a>] <)b,8 d> r [ ] r | [ < )e8. g>] } hoomPah = \notes \transpose c' { - c8 \translator Staff = top \stemdown - c'8 \translator Staff = bottom \stemup } + c8 \translator Staff = top \stemDown + c'8 \translator Staff = bottom \stemUp } hoomPahHoomPah = { [\hoomPah \hoomPah] } bassvoices = \notes \relative c' { c4 g8. b,16 \repeat unfold 4 {\hoomPahHoomPah} - \stemdown [c8 c'8] r4 + \stemDown [c8 c'8] r4 r4 - < {\stemup r2 } - \context Voice = reallyLow {\stemdown g2 ~ | g4 c8 } > + < {\stemUp r2 } + \context Voice = reallyLow {\stemDown g2 ~ | g4 c8 } > } \score { @@ -792,13 +792,16 @@ precisely one Voice context. @code{<} and @code{>} are short hands for @code{\simultaneous @{} and @code{@}}. So the expression enclosed in @code{<} and @code{>} is a chord. @code{\f} places a forte symbol under the chord. +[FIXME] + @example -\property Voice.verticalDirection = \down + \property Voice.verticalDirection = \down @end example @code{verticalDirection} is a property of the voice context. It controls the directions of stems, articulations marks and other symbols. - If @code{verticalDirection} is set to @code{\down} + +If @code{verticalDirection} is set to @code{\down} (identifier for the integer -1) the stems go down, @code{\up} (identifier for the integer 1) makes the stems go up. @example @@ -822,9 +825,9 @@ print the notes as one voice that makes chords. Again, we insure that these notes are indeed processed by precisely one context with @code{\context}. @example -\stemup s4 g8. b,16 c8 r +\stemUp s4 g8. b,16 c8 r @end example -@code{\stemup} is an identifier reference. It is shorthand for +@code{\stemUp} is an identifier reference. It is shorthand for @code{\property Voice.verticalDirection = \up}. If possible, you should use predefined identifiers like these for setting properties. Your input will be less dependent upon the implementation of LilyPond. @@ -863,7 +866,7 @@ The crescendo is ended at the half note by the escaped exclamation mark `@code{\!}'. @example \context Voice = oboeTwo @{ -\stemdown +\stemDown @end example We can't share stems with the other voice, so we have to create a new @code{Voice} context. We give it the name @code{oboeTwo} to distinguish @@ -876,9 +879,11 @@ created. This context acts like a miniature score of its own. It has its own time bookkeeping, and you can make notes, beams, slurs etc. Here we fiddle with a property and make a beam. The argument of @code{\grace} is sequential music. + @example -\property Grace.verticalDirection = \down -[f,16 g] @} +\property Grace.verticalDirection = \down +[f,16 g] @} + [FIXME] @end example Normally, grace notes are always stem up, but in this case, the upper voice interferes. We set the stems down here. @@ -893,10 +898,10 @@ the @code{f}. @end example This ends the two-part section. @example -\stemboth +\stemBoth \grace <)b8. d8.-\trill> | @end example -@code{\stemboth} ends the forced stem directions. From here, stems are +@code{\stemBoth} ends the forced stem directions. From here, stems are positioned as if it were single part music. The bass has a little hoom-pah melody to demonstrate parts switching @@ -918,7 +923,7 @@ octave@footnote{@code{hoomPah = \relative @dots{}} would be more intuitive to use, but that would not let me plug @code{\transpose} :-).}. @example -c8 \translator Staff = top \stemdown +c8 \translator Staff = top \stemDown @end example We assume that the first note will be put in the lower staff. After that note we switch to the upper staff with @code{\translator}. To be @@ -927,7 +932,7 @@ precise, this @code{\translator} entry switches the current voice to a `@code{top}'. Stem directions are set to avoid interfering with the oboe voices. @example -c'8 \translator Staff = bottom \stemup @} +c'8 \translator Staff = bottom \stemUp @} @end example Then a note is put on the upper staff, and we switch again. We have to name the lower staff `@code{bottom}'. @@ -943,7 +948,7 @@ Entering the bass part is easy: the hoomPahHoomPah variable is repeated four times; @code{unfold} means that all four repetitions should be written out. @example -\context Voice = reallyLow @{\stemdown g2 ~ | g4 c8 @} > +\context Voice = reallyLow @{\stemDown g2 ~ | g4 c8 @} > @end example After skipping some lines, we see @code{~}. This mark makes ties. @example diff --git a/VERSION b/VERSION index fb37fda8ec..38473d7230 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 -PATCH_LEVEL=93 -MY_PATCH_LEVEL=jcn2 +PATCH_LEVEL=94 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/aclocal.m4 b/aclocal.m4 index a32e3bc02a..e812c5f830 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,7 +1,5 @@ dnl WARNING WARNING WARNING WARNING dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in @@ -179,9 +177,15 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [ fi AC_MSG_CHECKING("Guile version") need_guile_version="1.3.4" - guile_version=`expr "\`$guile_config --version 2>&1\`" : ".*\($need_guile_version\).*"` + need_guile_version_numeric=100304 + guile_version=`$guile_config --version 2>&1 | awk '{print $NF}'` + guile_version_numeric=`echo $guile_version | awk -F. ' +{if ([$]3) {last = [$]3} +else {last =0}} +{printf "%s%s%s\n",[$]1*100, [$]2*10,last}'` AC_MSG_RESULT("$guile_version") - if test "$guile_version" != "$need_guile_version"; then + if test $guile_version_numeric -lt $need_guile_version_numeric + then AC_STEPMAKE_WARN("Guile version "$need_guile_version" or newer is needed") fi GUILE_FLAGS diff --git a/configure b/configure index 6f9cf86255..c79aba8915 100755 --- a/configure +++ b/configure @@ -2857,9 +2857,15 @@ echo "configure:2848: checking "if we are cross compiling"" >&5 echo $ac_n "checking "Guile version"""... $ac_c" 1>&6 echo "configure:2859: checking "Guile version"" >&5 need_guile_version="1.3.4" - guile_version=`expr "\`$guile_config --version 2>&1\`" : ".*\($need_guile_version\).*"` + need_guile_version_numeric=100304 + guile_version=`$guile_config --version 2>&1 | awk '{print $NF}'` + guile_version_numeric=`echo $guile_version | awk -F. ' +{if ($3) {last = $3} +else {last =0}} +{printf "%s%s%s\n",$1*100, $2*10,last}'` echo "$ac_t"""$guile_version"" 1>&6 - if test "$guile_version" != "$need_guile_version"; then + if test $guile_version_numeric -lt $need_guile_version_numeric + then echo "configure: warning: "Guile version "$need_guile_version" or newer is needed"" 1>&2 warn_b=yes @@ -2868,7 +2874,7 @@ echo "configure:2859: checking "Guile version"" >&5 ## The GUILE_FLAGS macro. echo $ac_n "checking for Guile""... $ac_c" 1>&6 -echo "configure:2872: checking for Guile" >&5 +echo "configure:2878: checking for Guile" >&5 if ! $guile_config link > /dev/null ; then echo "$ac_t"""cannot execute $guile_config"" 1>&6 { echo "configure: error: "cannot find guile-config; is Guile installed?"" 1>&2; exit 1; } @@ -2883,7 +2889,7 @@ echo "configure:2872: checking for Guile" >&5 # Extract the first word of "guile", so it can be a program name with args. set dummy guile; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2887: checking for $ac_word" >&5 +echo "configure:2893: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GUILE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2933,17 +2939,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2937: checking for $ac_hdr" >&5 +echo "configure:2943: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2970,7 +2976,7 @@ fi done echo $ac_n "checking for kpse_find_file in -lkpathsea""... $ac_c" 1>&6 -echo "configure:2974: checking for kpse_find_file in -lkpathsea" >&5 +echo "configure:2980: checking for kpse_find_file in -lkpathsea" >&5 ac_lib_var=`echo kpathsea'_'kpse_find_file | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2978,7 +2984,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkpathsea $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3025,12 +3031,12 @@ fi for ac_func in kpse_find_file do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3029: checking for $ac_func" >&5 +echo "configure:3035: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3085,7 +3091,7 @@ done fi echo $ac_n "checking whether to use kpathsea""... $ac_c" 1>&6 -echo "configure:3089: checking whether to use kpathsea" >&5 +echo "configure:3095: checking whether to use kpathsea" >&5 if test $kpathsea_b = yes; then echo "$ac_t""yes" 1>&6 KPATHSEA=1 @@ -3103,7 +3109,7 @@ EOF echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:3107: checking for 8-bit clean memcmp" >&5 +echo "configure:3113: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3111,7 +3117,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -3142,12 +3148,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:3146: checking for vprintf" >&5 +echo "configure:3152: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -3197,12 +3203,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:3201: checking for _doprnt" >&5 +echo "configure:3207: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -3255,12 +3261,12 @@ fi for ac_func in memmem snprintf vsnprintf gettext isinf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3259: checking for $ac_func" >&5 +echo "configure:3265: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3325,7 +3331,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3329: checking for $ac_word" >&5 +echo "configure:3335: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3358,7 +3364,7 @@ test -n "$MAKEINFO" || MAKEINFO="error" # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3362: checking for $ac_word" >&5 +echo "configure:3368: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/input/bugs/dotted-collision.ly b/input/bugs/dotted-collision.ly index e56cd2c6d2..bba8b8bdab 100644 --- a/input/bugs/dotted-collision.ly +++ b/input/bugs/dotted-collision.ly @@ -2,7 +2,7 @@ enteredby = "Donat Wullschleger"; } -\version "1.3.59"; +\version "1.3.93"; \include "paper16.ly"; \include "deutsch.ly"; @@ -21,7 +21,7 @@ righthandfirstvoice = \notes \relative c'' lefthandfirstvoice = \notes \relative c \context Voice = upper { - \voiceone + \voiceOne \key b \major; \clef bass; @@ -32,7 +32,7 @@ lefthandfirstvoice = \notes \relative c lefthandsecondvoice = \notes \relative c \context Voice = lower { - \voicetwo + \voiceTwo r2. | r4. r4. | r8. r8. r8. r8. | diff --git a/input/bugs/knee.ly b/input/bugs/knee.ly index f5590cf4a5..3b86f0c937 100644 --- a/input/bugs/knee.ly +++ b/input/bugs/knee.ly @@ -1,8 +1,8 @@ -\version "1.3.59"; +\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'] + [c16 \stemDown c'' \stemBoth c,, d] + \stemDown [d'' a \stemBoth c,, g,] + \stemUp [g c' \stemBoth a'' d'] } } diff --git a/input/denneboom.ly b/input/denneboom.ly index ff0f985206..3fa6b727a0 100644 --- a/input/denneboom.ly +++ b/input/denneboom.ly @@ -7,7 +7,7 @@ copyright = "public domain"; \include "paper20.ly" -\version "1.3.59"; +\version "1.3.93"; oden = \lyrics{ O | diff --git a/input/example-3.ly b/input/example-3.ly index f245ae37b1..7446e2eb47 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -1,4 +1,4 @@ -\version "1.3.59"; +\version "1.3.93"; one = \notes\relative c{ c'' d e f diff --git a/input/just-friends.ly b/input/just-friends.ly index cd427c7eca..82b34fc94d 100644 --- a/input/just-friends.ly +++ b/input/just-friends.ly @@ -56,4 +56,4 @@ of a certain tune (Jazz, Real Book, for example), like } } -\version "1.3.59"; +\version "1.3.93"; diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly index cfccea91c9..e6680033fb 100644 --- a/input/praeludium-fuga-E.ly +++ b/input/praeludium-fuga-E.ly @@ -22,7 +22,7 @@ * organ staff... %} -\version "1.3.59"; +\version "1.3.93"; @@ -37,26 +37,26 @@ praeludium_right = \notes { % 13 -- how to type -- where to split -- this more neatly? \context Staff < - \context Voice = I \relative c'' { \stemup r4 dis4 e4. e8 ~ | - \shifton e4 [d8 fis8] \shiftoff gis4 ~ [gis8 fis16 e ] | + \context Voice = I \relative c'' { \stemUp r4 dis4 e4. e8 ~ | + \shiftOn e4 [d8 fis8] \shiftOff gis4 ~ [gis8 fis16 e ] | fis4 ~ [fis8 e16 dis] e4 r8 e8 } - \context Voice = III \relative c'' { \stemup \shifton r4 bis cis \shiftoff cis | - a' ~ [a16 gis a b] \shifton dis,4 cis ~ | + \context Voice = III \relative c'' { \stemUp \shiftOn r4 bis cis \shiftOff cis | + a' ~ [a16 gis a b] \shiftOn dis,4 cis ~ | [cis8 dis16 ais] bis4 cis r8 b } \context Voice = IV \relative c'' { - %\stemup + %\stemUp %{ this is a diversion from the Griepenkerl/Keller edition; a hack to avoid collisions %} - \stemdown - \shifton s4 gis } + \stemDown + \shiftOn s4 gis } - \context Voice = II \relative c' { \stemdown -% \shifton % idem + \context Voice = II \relative c' { \stemDown +% \shiftOn % idem - r4 fis \shiftoff gis gis | + r4 fis \shiftOff gis gis | a4. cis8 gis2 | fis4 gis gis r8 e8 } > | @@ -70,17 +70,17 @@ praeludium_left = \notes \relative c { % 13 \context Staff < \context Voice = two { r4 } - \context Voice = one { \stemup s4 dis' cis cis ~ | + \context Voice = one { \stemUp s4 dis' cis cis ~ | [cis8 a d cis] [bis gis] cis4 | dis2 cis4 r8 cis } - \context Voice = one { \stemup bis2 } - \context Voice = three { \stemup \shifton r4 gis ~ [gis8 gis] ~ \stemdown \shiftoff gis4 | + \context Voice = one { \stemUp bis2 } + \context Voice = three { \stemUp \shiftOn r4 gis ~ [gis8 gis] ~ \stemDown \shiftOff gis4 | a4. fis8 gis4. a8 ~ | a4 gis4 gis r8 gis } -% { \stemup \shifton s4 fis4 e} +% { \stemUp \shiftOn s4 fis4 e} % a quick hack to avoid some collisons - \context Voice = four { \stemdown \shifton s4 fis4 e} - \context Voice = two { \stemdown s4 dis4 cis4 } + \context Voice = four { \stemDown \shiftOn s4 fis4 e} + \context Voice = two { \stemDown s4 dis4 cis4 } > | %16 } @@ -108,8 +108,8 @@ fugaII_right = \notes \relative c'' { %15 \context Staff < - \context Voice = VA { \stemup [b8 fis8] b4 } - \context Voice = VB { \stemdown fis2 } + \context Voice = VA { \stemUp [b8 fis8] b4 } + \context Voice = VB { \stemDown fis2 } > \context Staff \notes\relative c''< @@ -140,10 +140,10 @@ fugaII_right = \notes \relative c'' { \context Voice = one { dis2 dis4 | cis2 cis4 | b4. [cis8 dis e] } - \context Voice = three { \stemup \shifton [b8 fis] b2 ~ | + \context Voice = three { \stemUp \shiftOn [b8 fis] b2 ~ | [b8 a!16 gis] a2 ~ | a4 gis2 } - \context Voice = two { \stemdown fis2. ~ | + \context Voice = two { \stemDown fis2. ~ | fis ~ | fis4 e2 } > | @@ -156,12 +156,12 @@ fugaII_left = \notes { %15 \context Staff < - \context Voice = two { \stemdown b2 \stemup ais4 | + \context Voice = two { \stemDown b2 \stemUp ais4 | b2 b4 } - \context Voice = two { \stemdown s2 e4 | + \context Voice = two { \stemDown s2 e4 | fis2 fis4 } > - \stemdown cis2 e4 | + \stemDown cis2 e4 | b4. b8 b4 | %19 } diff --git a/input/rhythm.ly b/input/rhythm.ly index df4bfcb489..c0eebab78b 100644 --- a/input/rhythm.ly +++ b/input/rhythm.ly @@ -7,7 +7,7 @@ TestedFeatures = "multiple meters, beaming, unsynced bars, userdefd engravers"; -\version "1.3.59"; +\version "1.3.93"; ritme = \notes\transpose c'' { \time 4/4; diff --git a/input/scarlatti-properties.ly b/input/scarlatti-properties.ly index 53b117680d..4dc3154eaa 100644 --- a/input/scarlatti-properties.ly +++ b/input/scarlatti-properties.ly @@ -1,7 +1,7 @@ -\version "1.3.70"; +\version "1.3.93"; rh=\property Thread.noteHeadStyle=##f lh=\property Thread.noteHeadStyle = #'diamond @@ -10,8 +10,8 @@ sm=\property Thread.fontSize=#-1 % su=\property Voice.verticalDirection=#1 % sd=\property Voice.verticalDirection=#-1 -su=\property Voice.basicStemProperties \push #'direction = #1 -sd=\property Voice.basicStemProperties \push #'direction = #-1 +su=\property Voice.Stem \push #'direction = #1 +sd=\property Voice.Stem \push #'direction = #-1 zs=\property Voice.forceHorizontalShift=#0.0 ls=\property Voice.forceHorizontalShift=#-0.6 diff --git a/input/star-spangled-banner.ly b/input/star-spangled-banner.ly index f847471cbf..1416f5bf83 100644 --- a/input/star-spangled-banner.ly +++ b/input/star-spangled-banner.ly @@ -4,7 +4,7 @@ http://www.Arkkra.com/doc/star.html http://www.Arkkra.com/doc/star.ps %} -\version "1.3.59"; +\version "1.3.93"; % TODO: % @@ -139,12 +139,12 @@ text = \lyrics { \clef treble; \property Staff.automaticMelismata = ##t \context Voice = one \transpose c'' { - \stemup + \stemUp \$staff1_voice_1 \bar "|."; } \context Voice = two \transpose c'' { - \stemdown + \stemDown \$staff1_voice_2 } > @@ -154,11 +154,11 @@ text = \lyrics { \clef bass; \property Staff.noVoltaBraces = ##t \context Voice = three { - \stemup + \stemUp \$staff2_voice_1 } \context Voice = four { - \stemdown + \stemDown \$staff2_voice_2 } > diff --git a/input/test/arpeggio.ly b/input/test/arpeggio.ly deleted file mode 100644 index 8b81878ad4..0000000000 --- a/input/test/arpeggio.ly +++ /dev/null @@ -1,20 +0,0 @@ -\score{ - \context StaffGroup < - %< - \context Staff=one \notes\relative c''{ - f, - - } - \context Staff=two \notes\relative c{ - \clef bass; - g - - } - > - \paper{ - \translator{ - \StaffContext - \consists Arpeggio_engraver; - } - } -} diff --git a/input/test/auto-isknee.ly b/input/test/auto-isknee.ly index f2b30b932a..b53ec2924a 100644 --- a/input/test/auto-isknee.ly +++ b/input/test/auto-isknee.ly @@ -1,13 +1,13 @@ - +\version "1.3.93"; \score { \notes \context PianoStaff < \context Staff = "up" { \autochange Staff \relative c' { [c8 e'] [c' c,,] - \stemdown + \stemDown c'8 c c g, g8 d' d d - \stemup + \stemUp b8 c d e } } diff --git a/input/test/bagpipe.ly b/input/test/bagpipe.ly index 25afad8feb..89689d4358 100644 --- a/input/test/bagpipe.ly +++ b/input/test/bagpipe.ly @@ -1,3 +1,4 @@ +\version "1.3.80"; % bagpipe music. \header diff --git a/input/test/banter-chords.ly b/input/test/banter-chords.ly index ccd10d088f..91691f5978 100644 --- a/input/test/banter-chords.ly +++ b/input/test/banter-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.59"; +\version "1.3.93"; \header{ enteredby = "jcn"; diff --git a/input/test/bar-scripts.ly b/input/test/bar-scripts.ly index fa80b18037..c40ab56b41 100644 --- a/input/test/bar-scripts.ly +++ b/input/test/bar-scripts.ly @@ -1,5 +1,5 @@ -\version "1.3.59"; +\version "1.3.93"; onestaff = \context Staff = foo\notes { \property Staff.instr = instr diff --git a/input/test/beam-abbrev.ly b/input/test/beam-abbrev.ly index 117b13e7eb..e23cb2d407 100644 --- a/input/test/beam-abbrev.ly +++ b/input/test/beam-abbrev.ly @@ -1,12 +1,13 @@ +\version "1.3.93"; \score { \context Voice \notes\relative c { c'1:16 - \stemup + \stemUp c4:8 c4:16 [c8:16 c:] [c,8:16 c'':] - \stemboth + \stemBoth [c,,8:16 c'':] } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/beam-chord.ly b/input/test/beam-chord.ly index 79617a51b5..ac00bc9b3c 100644 --- a/input/test/beam-chord.ly +++ b/input/test/beam-chord.ly @@ -1,4 +1,4 @@ -\version "1.3.59"; +\version "1.3.93"; \score{ \notes\transpose c'{ diff --git a/input/test/beam-cross-staff.ly b/input/test/beam-cross-staff.ly index 08e442157f..7bdd5232b4 100644 --- a/input/test/beam-cross-staff.ly +++ b/input/test/beam-cross-staff.ly @@ -1,15 +1,15 @@ \score{ \context PianoStaff < \context Staff=one \notes\relative c'{ - \stemup [c8 c \translator Staff=two \stemup c c] + \stemUp [c8 c \translator Staff=two \stemUp c c] [c c c c] \translator Staff=one - \stemdown [c8 c \translator Staff=two \stemup c c] + \stemDown [c8 c \translator Staff=two \stemUp c c] r2 - \stemdown [c8 c \translator Staff=one \stemdown c c] + \stemDown [c8 c \translator Staff=one \stemDown c c] r2 \translator Staff=two - \stemup [c8 c \translator Staff=one \stemdown c c] + \stemUp [c8 c \translator Staff=one \stemDown c c] r2 } \context Staff=two \notes\relative c'{ @@ -22,4 +22,4 @@ > } -\version "1.3.59"; +\version "1.3.93"; diff --git a/input/test/beam-damp.ly b/input/test/beam-damp.ly index c6f2147b9e..5cfc6bcd04 100644 --- a/input/test/beam-damp.ly +++ b/input/test/beam-damp.ly @@ -1,15 +1,15 @@ \score{ \notes\relative c''{ -% \stemup +% \stemUp % [a16 b b c] % [c b b a] -% \stemdown +% \stemDown % [c b b a] % [a b b c] - \stemup + \stemUp [g16 a b c] [c b a g] - \stemdown + \stemDown [d' c b a] [a b c d] } @@ -17,3 +17,4 @@ linewidth=-1.; } } +\version "1.3.93"; diff --git a/input/test/beam-extreme.ly b/input/test/beam-extreme.ly index 4bdb1b0bc7..9d84d55709 100644 --- a/input/test/beam-extreme.ly +++ b/input/test/beam-extreme.ly @@ -1,8 +1,9 @@ +\version "1.3.93"; \score{ \notes\relative c''{ [g8 c c,] [c16 c'' a f] - \stemup + \stemUp [c,,32 c'' a f] } diff --git a/input/test/beam-isknee.ly b/input/test/beam-isknee.ly index c5532d704b..d8e3197d30 100644 --- a/input/test/beam-isknee.ly +++ b/input/test/beam-isknee.ly @@ -6,7 +6,7 @@ \context Staff=two \notes\relative c'{ \clef bass; % no knee - \stemup [c8 \translator Staff=one \stemdown g'16 f] + \stemUp [c8 \translator Staff=one \stemDown g'16 f] s8 s2 } @@ -16,4 +16,4 @@ } } -\version "1.3.59"; +\version "1.3.93"; diff --git a/input/test/beam-suspect.ly b/input/test/beam-suspect.ly index cf41188dcc..9ae29bcfd1 100644 --- a/input/test/beam-suspect.ly +++ b/input/test/beam-suspect.ly @@ -1,12 +1,13 @@ +\version "1.3.93"; \score{ \notes\relative c'{ - \stemup + \stemUp [f8 a' g f] [c8 g'16 f] [c8 e16 d] [a16 b c d] [d16 c b a] - \stemdown + \stemDown [c16 b a g] [g16 a b c] } diff --git a/input/test/beam-trend.ly b/input/test/beam-trend.ly index 24b2e7bc56..7c1357fec4 100644 --- a/input/test/beam-trend.ly +++ b/input/test/beam-trend.ly @@ -1,6 +1,7 @@ +\version "1.3.93"; \score{ \notes\relative c'{ - \stemup + \stemUp [f8 a' g f] } \paper{ diff --git a/input/test/beams.ly b/input/test/beams.ly index 5d6666095c..f219590cc5 100644 --- a/input/test/beams.ly +++ b/input/test/beams.ly @@ -6,7 +6,7 @@ copyright = "PD"; TestedFeatures = "beams and beamflags"; } -\version "1.3.59"; +\version "1.3.93"; \score{ < @@ -15,22 +15,22 @@ TestedFeatures = "beams and beamflags"; \notes\transpose c' { \time 8/4; - \stemup [c8 c'' a' f'] - \stemup [c16 c'' a' f'] - \stemup [c32 c'' a' f'] - \stemup [c64 c'' a' f'] - \stemup [c128 c'' a' f'] + \stemUp [c8 c'' a' f'] + \stemUp [c16 c'' a' f'] + \stemUp [c32 c'' a' f'] + \stemUp [c64 c'' a' f'] + \stemUp [c128 c'' a' f'] r32 - \stemup [g8 g g g] - \stemup [g16 g g g] - \stemup [g32 g g g] - \stemup [g64 g g g] - \stemup [g128 g g g] + \stemUp [g8 g g g] + \stemUp [g16 g g g] + \stemUp [g32 g g g] + \stemUp [g64 g g g] + \stemUp [g128 g g g] r32 \transpose c{ - \stemboth + \stemBoth [c'8 c'] [b b] [a a] [g g] [f f] [e e] [c'16 c'] [b b] [a a] [g g] [f f] [e e] [c'32 c'] [b b] [a a] [g g] [f f] [e e] @@ -41,23 +41,23 @@ TestedFeatures = "beams and beamflags"; \notes { \transpose c' { \time 8/4; - \stemdown [a'8 a, c e] - \stemdown [a'16 a, c e] - \stemdown [a'32 a, c e] - \stemdown [a'64 a, c e] - \stemdown [a'128 a, c e] + \stemDown [a'8 a, c e] + \stemDown [a'16 a, c e] + \stemDown [a'32 a, c e] + \stemDown [a'64 a, c e] + \stemDown [a'128 a, c e] r32} \transpose c{ - \stemdown [d''8 d'' d'' d''] - \stemdown [d''16 d'' d'' d''] - \stemdown [d''32 d'' d'' d''] - \stemdown [d''64 d'' d'' d''] - \stemdown [d''128 d'' d'' d''] + \stemDown [d''8 d'' d'' d''] + \stemDown [d''16 d'' d'' d''] + \stemDown [d''32 d'' d'' d''] + \stemDown [d''64 d'' d'' d''] + \stemDown [d''128 d'' d'' d''] r32} \transpose c''{ - \stemboth + \stemBoth [a8 a] [b b] [c' c'] [d' d'] [e' e'] [f' f'] [a16 a] [b b] [c' c'] [d' d'] [e' e'] [f' f'] [a32 a] [b b] [c' c'] [d' d'] [e' e'] [f' f'] diff --git a/input/test/breathing-sign.ly b/input/test/breathing-sign.ly index 0920abe866..9eaaa673b8 100644 --- a/input/test/breathing-sign.ly +++ b/input/test/breathing-sign.ly @@ -1,13 +1,13 @@ -\version "1.3.59"; +\version "1.3.93"; \score { \notes \relative c' { \key es \major; \time 3/4; - < \context Voice = two { \stemdown es4 bes es } - \context Voice = one { \stemup g4 as g } + < \context Voice = two { \stemDown es4 bes es } + \context Voice = one { \stemUp g4 as g } > | - < \context Voice = two { \stemdown es4 \breathe bes es } - \context Voice = one { \stemup g4 as g } + < \context Voice = two { \stemDown es4 \breathe bes es } + \context Voice = one { \stemUp g4 as g } > | es8 d es f g4 \breathe | es8 d \breathe es f g f | diff --git a/input/test/broken.ly b/input/test/broken.ly index b8d98bd2fd..38cf583388 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.59"; +\version "1.3.93"; shortlong = \notes{ c4()c( c c | diff --git a/input/test/chord-inversion.ly b/input/test/chord-inversion.ly index a2ed40d107..fe78836b81 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.59"; +\version "1.3.93"; diff --git a/input/test/chord-table.ly b/input/test/chord-table.ly index 435c465cfa..6527e63723 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.59"; +\version "1.3.93"; diff --git a/input/test/chords.ly b/input/test/chords.ly index 1e1ed03ee7..8fc784cb40 100644 --- a/input/test/chords.ly +++ b/input/test/chords.ly @@ -1,4 +1,4 @@ -\version "1.3.59"; +\version "1.3.93"; %{ Would this be acceptable/good enough/convenient for entry? diff --git a/input/test/clefs.ly b/input/test/clefs.ly index 97ff37a3c3..7a70aaf0c1 100644 --- a/input/test/clefs.ly +++ b/input/test/clefs.ly @@ -1,4 +1,4 @@ -\version "1.3.59"; +\version "1.3.93"; \score { \notes{ diff --git a/input/test/collision-merge-dotted.ly b/input/test/collision-merge-dotted.ly index b3a2f455d4..9fa2d0749c 100644 --- a/input/test/collision-merge-dotted.ly +++ b/input/test/collision-merge-dotted.ly @@ -1,18 +1,19 @@ +\version "1.3.93"; \score { \context Voice \notes\relative c { \relative c'' \context Staff < \context Voice = one { \property Staff.collisionMergeDotted = ##t - \stemup + \stemUp [c8 f g a] } \context Voice = two { - \stemdown c,4. f8 + \stemDown c,4. f8 }> } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/collisions.ly b/input/test/collisions.ly index c1b0d55e6c..e31e717b57 100644 --- a/input/test/collisions.ly +++ b/input/test/collisions.ly @@ -5,55 +5,55 @@ enteredby = "HWN,JCN"; copyright = "public domain"; Tested = "test the Collision resolution "; } -\version "1.3.59"; +\version "1.3.93"; twovoice = \context Staff \notes < - \context Voice=i { \stemdown c4 d e f g2~ g4 a [c8 d e f] c2| } - \context Voice=ii { \stemup g4 f e g ~ g2 g2 c4 g4 g2 } + \context Voice=i { \stemDown c4 d e f g2~ g4 a [c8 d e f] c2| } + \context Voice=ii { \stemUp g4 f e g ~ g2 g2 c4 g4 g2 } > twovoicesteminvert = \context Staff \notes < % the f and g on 4th beat are exceptionally ugh. - \context Voice=i { \stemup c4 d e f g2 g4 a | } - \context Voice=ii { \stemdown g4 f e g g2 g2 } + \context Voice=i { \stemUp c4 d e f g2 g4 a | } + \context Voice=ii { \stemDown g4 f e g g2 g2 } > threevoice = \context Staff \notes < - \context Voice=i { \stemup g4 f e f g a g2 } - \context Voice=ii { \stemup \property Voice.horizontalNoteShift = 1 e2 e2 e2 e2 } - \context Voice=iii { \stemdown c4 d e d c d es } + \context Voice=i { \stemUp g4 f e f g a g2 } + \context Voice=ii { \stemUp \property Voice.horizontalNoteShift = 1 e2 e2 e2 e2 } + \context Voice=iii { \stemDown c4 d e d c d es } > chordstest = \context Staff \notes < \context Voice = i \relative c { - \stemup e4 dis c f g f a b b + \stemUp e4 dis c f g f a b b } \context Voice = ii \relative c { - \stemdown + \stemDown } > hairyChord = \context Staff \notes\relative c' < \context Voice=one { \property Voice.horizontalNoteShift=0 - \stemup + \stemUp e4 } \context Voice=two { - \stemup + \stemUp \property Voice.horizontalNoteShift=1 cis } \context Voice=three { \property Voice.horizontalNoteShift=2 - \stemup + \stemUp ais } \context Voice=four { - \stemdown + \stemDown \property Voice.horizontalNoteShift=-1 fis } diff --git a/input/test/defaultbars.ly b/input/test/defaultbars.ly index b7640f5e40..05fa27508e 100644 --- a/input/test/defaultbars.ly +++ b/input/test/defaultbars.ly @@ -1,4 +1,4 @@ -\version "1.3.59"; +\version "1.3.93"; \score { diff --git a/input/test/dots.ly b/input/test/dots.ly index b21d25ae5c..a4ffc101a2 100644 --- a/input/test/dots.ly +++ b/input/test/dots.ly @@ -1,3 +1,4 @@ +\version "1.3.93"; \score { \context Voice \notes\relative c'' { \time 6/8; @@ -7,8 +8,8 @@ \context Staff < - \context Voice = VA { \stemup f'' r4. } - \context Voice = VB { \stemdown b, r4. } + \context Voice = VA { \stemUp f'' r4. } + \context Voice = VB { \stemDown b, r4. } > diff --git a/input/test/drarn-chords.ly b/input/test/drarn-chords.ly index 42efe9055d..5842761fb9 100644 --- a/input/test/drarn-chords.ly +++ b/input/test/drarn-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.59"; +\version "1.3.93"; %{ Would this be acceptable/good enough/convenient for entry? diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly index e5f208d4cc..0effb0a789 100644 --- a/input/test/extra-staff.ly +++ b/input/test/extra-staff.ly @@ -42,4 +42,4 @@ extra-staff.ly: } -\version "1.3.59"; +\version "1.3.93"; diff --git a/input/test/font-body.ly b/input/test/font-body.ly index 6b52586324..846928eede 100644 --- a/input/test/font-body.ly +++ b/input/test/font-body.ly @@ -1,14 +1,14 @@ -\version "1.3.59"; +\version "1.3.93"; FontBody= \notes\transpose c''{ \bar "|:"; \time 4/4; - \context Staff < \context Voice = VB { \stemup e'\longa a\breve | } - \context Voice = VA { \stemdown + \context Staff < \context Voice = VB { \stemUp e'\longa a\breve | } + \context Voice = VA { \stemDown c1 \clef "bass"; b,, \clef "violin"; c' a' c2 \clef "alto"; g c' \clef "violin"; a' } > - \stemboth + \stemBoth c4 g c' a' \bar ":|"; a\ppp-\upbow a\pp-\downbow a\p^\turn a\mp^\fermata | a\mf_\fermata a\f-\stopped a\ff-\open a\fff^\trill| @@ -20,9 +20,9 @@ FontBody= \notes\transpose c''{ \clef "bass"; r\longa * 1/4 r\breve *1/2 r1 r2 r4 r8 r16 r32 r64 r128 r128 | - \context Staff < \context Voice = VA { \stemup r2 c'2 c,,,1 } - \context Voice = VB {\stemdown r2 c2 r1 }> - \stemboth + \context Staff < \context Voice = VA { \stemUp r2 c'2 c,,,1 } + \context Voice = VB {\stemDown r2 c2 r1 }> + \stemBoth \clef "violin"; e8_. g'8-> e16^^ g'16_^ e32 _| g'32^| g''32-\ltoe g''32-\lheel diff --git a/input/test/font.ly b/input/test/font.ly index e7e4eb13b2..415401f2f5 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.59"; +\version "1.3.93"; \include "font-body.ly" \score{ diff --git a/input/test/font16.ly b/input/test/font16.ly index 480b237936..95564bde08 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.59"; +\version "1.3.93"; \include "paper16.ly" \include "font-body.ly" diff --git a/input/test/font20.ly b/input/test/font20.ly index 3aaf6c2458..6d43a2be28 100644 --- a/input/test/font20.ly +++ b/input/test/font20.ly @@ -17,5 +17,5 @@ TestedFeatures = gourlay_maxmeasures =5.; } } -\version "1.3.59"; +\version "1.3.93"; diff --git a/input/test/force-hshift.ly b/input/test/force-hshift.ly index a80f05eae9..b70d20084e 100644 --- a/input/test/force-hshift.ly +++ b/input/test/force-hshift.ly @@ -1,16 +1,17 @@ +\version "1.3.93"; \score { \context Voice \notes\relative c { \context Staff < \context Voice = VA { \property Voice.forceHorizontalShift = #0.1 - \stemup + \stemUp \property Voice.horizontalNoteShift=1 } \context Voice = VB { - \stemdown + \stemDown \property Voice.horizontalNoteShift=1 \property Voice.forceHorizontalShift = #-0.1 @@ -22,4 +23,4 @@ linewidth=-1.0; } \midi { } -} \ No newline at end of file +} diff --git a/input/test/generic-property-override.ly b/input/test/generic-property-override.ly index 4f8c7bb807..adb56e4b3c 100644 --- a/input/test/generic-property-override.ly +++ b/input/test/generic-property-override.ly @@ -1,9 +1,10 @@ +\version "1.3.93"; \score { \notes \relative c'' \context Voice { - \stemup + \stemUp c'4 () c4 - \slurdown + \slurDown c4 ( )c4 } \paper { linewidth = -1.0; } diff --git a/input/test/gmsusd.ly b/input/test/gmsusd.ly index d6d0cd320e..8f20ee9a0b 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.59"; +\version "1.3.93"; gmsus=\notes\relative c \chords{ g1 diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly index 0c0cb2f314..e0f5a644d8 100644 --- a/input/test/gourlay.ly +++ b/input/test/gourlay.ly @@ -1,4 +1,4 @@ -\version "1.3.59"; +\version "1.3.93"; %{ @@ -8,8 +8,8 @@ This is taken from [Gourlay]'s paper on breaking lines \score{ \notes \context Staff \relative c'' < - \context Voice = VA { \stemup d2 d | d d | d4 d2. | \break c1 } - \context Voice = VB { \stemdown g4 g g g | \times 2/3 { g2 g2 g2 } | g4. g8 g2 | c1 } + \context Voice = VA { \stemUp d2 d | d d | d4 d2. | \break c1 } + \context Voice = VB { \stemDown g4 g g g | \times 2/3 { g2 g2 g2 } | g4. g8 g2 | c1 } > \paper{ linewidth = 9.\cm; diff --git a/input/test/hara-kiri-short.ly b/input/test/hara-kiri-short.ly index 52b24f0503..5a27380cdc 100644 --- a/input/test/hara-kiri-short.ly +++ b/input/test/hara-kiri-short.ly @@ -1,5 +1,5 @@ -\version "1.3.59"; +\version "1.3.93"; zager = \context Staff = zager \notes \relative c'' { \clef treble; c1 diff --git a/input/test/hara-kiri-switch.ly b/input/test/hara-kiri-switch.ly index 72b338371b..ae042f764d 100644 --- a/input/test/hara-kiri-switch.ly +++ b/input/test/hara-kiri-switch.ly @@ -1,4 +1,4 @@ -\version "1.3.59"; +\version "1.3.93"; voiceOne = \notes \relative c'' { a1 a a diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly index 28bd2f0163..30dce01a5c 100644 --- a/input/test/hara-kiri.ly +++ b/input/test/hara-kiri.ly @@ -1,10 +1,10 @@ -\version "1.3.59"; +\version "1.3.93"; toeter_i = \notes\relative c <{ \property Staff.instrument = #"Toeters" \property Staff.instr = #"Ttr." } - \context Voice = lower { \stemdown s1*6 } - \context Voice = upper { \stemup s1*6 } + \context Voice = lower { \stemDown s1*6 } + \context Voice = upper { \stemUp s1*6 } \context Voice = together { c'''4^"toet I" c c c @@ -21,7 +21,7 @@ toeter_ii = \notes \relative c \context Voice = together { d d d d R1 \context Voice = lower { - \stemdown + \stemDown e4 e e e } f f f f @@ -42,7 +42,7 @@ zager = \context Staff = zager \notes \relative c'' { f e d c c d e f \property Staff.instr = #"Zag." - \stemup + \stemUp f e d c c d e f f e d c @@ -56,7 +56,7 @@ zoger = \context Staff = zoger \notes \relative c'' { \skip 1*2; \translator Staff=zager - \stemdown + \stemDown c2 g2 a4 b c d diff --git a/input/test/incipit.ly b/input/test/incipit.ly index 974ab04d5e..8813591d7e 100644 --- a/input/test/incipit.ly +++ b/input/test/incipit.ly @@ -6,7 +6,7 @@ /Mats B %} -\version "1.3.59"; +\version "1.3.93"; incipit = \notes\relative c'{ @@ -23,7 +23,7 @@ violin = \notes\relative c''{ \key; a4. b8 c4 fis | - gis~ gis8 fis16^\trill ()e b8 c \context Staff<{\voiceone a d}{\voicetwo es,4}>| + gis~ gis8 fis16^\trill ()e b8 c \context Staff<{\voiceOne a d}{\voiceTwo es,4}>| } BC = \notes\relative c{ diff --git a/input/test/keys.ly b/input/test/keys.ly index 1b694cd321..c5bd953e7f 100644 --- a/input/test/keys.ly +++ b/input/test/keys.ly @@ -1,4 +1,4 @@ -\version "1.3.59"; +\version "1.3.93"; \score { \notes \relative c'' diff --git a/input/test/keys2.ly b/input/test/keys2.ly index 499d0b1e8d..66c040fc5f 100644 --- a/input/test/keys2.ly +++ b/input/test/keys2.ly @@ -1,4 +1,4 @@ -\version "1.3.59"; +\version "1.3.93"; blah = \notes { diff --git a/input/test/knee-mult.ly b/input/test/knee-mult.ly index cd6c285f18..e710d252e3 100644 --- a/input/test/knee-mult.ly +++ b/input/test/knee-mult.ly @@ -6,7 +6,7 @@ \context Staff=two \notes\relative c'{ \clef bass; % no knee - \stemup [c8 \translator Staff=one \stemdown g'16 f] + \stemUp [c8 \translator Staff=one \stemDown g'16 f] s8 s2 } @@ -16,4 +16,4 @@ } } -\version "1.3.59"; +\version "1.3.93"; diff --git a/input/test/knee.ly b/input/test/knee.ly index f5590cf4a5..3b86f0c937 100644 --- a/input/test/knee.ly +++ b/input/test/knee.ly @@ -1,8 +1,8 @@ -\version "1.3.59"; +\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'] + [c16 \stemDown c'' \stemBoth c,, d] + \stemDown [d'' a \stemBoth c,, g,] + \stemUp [g c' \stemBoth a'' d'] } } diff --git a/input/test/lyric-combine.ly b/input/test/lyric-combine.ly index a1e28d0b80..bfb58c36aa 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.59"; +\version "1.3.93"; m =\notes \relative c'' { \property Staff.automaticMelismata = ##t diff --git a/input/test/lyric-extender.ly b/input/test/lyric-extender.ly index a088a49a77..42a416b99b 100644 --- a/input/test/lyric-extender.ly +++ b/input/test/lyric-extender.ly @@ -5,4 +5,4 @@ > } -\version "1.3.59"; +\version "1.3.93"; diff --git a/input/test/lyric-hyphen.ly b/input/test/lyric-hyphen.ly index 45db2afa18..a27a19b1d7 100644 --- a/input/test/lyric-hyphen.ly +++ b/input/test/lyric-hyphen.ly @@ -5,7 +5,7 @@ > } -\version "1.3.59"; +\version "1.3.93"; diff --git a/input/test/lyric-phrasing.ly b/input/test/lyric-phrasing.ly index cdd198c6fc..0e2dbec581 100644 --- a/input/test/lyric-phrasing.ly +++ b/input/test/lyric-phrasing.ly @@ -7,7 +7,7 @@ enteredby = "HWN, chords by Johan Vromans"; copyright = "public domain"; } -\version "1.3.59"; +\version "1.3.93"; m =\notes \relative c'' { \property Staff.automaticMelismata = ##t diff --git a/input/test/lyrics-multi-stanza.ly b/input/test/lyrics-multi-stanza.ly index 71f0a50f8f..d998078f91 100644 --- a/input/test/lyrics-multi-stanza.ly +++ b/input/test/lyrics-multi-stanza.ly @@ -3,7 +3,7 @@ % * Stanza_number_engraver % * Automatic melismata on beamed notes -\version "1.3.59"; +\version "1.3.93"; \include "english.ly" \header{ diff --git a/input/test/lyrics.ly b/input/test/lyrics.ly index c7b9e5da7e..31b8354b63 100644 --- a/input/test/lyrics.ly +++ b/input/test/lyrics.ly @@ -1,4 +1,4 @@ -\version "1.3.59"; +\version "1.3.93"; $somewhat_long = \lyrics{ \property Lyrics . textStyle = "roman" diff --git a/input/test/mark.ly b/input/test/mark.ly index 522d529275..754beeedd5 100644 --- a/input/test/mark.ly +++ b/input/test/mark.ly @@ -1,4 +1,4 @@ -\version "1.3.59"; +\version "1.3.93"; global = \notes { s1 | \mark "A"; diff --git a/input/test/memory.ly b/input/test/memory.ly index 774abcb841..ae76027ad9 100644 --- a/input/test/memory.ly +++ b/input/test/memory.ly @@ -11,5 +11,5 @@ bla = \notes { > \paper { Gourlay_maxmeaures = 2.; } } -\version "1.3.59"; +\version "1.3.93"; diff --git a/input/test/multi-measure-rest.ly b/input/test/multi-measure-rest.ly index 267f3081d2..ba4aedffa2 100644 --- a/input/test/multi-measure-rest.ly +++ b/input/test/multi-measure-rest.ly @@ -1,4 +1,4 @@ -\version "1.3.59"; +\version "1.3.93"; \score { \notes { \time 3/4; \key cis \major; R2.*15 R2. R2.*7 } diff --git a/input/test/multi-rest.ly b/input/test/multi-rest.ly index 579c3db142..0738d53849 100644 --- a/input/test/multi-rest.ly +++ b/input/test/multi-rest.ly @@ -1,6 +1,6 @@ -\version "1.3.59"; +\version "1.3.93"; -voice_one = \notes\transpose c''{ \stemup +voice_one = \notes\transpose c''{ \stemUp R1 * 2 | f'4-. r r2 | R1 * 3 | f'4-. r r2 | R1 * 3 | es'4-. r r2 | r1 | @@ -11,7 +11,7 @@ voice_one = \notes\transpose c''{ \stemup } voice_two = \notes - { \transpose c' { \stemdown + { \transpose c' { \stemDown R1 * 2 | f'4-. r r2 | R1 * 3 | f'4-. r r2 | R1 * 3 | es'4-. r r2 | r1 | diff --git a/input/test/non-empty-text.ly b/input/test/non-empty-text.ly index 03030e0b15..ade385f569 100644 --- a/input/test/non-empty-text.ly +++ b/input/test/non-empty-text.ly @@ -1,13 +1,9 @@ -% -% Try this file with 1.2.17: it works -% 1.2 had a different default, and uses textEmptyDimension scalar property -% +\version "1.3.93"; + \score{ \notes\relative c''{ -%%% \property Staff.textNonEmpty=##t -%%% burp? - \context Staff \property basicTextScriptProperties \pop #'no-spacing-rods - \context Staff \property Staff.basicTextScriptProperties \push #'no-spacing-rods = ##f + \context Staff \property Staff.TextScript \pop #'no-spacing-rods + \context Staff \property Staff.TextScript \push #'no-spacing-rods = ##f c4_"longlonglonglonglonglong" c4_"text" } \paper{ diff --git a/input/test/noteheadstyle.ly b/input/test/noteheadstyle.ly index 0ec56ee0cc..4e2185811e 100644 --- a/input/test/noteheadstyle.ly +++ b/input/test/noteheadstyle.ly @@ -31,7 +31,7 @@ c4 c2 c8 c16 c16 c1 c\breve c\longa c4 c4 } \context Thread = TB { \property Thread.noteHeadStyle = #'mensural - c'4 \stemdown c + c'4 \stemDown c } > } @@ -40,4 +40,4 @@ c4 c2 c8 c16 c16 c1 c\breve c\longa } } -\version "1.3.59"; +\version "1.3.93"; diff --git a/input/test/notemode-chords.ly b/input/test/notemode-chords.ly index 7df9324746..60fb93fe1c 100644 --- a/input/test/notemode-chords.ly +++ b/input/test/notemode-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.59"; +\version "1.3.93"; \score{ \notes \transpose c''{ diff --git a/input/test/orchestscore.ly b/input/test/orchestscore.ly index 4f3fc240b2..f938c5bc3f 100644 --- a/input/test/orchestscore.ly +++ b/input/test/orchestscore.ly @@ -1,4 +1,4 @@ -\version "1.3.59"; +\version "1.3.93"; m = \notes \relative c''{ @@ -42,14 +42,14 @@ c1 | c2 c | c c | R1*5 \context Staff = cor < \property Staff.instrument = "2 Corni in F" \property Staff.instr = "Cor." - \context Voice = corI { \stemup \M } - \context Voice = corII { \stemdown \M } + \context Voice = corI { \stemUp \M } + \context Voice = corII { \stemDown \M } > \context Staff = trp < \property Staff.instrument = "2 Trp. in B\\textflat " \property Staff.instr = "Trp." - \context Voice = trpI { \stemup \M } - \context Voice = trpII { \stemdown \M } + \context Voice = trpI { \stemUp \M } + \context Voice = trpII { \stemDown \M } > > \context StaffGroup = percussion <\context Staff = timpani < diff --git a/input/test/ossia.ly b/input/test/ossia.ly index bcc443185e..bab09a904b 100644 --- a/input/test/ossia.ly +++ b/input/test/ossia.ly @@ -1,4 +1,4 @@ -\version "1.3.59"; +\version "1.3.93"; \score { diff --git a/input/test/pushproperty.ly b/input/test/pushproperty.ly index 163ebc395d..31e996899e 100644 --- a/input/test/pushproperty.ly +++ b/input/test/pushproperty.ly @@ -1,7 +1,8 @@ +\version "1.3.93"; %{ -Look at ly/engraver.ly for inspiration on which basicXXXXProperties +Look at ly/engraver.ly for inspiration on which XXXX there are. Generally, you can find interesting element properties associated with @@ -23,7 +24,7 @@ setting `direction' in Stem object. You can use \pushproperty for setting stem directions by doing. - \pushproperty #'(basicStemProperties) #'direction #1 + \pushproperty #'(Stem) #'direction #1 (#-1 if you want down). @@ -47,36 +48,36 @@ Incorrect (\popproperty costs memory): You can use identifiers, eg. - slursUp = \context Voice \pushproperty '(basicSlurProperties) + slursUp = \context Voice \pushproperty '(Slur) #'direction #1 - slursBoth = \context Voice \popproperty '(basicSlurProperties) + slursBoth = \context Voice \popproperty '(Slur) %} \score { \notes \relative c' { c4-.( - \property Voice.basicDotsProperties \push #'direction = #-1 - \property Voice.basicStemProperties \push #'direction = #-1 + \property Voice.Dots \push #'direction = #-1 + \property Voice.Stem \push #'direction = #-1 \property Voice.noteColumnProperties \push #'direction = #-1 - \property Voice.basicStemProperties \push #'direction = #-1 + \property Voice.Stem \push #'direction = #-1 ) c4-. ( ) c4-. ( - \property Voice.basicSlurProperties \push #'direction = #-1 + \property Voice.Slur \push #'direction = #-1 ) c4-. ( - \property basicDotsProperties \pop #'direction - \property basicStemProperties \pop #'direction - \property basicScriptProperties \pop #'direction - \property basicTextProperties \pop #'direction + \property Dots \pop #'direction + \property Stem \pop #'direction + \property Script \pop #'direction + \property Text \pop #'direction ) c4-. () c4-. } \paper { \translator { \VoiceContext - basicNoteHeadProperties \push #'font-size = #-2 + NoteHead \push #'font-size = #-2 } } } diff --git a/input/test/rest-collision.ly b/input/test/rest-collision.ly index c424161dba..7e65f5cd47 100644 --- a/input/test/rest-collision.ly +++ b/input/test/rest-collision.ly @@ -7,34 +7,34 @@ rests = \notes { r r r r r r r r r r r r r r r r } different =< \context Voice = one { - \stemup + \stemUp \notes \relative c'' { r8 a e4 a e } } \context Voice = two { - \stemdown + \stemDown \notes \relative c'' { r1 }} > scales = \context Staff \notes < - \context Voice=i { \stemup r1 r2 r2 \scale c''1 c'2 a'2 \rests } - \context Voice = ii { \stemdown a'1 a'2 d'2 \rests r1 r2 r2 \scale } + \context Voice=i { \stemUp r1 r2 r2 \scale c''1 c'2 a'2 \rests } + \context Voice = ii { \stemDown a'1 a'2 d'2 \rests r1 r2 r2 \scale } > restsII = \context Staff \notes { r4 r8 - \context Staff < { \stemup r8 } { \stemdown r8} > - \context Staff < {\stemup r8} r8 { \stemdown r8} > - \context Staff < {\stemup r8} r8 r8 { \stemdown r8} > - \context Staff < {\stemup r} { \stemdown r} > - \context Staff < {\stemup r} r { \stemdown r} > - \stemup + \context Staff < { \stemUp r8 } { \stemDown r8} > + \context Staff < {\stemUp r8} r8 { \stemDown r8} > + \context Staff < {\stemUp r8} r8 r8 { \stemDown r8} > + \context Staff < {\stemUp r} { \stemDown r} > + \context Staff < {\stemUp r} r { \stemDown r} > + \stemUp \transpose c'' { [c''8 r8 c''8 c''8] [c8 r8 c8 c8] [c8 r8 r8 c'''8] - \stemdown + \stemDown [c8 r8 c8 c8] [c''8 r8 c''8 c''8] [c'8 r8 r8 c'''8] @@ -49,4 +49,4 @@ restsII = \context Staff \notes { } } -\version "1.3.59"; +\version "1.3.93"; diff --git a/input/test/scripts.ly b/input/test/scripts.ly index 96967a613d..b426bd6129 100644 --- a/input/test/scripts.ly +++ b/input/test/scripts.ly @@ -1,5 +1,5 @@ -\version "1.3.59"; +\version "1.3.93"; blah = \notes{ \transpose c'' { @@ -34,15 +34,15 @@ blah = \notes{ \transpose c'' { d' _>_._\fermata _"text" d'' _>_._\fermata _"text" - \stemup + \stemUp b,-. c-. d-. e-. f-. g-. a-. b-. c'-. - \stemdown + \stemDown a-. b-. c'-. d'-. e'-. f'-. g'-. a'-. b'-. - \stemup + \stemUp b,-> c-> d-> e-> f-> g-> a-> b-> c'-> - \stemup + \stemUp b,---. c---. d---. e---. f---. g---. a---. b---. c'---. - \stemboth + \stemBoth \time 4/4; [c8 \< d e \! f][d' \> e' f' \! g'] [c-> \< d-> e-> \! f->][d'-> \> e'-> f'-> \! g'->] diff --git a/input/test/sleur.ly b/input/test/sleur.ly index 1fd9d90ef7..0d3ccb443e 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.59"; +\version "1.3.93"; shortlong = \notes{ c4()c( c c | @@ -34,17 +34,17 @@ over = \notes\transpose c'{ e( a' a' )e e( b' b' )e e( c'' c'' )e - \stemup + \stemUp e( c' c' )e e( d' d' )e e( e' e' )e e( c'' c'' )e - \stemboth + \stemBoth e( f' b' )e e( b' f' )e e( e'' g' )e e( g' e'' )e - \stemup + \stemUp e( d' b )e e( b d' )e e( f' c'' )e @@ -52,23 +52,23 @@ over = \notes\transpose c'{ } under = \notes\transpose c'{ - \stemdown - f'( \stemboth d d \stemdown )f' - f'( \stemboth c c \stemdown )f' - f'( \stemboth b, b, \stemdown )f' - f'( \stemboth a, a, \stemdown )f' - \stemdown + \stemDown + f'( \stemBoth d d \stemDown )f' + f'( \stemBoth c c \stemDown )f' + f'( \stemBoth b, b, \stemDown )f' + f'( \stemBoth a, a, \stemDown )f' + \stemDown f'( a a )f' f'( g g )f' f'( f f )f' f'( a, a, )f' - \stemdown - f'( \stemboth d b, \stemdown )f' - f'( \stemboth b, d \stemdown )f' - f'( \stemboth d, b, \stemdown )f' - f'( \stemboth b, d, \stemdown )f' - \stemdown + \stemDown + f'( \stemBoth d b, \stemDown )f' + f'( \stemBoth b, d \stemDown )f' + f'( \stemBoth d, b, \stemDown )f' + f'( \stemBoth b, d, \stemDown )f' + \stemDown f'( f a )f' f'( a f )f' f'( f e, )f' @@ -76,39 +76,39 @@ under = \notes\transpose c'{ } eccentric = \notes\transpose c'{ - \stemup + \stemUp \times 4/7 { f( a' f f f f )f } | \times 4/7 { f( f f f f a' )f } | - \stemdown + \stemDown \times 4/7 { e'( c e' e' e' e' )e' } | \times 4/7 { e'( e' e' e' e' c )e' } | } tiltup = \notes\transpose c'{ e( c'' c'' )e' - \stemup + \stemUp e( c'' c'' )e' - \stemboth + \stemBoth e( g' e'' )e' - \stemup + \stemUp e( c'' f )e' - \stemdown - f'( \stemboth a, a, \stemdown )f'' - \stemdown + \stemDown + f'( \stemBoth a, a, \stemDown )f'' + \stemDown f'( a, a, )f'' } tiltdown = \notes\transpose c'{ e'( c'' c'' )e - \stemup + \stemUp e'( c'' c'' )e - \stemboth + \stemBoth e'( g' e'' )e - \stemup + \stemUp e'( c'' f )e - \stemdown - f''( \stemboth a, a, \stemdown )f' - \stemdown + \stemDown + f''( \stemBoth a, a, \stemDown )f' + \stemDown f''( a, a, )f' } @@ -127,19 +127,19 @@ broken = \notes\transpose c''{ blend = \notes\transpose c'{ e( c'' c'' )e - \stemup + \stemUp f'( c'' c'' )f' e( c'' c'' )e - \stemdown - f'( \stemboth a, a, \stemdown )f' + \stemDown + f'( \stemBoth a, a, \stemDown )f' f'( a, a, )f' - \stemboth + \stemBoth e( c'' c'' )e' e'( c'' c'' )e d( d d )d - \stemdown + \stemDown e( c'' c'' )e' e'( c'' c'' )e d( d d )d @@ -156,14 +156,14 @@ bug = \notes\transpose c'{ } clipping = \notes\transpose c'{ - \stemboth + \stemBoth c( c''' c''')c c( c''' c )c'' c''( c c''' )c - \stemdown - c( \stemup c,,, c,,, \stemdown )c - c( \stemup c,,, c \stemdown )c,, - c,,( \stemup c c,,, \stemdown )c + \stemDown + c( \stemUp c,,, c,,, \stemDown )c + c( \stemUp c,,, c \stemDown )c,, + c,,( \stemUp c c,,, \stemDown )c } \score{ diff --git a/input/test/slur-cross-staff.ly b/input/test/slur-cross-staff.ly index f3ca49d899..1dcc5cfd20 100644 --- a/input/test/slur-cross-staff.ly +++ b/input/test/slur-cross-staff.ly @@ -1,24 +1,24 @@ \score{ \context PianoStaff < \context Staff=one \notes\relative c'{ - \stemup c4( c \translator Staff=two c )c | + \stemUp c4( c \translator Staff=two c )c | \translator Staff=one - \stemup c4( c \translator Staff=two c )c | - \stemup c4( c \translator Staff=one c )c | + \stemUp c4( c \translator Staff=two c )c | + \stemUp c4( c \translator Staff=one c )c | \translator Staff=two - \stemup c4( c \translator Staff=one c )c | + \stemUp c4( c \translator Staff=one c )c | \translator Staff=two - \stemup c4( \translator Staff=one c c )c | + \stemUp c4( \translator Staff=one c c )c | r2 \translator Staff=two - \stemup c4( \translator Staff=one c + \stemUp c4( \translator Staff=one c \break c )c r2 -% \stemdown c4( \translator Staff=two c c \translator Staff=one )c - \stemdown d4( \translator Staff=two c c \translator Staff=one )d +% \stemDown c4( \translator Staff=two c c \translator Staff=one )c + \stemDown d4( \translator Staff=two c c \translator Staff=one )d \translator Staff=two - \stemup c4( \translator Staff=one c c \translator Staff=two )c + \stemUp c4( \translator Staff=one c c \translator Staff=two )c r1 } \context Staff=two \notes\relative c'{ @@ -28,4 +28,4 @@ > } -\version "1.3.59"; +\version "1.3.93"; diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly index 4e5f76f18f..b7c52f3bfd 100644 --- a/input/test/slur-damping.ly +++ b/input/test/slur-damping.ly @@ -1,5 +1,5 @@ % test damping -\version "1.3.59"; +\version "1.3.93"; \score{ \notes\relative c'{ diff --git a/input/test/slur-dash.ly b/input/test/slur-dash.ly index 2f5eb48317..f7473dacbd 100644 --- a/input/test/slur-dash.ly +++ b/input/test/slur-dash.ly @@ -1,4 +1,4 @@ -\version "1.3.59"; +\version "1.3.93"; \score{ \notes{ diff --git a/input/test/slur-follow-music.ly b/input/test/slur-follow-music.ly index b710ab9361..04da8d37d6 100644 --- a/input/test/slur-follow-music.ly +++ b/input/test/slur-follow-music.ly @@ -1,19 +1,20 @@ +\version "1.3.93"; \score { \context Voice \notes\relative c { % CASE 3 d''4 ( ) b a ( ) e' \break - g,( \stemdown ) b \stemboth c ( ) f, \break + g,( \stemDown ) b \stemBoth c ( ) f, \break % no adjusting... - \stemup [d'8 ( b a] \stemboth ) e' \break - \stemup [g,8 ( b d] \stemboth ) c \break + \stemUp [d'8 ( b a] \stemBoth ) e' \break + \stemUp [g,8 ( b d] \stemBoth ) c \break % still ugly g4 ( b d ) c \break %TIES d ~ b a ~ e' \break - g, ~ \stemdown b \stemboth c ~ f, \break + g, ~ \stemDown b \stemBoth c ~ f, \break } @@ -21,4 +22,4 @@ linewidth=-1.0; } \midi { } -} \ No newline at end of file +} diff --git a/input/test/slur-nice.ly b/input/test/slur-nice.ly index c4efee9a62..5bf4da02bc 100644 --- a/input/test/slur-nice.ly +++ b/input/test/slur-nice.ly @@ -1,13 +1,15 @@ + +\version "1.3.93"; \score{ \notes\relative c''{ \time 3/4; - \slurup - \stemboth a ( \stemdown a \stemboth ) a a( c )a a( e' )a, a( g' )a, - \stemup a( e' )a, + \slurUp + \stemBoth a ( \stemDown a \stemBoth ) a a( c )a a( e' )a, a( g' )a, + \stemUp a( e' )a, \break - \slurdown - \stemboth c ( \stemup c \stemboth ) c c ( a ) c c( d, )c' c( f, )c' - \stemdown c( f, )c' + \slurDown + \stemBoth c ( \stemUp c \stemBoth ) c c ( a ) c c( d, )c' c( f, )c' + \stemDown c( f, )c' } \paper{ linewidth = 120.\mm; diff --git a/input/test/slur-positions.ly b/input/test/slur-positions.ly index f78dd10a99..c904ac5eef 100644 --- a/input/test/slur-positions.ly +++ b/input/test/slur-positions.ly @@ -1,12 +1,12 @@ \score{ \notes\relative c''{ - \slurup + \slurUp a2 () a\break - \slurdown + \slurDown a2 () a\break - \slurup + \slurUp c2 () c\break - \slurdown + \slurDown c2 () c\break } diff --git a/input/test/slurs.ly b/input/test/slurs.ly index d065f3ce59..6b3cf27f35 100644 --- a/input/test/slurs.ly +++ b/input/test/slurs.ly @@ -1,5 +1,5 @@ -\version "1.3.59"; +\version "1.3.93"; \score{ \notes\transpose c'{ @@ -17,8 +17,8 @@ { e ~ f } > % \context Staff < -% { \stemup c'8 ~g ~e( ~c~ [c'~ g' e' )c'] c'' ~ c'' c~c } -% { \stemdown c (e g )c'~( [b a g )d] r2 } +% { \stemUp c'8 ~g ~e( ~c~ [c'~ g' e' )c'] c'' ~ c'' c~c } +% { \stemDown c (e g )c'~( [b a g )d] r2 } % > { diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly index 48efac0a56..7492df7db9 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.59"; +\version "1.3.93"; diff --git a/input/test/spacing.ly b/input/test/spacing.ly index 324150f03c..6b9b98dfbd 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.59"; +\version "1.3.93"; multipart = \notes \relative c'{ \context StaffGroup < diff --git a/input/test/span-bars.ly b/input/test/span-bars.ly index f2ea46d754..8723c11a9e 100644 --- a/input/test/span-bars.ly +++ b/input/test/span-bars.ly @@ -1,5 +1,5 @@ -\version "1.3.59"; +\version "1.3.93"; 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 ce2817935b..d9648fc673 100644 --- a/input/test/staff-margin-partial.ly +++ b/input/test/staff-margin-partial.ly @@ -1,6 +1,6 @@ % test staff margin with partial measure. -\version "1.3.59"; +\version "1.3.93"; \score { \notes { \property Staff.instrument = "foo" \partial 4; c4 c1 } diff --git a/input/test/staff-margin.ly b/input/test/staff-margin.ly index ef8617d874..0737be1ff9 100644 --- a/input/test/staff-margin.ly +++ b/input/test/staff-margin.ly @@ -1,6 +1,6 @@ -\version "1.3.59"; +\version "1.3.93"; \score { diff --git a/input/test/staff-side-slur.ly b/input/test/staff-side-slur.ly index c84e272264..e4a04ba2bb 100644 --- a/input/test/staff-side-slur.ly +++ b/input/test/staff-side-slur.ly @@ -18,4 +18,4 @@ } -\version "1.3.59"; +\version "1.3.93"; diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly index 48a6fc3c29..486ead240b 100644 --- a/input/test/staff-size.ly +++ b/input/test/staff-size.ly @@ -4,7 +4,7 @@ \property Staff.fontSize = #-1 \property Voice.fontSize = #-1 - \property Voice . dynamicDirection = \up \stemdown + \property Voice . dynamicDirection = \up \stemDown %\key gis \major; c8 d [e f g a] b c \ff } @@ -14,4 +14,4 @@ > \paper { linewidth = -1.; } } -\version "1.3.59"; +\version "1.3.93"; diff --git a/input/test/stem-tremolo.ly b/input/test/stem-tremolo.ly index d1b8151eef..5c9d7d86e3 100644 --- a/input/test/stem-tremolo.ly +++ b/input/test/stem-tremolo.ly @@ -1,5 +1,5 @@ -\version "1.3.59"; +\version "1.3.93"; \score{ \context Voice\notes \relative c''{ %%? @@ -9,11 +9,11 @@ a1:4^":4" a:8^":8" c:16^":16" a:32^":32" a^"x" a:^":" a4:4 c:8 a:16 c:32 a a: a2: \break - \stemup + \stemUp a4:32 a'4:64 - \stemdown + \stemDown c,4:32 c,4:64 - \stemboth + \stemBoth c'8:16 c c c a': a a: a c,16:32 c: c c a16:32 a: a a diff --git a/input/test/stem.ly b/input/test/stem.ly index 5fe3bf91c0..af01e1e777 100644 --- a/input/test/stem.ly +++ b/input/test/stem.ly @@ -8,17 +8,17 @@ of beams"; } -\version "1.3.59"; +\version "1.3.93"; beamintervals = \notes{ \time 7/4; - \stemup + \stemUp \transpose c'{ [ c8 d ] [ c e ] [ c f ] [ c g ] [ c a ] [ c b ] [ c c' ] | [ c b, ] [ c a, ] [ c g, ] [ c f, ] [ c e, ] [ c d, ] [ c c, ] | }\transpose c''{ [ c b, ] [ c a, ] [ c g, ] [ c f, ] [ c e, ] [ c d, ] [ c c, ] | - \stemdown} + \stemDown} \transpose c'''{ [ c b, ] [ c a, ] [ c g, ] [ c f, ] [ c e, ] [ c d, ] [ c c, ] | } \transpose c''{ @@ -28,10 +28,10 @@ beamintervals = \notes{ \score{ \notes\transpose c'{ - \stemup + \stemUp \time 17/4; g,4 a, b, c d e f g a b c' d' e' f' g' a' b' | - \stemdown + \stemDown b' a' g' f' e' d' c' b a g f e d c b, a, g, | \beamintervals \transpose d \beamintervals diff --git a/input/test/tchaikovsky.ly b/input/test/tchaikovsky.ly index 80153ee52d..81542e6a0a 100644 --- a/input/test/tchaikovsky.ly +++ b/input/test/tchaikovsky.ly @@ -7,7 +7,7 @@ enteredby = "Maarten Storm"; instrument= "Violoncello"; } -\version "1.3.59"; +\version "1.3.93"; % this is an example of extreme dynamics diff --git a/input/test/thumb.ly b/input/test/thumb.ly index 1e65b44730..e23b193a64 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.59"; +\version "1.3.93"; \score { \notes \relative c'' { [ <)b_\thumb b'-3> diff --git a/input/test/title.ly b/input/test/title.ly index ae4d4650ae..dd96c2ff6a 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -10,7 +10,7 @@ source = "urtext"; instrument= "Instrument"; } -\version "1.3.59"; +\version "1.3.93"; \score{ \notes diff --git a/input/test/transposition.ly b/input/test/transposition.ly index d9a576b634..1f483df4e0 100644 --- a/input/test/transposition.ly +++ b/input/test/transposition.ly @@ -22,7 +22,7 @@ copyright = "public domain"; } -\version "1.3.59"; +\version "1.3.93"; vOne = \notes \relative c''{ \clef"violin"; diff --git a/input/test/tup.ly b/input/test/tup.ly index c236afff84..0be36c81c9 100644 --- a/input/test/tup.ly +++ b/input/test/tup.ly @@ -8,4 +8,4 @@ } } -\version "1.3.59"; +\version "1.3.93"; diff --git a/input/test/tuplet.ly b/input/test/tuplet.ly index f9d946904b..0afb1f27dd 100644 --- a/input/test/tuplet.ly +++ b/input/test/tuplet.ly @@ -1,4 +1,4 @@ -\version "1.3.70" +\version "1.3.93" \score { \context Voice \notes\relative c'' { diff --git a/input/test/twinkle-as5.ly b/input/test/twinkle-as5.ly index a203483870..78e40399d5 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.59"; +\version "1.3.93"; \include "paper-as5.ly" diff --git a/input/test/two-slurs.ly b/input/test/two-slurs.ly index 45b6025b9c..9475f78274 100644 --- a/input/test/two-slurs.ly +++ b/input/test/two-slurs.ly @@ -1,3 +1,4 @@ +\version "1.3.93"; % % We'd want to combine the stems, but have two slurs too... % Looks like the a-due engraver @@ -5,11 +6,11 @@ \score{ \context Staff < \context Voice=v \notes\relative c''{ - \stemup + \stemUp a4 c4.()g8 a4 } \context Voice=u \notes\relative c''{ - \stemdown + \stemDown g4 e4.()d8 c4 } > diff --git a/input/test/updown.ly b/input/test/updown.ly index fdc47121c8..fe5faf77fc 100644 --- a/input/test/updown.ly +++ b/input/test/updown.ly @@ -1,16 +1,16 @@ \score { \context Voice \notes\relative c { % this used to work: - % <{\voiceone e} - % {\voicetwo c}> + % <{\voiceOne e} + % {\voiceTwo c}> % now we need: \context Staff - <{\voiceone e} - {\voicetwo c}> + <{\voiceOne e} + {\voiceTwo c}> - \version "1.3.59"; + \version "1.3.93"; } \paper { } diff --git a/input/test/vertical-align.ly b/input/test/vertical-align.ly index f744c3771e..57fff1e03f 100644 --- a/input/test/vertical-align.ly +++ b/input/test/vertical-align.ly @@ -1,5 +1,5 @@ -\version "1.3.59"; +\version "1.3.93"; \score { \notes < diff --git a/input/test/vertical-text.ly b/input/test/vertical-text.ly index 299a81f750..c497223856 100644 --- a/input/test/vertical-text.ly +++ b/input/test/vertical-text.ly @@ -1,13 +1,13 @@ \score{ < \context Staff = o \notes\relative c,,, { - \stemdown [c8 c c c] c4 c4 \break [c8 c c c] c4 c4 + \stemDown [c8 c c c] c4 c4 \break [c8 c c c] c4 c4 } \context Lyrics \lyrics{ BLA gag _2 < { BLA gag } { BLA gag la } > _2 } \context Staff = t \notes\relative c''''' { - \stemup [c8 c c c] c4 c [c8 c c c] c4 c + \stemUp [c8 c c c] c4 c [c8 c c c] c4 c } > \paper{ @@ -15,4 +15,4 @@ } } -\version "1.3.59"; +\version "1.3.93"; diff --git a/input/test/volta.ly b/input/test/volta.ly index 48889cf91a..780c33f140 100644 --- a/input/test/volta.ly +++ b/input/test/volta.ly @@ -16,8 +16,8 @@ voice4 = \notes { } } voicedefault = \notes { - \property Staff.timeSignatureStyle="C" - \time 4/4; \key f; + + \time 4/4; \key f \major ; \tempo 4 = 200; } \score{ @@ -34,7 +34,8 @@ voicedefault = \notes { \paper { font_normal = 12.; \translator { - \StaffContext + \StaffContext + TimeSignature \push #'style = #"C" \consists Instrument_name_engraver; } } diff --git a/input/trip.ly b/input/trip.ly index 7f55ece974..4b588fe39b 100644 --- a/input/trip.ly +++ b/input/trip.ly @@ -19,27 +19,27 @@ TODO: %} -\version "1.3.59"; +\version "1.3.93"; praeludiumRight = \notes { \key e \major; \clef violin; % 13 -- how to type -- where to split -- this more neatly? \context Staff < - \context Voice = I \relative c'' { \stemup r4 dis4 e4. e8 ~ | - \shifton e4-.-^^\f [d8 fis8] \shiftoff gis4 ~ [gis8 fis16 e ] | + \context Voice = I \relative c'' { \stemUp r4 dis4 e4. e8 ~ | + \shiftOn e4-.-^^\f [d8 fis8] \shiftOff gis4 ~ [gis8 fis16 e ] | fis4 ~ [fis8 e16 dis] e4 r8 e8 } - \context Voice = III \relative c'' { \stemup \shifton r4 bis cis \shiftoff cis | - a' ~ [a16 gis a b] \shifton dis,4 cis ~ | + \context Voice = III \relative c'' { \stemUp \shiftOn r4 bis cis \shiftOff cis | + a' ~ [a16 gis a b] \shiftOn dis,4 cis ~ | [cis8 dis16 ais] bis4 cis r8 b } \context Voice = IV \relative c'' { - \stemdown - \shifton s4 gis } + \stemDown + \shiftOn s4 gis } - \context Voice = II \relative c' { \stemdown -% \shifton % idem + \context Voice = II \relative c' { \stemDown +% \shiftOn % idem - r4 fis \shiftoff gis gis | + r4 fis \shiftOff gis gis | a4. cis8 gis2 | fis4 gis gis r8 e8 } > | @@ -53,31 +53,31 @@ praeludiumLeft = \notes \relative c { % 13 \context Staff < \context Voice = two { r4 } - \context Voice = one { \stemup s4 dis' cis cis ~ | + \context Voice = one { \stemUp s4 dis' cis cis ~ | \times 4/5 { [cis8 ( cis - a \translator Staff = treble \stemdown \shifton d + a \translator Staff = treble \stemDown \shiftOn d ) cis] } \translator Staff = bass - \shiftoff + \shiftOff [bis gis] cis4 | dis2 cis4 r8 cis } - \context Voice = one { \stemup bis2 } + \context Voice = one { \stemUp bis2 } \context Voice = three { - \property Voice.basicDynamicLineSpannerProperties \push #'direction = #-1 - \stemup \shifton r4 gis ~ [gis8 + \property Voice.DynamicLineSpanner \push #'direction = #-1 + \stemUp \shiftOn r4 gis ~ [gis8 \< - gis] ~ \stemdown \shiftoff gis4 | + gis] ~ \stemDown \shiftOff gis4 | a4. fis8 \! gis4. a8 ~ | a4 gis4 gis r8 gis } - \context Voice = four { \stemdown \shifton s4 fis4 e} - \context Voice = two { \stemdown s4 dis4 cis4 } + \context Voice = four { \stemDown \shiftOn s4 fis4 e} + \context Voice = two { \stemDown s4 dis4 cis4 } > | %16 } @@ -92,29 +92,29 @@ fugaIIRight = \notes \relative c'' { %15 \context Staff < - \context Voice = VA { \stemup [b8 fis8] b4 } - \context Voice = VB { \stemdown fis2 } + \context Voice = VA { \stemUp [b8 fis8] b4 } + \context Voice = VB { \stemDown fis2 } > \context Staff \notes\relative c''< \context Voice=one { - \shiftoff - \stemup + \shiftOff + \stemUp e4 } \context Voice=two { - \shifton - \stemup + \shiftOn + \stemUp cis } \context Voice=three { - \shiftonn - \stemup + \shiftOnn + \stemUp ais } \context Voice=four { - \shiftonnn - \stemup + \shiftOnnn + \stemUp fis } > @@ -124,10 +124,10 @@ fugaIIRight = \notes \relative c'' { \context Voice = one { dis2 dis4 | cis2 cis4 | b4. [cis8 dis e] } - \context Voice = three { \stemup \shifton [b8 fis] b2 ~ | + \context Voice = three { \stemUp \shiftOn [b8 fis] b2 ~ | [b8 a!16 gis] a2 ~ | a4 gis2 } - \context Voice = two { \stemdown fis2. ~ | + \context Voice = two { \stemDown fis2. ~ | fis ~ | fis4 e2 } > | @@ -142,14 +142,14 @@ fugaIILeft = \notes { %15 \context Staff < - \context Voice = one { \stemdown + \context Voice = one { \stemDown \gracetest - \relative b, < )b2 dis fis a b cis dis> \stemup ais4 | + \relative b, < )b2 dis fis a b cis dis> \stemUp ais4 | b2 b4 } - \context Voice = two { \stemdown s2 e4 | + \context Voice = two { \stemDown s2 e4 | fis2 fis4 } > - \stemboth cis2 [e16( fis a \clef "treble"; b] | + \stemBoth cis2 [e16( fis a \clef "treble"; b] | d'4 ) b8 b8 b4 | %19 } @@ -158,10 +158,6 @@ fugaIIPedal = \notes \relative c { \key e \major; \clef bass; - %15 - % - % TODO: the volta typesetting should spread over the complete score. - % \repeat "volta" 2 { dis4.-\ltoe } \alternative { e8-\rtoe cis4 } | b4.-\lheel [cis8-\ltoe dis8-\rtoe e8-\rheel] | fis4.-\rtoe [e8-\rheel dis8-\rtoe cis8-\ltoe] | diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index c947712eb1..24bf8face8 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -7,7 +7,7 @@ enteredby = "HWN, chords by Johan Vromans"; copyright = "public domain"; } -\version "1.3.59"; +\version "1.3.93"; melodie = \notes\relative c'' { \clef "violin"; diff --git a/input/twinkle.ly b/input/twinkle.ly index afa9353aa7..759ccbc25f 100644 --- a/input/twinkle.ly +++ b/input/twinkle.ly @@ -20,7 +20,7 @@ Tested Features: lyrics, interleaving lyrics and staffs, repeats, auto beaming, adding lyrics to notes, hyphens %} -\version "1.3.59"; +\version "1.3.93"; melody = \notes \relative c'' { \clef violin; diff --git a/lily/a2-engraver.cc b/lily/a2-engraver.cc index 34039b43ea..4c84ff402e 100644 --- a/lily/a2-engraver.cc +++ b/lily/a2-engraver.cc @@ -56,7 +56,7 @@ A2_engraver::do_process_music () || (unison == SCM_BOOL_T && state_ != UNISON && daddy_trans_l_->id_str_ == "one"))) { - text_p_ = new Item (get_property ("basicTextScriptProperties")); + text_p_ = new Item (get_property ("TextScript")); Side_position::set_axis (text_p_, Y_AXIS); announce_element (text_p_, 0); diff --git a/lily/align-interface.cc b/lily/align-interface.cc index 120f2a1282..8bc3f13f25 100644 --- a/lily/align-interface.cc +++ b/lily/align-interface.cc @@ -140,7 +140,7 @@ Align_interface::get_count (Score_element*me,Score_element*s) void Align_interface::add_element (Score_element*me,Score_element* s) { - s->add_offset_callback (Align_interface_alignment_callback_proc, Align_interface::axis (me)); + s->add_offset_callback (Align_interface::alignment_callback_proc, Align_interface::axis (me)); Axis_group_interface::add_element (me, s); } diff --git a/lily/align-note-column-engraver.cc b/lily/align-note-column-engraver.cc index f8adafad7d..431e013fad 100644 --- a/lily/align-note-column-engraver.cc +++ b/lily/align-note-column-engraver.cc @@ -46,7 +46,7 @@ Align_note_column_engraver::Align_note_column_engraver() void Align_note_column_engraver::do_creation_processing () { - align_item_p_ = new Item (get_property ("basicGraceAlignItemProperties")); + align_item_p_ = new Item (get_property ("GraceAlignment")); Grace_align_item::set_interface (align_item_p_); Side_position::set_axis (align_item_p_, X_AXIS); Side_position::set_direction (align_item_p_, LEFT); diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc deleted file mode 100644 index 15a2011709..0000000000 --- a/lily/arpeggio-engraver.cc +++ /dev/null @@ -1,74 +0,0 @@ -/* - arpeggio-engraver.cc -- implement Arpeggio_engraver - - source file of the GNU LilyPond music typesetter - - (c) 2000 Jan Nieuwenhuizen - */ - -#include "engraver.hh" -#include "group-interface.hh" -#include "item.hh" -#include "arpeggio.hh" -#include "stem.hh" - -class Arpeggio_engraver : public Engraver -{ -public: - VIRTUAL_COPY_CONS (Translator); - Arpeggio_engraver (); - -protected: - virtual void acknowledge_element (Score_element_info); - virtual void process_acknowledged (); - virtual void do_pre_move_processing (); - -private: - Item* arpeggio_; - Link_array stems_; -}; - -Arpeggio_engraver::Arpeggio_engraver () -{ - arpeggio_ = 0; -} - -void -Arpeggio_engraver::acknowledge_element (Score_element_info info) -{ - if (Stem::has_interface (info.elem_l_)) - { - stems_.push (info.elem_l_); - } -} - -void -Arpeggio_engraver::process_acknowledged () -{ - if (!arpeggio_ && !stems_.empty ()) - { - arpeggio_ = new Item (get_property ("basicArpeggioProperties")); - Pointer_group_interface pgi (arpeggio_, "stems"); - for (int i = 0; i < stems_.size (); i++) - { - pgi.add_element (stems_[i]); - arpeggio_->add_dependency (stems_[i]); - } - announce_element (arpeggio_, 0); - } -} - -void -Arpeggio_engraver::do_pre_move_processing () -{ - if (arpeggio_) - { - typeset_element (arpeggio_); - arpeggio_ = 0; - } - stems_.clear (); -} - - -ADD_THIS_TRANSLATOR (Arpeggio_engraver); - diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc deleted file mode 100644 index 7500ef844b..0000000000 --- a/lily/arpeggio.cc +++ /dev/null @@ -1,50 +0,0 @@ -/* - arpegggio.cc -- implement Arpeggio - - source file of the GNU LilyPond music typesetter - - (c) 2000 Jan Nieuwenhuizen - */ - -#include "molecule.hh" -#include "paper-def.hh" -#include "lookup.hh" -#include "arpeggio.hh" -#include "score-element.hh" -#include "stem.hh" -#include "staff-symbol-referencer.hh" - -bool -Arpeggio::has_interface (Score_element* me) -{ - return me && me->has_interface (ly_symbol2scm ("arpeggio-interface")); -} - -MAKE_SCHEME_CALLBACK (Arpeggio, brew_molecule, 1); -SCM -Arpeggio::brew_molecule (SCM smob) -{ - Score_element *me = unsmob_element (smob); - - Interval iv; - for (SCM s = me->get_elt_property ("stems"); gh_pair_p (s); s = gh_cdr (s)) - { - Score_element *stem = unsmob_element (gh_car (s)); - iv.unite (Stem::head_positions (stem)); - } - - Molecule mol; - Molecule dot = me->paper_l ()->lookup_l (0)->afm_find ("dots-dot"); - Real half_space = Staff_symbol_referencer::staff_space (me) / 2; - for (Real i = iv[MIN]; i <= iv[MAX]; i++) - { - Molecule d (dot); - d.translate_axis (i * half_space, Y_AXIS); - mol.add_molecule (d); - } - mol.translate (Offset (-3, 0)); - - return mol.create_scheme (); -} - - diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 2b75352435..4481ce67b3 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -239,7 +239,7 @@ Auto_beam_engraver::begin_beam () Spanner* Auto_beam_engraver::create_beam_p () { - Spanner* beam_p = new Spanner (get_property ("basicBeamProperties")); + Spanner* beam_p = new Spanner (get_property ("Beam")); Beam::set_interface (beam_p); for (int i = 0; i < stem_l_arr_p_->size (); i++) diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index 73fa3b8ade..2b70f62fc9 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -56,7 +56,7 @@ Axis_group_engraver::do_creation_processing () Spanner* Axis_group_engraver::get_spanner_p () const { - return new Spanner (get_property ("basicVerticalAxisGroupProperties")); + return new Spanner (get_property ("VerticalAxisGroup")); } void @@ -68,7 +68,7 @@ Axis_group_engraver::do_removal_processing () if (gh_pair_p (dims) && gh_number_p (gh_car (dims)) && gh_number_p (gh_cdr (dims))) { - staffline_p_->set_extent_callback (&Score_element::preset_extent, Y_AXIS); + staffline_p_->set_extent_callback (Score_element::preset_extent_proc, Y_AXIS); staffline_p_->set_elt_property ("extent-Y", dims); } @@ -148,7 +148,7 @@ Hara_kiri_engraver::add_element (Score_element*e) Spanner* Hara_kiri_engraver::get_spanner_p () const { - Spanner * sp = new Spanner (get_property ("basicHaraKiriVerticalGroupspannerProperties")); + Spanner * sp = new Spanner (get_property ("HaraKiriVerticalGroup")); Hara_kiri_group_spanner::set_interface (sp); return sp; } diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc index 4d7db9b452..f7e8c22bf1 100644 --- a/lily/axis-group-interface.cc +++ b/lily/axis-group-interface.cc @@ -33,8 +33,8 @@ Axis_group_interface::axis_b (Score_element*me,Axis a ) */ - return me->has_extent_callback_b (group_extent_callback, a) || - (me->has_extent_callback_b (Hara_kiri_group_spanner::y_extent, a)); + return me->has_extent_callback_b (group_extent_callback_proc, a) || + (me->has_extent_callback_b (Hara_kiri_group_spanner::y_extent_proc, a)); } Interval @@ -51,9 +51,13 @@ Axis_group_interface::relative_group_extent (Axis a, Score_element *common, SCM return r; } -Interval -Axis_group_interface::group_extent_callback (Score_element *me, Axis a) +MAKE_SCHEME_CALLBACK(Axis_group_interface,group_extent_callback,2); +SCM +Axis_group_interface::group_extent_callback (SCM element_smob, SCM scm_axis) { + Score_element *me = unsmob_element (element_smob); + Axis a = (Axis) gh_scm2int (scm_axis); + Score_element * common =(Score_element*) me; for (SCM s = me->get_elt_property ("elements"); gh_pair_p (s); s = gh_cdr (s)) @@ -65,7 +69,7 @@ Axis_group_interface::group_extent_callback (Score_element *me, Axis a) Real my_coord = me->relative_coordinate (common, a); Interval r (relative_group_extent (a, common, me->get_elt_property ("elements"))); - return r - my_coord; + return ly_interval2scm (r - my_coord); } @@ -90,15 +94,17 @@ Axis_group_interface::set_axes (Score_element*me,Axis a1, Axis a2) } if (a1 != X_AXIS && a2 != X_AXIS) - me->set_extent_callback (0, X_AXIS); + me->set_extent_callback (SCM_EOL, X_AXIS); if (a1 != Y_AXIS && a2 != Y_AXIS) - me->set_extent_callback (0, Y_AXIS); - - // if (!me->has_extent_callback_b (a1)) - if (me->has_extent_callback_b (Score_element::molecule_extent, a1)) - me->set_extent_callback (Axis_group_interface::group_extent_callback,a1); - if (me->has_extent_callback_b (Score_element::molecule_extent, a2)) - me->set_extent_callback (Axis_group_interface::group_extent_callback,a2); + me->set_extent_callback (SCM_EOL, Y_AXIS); + + /* + why so convoluted ? (fixme/documentme?) + */ + if (me->has_extent_callback_b (Score_element::molecule_extent_proc, a1)) + me->set_extent_callback (Axis_group_interface::group_extent_callback_proc,a1); + if (me->has_extent_callback_b (Score_element::molecule_extent_proc, a2)) + me->set_extent_callback (Axis_group_interface::group_extent_callback_proc,a2); } Link_array diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc index 5a45005be8..e5eafb06e3 100644 --- a/lily/bar-engraver.cc +++ b/lily/bar-engraver.cc @@ -52,7 +52,7 @@ Bar_engraver::create_bar () { if (!bar_p_) { - bar_p_ = new Item (get_property ("basicBarProperties")); + bar_p_ = new Item (get_property ("BarLine")); SCM gl = get_property ("whichBar"); if (scm_equal_p (gl, bar_p_->get_elt_property ("glyph")) != SCM_BOOL_T) diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc index 8c698b6e12..834270e4d0 100644 --- a/lily/bar-number-engraver.cc +++ b/lily/bar-number-engraver.cc @@ -111,7 +111,7 @@ Bar_number_engraver::create_items () if (text_p_) return; - SCM b = get_property ("basicBarNumberProperties"); + SCM b = get_property ("BarNumber"); text_p_ = new Item (b); Side_position::set_axis(text_p_,Y_AXIS); diff --git a/lily/bar.cc b/lily/bar.cc index abe7b29ee5..11bcc38302 100644 --- a/lily/bar.cc +++ b/lily/bar.cc @@ -143,8 +143,7 @@ Bar::before_line_breaking (SCM smob) if (!gh_string_p (g)) { me->set_elt_property ("molecule-callback", SCM_BOOL_T); - me->set_extent_callback (0, X_AXIS); - + me->set_extent_callback (SCM_EOL, X_AXIS); // leave y_extent for spanbar? } diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index 74f1331738..29c5005974 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -149,7 +149,7 @@ Beam_engraver::do_process_music () } prev_start_req_ = reqs_drul_[START]; - beam_p_ = new Spanner (get_property ("basicBeamProperties")); + beam_p_ = new Spanner (get_property ("Beam")); Beam::set_interface (beam_p_); SCM smp = get_property ("measurePosition"); @@ -227,7 +227,7 @@ Beam_engraver::acknowledge_element (Score_element_info info) { if (Rest::has_interface (info.elem_l_)) { - info.elem_l_->add_offset_callback (Beam_rest_collision_callback_proc, Y_AXIS); + info.elem_l_->add_offset_callback (Beam::rest_collision_callback_proc, Y_AXIS); } else if (Stem::has_interface (info.elem_l_)) { diff --git a/lily/beam.cc b/lily/beam.cc index d00d460b8e..7def162133 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -891,7 +891,7 @@ Beam::last_visible_stem(Score_element*me) rest -> stem -> beam -> interpolate_y_position () */ -MAKE_SCHEME_CALLBACK(Beam,rest_collision_callback,1); +MAKE_SCHEME_CALLBACK(Beam,rest_collision_callback,2); SCM Beam::rest_collision_callback (SCM element_smob, SCM axis) { @@ -947,7 +947,7 @@ Beam::rest_collision_callback (SCM element_smob, SCM axis) if (discrete_dist < stafflines+1) discrete_dist = int (ceil (discrete_dist / 2.0)* 2.0); - return (-d * discrete_dist); + return gh_double2scm (-d * discrete_dist); } @@ -960,9 +960,6 @@ Beam::has_interface (Score_element*me) void Beam::set_interface (Score_element*me) { - Pointer_group_interface g (me, "stems"); - g.set_interface (); - /* why the init? No way to tell difference between default and user override. */ diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc index df01cfb4d0..b96a117f95 100644 --- a/lily/break-align-engraver.cc +++ b/lily/break-align-engraver.cc @@ -103,12 +103,12 @@ Break_align_engraver::acknowledge_element (Score_element_info inf) if (!align_l_) { - align_l_ = new Item (get_property ("basicBreakAlignProperties")); + align_l_ = new Item (get_property ("BreakAlignment")); Break_align_interface::set_interface (align_l_); announce_element (align_l_,0); SCM edge_sym = ly_symbol2scm ("Left_edge_item"); - Item * edge = new Item (get_property ("leftEdgeBasicProperties")); + Item * edge = new Item (get_property ("LeftEdge")); /* We must have left-edge in the middle. Instrument-names @@ -123,7 +123,7 @@ Break_align_engraver::acknowledge_element (Score_element_info inf) TODO: switch off ignoring empty stuff? */ - edge->set_extent_callback (Score_element::point_dimension_callback,X_AXIS); + edge->set_extent_callback (Score_element::point_dimension_callback_proc, X_AXIS); align_l_->set_elt_property ("group-center-element", edge->self_scm ()); @@ -142,7 +142,7 @@ Break_align_engraver::acknowledge_element (Score_element_info inf) } else { - group = new Item (get_property ("basicBreakAlignGroupProperties")); + group = new Item (get_property ("BreakAlignGroup")); Axis_group_interface::set_interface (group); Axis_group_interface::set_axes (group, X_AXIS,X_AXIS); diff --git a/lily/break-align-item.cc b/lily/break-align-item.cc index 8fd6ba0b06..b8d87a0112 100644 --- a/lily/break-align-item.cc +++ b/lily/break-align-item.cc @@ -70,7 +70,6 @@ Break_align_interface::self_align_callback (SCM element_smob, SCM axis) void Break_align_interface::add_element (Score_element*me, Score_element *toadd) { - toadd->add_offset_callback (Break_align_interface_alignment_callback_proc, X_AXIS); Axis_group_interface::add_element (me, toadd); } @@ -225,5 +224,5 @@ Break_align_interface::set_interface (Score_element*me) Align_interface::set_interface (me); Align_interface::set_axis (me,X_AXIS); - me->add_offset_callback (Break_align_interface_self_align_callback_proc, X_AXIS); + } diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc index 2a19cdb4ab..8c06a74e8d 100644 --- a/lily/breathing-sign-engraver.cc +++ b/lily/breathing-sign-engraver.cc @@ -62,7 +62,7 @@ Breathing_sign_engraver::do_process_music() { if(breathing_sign_req_l_) { - SCM b = get_property ("basicBreathingSignProperties"); + SCM b = get_property ("BreathingSign"); breathing_sign_p_ = new Item (b); Breathing_sign::set_interface (breathing_sign_p_); diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc index 5d24908532..6f245f9920 100644 --- a/lily/breathing-sign.cc +++ b/lily/breathing-sign.cc @@ -20,10 +20,7 @@ #include "dimensions.hh" #include "direction.hh" - - MAKE_SCHEME_CALLBACK(Breathing_sign,brew_molecule,1); - SCM Breathing_sign::brew_molecule (SCM smob) { @@ -42,8 +39,6 @@ SCM Breathing_sign::offset_callback (SCM element_smob, SCM axis) { Score_element *me = unsmob_element (element_smob); - Axis a = (Axis) gh_scm2int (axis); - Direction d = Directional_element_interface::get (me); if (!d) @@ -61,5 +56,5 @@ void Breathing_sign::set_interface (Score_element *b) { Staff_symbol_referencer::set_interface (b); - b->add_offset_callback (Breathing_sign_offset_callback_proc,Y_AXIS); + } diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index d8458a64eb..7578496b8e 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -116,7 +116,7 @@ void Chord_name_engraver::create_chord_name () { assert (chord_p_); - chord_name_p_ = new Item (get_property ("basicChordNameProperties")); + chord_name_p_ = new Item (get_property ("ChordName")); /* Hmm, why not represent complete chord as list? ((tonic third fifth) (inversion bass)) diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index c11f482960..e504bdeadb 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -93,7 +93,7 @@ Chord_tremolo_engraver::do_process_music () { if (repeat_ && !beam_p_) { - beam_p_ = new Spanner (get_property ("basicBeamProperties")); + beam_p_ = new Spanner (get_property ("Beam")); Beam::set_interface (beam_p_); beam_p_->set_elt_property ("chord-tremolo", SCM_BOOL_T); diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index f435ca6eaf..8544562006 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -105,7 +105,7 @@ Clef_engraver::set_type (String s) c0_position_i_ -= (int) octave_dir_ * 7; - SCM basic = ly_symbol2scm ("basicClefItemProperties"); + SCM basic = ly_symbol2scm ("Clef"); SCM c0 = ly_symbol2scm ("c0-position"); SCM gl = ly_symbol2scm ("glyph"); daddy_trans_l_->execute_single_pushpop_property (basic, gl, SCM_UNDEFINED); @@ -136,7 +136,6 @@ Clef_engraver::acknowledge_element (Score_element_info info) { int p = int (Staff_symbol_referencer::position_f (item)) + c0_position_i_; Staff_symbol_referencer::set_position (item,p); - } else if (Key_item::has_interface (item)) { @@ -176,7 +175,7 @@ Clef_engraver::create_clef() { if (!clef_p_) { - Item *c= new Item (get_property ("basicClefItemProperties")); + Item *c= new Item (get_property ("Clef")); announce_element (c, clef_req_l_); Staff_symbol_referencer::set_interface (c); @@ -186,14 +185,13 @@ Clef_engraver::create_clef() Staff_symbol_referencer::set_position(clef_p_, clef_position_i_); if (octave_dir_) { - Item * g = new Item (get_property ("basicOctavateEightProperties")); - Side_position::set_axis (g,Y_AXIS); + Item * g = new Item (get_property ("OctavateEight")); + Side_position::add_support (g,clef_p_); g->set_parent (clef_p_, Y_AXIS); g->set_parent (clef_p_, X_AXIS); - g->add_offset_callback (Side_position_aligned_on_self_proc, X_AXIS); - g->add_offset_callback (Side_position_centered_on_parent_proc, X_AXIS); + g->set_elt_property ("direction", gh_int2scm (octave_dir_)); octavate_p_ = g; announce_element (octavate_p_, clef_req_l_); diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc index fc0d97cc98..e97ecccb0c 100644 --- a/lily/collision-engraver.cc +++ b/lily/collision-engraver.cc @@ -36,7 +36,7 @@ Collision_engraver::process_acknowledged () return ; if (!col_p_) { - col_p_ = new Item (get_property ("basicCollisionProperties")); + col_p_ = new Item (get_property ("NoteCollision")); Axis_group_interface::set_interface (col_p_); Axis_group_interface::set_axes (col_p_, X_AXIS, Y_AXIS); diff --git a/lily/collision.cc b/lily/collision.cc index d73ce84a4e..14c0e4fe82 100644 --- a/lily/collision.cc +++ b/lily/collision.cc @@ -228,7 +228,7 @@ Collision::forced_shift (Score_element *me) void Collision::add_column (Score_element*me,Score_element* ncol_l) { - ncol_l->add_offset_callback (Collision_force_shift_callback_proc, X_AXIS); + ncol_l->add_offset_callback (Collision::force_shift_callback_proc, X_AXIS); Axis_group_interface::add_element (me, ncol_l); me->add_dependency (ncol_l); } diff --git a/lily/dimension-cache.cc b/lily/dimension-cache.cc index 2c82102960..da14511f52 100644 --- a/lily/dimension-cache.cc +++ b/lily/dimension-cache.cc @@ -15,7 +15,8 @@ Dimension_cache::Dimension_cache (Dimension_cache const &d) { init(); - extent_callback_l_ = d.extent_callback_l_; + dimension_ = d.dimension_; + offset_ = d.offset_; offset_callbacks_ = d.offset_callbacks_; offsets_left_ = d.offsets_left_; @@ -30,14 +31,13 @@ Dimension_cache::Dimension_cache () void Dimension_cache::init() { - extent_callback_l_ =0; + dimension_ = SCM_EOL; + offsets_left_ = 0; offset_callbacks_ = SCM_EOL; offset_ =0.0; - dim_.set_empty (); parent_l_ =0; - valid_b_ = false; } diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc index 935d3f3e65..ff462d7332 100644 --- a/lily/dot-column-engraver.cc +++ b/lily/dot-column-engraver.cc @@ -51,7 +51,7 @@ Dot_column_engraver::acknowledge_element (Score_element_info info) { if (!dotcol_p_) { - dotcol_p_ = new Item(get_property ("basicDotColumnProperties")); + dotcol_p_ = new Item(get_property ("DotColumn")); Dot_column::set_interface (dotcol_p_); Side_position::set_axis (dotcol_p_, X_AXIS); diff --git a/lily/dot-column.cc b/lily/dot-column.cc index a0a61a5dfd..d91e1b9de4 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -129,7 +129,7 @@ Dot_column::add_head (Score_element * me, Score_element *rh) Pointer_group_interface gi (me, "dots"); gi.add_element (d); - d->add_offset_callback (Dot_column_force_shift_callback_proc , Y_AXIS); + d->add_offset_callback (Dot_column::force_shift_callback_proc , Y_AXIS); Axis_group_interface::add_element (me, d); } } diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 8fd1275047..a1fc434742 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -126,7 +126,7 @@ Dynamic_engraver::do_process_music () { if (!line_spanner_) { - line_spanner_ = new Spanner (get_property ("basicDynamicLineSpannerProperties")); + line_spanner_ = new Spanner (get_property ("DynamicLineSpanner")); Side_position::set_axis (line_spanner_, Y_AXIS); Axis_group_interface::set_interface (line_spanner_); @@ -183,15 +183,13 @@ Dynamic_engraver::do_process_music () { String loud = text_req_l_->text_str_; - text_p_ = new Item (get_property ("basicDynamicTextProperties")); + text_p_ = new Item (get_property ("DynamicText")); text_p_->set_elt_property ("text", ly_str02scm (loud.ch_C ())); if (Direction d=text_req_l_->get_direction ()) Directional_element_interface::set (line_spanner_, d); Axis_group_interface::add_element (line_spanner_, text_p_); - text_p_->add_offset_callback (Side_position_aligned_on_self_proc, - Y_AXIS); announce_element (text_p_, text_req_l_); } @@ -227,7 +225,7 @@ Dynamic_engraver::do_process_music () else { current_cresc_req_ = accepted_spanreqs_drul_[START]; - cresc_p_ = new Spanner (get_property ("basicCrescendoProperties")); + cresc_p_ = new Spanner (get_property ("Crescendo")); Crescendo::set_interface (cresc_p_); cresc_p_->set_elt_property ("grow-direction", @@ -288,9 +286,6 @@ Dynamic_engraver::do_process_music () } Axis_group_interface::add_element (line_spanner_, cresc_p_); - cresc_p_->set_elt_property ("self-alignment-Y", gh_int2scm (0)); - cresc_p_->add_offset_callback - (Side_position_aligned_on_self_proc, Y_AXIS); announce_element (cresc_p_, accepted_spanreqs_drul_[START]); } } diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc index db813f141a..5c893207ee 100644 --- a/lily/extender-engraver.cc +++ b/lily/extender-engraver.cc @@ -111,8 +111,8 @@ Extender_engraver::do_process_music () return; } - extender_p_ = new Spanner (get_property ("basicLyricExtenderProperties")); - extender_p_->set_extent_callback (Score_element::point_dimension_callback, Y_AXIS); + extender_p_ = new Spanner (get_property ("LyricExtender")); + Lyric_extender (extender_p_).set_textitem (LEFT, last_lyric_l_); announce_element (extender_p_, req_l_); diff --git a/lily/group-interface.cc b/lily/group-interface.cc index b82807d5b2..a64ba45925 100644 --- a/lily/group-interface.cc +++ b/lily/group-interface.cc @@ -48,12 +48,5 @@ Group_interface::count () return scm_ilength (elt_l_->get_elt_property (name_.ch_C())); } -void -Group_interface::set_interface () -{ - if (!has_interface ()) - { - } -} diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc index 2ed9dae9ce..66bd0389ad 100644 --- a/lily/hara-kiri-group-spanner.cc +++ b/lily/hara-kiri-group-spanner.cc @@ -14,27 +14,18 @@ #include "item.hh" -Interval -Hara_kiri_group_spanner::y_extent(Score_element*me, Axis a) +MAKE_SCHEME_CALLBACK(Hara_kiri_group_spanner,y_extent,2); +SCM +Hara_kiri_group_spanner::y_extent (SCM element_smob, SCM scm_axis) { + Score_element *me = unsmob_element (element_smob); + Axis a = (Axis) gh_scm2int (scm_axis); + assert (a == Y_AXIS); consider_suicide (me); - return Axis_group_interface::group_extent_callback (me, a); -} - - -bool -Hara_kiri_group_spanner::has_interface (Score_element*me) -{ - return me->has_interface (ly_symbol2scm ("hara-kiri-spanner-interface")); + return Axis_group_interface::group_extent_callback (me->self_scm (), scm_axis); } -void -Hara_kiri_group_spanner::add_interesting_item (Score_element* me,Score_element* n) -{ - me->add_dependency (n); - Pointer_group_interface (me, "items-worth-living").add_element (n); -} void Hara_kiri_group_spanner::consider_suicide(Score_element*me) @@ -79,7 +70,7 @@ Hara_kiri_group_spanner::force_hara_kiri_in_parent_callback (SCM element_smob, S Score_element *daughter = unsmob_element (element_smob); Axis a = (Axis) gh_scm2int (axis); assert (a == Y_AXIS); - force_hara_kiri_callback (daughter->parent_l (a)->self_scm (), Y_AXIS); + force_hara_kiri_callback (daughter->parent_l (a)->self_scm (), axis); return gh_double2scm ( 0.0); } @@ -94,7 +85,19 @@ Hara_kiri_group_spanner::add_element (Score_element * me, Score_element *e) void Hara_kiri_group_spanner::set_interface (Score_element*me) { - me->add_offset_callback (Hara_kiri_group_spanner_force_hara_kiri_callback_proc, Y_AXIS); - me->set_interface (ly_symbol2scm ("hara-kiri-spanner-interface")); - me->set_extent_callback (Hara_kiri_group_spanner::y_extent, Y_AXIS); + me->set_interface (ly_symbol2scm ("hara-kiri-group-interface")); +} + + +bool +Hara_kiri_group_spanner::has_interface (Score_element*me) +{ + return me->has_interface (ly_symbol2scm ("hara-kiri-group-interface")); +} + +void +Hara_kiri_group_spanner::add_interesting_item (Score_element* me,Score_element* n) +{ + me->add_dependency (n); + Pointer_group_interface (me, "items-worth-living").add_element (n); } diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc index 79fbe31f7f..e18619c28a 100644 --- a/lily/hyphen-engraver.cc +++ b/lily/hyphen-engraver.cc @@ -103,8 +103,8 @@ Hyphen_engraver::do_process_music () return; } - hyphen_p_ = new Spanner (get_property ("basicHyphenSpannerProperties")); - hyphen_p_->set_extent_callback (Score_element::point_dimension_callback,Y_AXIS); + hyphen_p_ = new Spanner (get_property ("LyricHyphen")); + Hyphen_spanner (hyphen_p_).set_textitem (LEFT, last_lyric_l_); announce_element (hyphen_p_, req_l_); } diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh index 35070547be..924ca2dec3 100644 --- a/lily/include/align-interface.hh +++ b/lily/include/align-interface.hh @@ -14,7 +14,7 @@ #include "lily-proto.hh" #include "lily-guile.hh" -extern SCM Align_interface_alignment_callback_proc; + /* Order elements top to bottom/left to right/right to left etc. @@ -53,7 +53,7 @@ extern SCM Align_interface_alignment_callback_proc; */ struct Align_interface { - static SCM alignment_callback (SCM element, SCM axis); + DECLARE_SCHEME_CALLBACK(alignment_callback, (SCM element, SCM axis)); static void do_side_processing (Score_element*,Axis a); static void set_axis (Score_element*,Axis); static Axis axis (Score_element*) ; @@ -61,7 +61,7 @@ struct Align_interface { static int get_count (Score_element*,Score_element*); static void set_interface (Score_element*); static bool has_interface (Score_element*); - static SCM center_on_element (SCM element, SCM axis); + DECLARE_SCHEME_CALLBACK(center_on_element, (SCM element, SCM axis)); }; #endif /* ALIGN_INTERFACE_HH */ diff --git a/lily/include/arpeggio.hh b/lily/include/arpeggio.hh deleted file mode 100644 index 362c87e193..0000000000 --- a/lily/include/arpeggio.hh +++ /dev/null @@ -1,23 +0,0 @@ -/* - arpegio.hh -- declare Arpeggio - - source file of the GNU LilyPond music typesetter - - (c) 2000 Jan Nieuwenhuizen -*/ - -#ifndef ARPEGGIO_HH -#define ARPEGGIO_HH - -#include "lily-guile.hh" -#include "lily-proto.hh" - -class Arpeggio -{ -public: - static SCM brew_molecule (SCM); - static bool has_interface (Score_element*); -}; - -#endif /* ARPEGGIO_HH */ - diff --git a/lily/include/axis-group-interface.hh b/lily/include/axis-group-interface.hh index 659905c2d4..258ff65dc4 100644 --- a/lily/include/axis-group-interface.hh +++ b/lily/include/axis-group-interface.hh @@ -28,7 +28,7 @@ */ struct Axis_group_interface { - static Interval group_extent_callback (Score_element *,Axis); + DECLARE_SCHEME_CALLBACK(group_extent_callback, (SCM smob, SCM axis)); static Interval relative_group_extent (Axis, Score_element * common, SCM list); static void add_element (Score_element* me, Score_element*); diff --git a/lily/include/bar.hh b/lily/include/bar.hh index c9ab5d36ef..663b233e89 100644 --- a/lily/include/bar.hh +++ b/lily/include/bar.hh @@ -20,9 +20,9 @@ public: static void set_interface (Score_element*); static Molecule compound_barline (Score_element*, String, Real height) ; static Molecule simple_barline (Score_element*, Real wid, Real height) ; - static SCM get_staff_bar_size (SCM); - static SCM brew_molecule (SCM); - static SCM before_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(get_staff_bar_size, (SCM )); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); + DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM )); }; #endif // BAR_HH diff --git a/lily/include/beam.hh b/lily/include/beam.hh index 99de7ea4f4..11bc3d3704 100644 --- a/lily/include/beam.hh +++ b/lily/include/beam.hh @@ -11,7 +11,7 @@ #include "lily-guile.hh" -extern SCM Beam_rest_collision_callback_proc; + /** a beam connects multiple stems. Beam adjusts the stems its owns to make sure that they reach the @@ -62,15 +62,15 @@ public: static Item* last_visible_stem (Score_element*); static bool has_interface (Score_element*); static void set_interface (Score_element*); - static SCM rest_collision_callback (SCM element, SCM axis); + DECLARE_SCHEME_CALLBACK(rest_collision_callback, (SCM element, SCM axis)); Beam (SCM); static void add_stem (Score_element*,Score_element*); static void set_beaming (Score_element*,Beaming_info_list *); static void set_stemlens (Score_element*); static int get_multiplicity (Score_element*me); - static SCM brew_molecule (SCM); - static SCM before_line_breaking (SCM); - static SCM after_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); + DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM )); + DECLARE_SCHEME_CALLBACK(after_line_breaking, (SCM )); static Molecule stem_beams (Score_element*,Item *here, Item *next, Item *prev); private: diff --git a/lily/include/break-align-item.hh b/lily/include/break-align-item.hh index 9e3bc936ab..3e9d0d6c1d 100644 --- a/lily/include/break-align-item.hh +++ b/lily/include/break-align-item.hh @@ -11,7 +11,7 @@ #define BREAK_ALIGN_ITEM_HH #include "item.hh" -extern SCM Break_align_interface_alignment_callback_proc; + /** align breakable items (clef, bar, etc.) @@ -24,12 +24,12 @@ extern SCM Break_align_interface_alignment_callback_proc; class Break_align_interface { public: - static SCM before_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM )); static void do_alignment (Score_element*); static void set_interface (Score_element*); static bool has_interface (Score_element*); static void add_element (Score_element*me, Score_element*add); - static SCM alignment_callback (SCM element, SCM axis); - static SCM self_align_callback (SCM element, SCM axis); + DECLARE_SCHEME_CALLBACK(alignment_callback, (SCM element, SCM axis)); + DECLARE_SCHEME_CALLBACK(self_align_callback, (SCM element, SCM axis)); }; #endif // BREAK_ALIGN_ITEM_HH diff --git a/lily/include/breathing-sign.hh b/lily/include/breathing-sign.hh index e0f8dc8b63..c131e57fe2 100644 --- a/lily/include/breathing-sign.hh +++ b/lily/include/breathing-sign.hh @@ -19,8 +19,8 @@ class Breathing_sign { public: - static SCM brew_molecule (SCM); - static SCM offset_callback (SCM element, SCM axis); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); + DECLARE_SCHEME_CALLBACK(offset_callback, (SCM element, SCM axis)); static void set_interface (Score_element*); static bool has_interface (Score_element*); }; diff --git a/lily/include/chord-name.hh b/lily/include/chord-name.hh index bd9bcfb9dc..b4825593ba 100644 --- a/lily/include/chord-name.hh +++ b/lily/include/chord-name.hh @@ -21,10 +21,10 @@ class Chord_name { public: - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); static Molecule ly_word2molecule (Score_element*, SCM scm, Real* x) ; static Molecule ly_text2molecule (Score_element*, SCM scm) ; - static SCM after_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(after_line_breaking, (SCM )); }; #endif // CHORD_NAME_HH diff --git a/lily/include/clef.hh b/lily/include/clef.hh index f8c4b52c61..bd59e6ee1d 100644 --- a/lily/include/clef.hh +++ b/lily/include/clef.hh @@ -26,7 +26,7 @@ */ struct Clef { - static SCM before_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM )); static bool has_interface (Score_element*); static void set_interface (Score_element*); }; diff --git a/lily/include/collision.hh b/lily/include/collision.hh index e8c3100037..d700f5a34a 100644 --- a/lily/include/collision.hh +++ b/lily/include/collision.hh @@ -43,7 +43,7 @@ class Collision // interface public: static SCM automatic_shift (Score_element*); static SCM forced_shift (Score_element*); - static SCM force_shift_callback (SCM element, SCM axis); + DECLARE_SCHEME_CALLBACK(force_shift_callback, (SCM element, SCM axis)); static void do_shifts (Score_element*); static void add_column (Score_element*me,Score_element*ncol_l); }; diff --git a/lily/include/crescendo.hh b/lily/include/crescendo.hh index 09c46265ac..e7e4a16c52 100644 --- a/lily/include/crescendo.hh +++ b/lily/include/crescendo.hh @@ -19,7 +19,7 @@ struct Crescendo { public: - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); static void set_interface(Score_element*); static bool has_interface (Score_element*); }; diff --git a/lily/include/dimension-cache.hh b/lily/include/dimension-cache.hh index adbcc2aa04..5ae4845fd0 100644 --- a/lily/include/dimension-cache.hh +++ b/lily/include/dimension-cache.hh @@ -20,13 +20,18 @@ /** Adminstration of offset dimension info. - - TODO: use SCM for callbacks, and let them be set as basic - properties. */ struct Dimension_cache { - Interval dim_; + /* + Multi typed: + + - cons: interval + - procedure: callback + - else: empty + */ + SCM dimension_; + /** The offset wrt. to the center of #parent_l_# */ @@ -34,13 +39,11 @@ struct Dimension_cache Real offset_; SCM offset_callbacks_; - bool valid_b_; char offsets_left_; /** What to call to find extent. Nil means empty. */ - Dim_cache_callback extent_callback_l_; Score_element * parent_l_; Dimension_cache(Dimension_cache const&); diff --git a/lily/include/dot-column.hh b/lily/include/dot-column.hh index 8ee712ae42..dc50f326fc 100644 --- a/lily/include/dot-column.hh +++ b/lily/include/dot-column.hh @@ -22,7 +22,7 @@ public: static void add_head (Score_element * dotcol, Score_element* rh ); static void set_interface (Score_element*); static bool has_interface (Score_element*); - static SCM force_shift_callback (SCM,SCM); + DECLARE_SCHEME_CALLBACK(force_shift_callback, (SCM ,SCM)); static SCM do_shifts (SCM dotlist); }; #endif // DOT_COLUMN_HH diff --git a/lily/include/dots.hh b/lily/include/dots.hh index 4d9394eecd..ea4ce9be63 100644 --- a/lily/include/dots.hh +++ b/lily/include/dots.hh @@ -13,7 +13,7 @@ #include "lily-proto.hh" #include "lily-guile.hh" -extern SCM Dots_quantised_position_callback_proc; + /** The dots to go with a notehead/rest. A separate class, since they @@ -28,8 +28,8 @@ extern SCM Dots_quantised_position_callback_proc; class Dots // interface { public: - static SCM quantised_position_callback (SCM element, SCM axis); - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(quantised_position_callback, (SCM element, SCM axis)); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); }; #endif // DOTS_HH diff --git a/lily/include/grace-align-item.hh b/lily/include/grace-align-item.hh index 3e446295e3..812a442e29 100644 --- a/lily/include/grace-align-item.hh +++ b/lily/include/grace-align-item.hh @@ -23,7 +23,7 @@ class Grace_align_item public: static void set_interface (Score_element*); static bool has_interface (Score_element*); - static SCM before_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM )); }; #endif /* GRACE_ALIGN_ITEM_HH */ diff --git a/lily/include/group-interface.hh b/lily/include/group-interface.hh index 66308caf44..81ee3e4ccf 100644 --- a/lily/include/group-interface.hh +++ b/lily/include/group-interface.hh @@ -33,7 +33,7 @@ public: int count (); void add_thing (SCM); bool has_interface (); - void set_interface (); + }; struct Pointer_group_interface { @@ -43,7 +43,7 @@ public: Pointer_group_interface (Score_element*); Pointer_group_interface (Score_element*, String); int count (); - void set_interface (); + static bool has_interface (Score_element*); bool has_interface (); void add_element (Score_element*); diff --git a/lily/include/hara-kiri-group-spanner.hh b/lily/include/hara-kiri-group-spanner.hh index 7e3856e445..0c3268ea20 100644 --- a/lily/include/hara-kiri-group-spanner.hh +++ b/lily/include/hara-kiri-group-spanner.hh @@ -30,9 +30,9 @@ class Hara_kiri_group_spanner { public: - static SCM force_hara_kiri_callback (SCM,SCM); - static Interval y_extent (Score_element * , Axis); - static SCM force_hara_kiri_in_parent_callback(SCM,SCM); + DECLARE_SCHEME_CALLBACK(force_hara_kiri_callback, (SCM ,SCM)); + DECLARE_SCHEME_CALLBACK(y_extent, (SCM smob, SCM axis)); + DECLARE_SCHEME_CALLBACK(force_hara_kiri_in_parent_callback, (SCM ,SCM)); static void add_element (Score_element *me, Score_element *e); static void set_interface (Score_element*me); static bool has_interface (Score_element*); diff --git a/lily/include/hyphen-spanner.hh b/lily/include/hyphen-spanner.hh index fb114a914a..fba4ed4c26 100644 --- a/lily/include/hyphen-spanner.hh +++ b/lily/include/hyphen-spanner.hh @@ -36,7 +36,7 @@ public: Spanner* elt_l_; Hyphen_spanner (Spanner*); void set_textitem (Direction, Score_element*); - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); }; #endif // HYPHEN_SPANNER_HH diff --git a/lily/include/key-item.hh b/lily/include/key-item.hh index de16e2a130..706f65530f 100644 --- a/lily/include/key-item.hh +++ b/lily/include/key-item.hh @@ -26,7 +26,7 @@ struct Key_item static int calculate_position(Score_element*,SCM pair) ; static void set_interface (Score_element*); static bool has_interface (Score_element*); - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); }; #endif // KEYITEM_HH diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index 092d7a57e6..623e852692 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -91,13 +91,17 @@ typedef SCM(*Scheme_function_1)(...); typedef SCM(*Scheme_function_2)(...); #endif -#define MAKE_SCHEME_CALLBACK(TYPE, FUNC, ARGS) \ -SCM TYPE ## _ ## FUNC ## _proc;\ +#define DECLARE_SCHEME_CALLBACK(NAME,ARGS) \ + static SCM NAME ARGS; \ + static SCM NAME ## _proc + +#define MAKE_SCHEME_CALLBACK(TYPE, FUNC, ARGCOUNT) \ +SCM TYPE :: FUNC ## _proc;\ void \ TYPE ## _ ## FUNC ## _init_functions () \ { \ - TYPE ## _ ## FUNC ## _proc = gh_new_procedure ## ARGS ## _0 (#TYPE "::" #FUNC, \ - ((Scheme_function_ ## ARGS)TYPE :: FUNC)); \ + TYPE :: FUNC ## _proc = gh_new_procedure ## ARGCOUNT ## _0 (#TYPE "::" #FUNC, \ + ((Scheme_function_ ## ARGCOUNT)TYPE :: FUNC)); \ } \ \ ADD_SCM_INIT_FUNC(TYPE ## _ ## FUNC ## _callback, TYPE ## _ ## FUNC ## _init_functions); \ diff --git a/lily/include/local-key-item.hh b/lily/include/local-key-item.hh index e1f45bd305..88b76d7b46 100644 --- a/lily/include/local-key-item.hh +++ b/lily/include/local-key-item.hh @@ -15,7 +15,7 @@ class Local_key_item { static Molecule parenthesize (Score_element*me, Molecule) ; public: - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); static void add_pitch (Score_element*me, Musical_pitch, bool cautionary, bool natural); static bool has_interface (Score_element*); static void set_interface (Score_element*); diff --git a/lily/include/lyric-extender.hh b/lily/include/lyric-extender.hh index 1a71a1e7cb..1204a3befc 100644 --- a/lily/include/lyric-extender.hh +++ b/lily/include/lyric-extender.hh @@ -43,7 +43,7 @@ public: Spanner*elt_l_; Lyric_extender (Spanner*); void set_textitem (Direction, Score_element*); - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); }; #endif // EXTENDER_SPANNER_HH diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh index ba805eadd0..d516dbfd96 100644 --- a/lily/include/multi-measure-rest.hh +++ b/lily/include/multi-measure-rest.hh @@ -29,9 +29,9 @@ class Multi_measure_rest public: static void set_interface (Score_element*); static bool has_interface (Score_element*); - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); static void add_column (Score_element*,Item*); - static SCM set_spacing_rods (SCM); + DECLARE_SCHEME_CALLBACK(set_spacing_rods, (SCM )); }; #endif /* MULTI_MEASURE_REST_HH */ diff --git a/lily/include/note-head.hh b/lily/include/note-head.hh index 09c75e186e..8974b9828d 100644 --- a/lily/include/note-head.hh +++ b/lily/include/note-head.hh @@ -23,7 +23,7 @@ class Note_head { public: - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); static Molecule ledger_line (Interval, Score_element*) ; static bool has_interface (Score_element*); }; diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh index 2df8ae606c..94055324c7 100644 --- a/lily/include/rest-collision.hh +++ b/lily/include/rest-collision.hh @@ -14,7 +14,7 @@ #include "lily-guile.hh" -extern SCM Rest_collision_force_shift_callback_proc; + /* Move rests in note-columns so that they do not collide. @@ -49,7 +49,7 @@ public: static void add_column (Score_element*me,Score_element*); static void set_interface (Score_element*me); static bool has_interface (Score_element*); - static SCM force_shift_callback (SCM element, SCM axis); + DECLARE_SCHEME_CALLBACK(force_shift_callback, (SCM element, SCM axis)); static SCM do_shift (Score_element*,SCM); }; #endif // REST_COLLISION_HH diff --git a/lily/include/rest.hh b/lily/include/rest.hh index f403690dc7..204c19f407 100644 --- a/lily/include/rest.hh +++ b/lily/include/rest.hh @@ -22,8 +22,8 @@ class Rest { public: - static SCM after_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(after_line_breaking, (SCM )); static bool has_interface (Score_element*); - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); }; #endif // REST_HH diff --git a/lily/include/rhythmic-head.hh b/lily/include/rhythmic-head.hh index b64844d41d..855f84b7f7 100644 --- a/lily/include/rhythmic-head.hh +++ b/lily/include/rhythmic-head.hh @@ -29,7 +29,7 @@ public: static Item * stem_l (Score_element*) ; static Item * dots_l (Score_element*) ; static int dot_count (Score_element*) ; - static SCM after_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(after_line_breaking, (SCM )); static bool has_interface (Score_element*); static void set_interface (Score_element*); }; diff --git a/lily/include/score-element.hh b/lily/include/score-element.hh index c83579304c..99742defe0 100644 --- a/lily/include/score-element.hh +++ b/lily/include/score-element.hh @@ -14,11 +14,6 @@ #include "smobs.hh" #include "dimension-cache.hh" -typedef Interval (*Extent_callback)(Score_element *,Axis); -typedef Real (*Offset_callback)(Score_element *,Axis); - - - /** for administration of what was done already */ @@ -103,8 +98,6 @@ public: Paper_def *paper_l () const; Lookup const *lookup_l () const; - void add_processing (); - /** add a dependency. It may be the 0 pointer, in which case, it is ignored. */ @@ -124,8 +117,6 @@ public: #funcptr# is the function to call to update this element. */ void calculate_dependencies (int final, int busy, SCM funcname); - - static SCM handle_broken_smobs (SCM, SCM criterion); virtual void do_break_processing (); @@ -136,16 +127,11 @@ public: Molecule get_molecule () const; void suicide (); - static Interval preset_extent (Score_element *,Axis); - static Interval point_dimension_callback (Score_element *,Axis ); - static Interval molecule_extent (Score_element *,Axis); - -protected: - ///executed directly after the item is added to the Paper_score - virtual void do_add_processing (); - static Interval dim_cache_callback (Dimension_cache const*); - -public: + DECLARE_SCHEME_CALLBACK(preset_extent, (SCM smob, SCM axis)); + DECLARE_SCHEME_CALLBACK(point_dimension_callback, (SCM smob, SCM axis)); + DECLARE_SCHEME_CALLBACK(molecule_extent, (SCM smob, SCM axis)); + + static SCM ly_set_elt_property (SCM, SCM,SCM); static SCM ly_get_elt_property (SCM, SCM); @@ -153,7 +139,7 @@ public: void set_interface (SCM intf); - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); virtual void handle_broken_dependencies (); virtual void handle_prebroken_dependencies (); @@ -190,11 +176,11 @@ public: // duh. slim down interface here. (todo) bool has_offset_callback_b (SCM callback, Axis)const; void add_offset_callback (SCM callback, Axis); - - bool has_extent_callback_b (Extent_callback, Axis)const; + bool has_extent_callback_b (SCM, Axis)const; + void set_extent_callback (SCM , Axis); bool has_extent_callback_b (Axis) const; - void set_extent_callback (Extent_callback , Axis); + /** Invoke callbacks to get offset relative to parent. */ @@ -205,7 +191,7 @@ public: void set_parent (Score_element* e, Axis); Score_element *parent_l (Axis a) const; - static SCM fixup_refpoint (SCM); + DECLARE_SCHEME_CALLBACK(fixup_refpoint, (SCM)); }; Score_element * unsmob_element (SCM); diff --git a/lily/include/script-column.hh b/lily/include/script-column.hh index 1e41d86583..3603372fae 100644 --- a/lily/include/script-column.hh +++ b/lily/include/script-column.hh @@ -17,7 +17,7 @@ class Script_column { public: static void add_staff_sided (Score_element*, Item*); - static SCM before_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM )); }; diff --git a/lily/include/script.hh b/lily/include/script.hh index 0e4dfae387..6d9b51f2c3 100644 --- a/lily/include/script.hh +++ b/lily/include/script.hh @@ -24,8 +24,8 @@ public: static Molecule get_molecule (Score_element*,Direction d); static void set_interface (Score_element*); static bool has_interface (Score_element*); - static SCM brew_molecule (SCM); - static SCM after_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); + DECLARE_SCHEME_CALLBACK(after_line_breaking, (SCM )); }; #endif /* Stem_SCRIPT_HH */ diff --git a/lily/include/separating-group-spanner.hh b/lily/include/separating-group-spanner.hh index d01b6dbb51..8bcff500a4 100644 --- a/lily/include/separating-group-spanner.hh +++ b/lily/include/separating-group-spanner.hh @@ -17,7 +17,7 @@ class Separating_group_spanner public: static void add_spacing_unit (Score_element*me, Item*); static void set_interface (Score_element*); - static SCM set_spacing_rods (SCM); + DECLARE_SCHEME_CALLBACK(set_spacing_rods, (SCM )); }; #endif /* SEPARATING_GROUP_SPANNER_HH */ diff --git a/lily/include/side-position-interface.hh b/lily/include/side-position-interface.hh index dde5487bae..db67e19143 100644 --- a/lily/include/side-position-interface.hh +++ b/lily/include/side-position-interface.hh @@ -13,9 +13,9 @@ #include "spanner.hh" #include "item.hh" -extern SCM Side_position_aligned_on_self_proc; -extern SCM Side_position_centered_on_parent_proc; -extern SCM Side_position_quantised_position_proc; + + + /** Position victim object (ELT_L_) next to other objects (the support). @@ -49,11 +49,11 @@ extern SCM Side_position_quantised_position_proc; struct Side_position { public: - static SCM side_position (SCM element, SCM axis); - static SCM aligned_on_self (SCM element, SCM axis); - static SCM aligned_side (SCM element, SCM axis); - static SCM quantised_position (SCM element, SCM axis); - static SCM centered_on_parent (SCM element, SCM axis); + DECLARE_SCHEME_CALLBACK(side_position, (SCM element, SCM axis)); + DECLARE_SCHEME_CALLBACK(aligned_on_self, (SCM element, SCM axis)); + DECLARE_SCHEME_CALLBACK(aligned_side, (SCM element, SCM axis)); + DECLARE_SCHEME_CALLBACK(quantised_position, (SCM element, SCM axis)); + DECLARE_SCHEME_CALLBACK(centered_on_parent, (SCM element, SCM axis)); static void set_axis (Score_element*,Axis); static void set_minimum_space (Score_element*,Real); static void set_padding (Score_element*,Real); diff --git a/lily/include/slur.hh b/lily/include/slur.hh index 44e4ffaccf..797bdc321b 100644 --- a/lily/include/slur.hh +++ b/lily/include/slur.hh @@ -30,7 +30,7 @@ control-points -- - + Read-only ========= @@ -41,19 +41,20 @@ thickness -- + dash -- number representing the length of the dashes. */ class Slur { public: static void add_column (Score_element*me,Score_element*col); - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); static void set_interface (Score_element*); static bool has_interface (Score_element*); static Array get_encompass_offset_arr (Score_element*me) ; static Bezier get_curve (Score_element*me) ; static Direction get_default_dir (Score_element*me) ; - static SCM after_line_breaking (SCM); - static SCM set_spacing_rods (SCM); + DECLARE_SCHEME_CALLBACK(after_line_breaking, (SCM )); + DECLARE_SCHEME_CALLBACK(set_spacing_rods, (SCM )); private: static Real get_first_notecolumn_y (Score_element *me, Direction dir); static Offset broken_trend_offset (Score_element *me, Direction dir); diff --git a/lily/include/spacing-spanner.hh b/lily/include/spacing-spanner.hh index 917b5fdc89..7f678043ee 100644 --- a/lily/include/spacing-spanner.hh +++ b/lily/include/spacing-spanner.hh @@ -18,7 +18,7 @@ public: static void set_interface (Score_element*); static void do_measure (Score_element*,Link_array) ; - static SCM set_springs (SCM); + DECLARE_SCHEME_CALLBACK(set_springs, (SCM )); static Real stem_dir_correction (Score_element*,Score_element*,Score_element*) ; static Real default_bar_spacing (Score_element*,Score_element*,Score_element*,Moment) ; static Real note_spacing (Score_element*,Score_element*,Score_element*,Moment) ; diff --git a/lily/include/span-arpeggio.hh b/lily/include/span-arpeggio.hh deleted file mode 100644 index bda8c85722..0000000000 --- a/lily/include/span-arpeggio.hh +++ /dev/null @@ -1,24 +0,0 @@ -/* - span-arpegio.hh -- declare Span_arpeggio - - source file of the GNU LilyPond music typesetter - - (c) 2000 Jan Nieuwenhuizen -*/ - -#ifndef SPAN_ARPEGGIO_HH -#define SPAN_ARPEGGIO_HH - -#include "lily-guile.hh" -#include "lily-proto.hh" -#include "interval.hh" - -class Span_arpeggio -{ -public: - static SCM brew_molecule (SCM); - static bool has_interface (Score_element*); -}; - -#endif /* SPAN_ARPEGGIO_HH */ - diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh index 506a2e7438..9b942fada0 100644 --- a/lily/include/span-bar.hh +++ b/lily/include/span-bar.hh @@ -31,10 +31,10 @@ public: static void add_bar (Score_element*,Score_element*); static void evaluate_glyph (Score_element*); static void evaluate_empty (Score_element*); - static Interval width_callback(Score_element *, Axis) ; - static SCM get_bar_size (SCM); - static SCM before_line_breaking (SCM); - static SCM center_on_spanned_callback (SCM element, SCM axis); + DECLARE_SCHEME_CALLBACK(width_callback, (SCM smob, SCM axis)); + DECLARE_SCHEME_CALLBACK(get_bar_size, (SCM )); + DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM )); + DECLARE_SCHEME_CALLBACK(center_on_spanned_callback, (SCM element, SCM axis)); }; #endif // SPAN_BAR_HH diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh index ecded8250b..597ed0944b 100644 --- a/lily/include/staff-symbol-referencer.hh +++ b/lily/include/staff-symbol-referencer.hh @@ -24,7 +24,7 @@ public: static void set_interface (Score_element*); static bool has_interface (Score_element*); static void set_position (Score_element*,Real); - static SCM callback (SCM element, SCM axis); + DECLARE_SCHEME_CALLBACK(callback, (SCM element, SCM axis)); /** Leading are the lead strips between the sticks (lines) of diff --git a/lily/include/staff-symbol.hh b/lily/include/staff-symbol.hh index b854b76dfd..5bcf6196a7 100644 --- a/lily/include/staff-symbol.hh +++ b/lily/include/staff-symbol.hh @@ -24,7 +24,7 @@ public: static Real staff_space (Score_element*) ; static int steps_i(Score_element*) ; static int line_count (Score_element*); - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); static bool has_interface (Score_element*); static void set_interface (Score_element*); }; diff --git a/lily/include/stem-tremolo.hh b/lily/include/stem-tremolo.hh index c8c29a678a..81ef981d10 100644 --- a/lily/include/stem-tremolo.hh +++ b/lily/include/stem-tremolo.hh @@ -21,8 +21,8 @@ class Stem_tremolo public: static void set_interface (Score_element*); static bool has_interface (Score_element*); - static Interval dim_callback (Score_element*, Axis); - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(dim_callback, (SCM smob, SCM axis)); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); static void set_stem (Score_element*me, Score_element *st); }; diff --git a/lily/include/stem.hh b/lily/include/stem.hh index 0a4aee4859..55e30a0f5c 100644 --- a/lily/include/stem.hh +++ b/lily/include/stem.hh @@ -39,7 +39,7 @@ class Stem { public: - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); /// log of the duration. Eg. 4 -> 16th note -> 2 flags static int flag_i (Score_element*) ; @@ -71,10 +71,10 @@ public: static Real get_default_stem_end_position (Score_element*me) ; static void position_noteheads(Score_element*); static Real stem_end_position (Score_element*) ; - static SCM off_callback (SCM element, SCM axis); + DECLARE_SCHEME_CALLBACK(off_callback, (SCM element, SCM axis)); static Molecule flag (Score_element*); - static SCM before_line_breaking (SCM); - static Interval dim_callback (Score_element *,Axis); + DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM )); + DECLARE_SCHEME_CALLBACK(dim_callback, (SCM smob, SCM axis)); static bool has_interface (Score_element*); static void set_interface (Score_element*); diff --git a/lily/include/system-start-delimiter.hh b/lily/include/system-start-delimiter.hh index 121713d9e6..081f0c6c91 100644 --- a/lily/include/system-start-delimiter.hh +++ b/lily/include/system-start-delimiter.hh @@ -19,11 +19,11 @@ class System_start_delimiter { public: - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); static void set_interface (Score_element*me); static bool has_interface (Score_element*); - static SCM after_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(after_line_breaking, (SCM )); static void try_collapse (Score_element*); static Molecule staff_bracket (Score_element*,Real) ; static Molecule staff_brace (Score_element*,Real) ; diff --git a/lily/include/tie-column.hh b/lily/include/tie-column.hh index 2c8545a079..b841125b31 100644 --- a/lily/include/tie-column.hh +++ b/lily/include/tie-column.hh @@ -20,7 +20,7 @@ public: static void set_interface (Score_element*me); static bool has_interface (Score_element*); static void add_tie (Score_element*me,Score_element*); - static SCM after_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(after_line_breaking, (SCM )); static void set_directions (Score_element*me); }; diff --git a/lily/include/tie.hh b/lily/include/tie.hh index 329e41fb0b..a5553555a9 100644 --- a/lily/include/tie.hh +++ b/lily/include/tie.hh @@ -25,10 +25,10 @@ public: static bool has_interface (Score_element*); static Score_element * head (Score_element*,Direction) ; static Real position_f (Score_element*) ; - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); static Direction get_default_dir(Score_element*) ; static SCM get_control_points (SCM); - static SCM set_spacing_rods (SCM); + DECLARE_SCHEME_CALLBACK(set_spacing_rods, (SCM )); }; #endif // TIE_HH diff --git a/lily/include/time-signature.hh b/lily/include/time-signature.hh index f25d12c866..f88a4f1324 100644 --- a/lily/include/time-signature.hh +++ b/lily/include/time-signature.hh @@ -21,7 +21,7 @@ struct Time_signature { static Molecule special_time_signature (Score_element*,String,int,int) ; static Molecule time_signature (Score_element*,int, int); - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); }; #endif // METER_HH diff --git a/lily/include/tuplet-spanner.hh b/lily/include/tuplet-spanner.hh index 49a5bac13c..5d317cda25 100644 --- a/lily/include/tuplet-spanner.hh +++ b/lily/include/tuplet-spanner.hh @@ -26,7 +26,7 @@ properties: class Tuplet_spanner { public: - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); static void set_interface (Score_element*); static bool has_interface (Score_element*); @@ -36,7 +36,7 @@ public: static void calc_dy (Score_element*,Real *) ; static void calc_position_and_height (Score_element*,Real*,Real *dy); - static SCM after_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(after_line_breaking, (SCM )); static Direction get_default_dir (Score_element*); }; diff --git a/lily/include/volta-spanner.hh b/lily/include/volta-spanner.hh index 8955f1b247..6bf3608531 100644 --- a/lily/include/volta-spanner.hh +++ b/lily/include/volta-spanner.hh @@ -27,7 +27,7 @@ class Volta_spanner public: static void set_interface (Score_element*); static bool has_interface (Score_element*); - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); static void add_column (Score_element*, Score_element*col); static void add_bar (Score_element*me, Item*bar); }; diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc index ce4c328946..131c67ad3b 100644 --- a/lily/instrument-name-engraver.cc +++ b/lily/instrument-name-engraver.cc @@ -42,9 +42,6 @@ Instrument_name_engraver::do_pre_move_processing () { if (text_) { - text_->add_offset_callback (Side_position_centered_on_parent_proc, - Y_AXIS); - typeset_element (text_); text_ = 0; } @@ -55,7 +52,7 @@ Instrument_name_engraver::create_text (SCM txt) { if(!text_) { - text_ = new Item (get_property ("basicInstrumentNameProperties")); + text_ = new Item (get_property ("InstrumentName")); text_->set_elt_property ("text", txt); /* diff --git a/lily/item.cc b/lily/item.cc index eac4533b4c..811ed663e0 100644 --- a/lily/item.cc +++ b/lily/item.cc @@ -168,8 +168,8 @@ Item::handle_prebroken_dependencies () suicide (); else if (empty) { - set_extent_callback (0, X_AXIS); - set_extent_callback (0, Y_AXIS); + set_extent_callback (SCM_EOL, X_AXIS); + set_extent_callback (SCM_EOL, Y_AXIS); } else if (trans) set_elt_property ("molecule-callback", SCM_BOOL_T); diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index 110e6717e1..eff8a73a20 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -64,7 +64,7 @@ Key_engraver::create_key (bool def) { if (!item_p_) { - item_p_ = new Item ( get_property ("basicKeyProperties")); + item_p_ = new Item ( get_property ("KeySignature")); item_p_->set_elt_property ("c0-position", gh_int2scm (0)); diff --git a/lily/line-number-engraver.cc b/lily/line-number-engraver.cc deleted file mode 100644 index 476ade7070..0000000000 --- a/lily/line-number-engraver.cc +++ /dev/null @@ -1,105 +0,0 @@ -/* - line-number-engraver.cc -- implement Line_number_engraver - - source file of the GNU LilyPond music typesetter - - (c) 2000 Han-Wen Nienhuys - - */ - -#include "engraver.hh" -#include "item.hh" -#include "side-position-interface.hh" -#include "rhythmic-head.hh" -#include "stem.hh" -#include "note-head.hh" - -/** - Annotate output with line numbers. Creates text-items when it - catches note heads. */ -class Line_number_engraver : public Engraver -{ - Array interesting_; - Link_array support_; - Item * text_item_p_; - String last_text_; -public: - Line_number_engraver (); - VIRTUAL_COPY_CONS (Translator); -protected: - virtual void do_pre_move_processing (); - virtual void acknowledge_element (Score_element_info); - virtual void process_acknowledged (); -}; - -void -Line_number_engraver::process_acknowledged () -{ - if (!text_item_p_ && interesting_.size ()) - { - text_item_p_ = new Item (get_property ("basicTextProperties") ); - Side_position::set_axis (text_item_p_,Y_AXIS); - Side_position::set_direction (text_item_p_, UP); - text_item_p_->set_parent (interesting_[0].elem_l_, Y_AXIS); - - - announce_element (text_item_p_, 0); - } -} - -void -Line_number_engraver::acknowledge_element (Score_element_info inf) -{ - if (!inf.req_l_) - return ; - - if ( Note_head::has_interface (inf.elem_l_)) - { - interesting_.push (inf); - support_.push (inf.elem_l_); - } - else if (Stem::has_interface (inf.elem_l_)) - { - support_.push (inf.elem_l_); - } -} - -void -Line_number_engraver::do_pre_move_processing () -{ - if (text_item_p_) - { - String s; - - for (int i=0; i < interesting_.size (); i++) - { - if (i) - s += ","; - - s += interesting_[i].req_l_->origin ()->line_number_str (); - - } - - for (int j= support_.size (); j--; ) - { - Side_position::add_support (text_item_p_,support_[j]); - } - if (s != last_text_) - { - text_item_p_->set_elt_property ("text", ly_str02scm (s.ch_C())); - last_text_ =s; - } - - typeset_element (text_item_p_); - text_item_p_ =0; - } - interesting_.clear (); - support_.clear (); -} - -Line_number_engraver::Line_number_engraver () -{ - text_item_p_ =0; -} - -ADD_THIS_TRANSLATOR(Line_number_engraver); diff --git a/lily/local-key-engraver.cc b/lily/local-key-engraver.cc index 052f3a9234..f8fd3516ff 100644 --- a/lily/local-key-engraver.cc +++ b/lily/local-key-engraver.cc @@ -103,7 +103,7 @@ Local_key_engraver::process_acknowledged () { if (!key_item_p_) { - key_item_p_ = new Item(get_property ("basicLocalKeyProperties")); + key_item_p_ = new Item(get_property ("Accidentals")); Local_key_item::set_interface (key_item_p_); Side_position::set_axis (key_item_p_, X_AXIS); Side_position::set_direction (key_item_p_, LEFT); diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc index 42a7ee3287..0f042d33f3 100644 --- a/lily/lyric-engraver.cc +++ b/lily/lyric-engraver.cc @@ -41,18 +41,18 @@ Lyric_engraver::do_process_music() { if (req_l_) { - text_p_= new Item (get_property ("basicLyricTextProperties")); + text_p_= new Item (get_property ("LyricText")); text_p_->set_elt_property ("text", // ly_str02scm ((req_l_->text_str_ + " ").ch_C ())); ly_str02scm ((req_l_->text_str_).ch_C ())); - text_p_->add_offset_callback (Side_position_aligned_on_self_proc,X_AXIS); + /* We can't reach the notehead where we're centered from here. So we kludge. - (UGH UGH, pulled amount of space out of thin air value ) + (UGH UGH, pulled amount of space out of thin air) */ text_p_->translate_axis (paper_l()->get_var ("staffspace")*0.66, X_AXIS); diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index d58823470f..eeada94856 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -102,7 +102,7 @@ Mark_engraver::create_items (Request *rq) if (text_p_) return; - SCM s = get_property ("basicMarkProperties"); + SCM s = get_property ("RehearsalMark"); text_p_ = new Item (s); diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index 552865111b..be25b4ab48 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -114,7 +114,7 @@ Multi_measure_rest_engraver::do_process_music () if (busy_span_req_l_ && !mmrest_p_) { - mmrest_p_ = new Spanner (get_property ("basicMultiMeasureRestProperties")); + mmrest_p_ = new Spanner (get_property ("MultiMeasureRest")); Multi_measure_rest::set_interface (mmrest_p_); Staff_symbol_referencer::set_interface (mmrest_p_); diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index 44843e402a..e394708996 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -58,8 +58,6 @@ static Keyword_ent the_key_tab[]={ {"notenames", NOTENAMES}, {"notes", NOTES}, {"outputproperty", OUTPUTPROPERTY}, - {"pushproperty", PUSHPROPERTY}, - {"popproperty", POPPROPERTY}, {"push", PUSH}, {"pop", POP}, {"partial", PARTIAL}, diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index 1e73315091..9bcd1dad7b 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -80,7 +80,7 @@ Note_heads_engraver::do_process_music() for (int i=0; i < note_req_l_arr_.size (); i++) { - Item *note_p = new Item (get_property ("basicNoteHeadProperties")); + Item *note_p = new Item (get_property ("NoteHead")); Staff_symbol_referencer::set_interface (note_p); @@ -93,10 +93,7 @@ Note_heads_engraver::do_process_music() if (note_req_l->duration_.dots_i_) { - Item * d = new Item (get_property ("basicDotsProperties")); - - Staff_symbol_referencer::set_interface (d); - + Item * d = new Item (get_property ("Dots")); Rhythmic_head::set_dots (note_p, d); if (note_req_l->duration_.dots_i_ @@ -104,7 +101,6 @@ Note_heads_engraver::do_process_music() d->set_elt_property ("dot-count", gh_int2scm (note_req_l->duration_.dots_i_)); d->set_parent (note_p, Y_AXIS); - d->add_offset_callback (Dots_quantised_position_callback_proc, Y_AXIS); announce_element (d,0); dot_p_arr_.push (d); } diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc index 095f18cd60..df2c487214 100644 --- a/lily/note-name-engraver.cc +++ b/lily/note-name-engraver.cc @@ -46,7 +46,7 @@ Note_name_engraver::do_process_music () } if (s.length_i()) { - Item * t = new Item (get_property ("basicNoteNameProperties")); + Item * t = new Item (get_property ("NoteName")); t->set_elt_property ("text", ly_str02scm ( s.ch_C())); announce_element (t, req_l_arr_[0]); texts_.push (t); diff --git a/lily/parser.yy b/lily/parser.yy index e02e0047eb..70b04f7680 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -164,7 +164,6 @@ yylex (YYSTYPE *s, void * v_l) %token PARTIAL %token PENALTY %token PROPERTY -%token PUSHPROPERTY POPPROPERTY %token PUSH POP %token PT_T %token RELATIVE @@ -697,18 +696,6 @@ Simple_music: } | MUSIC_IDENTIFIER { $$ = unsmob_music ($1)->clone (); } | property_def -/* | PUSHPROPERTY embedded_scm embedded_scm embedded_scm { - $$ = new Push_translation_property; - $$->set_mus_property ("symbols", $2); - $$->set_mus_property ("element-property", $3); - $$->set_mus_property ("element-value", $4); - } - | POPPROPERTY embedded_scm embedded_scm { - $$ = new Pop_translation_property; - $$->set_mus_property ("symbols", $2); - $$->set_mus_property ("element-property", $3); - } -*/ | translator_change | Simple_music '*' bare_unsigned '/' bare_unsigned { $$ = $1; @@ -851,10 +838,17 @@ property_def: csm-> translator_type_str_ = ly_scm2string ($2); } - | PROPERTY STRING POP embedded_scm { - $$ = new Pop_translation_property; - $$->set_mus_property ("symbols", scm_string_to_symbol ($2)); - $$->set_mus_property ("element-property", $4); + | PROPERTY STRING '.' STRING POP embedded_scm { + Pop_translation_property *t = new Pop_translation_property; + + t->set_mus_property ("symbols", scm_string_to_symbol ($4)); + t->set_mus_property ("element-property", $6); + + Context_specced_music *csm = new Context_specced_music (t); + $$ = csm; + $$->set_spot (THIS->here_input ()); + + csm-> translator_type_str_ = ly_scm2string ($2); } ; diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc index 861c74f939..5e1eea027f 100644 --- a/lily/piano-pedal-engraver.cc +++ b/lily/piano-pedal-engraver.cc @@ -182,16 +182,10 @@ Piano_pedal_engraver::do_process_music () if (gh_string_p (s)) { - String propname = String ("basic")+ p->name_ + "PedalProperties"; + String propname = String (p->name_) + "Pedal"; p->item_p_ = new Item (get_property (propname.ch_C())); p->item_p_->set_elt_property ("text", s); - // guh - Side_position::set_axis (p->item_p_,Y_AXIS); - - // todo: init with basic props. - p->item_p_->add_offset_callback (Side_position_aligned_on_self_proc, X_AXIS); - p->item_p_->add_offset_callback (Side_position_centered_on_parent_proc, X_AXIS); announce_element (p->item_p_, p->req_l_drul_[START] ? p->req_l_drul_[START] diff --git a/lily/pointer-group-interface.cc b/lily/pointer-group-interface.cc index aef7b46a4f..66b327959a 100644 --- a/lily/pointer-group-interface.cc +++ b/lily/pointer-group-interface.cc @@ -51,8 +51,4 @@ Pointer_group_interface::count () return scm_ilength (elt_l_->get_elt_property (name_.ch_C())); } -void -Pointer_group_interface::set_interface () -{ -} diff --git a/lily/property-engraver.cc b/lily/property-engraver.cc index 312e1022be..9877b430ec 100644 --- a/lily/property-engraver.cc +++ b/lily/property-engraver.cc @@ -116,14 +116,24 @@ Property_engraver::apply_properties (SCM p, Score_element *e, Translator_group*o { e->set_elt_property (elt_prop_sym, val); - String msg = "Property_engraver is deprecated. Use\n \\property " - + origin->type_str_ - + ".basicXXXXProperties" - + " \\push #'" - + ly_symbol2string (elt_prop_sym) - + " = #"; - warning (msg); + SCM errport = scm_current_error_port (); + scm_display (prop_sym, errport); + scm_puts (" is deprecated. Use\n \\property ", errport); + + SCM name = e->get_elt_property ("name"); + scm_puts (origin->type_str_.ch_C(), errport); + scm_puts (".", errport); + + scm_display (name, errport); + scm_puts(" \\push #'",errport); + scm_display (elt_prop_sym,errport); + scm_puts ( " = #",errport); + if (gh_string_p (val)) + scm_puts ("\"", errport); scm_display (val, scm_current_error_port ()); + if (gh_string_p (val)) + scm_puts ("\"", errport); + scm_puts ("\n", errport); } else diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc index be91eb2306..7184c5be4b 100644 --- a/lily/rest-collision-engraver.cc +++ b/lily/rest-collision-engraver.cc @@ -40,7 +40,7 @@ Rest_collision_engraver::process_acknowledged () if (rest_collision_p_ || note_column_l_arr_.size () < 2) return; - rest_collision_p_ = new Item (get_property ("basicRestCollisionProperties")); + rest_collision_p_ = new Item (get_property ("RestCollision")); Rest_collision::set_interface (rest_collision_p_); announce_element (rest_collision_p_, 0); for (int i=0; i< note_column_l_arr_.size (); i++) diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index be3edfdabc..dad5f9cea4 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -50,7 +50,7 @@ Rest_collision::add_column (Score_element*me,Score_element *p) Pointer_group_interface gi (me); gi.add_element (p); - p->add_offset_callback (Rest_collision_force_shift_callback_proc, Y_AXIS); + p->add_offset_callback (Rest_collision::force_shift_callback_proc, Y_AXIS); p->set_elt_property ("rest-collision", me->self_scm ()); } @@ -234,7 +234,7 @@ Rest_collision::do_shift (Score_element *me, SCM elts) void Rest_collision::set_interface (Score_element*me) { - me->set_extent_callback (0, X_AXIS); - me->set_extent_callback (0, Y_AXIS); + me->set_extent_callback (SCM_EOL, X_AXIS); + me->set_extent_callback (SCM_EOL, Y_AXIS); } diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc index ce77975e2b..c7cada9b3d 100644 --- a/lily/rest-engraver.cc +++ b/lily/rest-engraver.cc @@ -66,7 +66,7 @@ Rest_engraver::do_process_music () { if (rest_req_l_ && !rest_p_) { - rest_p_ = new Item (get_property ("basicRestProperties")); + rest_p_ = new Item (get_property ("Rest")); Rhythmic_head::set_interface (rest_p_); Staff_symbol_referencer::set_interface (rest_p_); @@ -76,12 +76,10 @@ Rest_engraver::do_process_music () if (rest_req_l_->duration_.dots_i_) { - dot_p_ = new Item (get_property ("basicDotsProperties")); + dot_p_ = new Item (get_property ("Dots")); - Staff_symbol_referencer::set_interface (dot_p_); Rhythmic_head::set_dots (rest_p_, dot_p_); dot_p_->set_parent (rest_p_, Y_AXIS); - dot_p_->add_offset_callback (Dots_quantised_position_callback_proc, Y_AXIS); dot_p_->set_elt_property ("dot-count", gh_int2scm (rest_req_l_->duration_.dots_i_)); announce_element (dot_p_,0); diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc index b72f6b1f99..99f19e26f3 100644 --- a/lily/rhythmic-column-engraver.cc +++ b/lily/rhythmic-column-engraver.cc @@ -52,7 +52,7 @@ Rhythmic_column_engraver::process_acknowledged () { if (!ncol_p_) { - ncol_p_ = new Item (get_property("basicNoteColumnProperties")); + ncol_p_ = new Item (get_property("NoteColumn")); Note_column::set_interface (ncol_p_); announce_element (ncol_p_, 0); } diff --git a/lily/score-element.cc b/lily/score-element.cc index 7a27361638..39405a4324 100644 --- a/lily/score-element.cc +++ b/lily/score-element.cc @@ -48,8 +48,8 @@ Score_element::Score_element(SCM basicprops) /* fixme: default should be no callback. */ - set_extent_callback (molecule_extent, X_AXIS); - set_extent_callback (molecule_extent, Y_AXIS); + set_extent_callback (molecule_extent_proc, X_AXIS); + set_extent_callback (molecule_extent_proc, Y_AXIS) ; pscore_l_=0; lookup_l_ =0; @@ -67,6 +67,14 @@ Score_element::Score_element(SCM basicprops) dim_cache_[X_AXIS].offsets_left_ = scm_ilength (dim_cache_[X_AXIS].offset_callbacks_); dim_cache_[Y_AXIS].offsets_left_ = scm_ilength (dim_cache_[Y_AXIS].offset_callbacks_); + + SCM cb = get_elt_property ("X-extent-callback"); + if (cb != SCM_EOL) + dim_cache_[X_AXIS].dimension_ = cb; + + cb = get_elt_property ("Y-extent-callback"); + if (cb != SCM_EOL) + dim_cache_[Y_AXIS].dimension_ = cb; } @@ -156,16 +164,25 @@ Score_element::set_elt_property (SCM s, SCM v) } -Interval -Score_element::molecule_extent (Score_element *s, Axis a) +MAKE_SCHEME_CALLBACK(Score_element,molecule_extent,2); +SCM +Score_element::molecule_extent (SCM element_smob, SCM scm_axis) { + Score_element *s = unsmob_element (element_smob); + Axis a = (Axis) gh_scm2int (scm_axis); + Molecule m = s->get_molecule (); - return m.extent(a); + return ly_interval2scm ( m.extent(a)); } -Interval -Score_element::preset_extent (Score_element *s , Axis a) +MAKE_SCHEME_CALLBACK(Score_element,preset_extent,2); + +SCM +Score_element::preset_extent (SCM element_smob, SCM scm_axis) { + Score_element *s = unsmob_element (element_smob); + Axis a = (Axis) gh_scm2int (scm_axis); + SCM ext = s->get_elt_property ((a == X_AXIS) ? "extent-X" : "extent-Y"); @@ -176,10 +193,10 @@ Score_element::preset_extent (Score_element *s , Axis a) Real r = gh_scm2double (gh_cdr (ext)); l *= s->paper_l ()->get_var ("staffspace"); r *= s->paper_l ()->get_var ("staffspace"); - return Interval (l, r); + return ly_interval2scm (Interval (l, r)); } - return Interval (); + return ly_interval2scm ( Interval ()); } @@ -209,17 +226,6 @@ Score_element::lookup_l () const return lookup_l_; } -void -Score_element::add_processing() -{ - assert (status_i_ >=0); - if (status_i_) - return; - status_i_ ++; - - do_add_processing(); -} - void Score_element::calculate_dependencies (int final, int busy, SCM funcname) { @@ -297,10 +303,7 @@ Score_element::do_break_processing() } -void -Score_element::do_add_processing() -{ -} + MAKE_SCHEME_CALLBACK(Score_element,brew_molecule,1) @@ -480,8 +483,9 @@ Score_element::suicide () { mutable_property_alist_ = SCM_EOL; immutable_property_alist_ = SCM_EOL; - set_extent_callback (0, Y_AXIS); - set_extent_callback (0, X_AXIS); + + set_extent_callback (SCM_EOL, Y_AXIS); + set_extent_callback (SCM_EOL, X_AXIS); for (int a= X_AXIS; a <= Y_AXIS; a++) { @@ -551,37 +555,39 @@ Score_element::get_offset (Axis a) const } -Interval -Score_element::point_dimension_callback (Score_element* , Axis) +MAKE_SCHEME_CALLBACK(Score_element,point_dimension_callback,2); +SCM +Score_element::point_dimension_callback (SCM , SCM ) { - return Interval (0,0); + return ly_interval2scm ( Interval (0,0)); } bool Score_element::empty_b (Axis a)const { - return !dim_cache_[a].extent_callback_l_; + return ! (gh_pair_p (dim_cache_[a].dimension_ ) || + gh_procedure_p (dim_cache_[a].dimension_ )); } Interval Score_element::extent (Axis a) const { Dimension_cache * d = (Dimension_cache *)&dim_cache_[a]; - if (!d->extent_callback_l_) - { - d->dim_.set_empty (); - } - else if (!d->valid_b_) + Interval ext ; + if (gh_pair_p (d->dimension_)) + ; + else if (gh_procedure_p (d->dimension_)) { - d->dim_= (*d->extent_callback_l_ ) ((Score_element*)this, a); - d->valid_b_ = true; + /* + FIXME: add doco on types, and should typecheck maybe? + */ + d->dimension_= gh_call2 (d->dimension_, self_scm(), gh_int2scm (a)); } - - Interval ext = d->dim_; - - if (empty_b (a)) + else return ext; + ext = ly_scm2interval (d->dimension_); + SCM extra = get_elt_property (a == X_AXIS ? "extra-extent-X" : "extra-extent-Y"); @@ -656,21 +662,24 @@ Score_element::name () const void Score_element::add_offset_callback (SCM cb, Axis a) { - dim_cache_[a].offset_callbacks_ = gh_cons (cb, dim_cache_[a].offset_callbacks_ ); - dim_cache_[a].offsets_left_ ++; + if (!has_offset_callback_b (cb, a)) + { + dim_cache_[a].offset_callbacks_ = gh_cons (cb, dim_cache_[a].offset_callbacks_ ); + dim_cache_[a].offsets_left_ ++; + } } bool -Score_element::has_extent_callback_b (Extent_callback cb, Axis a)const +Score_element::has_extent_callback_b (SCM cb, Axis a)const { - return cb == dim_cache_[a].extent_callback_l_; + return scm_equal_p (cb, dim_cache_[a].dimension_); } bool Score_element::has_extent_callback_b (Axis a) const { - return dim_cache_[a].extent_callback_l_; + return gh_procedure_p (dim_cache_[a].dimension_); } bool @@ -680,12 +689,11 @@ Score_element::has_offset_callback_b (SCM cb, Axis a)const } void -Score_element::set_extent_callback (Dim_cache_callback dc, Axis a) +Score_element::set_extent_callback (SCM dc, Axis a) { - dim_cache_[a].extent_callback_l_ = dc ; + dim_cache_[a].dimension_ =dc; } - void Score_element::set_parent (Score_element *g, Axis a) { @@ -746,8 +754,12 @@ Score_element::mark_smob (SCM ses) Score_element * s = (Score_element*) SCM_CELL_WORD_1(ses); scm_gc_mark (s->immutable_property_alist_); scm_gc_mark (s->mutable_property_alist_); - scm_gc_mark (s->dim_cache_[X_AXIS].offset_callbacks_); - scm_gc_mark (s->dim_cache_[Y_AXIS].offset_callbacks_); + + for (int a =0 ; a < 2; a++) + { + scm_gc_mark (s->dim_cache_[a].offset_callbacks_); + scm_gc_mark (s->dim_cache_[a].dimension_); + } if (s->parent_l (Y_AXIS)) scm_gc_mark (s->parent_l (Y_AXIS)->self_scm ()); @@ -854,9 +866,6 @@ init_functions () bool Score_element::has_interface (SCM k) { - // if (mutable_property_alist_ == SCM_EOL) - // return false; - SCM ifs = get_elt_property (interfaces_sym); return scm_memq (k, ifs) != SCM_BOOL_F; diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index e2fa641da3..cb3577a163 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -32,7 +32,7 @@ Score_engraver::prepare (Moment w) { Global_translator::prepare (w); - SCM props = get_property (ly_symbol2scm ("basicPaperColumnProperties")); + SCM props = get_property (ly_symbol2scm ("PaperColumn")); set_columns (new Paper_column (props), new Paper_column (props)); command_column_l_->set_elt_property ("when", w.make_scm()); @@ -132,8 +132,6 @@ Score_engraver::typeset_all() for (int i =0; i < elem_p_arr_.size(); i++) { Score_element * elem_p = elem_p_arr_[i]; - elem_p->add_processing (); - if (Spanner *s = dynamic_cast (elem_p)) { @@ -269,7 +267,7 @@ Score_engraver::do_add_processing () pscore_p_ = new Paper_score; pscore_p_->paper_l_ = dynamic_cast(output_def_l_); - SCM props = get_property (ly_symbol2scm ("basicLineOfScoreProperties")); + SCM props = get_property (ly_symbol2scm ("LineOfScore")); pscore_p_->typeset_line (new Line_of_score (props)); } diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc index 0a30bea249..e621bdfca2 100644 --- a/lily/script-column-engraver.cc +++ b/lily/script-column-engraver.cc @@ -72,7 +72,7 @@ Script_column_engraver::process_acknowledged () { if (!scol_p_ && script_l_arr_.size () > 1) { - scol_p_ = new Item (get_property ("basicScriptColumnProperties")); + scol_p_ = new Item (get_property ("ScriptColumn")); announce_element (scol_p_, 0); diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index 8736506d57..6947d40390 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -67,11 +67,7 @@ Script_engraver::do_process_music() continue; } // todo -> use result of articulation-to-scriptdef directly as basic prop list. - Score_element *p =new Item (get_property ("basicScriptProperties")); - Script::set_interface (p); - - p->add_offset_callback (Side_position_centered_on_parent_proc, X_AXIS); - + Score_element *p =new Item (get_property ("Script")); list = gh_cdr (list); p->set_elt_property ("molecule", gh_car (list)); @@ -79,21 +75,24 @@ Script_engraver::do_process_music() list = gh_cdr(list); bool follow_staff = gh_scm2bool (gh_car (list)); list = gh_cdr(list); - int relative_stem_dir = gh_scm2int (gh_car (list)); + SCM relative_stem_dir = gh_car (list); list = gh_cdr(list); - int force_dir =gh_scm2int (gh_car (list)); + + SCM force_dir = l->get_mus_property ("direction"); + if (!isdir_b (force_dir)) + force_dir = gh_car (list); list = gh_cdr(list); SCM priority = gh_car (list); - if (relative_stem_dir) - p->set_elt_property ("side-relative-direction", gh_int2scm (relative_stem_dir)); + if (to_dir (relative_stem_dir)) + p->set_elt_property ("side-relative-direction", relative_stem_dir); else - Side_position::set_direction (p,(Direction)force_dir); - - if (l->get_direction ()) - Side_position::set_direction (p, l->get_direction ()); + p->set_elt_property ("direction", force_dir); + /* + FIXME: should figure this out in relation with basic props! + */ SCM axisprop = get_property ("scriptHorizontal"); bool xaxis = to_boolean (axisprop); Side_position::set_axis (p, xaxis ? X_AXIS : Y_AXIS); @@ -102,7 +101,7 @@ Script_engraver::do_process_music() p->set_elt_property ("staff-support", SCM_BOOL_T); if (!xaxis && follow_staff) - p->add_offset_callback (Side_position_quantised_position_proc, Y_AXIS); + p->add_offset_callback (Side_position::quantised_position_proc, Y_AXIS); p->set_elt_property ("script-priority", priority); diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc index eda666a9b4..63b66cc2f4 100644 --- a/lily/separating-line-group-engraver.cc +++ b/lily/separating-line-group-engraver.cc @@ -39,7 +39,7 @@ Separating_line_group_engraver::Separating_line_group_engraver () void Separating_line_group_engraver::do_creation_processing () { - sep_span_p_ = new Spanner (get_property ("basicSeparatingGroupSpannerProperties")); + sep_span_p_ = new Spanner (get_property ("SeparatingGroupSpanner")); Separating_group_spanner::set_interface (sep_span_p_); announce_element (sep_span_p_, 0); sep_span_p_->set_bound (LEFT, unsmob_element (get_property ("currentCommandColumn"))); @@ -66,7 +66,7 @@ Separating_line_group_engraver::acknowledge_element (Score_element_info i) if (!p_ref_) { p_ref_ = new Item - (get_property ("basicSeparationItemProperties")); + (get_property ("SeparationItem")); if (ib) p_ref_->set_elt_property ("breakable", SCM_BOOL_T); diff --git a/lily/separation-item.cc b/lily/separation-item.cc index a50bea8d4f..fa73f2f4bd 100644 --- a/lily/separation-item.cc +++ b/lily/separation-item.cc @@ -15,8 +15,8 @@ void Separation_item::set_interface (Score_element*s) { - s->set_extent_callback (0, X_AXIS); - s->set_extent_callback (0, Y_AXIS); + s->set_extent_callback (SCM_EOL, X_AXIS); + s->set_extent_callback (SCM_EOL, Y_AXIS); } void diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index 3b22afbe44..9ad3f6f3c4 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -12,7 +12,6 @@ #include "debug.hh" #include "warn.hh" #include "dimensions.hh" - #include "staff-symbol-referencer.hh" #include "group-interface.hh" @@ -241,8 +240,7 @@ Side_position::add_staff_support (Score_element*me) void Side_position::set_axis (Score_element*me, Axis a) { - if (!me->has_offset_callback_b (Side_position_aligned_side_proc, a)) - me->add_offset_callback (Side_position_aligned_side_proc, a); + me->add_offset_callback (Side_position::aligned_side_proc, a); } @@ -251,8 +249,8 @@ Side_position::set_axis (Score_element*me, Axis a) Axis Side_position::get_axis (Score_element*me) { - if (me->has_offset_callback_b (Side_position_aligned_side_proc, X_AXIS) - || me->has_offset_callback_b (Side_position_aligned_side_proc , X_AXIS)) + if (me->has_offset_callback_b (Side_position::aligned_side_proc, X_AXIS) + || me->has_offset_callback_b (Side_position::aligned_side_proc , X_AXIS)) return X_AXIS; diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index b993e907f3..ef3d6f062b 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -156,7 +156,7 @@ Slur_engraver::do_process_music () { // push a new slur onto stack. // (use temp. array to wait for all slur STOPs) - Score_element* slur = new Spanner (get_property ("basicSlurProperties")); + Score_element* slur = new Spanner (get_property ("Slur")); Slur::set_interface (slur); SCM s = get_property ("slurBeginAttachment"); if (gh_symbol_p (s)) diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc index 7578fa0073..d457007176 100644 --- a/lily/spacing-engraver.cc +++ b/lily/spacing-engraver.cc @@ -75,7 +75,7 @@ Spacing_engraver::Spacing_engraver() void Spacing_engraver::do_creation_processing () { - spacing_p_ =new Spanner (get_property ("basicSpacingSpannerProperties")); + spacing_p_ =new Spanner (get_property ("SpacingSpanner")); Spacing_spanner::set_interface (spacing_p_); spacing_p_->set_bound (LEFT, unsmob_element (get_property ("currentCommandColumn"))); announce_element (spacing_p_, 0); diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index dd369960ce..5483955386 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -19,8 +19,8 @@ void Spacing_spanner::set_interface (Score_element*me) { - me->set_extent_callback (0, X_AXIS); - me->set_extent_callback (0, Y_AXIS); + me->set_extent_callback (SCM_EOL, X_AXIS); + me->set_extent_callback (SCM_EOL, Y_AXIS) ; } /* diff --git a/lily/span-arpeggio-engraver.cc b/lily/span-arpeggio-engraver.cc deleted file mode 100644 index 9f5bc6083d..0000000000 --- a/lily/span-arpeggio-engraver.cc +++ /dev/null @@ -1,87 +0,0 @@ -/* - span-arpeggio-engraver.cc -- implement Span_arpeggio_engraver - - source file of the GNU LilyPond music typesetter - - (c) 2000 Jan Nieuwenhuizen -*/ - -#include "engraver.hh" -#include "item.hh" -#include "arpeggio.hh" -#include "span-arpeggio.hh" -#include "group-interface.hh" - - -/** - - Make arpeggios that span multiple staffs. Catch arpeggios, and span a - Span_arpeggio over them if we find more than two arpeggios. - */ -class Span_arpeggio_engraver : public Engraver -{ -public: - VIRTUAL_COPY_CONS (Translator); - Span_arpeggio_engraver (); - -protected: - virtual void acknowledge_element (Score_element_info); - virtual void process_acknowledged (); - virtual void do_pre_move_processing (); - -private: - Item *span_arpeggio_; - Link_array arpeggios_; -}; - - -Span_arpeggio_engraver::Span_arpeggio_engraver () -{ - span_arpeggio_ = 0; -} - -void -Span_arpeggio_engraver::acknowledge_element (Score_element_info info) -{ - int depth = info.origin_trans_l_arr (this).size (); - if (Arpeggio::has_interface (info.elem_l_)) - //if (info.origin_trans_l_arr (this).size () - // && Arpeggio::has_interface (info.elem_l_)) - { - arpeggios_.push (info.elem_l_); - } -} - -void -Span_arpeggio_engraver::process_acknowledged () -{ - if (arpeggios_.size () > 1 && !span_arpeggio_) - { - span_arpeggio_ = new Item (get_property ("basicSpanArpeggioProperties")); - Pointer_group_interface pgi (span_arpeggio_, "arpeggios"); - for (int i = 0; i < arpeggios_.size () ; i++) - { - pgi.add_element (arpeggios_[i]); - span_arpeggio_->add_dependency (arpeggios_[i]); - } - - span_arpeggio_->set_parent (arpeggios_[0], Y_AXIS); - span_arpeggio_->set_parent (arpeggios_[0], X_AXIS); - - announce_element (span_arpeggio_, 0); - } -} - -void -Span_arpeggio_engraver::do_pre_move_processing () -{ - if (span_arpeggio_) - { - typeset_element (span_arpeggio_); - span_arpeggio_ = 0; - } - arpeggios_.clear (); -} - -ADD_THIS_TRANSLATOR (Span_arpeggio_engraver); - diff --git a/lily/span-arpeggio.cc b/lily/span-arpeggio.cc deleted file mode 100644 index 5a574a8eb8..0000000000 --- a/lily/span-arpeggio.cc +++ /dev/null @@ -1,68 +0,0 @@ -/* - span-arpeggio.cc -- implement Span_arpeggio - - source file of the GNU LilyPond music typesetter - - (c) 2000 Jan Nieuwenhuizen -*/ - -#include "axis-group-interface.hh" -#include "molecule.hh" -#include "paper-def.hh" -#include "lookup.hh" -#include "arpeggio.hh" -#include "span-arpeggio.hh" -#include "score-element.hh" -#include "stem.hh" -#include "staff-symbol-referencer.hh" - -bool -Span_arpeggio::has_interface (Score_element* me) -{ - return me && me->has_interface (ly_symbol2scm ("span-arpeggio-interface")); -} - -/* - We could collapse this with Arpeggio::brew_molecule, but that requires - hairy scm callback hacking. - */ -MAKE_SCHEME_CALLBACK (Span_arpeggio, brew_molecule, 1); -SCM -Span_arpeggio::brew_molecule (SCM smob) -{ - Score_element *me = unsmob_element (smob); - - Interval iv; - Score_element *common = me; - for (SCM s = me->get_elt_property ("arpeggios"); gh_pair_p (s); s = gh_cdr (s)) - { - Score_element *arpeggio = unsmob_element (gh_car (s)); - common = arpeggio->common_refpoint (common, Y_AXIS); - } - // Hmm, nothing in common? - if (0) //(common) - for (SCM s = me->get_elt_property ("arpeggios"); gh_pair_p (s); s = gh_cdr (s)) - { - Score_element *arpeggio = unsmob_element (gh_car (s)); - Real c = common->relative_coordinate (arpeggio, Y_AXIS); - //iv.unite (Arpeggio::head_positions (stem)); - iv.unite (Interval (c, c)); - } - else - iv = Interval (-23, 5); - - Molecule mol; - Molecule dot = me->paper_l ()->lookup_l (0)->afm_find ("dots-dot"); - Real half_space = Staff_symbol_referencer::staff_space (me) / 2; - for (Real i = iv[MIN]; i < iv[MAX]; i++) - { - Molecule d (dot); - d.translate_axis (i * half_space, Y_AXIS); - mol.add_molecule (d); - } - mol.translate (Offset (-6, 0)); - - return mol.create_scheme (); -} - - diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc index 5fbd94f254..4ac4a896cd 100644 --- a/lily/span-bar-engraver.cc +++ b/lily/span-bar-engraver.cc @@ -57,7 +57,7 @@ Span_bar_engraver::acknowledge_element (Score_element_info i) if (bar_l_arr_.size() >= 2 && !spanbar_p_) { - spanbar_p_ = new Item (get_property ("basicSpanBarProperties")); + spanbar_p_ = new Item (get_property ("SpanBar")); Span_bar::set_interface (spanbar_p_); spanbar_p_->set_parent (bar_l_arr_[0], Y_AXIS); diff --git a/lily/span-bar.cc b/lily/span-bar.cc index 5c916a23e6..6f04809e74 100644 --- a/lily/span-bar.cc +++ b/lily/span-bar.cc @@ -26,9 +26,13 @@ Span_bar::add_bar (Score_element*me, Score_element*b) me->add_dependency (b); } -Interval -Span_bar::width_callback (Score_element *se, Axis ) +MAKE_SCHEME_CALLBACK(Span_bar,width_callback,2); +SCM +Span_bar::width_callback (SCM element_smob, SCM scm_axis) { + Score_element *se = unsmob_element (element_smob); + Axis a = (Axis) gh_scm2int (scm_axis); + assert (a == X_AXIS); String gl = ly_scm2string (se->get_elt_property ("glyph")); /* @@ -36,7 +40,7 @@ Span_bar::width_callback (Score_element *se, Axis ) */ Molecule m = Bar::compound_barline (se, gl, 40 PT); - return m.extent (X_AXIS); + return ly_interval2scm ( m.extent (X_AXIS)); } MAKE_SCHEME_CALLBACK(Span_bar,before_line_breaking,1); @@ -121,7 +125,7 @@ Span_bar::evaluate_glyph (Score_element*me) Interval Span_bar::get_spanned_interval (Score_element*me) { - return Axis_group_interface::group_extent_callback (me, Y_AXIS); + return ly_scm2interval (Axis_group_interface::group_extent_callback (me->self_scm(), gh_int2scm (Y_AXIS))); } @@ -141,17 +145,13 @@ Span_bar::get_bar_size (SCM smob) } return gh_double2scm (iv.length ()); } - void Span_bar::set_interface (Score_element *me) { Bar::set_interface (me); - Pointer_group_interface(me).set_interface (); - me->set_extent_callback (width_callback, X_AXIS); - me->add_offset_callback (Span_bar_center_on_spanned_callback_proc, Y_AXIS); me->set_interface (ly_symbol2scm ("span-bar-interface")); - me->set_extent_callback (0, Y_AXIS); + me->set_extent_callback (SCM_EOL, Y_AXIS); } bool diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc index 2917e16a45..37bfa33d6b 100644 --- a/lily/staff-symbol-engraver.cc +++ b/lily/staff-symbol-engraver.cc @@ -44,7 +44,7 @@ Staff_symbol_engraver::Staff_symbol_engraver() void Staff_symbol_engraver::do_creation_processing() { - span_p_ = new Spanner (get_property ("basicStaffSymbolProperties")); + span_p_ = new Spanner (get_property ("StaffSymbol")); span_p_->set_bound(LEFT, unsmob_element (get_property ("currentCommandColumn"))); diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc index 9a339f72ae..9fb2b2bc0d 100644 --- a/lily/staff-symbol-referencer.cc +++ b/lily/staff-symbol-referencer.cc @@ -89,10 +89,10 @@ Staff_symbol_referencer::position_f (Score_element*me) */ MAKE_SCHEME_CALLBACK(Staff_symbol_referencer,callback,2); SCM -Staff_symbol_referencer::callback (SCM element_smob, SCM axis) +Staff_symbol_referencer::callback (SCM element_smob, SCM ) { Score_element *me = unsmob_element (element_smob); - Axis a = (Axis) gh_scm2int (axis); + SCM pos = me->get_elt_property ("staff-position"); Real off =0.0; @@ -134,14 +134,14 @@ Staff_symbol_referencer::set_position (Score_element*me,Real p) else { me->set_elt_property ("staff-position", - gh_double2scm (p)); + gh_double2scm (p)); } - if (me->has_offset_callback_b (Staff_symbol_referencer_callback_proc, Y_AXIS)) + if (me->has_offset_callback_b (Staff_symbol_referencer::callback_proc, Y_AXIS)) return ; - me->add_offset_callback (Staff_symbol_referencer_callback_proc, Y_AXIS); + me->add_offset_callback (Staff_symbol_referencer::callback_proc, Y_AXIS); } /* @@ -167,6 +167,7 @@ Staff_symbol_referencer::set_interface (Score_element * e) { if (!gh_number_p (e->get_elt_property ("staff-position"))) e->set_elt_property ("staff-position", gh_double2scm (0.0)); - - e->add_offset_callback (Staff_symbol_referencer_callback_proc, Y_AXIS); + + e->add_offset_callback (Staff_symbol_referencer::callback_proc, Y_AXIS); } + diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc index e21d7c4fc9..11e8eea1b2 100644 --- a/lily/stanza-number-engraver.cc +++ b/lily/stanza-number-engraver.cc @@ -77,7 +77,7 @@ Stanza_number_engraver::create_text (SCM txt) { if(!text_) { - text_ = new Item (get_property ("basicStanzaNumberProperties")); + text_ = new Item (get_property ("StanzaNumber")); text_->set_elt_property ("text", txt); announce_element (text_,0); } diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index 1c3de7e27a..5707d843b4 100644 --- a/lily/stem-engraver.cc +++ b/lily/stem-engraver.cc @@ -77,7 +77,7 @@ Stem_engraver::acknowledge_element(Score_element_info i) int duration_log = r->duration_.durlog_i_; if (!stem_p_) { - stem_p_ = new Item (get_property ("basicStemProperties")); + stem_p_ = new Item (get_property ("Stem")); Stem::set_interface (stem_p_); Staff_symbol_referencer::set_interface(stem_p_); @@ -103,7 +103,7 @@ Stem_engraver::acknowledge_element(Score_element_info i) if (requested_type) { - tremolo_p_ = new Item (get_property ("basicStemTremoloProperties")); + tremolo_p_ = new Item (get_property ("StemTremolo")); Stem_tremolo::set_interface (tremolo_p_); announce_element (tremolo_p_, tremolo_req_l_); diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc index 0b3ad55f6c..2db2edad8a 100644 --- a/lily/stem-tremolo.cc +++ b/lily/stem-tremolo.cc @@ -34,12 +34,18 @@ Stem_tremolo::has_interface (Score_element *me) return me->has_interface (ly_symbol2scm ("stem-tremolo")); } +MAKE_SCHEME_CALLBACK(Stem_tremolo,dim_callback,2); -Interval -Stem_tremolo::dim_callback (Score_element * se, Axis ) +/* + todo: init with cons. + */ +SCM +Stem_tremolo::dim_callback (SCM e, SCM ) { + Score_element * se = unsmob_element (e); + Real space = Staff_symbol_referencer::staff_space (se); - return Interval (-space, space); + return ly_interval2scm ( Interval (-space, space)); } diff --git a/lily/stem.cc b/lily/stem.cc index 9671635e05..58fd950b67 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -429,9 +429,11 @@ Stem::flag (Score_element*me) return m; } -Interval -Stem::dim_callback (Score_element *se, Axis ) +MAKE_SCHEME_CALLBACK(Stem,dim_callback,2); +SCM +Stem::dim_callback (SCM e, SCM ) { + Score_element *se = unsmob_element (e); Interval r (0, 0); if (unsmob_element (se->get_elt_property ("beam")) || abs (flag_i (se)) <= 2) ; // TODO! @@ -439,7 +441,7 @@ Stem::dim_callback (Score_element *se, Axis ) { r = flag (se).extent (X_AXIS); } - return r; + return ly_interval2scm ( r); } @@ -491,7 +493,7 @@ SCM Stem::off_callback (SCM element_smob, SCM axis) { Score_element *me = unsmob_element (element_smob); - Axis a = (Axis) gh_scm2int (axis); + Real r=0; if (Score_element * f = first_head (me)) { @@ -640,7 +642,5 @@ Stem::has_interface (Score_element*m) void Stem::set_interface (Score_element*me) { - me->set_elt_property ("heads", SCM_EOL); - me->add_offset_callback ( Stem_off_callback_proc, X_AXIS); me->set_interface (ly_symbol2scm ("stem-interface")); } diff --git a/lily/sustain-pedal.cc b/lily/sustain-pedal.cc index ca8463c515..b4bd9f53a3 100644 --- a/lily/sustain-pedal.cc +++ b/lily/sustain-pedal.cc @@ -30,12 +30,11 @@ struct Sustain_pedal { public: - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM)); }; MAKE_SCHEME_CALLBACK(Sustain_pedal,brew_molecule,1); - SCM Sustain_pedal::brew_molecule (SCM smob) { diff --git a/lily/syllable-group.cc b/lily/syllable-group.cc index 3fe3db27b0..f1438f69f8 100644 --- a/lily/syllable-group.cc +++ b/lily/syllable-group.cc @@ -120,7 +120,7 @@ Syllable_group::set_lyric_align(const char *punc, Score_element *default_notehea // centre on notehead ... if we have one. if(notehead_l_) { lyric->set_parent(notehead_l_, X_AXIS); - lyric->add_offset_callback (Side_position_centered_on_parent_proc, X_AXIS); + lyric->add_offset_callback (Side_position::centered_on_parent_proc, X_AXIS); // reference is on the right of the notehead; move it left half way, and add translation lyric->translate_axis (group_translation_f_-(notehead_l_->extent(X_AXIS)).center(), X_AXIS); } diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc index 493be5a667..0a89d2edc4 100644 --- a/lily/system-start-delimiter-engraver.cc +++ b/lily/system-start-delimiter-engraver.cc @@ -65,7 +65,7 @@ System_start_delimiter_engraver::System_start_delimiter_engraver() void System_start_delimiter_engraver::do_creation_processing() { - delim_ = new Spanner (get_property ("basicSystemStartDelimiterProperties")); + delim_ = new Spanner (get_property ("SystemStartDelimiter")); System_start_delimiter::set_interface (delim_); delim_->set_bound (LEFT, unsmob_element (get_property ("currentCommandColumn"))); diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index e97c392407..957dd429ee 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -44,8 +44,7 @@ System_start_delimiter::staff_bracket (Score_element*me,Real height) void System_start_delimiter::set_interface (Score_element*me) { - me->set_extent_callback (0, Y_AXIS); - Pointer_group_interface (me).set_interface(); + me->set_extent_callback (SCM_EOL, Y_AXIS); me->set_interface (ly_symbol2scm ("system-start-delimiter-interface")); } @@ -91,7 +90,7 @@ SCM System_start_delimiter::brew_molecule (SCM smob) { Score_element * me = unsmob_element (smob); - Interval ext = Axis_group_interface::group_extent_callback (me, Y_AXIS); + Interval ext = ly_scm2interval (Axis_group_interface::group_extent_callback (me->self_scm(), gh_int2scm (Y_AXIS))); Real l = ext.length (); Molecule m; diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index a2c8d48e05..2a30a0a6fb 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -85,17 +85,20 @@ Text_engraver::do_process_music () { Text_script_req * r = reqs_[i]; - String basic = "basicTextScriptProperties"; + String basic = "TextScript"; // separate engraver? if (r->style_str_== "finger") { - basic = "basicFingeringProperties"; + basic = "Fingering"; } Item *text = new Item (get_property (basic.ch_C())); - + /* + FIXME -> need to use basic props. + */ SCM axisprop = get_property ("scriptHorizontal"); + Axis ax = to_boolean (axisprop) ? X_AXIS : Y_AXIS; Side_position::set_axis (text, ax); @@ -104,8 +107,8 @@ Text_engraver::do_process_music () /* nicely center the scripts. */ - text->add_offset_callback (Side_position_aligned_on_self_proc, X_AXIS); - text->add_offset_callback (Side_position_centered_on_parent_proc, X_AXIS); + text->add_offset_callback (Side_position::aligned_on_self_proc, X_AXIS); + text->add_offset_callback (Side_position::centered_on_parent_proc, X_AXIS); } diff --git a/lily/text-item.cc b/lily/text-item.cc index 35e0c5d724..feca94f884 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -15,7 +15,7 @@ struct Text_item { - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK( brew_molecule, (SCM)); }; diff --git a/lily/tie-column.cc b/lily/tie-column.cc index 13951511d9..32d6f4a1ad 100644 --- a/lily/tie-column.cc +++ b/lily/tie-column.cc @@ -20,8 +20,8 @@ void Tie_column::set_interface (Score_element*me) { me->set_interface (ly_symbol2scm ("tie-column")); - me->set_extent_callback (0, X_AXIS); - me->set_extent_callback (0, Y_AXIS); + me->set_extent_callback (SCM_EOL, X_AXIS); + me->set_extent_callback (SCM_EOL, Y_AXIS) ; } bool diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 68121fb2bb..bec3b7f0fa 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -168,7 +168,7 @@ Tie_engraver::process_acknowledged () } } - SCM basic = get_property ("basicTieProperties"); + SCM basic = get_property ("Tie"); SCM sparse = get_property ("sparseTies"); if (to_boolean (sparse)) { @@ -204,7 +204,7 @@ Tie_engraver::process_acknowledged () } else if (tie_p_arr_.size () > 1 && !tie_column_p_) { - tie_column_p_ = new Spanner (get_property ("basicTieColumnProperties")); + tie_column_p_ = new Spanner (get_property ("TieColumn")); Tie_column::set_interface (tie_column_p_); for (int i = tie_p_arr_.size (); i--; ) Tie_column::add_tie (tie_column_p_,tie_p_arr_ [i]); diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc index 8eeb7e3109..aee3ea0852 100644 --- a/lily/time-signature-engraver.cc +++ b/lily/time-signature-engraver.cc @@ -45,7 +45,7 @@ Time_signature_engraver::do_process_music() if (last_time_fraction_ != fr) { last_time_fraction_ = fr; - time_signature_p_ = new Item (get_property ("basicTimeSignatureProperties")); + time_signature_p_ = new Item (get_property ("TimeSignature")); time_signature_p_->set_elt_property ("fraction",fr); } diff --git a/lily/translator.cc b/lily/translator.cc index 905266cbea..4946af8027 100644 --- a/lily/translator.cc +++ b/lily/translator.cc @@ -88,10 +88,6 @@ Translator::do_add_processing () { } - - - - void Translator::creation_processing () { @@ -120,11 +116,8 @@ Translator::removal_processing () return; creation_processing (); do_removal_processing (); - // elegancy ... - // status_ = ORPHAN; } - bool Translator::try_music (Music * r) { diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc index 0c38ef1d2a..c102fd7ad5 100644 --- a/lily/tuplet-engraver.cc +++ b/lily/tuplet-engraver.cc @@ -74,7 +74,7 @@ Tuplet_engraver::do_process_music () if (i < started_span_p_arr_.size () && started_span_p_arr_[i]) continue; - Spanner* glep = new Spanner (get_property ("basicTupletSpannerProperties")); + Spanner* glep = new Spanner (get_property ("TupletBracket")); Tuplet_spanner::set_interface (glep); if (i >= started_span_p_arr_.size ()) started_span_p_arr_.push (glep); diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc index fa4d80f0a8..db986562af 100644 --- a/lily/vertical-align-engraver.cc +++ b/lily/vertical-align-engraver.cc @@ -34,12 +34,7 @@ Vertical_align_engraver::Vertical_align_engraver() void Vertical_align_engraver::do_creation_processing() { - valign_p_ =new Spanner (get_property ("basicVerticalAlignmentProperties")); - Align_interface::set_interface (valign_p_); - Align_interface::set_axis (valign_p_,Y_AXIS); - valign_p_->set_elt_property ("stacking-dir", - gh_int2scm (DOWN)); - + valign_p_ =new Spanner (get_property ("VerticalAlignment")); valign_p_->set_bound(LEFT,unsmob_element (get_property ("currentCommandColumn"))); announce_element (valign_p_ , 0); } diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc index 84218a5ce2..d80304ad9b 100644 --- a/lily/volta-engraver.cc +++ b/lily/volta-engraver.cc @@ -109,7 +109,7 @@ Volta_engraver::do_process_music () volta_span_p_ = 0; } - volta_span_p_ = new Spanner (get_property ("basicVoltaBracketProperties")); + volta_span_p_ = new Spanner (get_property ("VoltaBracket")); Volta_spanner::set_interface (volta_span_p_); announce_element (volta_span_p_,0); volta_span_p_->set_elt_property ("text", str); diff --git a/ly/book-fragment.ly b/ly/book-fragment.ly index cf792a4408..2ed7db67fb 100644 --- a/ly/book-fragment.ly +++ b/ly/book-fragment.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.59"; +\version "1.3.93"; \include "declarations.ly" diff --git a/ly/book-init.ly b/ly/book-init.ly index 95abb1a0c6..b88f349620 100644 --- a/ly/book-init.ly +++ b/ly/book-init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.59"; +\version "1.3.93"; \include "declarations.ly"; diff --git a/ly/catalan.ly b/ly/catalan.ly index 2d3d5238c5..1c71d9722f 100644 --- a/ly/catalan.ly +++ b/ly/catalan.ly @@ -71,4 +71,4 @@ -\version "1.3.59"; +\version "1.3.93"; diff --git a/ly/center-fragment.ly b/ly/center-fragment.ly index 6253a5330c..6f87babb9b 100644 --- a/ly/center-fragment.ly +++ b/ly/center-fragment.ly @@ -1,7 +1,7 @@ % Toplevel initialisation file. -\version "1.3.59"; +\version "1.3.93"; \include "declarations.ly" diff --git a/ly/center.ly b/ly/center.ly index 887ac83a4e..ebd09b43fd 100644 --- a/ly/center.ly +++ b/ly/center.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.59"; +\version "1.3.93"; \include "declarations.ly" diff --git a/ly/deutsch.ly b/ly/deutsch.ly index 5a4beb4e0c..ae99df64f9 100644 --- a/ly/deutsch.ly +++ b/ly/deutsch.ly @@ -49,4 +49,4 @@ -\version "1.3.59"; +\version "1.3.93"; diff --git a/ly/english.ly b/ly/english.ly index 50042bb52b..bd89faceb7 100644 --- a/ly/english.ly +++ b/ly/english.ly @@ -77,5 +77,5 @@ (bss . ( -1 6 2 )) ) -\version "1.3.59"; +\version "1.3.93"; diff --git a/ly/engraver.ly b/ly/engraver.ly index 785e6223af..b5f51c2f0b 100644 --- a/ly/engraver.ly +++ b/ly/engraver.ly @@ -1,4 +1,6 @@ -% + +\version "1.3.93" + % % setup for Request->Element conversion. Guru-only % @@ -32,8 +34,6 @@ StaffContext=\translator { \consists "Piano_pedal_engraver"; -% \consists "Arpeggio_engraver"; - \consistsend "Axis_group_engraver"; %{ @@ -78,10 +78,10 @@ RhythmicStaffContext=\translator{ \consists "Pitch_squash_engraver"; \consists "Separating_line_group_engraver"; \name RhythmicStaff; - basicBarProperties \push #'bar-size = #4 - basicVoltaSpannerProperties \push #'minimum-space = #15 % urg, in \pt - basicVoltaSpannerProperties \push #'padding = #5 % urg, in \pt - basicStaffSymbolProperties \push #'line-count = #1 + Bar \push #'bar-size = #4 + VoltaBracket \push #'minimum-space = #15 % urg, in \pt + VoltaBracket \push #'padding = #5 % urg, in \pt + StaffSymbol \push #'line-count = #1 % \consists "Repeat_engraver"; \consists "Volta_engraver"; @@ -152,25 +152,25 @@ GraceContext=\translator { \consists "Property_engraver"; - basicStemProperties \push #'style = #"grace" - basicStemProperties \push #'flag-style = #"grace" - basicStemProperties \push #'stem-length = #6.0 - basicStemProperties \push #'direction = #1 - - basicNoteHeadProperties \push #'font-size = #-1 - basicStemProperties \push #'font-size = #-1 - basicStemProperties \push #'stem-shorten = #'(0) - basicBeamProperties \push #'font-size = #-1 - basicTextScriptProperties \push #'font-size = #-1 - basicSlurProperties \push #'font-size = #-1 - basicLocalKeyProperties \push #'font-size = #-1 - basicBeamProperties \push #'beam-thickness = #0.3 - basicBeamProperties \push #'beam-space-function = #(lambda (x) 0.5) - - basicStemProperties \push #'lengths = #(map (lambda (x) (* 0.8 x)) '(3.5 3.5 3.5 4.5 5.0)) - basicStemProperties \push #'beamed-lengths = + Stem \push #'style = #"grace" + Stem \push #'flag-style = #"grace" + Stem \push #'stem-length = #6.0 + Stem \push #'direction = #1 + + NoteHead \push #'font-size = #-1 + Stem \push #'font-size = #-1 + Stem \push #'stem-shorten = #'(0) + Beam \push #'font-size = #-1 + TextScript \push #'font-size = #-1 + Slur \push #'font-size = #-1 + Accidentals \push #'font-size = #-1 + Beam \push #'beam-thickness = #0.3 + Beam \push #'beam-space-function = #(lambda (x) 0.5) + + Stem \push #'lengths = #(map (lambda (x) (* 0.8 x)) '(3.5 3.5 3.5 4.5 5.0)) + Stem \push #'beamed-lengths = #'(0.0 2.5 2.0 1.5) - basicStemProperties \push #'minimum-beamed-lengths + Stem \push #'minimum-beamed-lengths = #(map (lambda (x) (* 0.8 x)) '(0.0 2.5 2.0 1.5)) weAreGraceContext = ##t @@ -191,7 +191,6 @@ GrandStaffContext=\translator{ \type "Engraver_group_engraver"; \name GrandStaff; \consists "Span_bar_engraver"; - \consists "Span_arpeggio_engraver"; \consists "System_start_delimiter_engraver"; systemStartDelimiterGlyph = #'brace @@ -205,7 +204,7 @@ PianoStaffContext = \translator{\GrandStaffContext \consists "Vertical_align_engraver"; - basicVerticalAlignmentProperties \push #'threshold = #'(12 . 12) + VerticalAlignment \push #'threshold = #'(12 . 12) % \consistsend "Axis_group_engraver"; \name "PianoStaff"; @@ -213,13 +212,11 @@ PianoStaffContext = \translator{\GrandStaffContext StaffGroupContext= \translator { \type "Engraver_group_engraver"; - \name StaffGroup; - \consists "Span_bar_engraver"; - \consists "Span_arpeggio_engraver"; \consists "Output_property_engraver"; - systemStartDelimiterGlyph = #'bracket \consists "System_start_delimiter_engraver"; + systemStartDelimiterGlyph = #'bracket + \name StaffGroup; \accepts "Staff"; \accepts "RhythmicStaff"; \accepts "GrandStaff"; @@ -340,7 +337,6 @@ ScoreContext = \translator { \consists "Lyric_phrasing_engraver"; \consists "Bar_number_engraver"; - \consists "Span_arpeggio_engraver"; \accepts "Staff"; @@ -437,12 +433,7 @@ ScoreContext = \translator { % distances are given in stafflinethickness (thicknesses) and % staffspace (distances) % - basicArpeggioProperties = #`( - (interfaces . (arpeggio-interface)) - (molecule-callback . ,Arpeggio::brew_molecule) - (name . "arpeggio") - ) - basicBarProperties = #`( + BarLine = #`( (interfaces . (bar-interface staff-bar-interface)) (break-align-symbol . Staff_bar) (glyph . "|") @@ -459,63 +450,75 @@ ScoreContext = \translator { (thin-kern . 3.0) (hair-thickness . 1.6) (thick-thickness . 6.0) - (name . "barline") + (name . "BarLine") ) - basicBarNumberProperties = #`( + BarNumber = #`( (molecule-callback . ,Text_item::brew_molecule) (breakable . #t) (visibility-lambda . ,begin-of-line-visible) - (name . "barnumber") + (name . "BarNumber") (padding . 1.0) (direction . 1) ) - basicBeamProperties = #basic-beam-properties - basicBreakAlignProperties = #`( + Beam = #basic-beam-properties + + BreakAlignment = #`( (breakable . #t) (interfaces . (break-align-interface)) (stacking-dir . 1) (axes 0) + (X-offset-callbacks . (,Break_align_interface::self_align_callback)) (space-alist . ,default-break-align-space-alist) - (name . "break alignment") + (name . "BreakAlignment") ) - basicBreakAlignGroupProperties = #`( + + BreakAlignGroup = #`( (interfaces . (axis-group-interface)) (axes . (0)) - (name . "break alignment group") + (X-offset-callbacks . (,Break_align_interface::alignment_callback)) + + (name . "BreakAlignGroup") ) - basicBreathingSignProperties = #`( + + BreathingSign = #`( (interfaces . (breathing-sign-interface)) (break-align-symbol . Breathing_sign) (breakable . #t ) (molecule-callback . ,Breathing_sign::brew_molecule) + (Y-offset-callbacks . (,Breathing_sign::offset_callback)) (visibility-lambda . ,begin-of-line-invisible) - (name . "breathing sign") + (name . "BreathingSign") ) - basicClefItemProperties = #`( + + Clef = #`( (interfaces . (clef-interface)) (molecule-callback . ,Score_element::brew_molecule) (before-line-breaking-callback . ,Clef::before_line_breaking) (breakable . #t) (break-align-symbol . Clef_item) (visibility-lambda . ,begin-of-line-visible) - (name . "clef") - ) - basicChordNameProperties = #`( + (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) + (name . "Clef") + ) + + ChordName = #`( (molecule-callback . ,Chord_name::brew_molecule) (interfaces . (chord-name-interface)) (after-line-breaking-callback . ,Chord_name::after_line_breaking) (chord-name-function . ,default-chord-name-function) - (name . "chord name") + (name . "ChordName") ) - basicCollisionProperties = #`( + + NoteCollision = #`( (axes 0 1) (interfaces . (collision-interface)) (note-width . 1.65) - (name . "note collision") + (name . "NoteCollision") ) - basicCrescendoProperties = #`( + + Crescendo = #`( (molecule-callback . ,Crescendo::brew_molecule) (interfaces . (crescendo-interface dynamic-interface)) (thickness . 1.0) @@ -523,29 +526,39 @@ ScoreContext = \translator { (height . 0.6666) (dash-thickness . 1.2) (dash-length . 4.0) - (name . "crescendo") + (name . "Crescendo") + (self-alignment-Y . 0) + (Y-offset-callbacks . (,Side_position::aligned_on_self)) ) - basicDotColumnProperties = #`( + + DotColumn = #`( (interfaces . (dot-column-interface axis-group-interface )) (axes 0 ) - (name . "dot column") + (name . "DotColumn") ) - basicDotsProperties = #`( + + Dots = #`( (interfaces . (dot-interface)) (molecule-callback . ,Dots::brew_molecule) (dot-count . 1) - (name . "augmentation dot") + (position . 0.0) + (Y-offset-callbacks . (,Dots::quantised_position_callback ,Staff_symbol_referencer::callback)) + + (name . "Dots") ) - basicDynamicTextProperties = #`( + + DynamicText = #`( (style . "dynamic") (interfaces . (dynamic-interface)) + (Y-offset-callbacks . (,Side_position::aligned_on_self)) + (molecule-callback . ,Text_item::brew_molecule) (script-priority . 100) (self-alignment-Y . 0) - (name . "dynamic text") + (name . "DynamicText") ) - basicDynamicLineSpannerProperties = #`( + DynamicLineSpanner = #`( (interfaces . (dynamic-interface axis-group-interface side-position-interface)) (axes . ( 1)) (padding . 3) @@ -553,90 +566,109 @@ ScoreContext = \translator { (name . "dynamic alignment") ) - leftEdgeBasicProperties = #`( + LeftEdge = #`( (break-align-symbol . Left_edge_item) (breakable . #t) - (name . "left edge") + (name . "LeftEdge") ) - basicFingeringProperties = #`( + + Fingering = #`( (interfaces . (finger-interface text-script-interface text-item-interface side-position-interface)) (molecule-callback . ,Text_item::brew_molecule) (padding . 3.0) (self-alignment-X . 0) - (name . "fingering script") + (name . "Fingering") ) - basicGraceAlignItemProperties = #`( + + GraceAlignment = #`( (interfaces . (axis-group-interface align-interface)) (axes . (0)) (horizontal-space . 1.2) (padding . 1.0) (before-line-breaking-callback . ,Grace_align_item::before_line_breaking) - (name . "grace alignment") + (name . "GraceAlignment") ) - basicHaraKiriVerticalGroupspannerProperties = #`( - (interfaces . (hara-kiri-interface)) + + HaraKiriVerticalGroup = #`( + (Y-offset-callbacks . (,Hara_kiri_group_spanner::force_hara_kiri_callback)) + (Y-extent-callback . ,Hara_kiri_group_spanner::y_extent) + (interfaces . (hara-kiri-group-interface)) (axes 1) - (name . "hara kiri") + (name . "HaraKiriVerticalGroup") ) - basicHyphenSpannerProperties = #`( + + LyricHyphen = #`( + (interfaces . (lyric-hyphen-interface)) (thickness . 1.0) (height . 0.4) (minimum-length . 0.5) (molecule-callback . ,Hyphen_spanner::brew_molecule) - (name . "hyphen") + (Y-extent-callback . ,Score_element::point_dimension_callback) + (name . "LyricHyphen") ) - basicInstrumentNameProperties = #`( + InstrumentName = #`( + (interfaces . (instrument-name-interface)) (breakable . #t) + (Y-offset-callbacks . (,Side_position::centered_on_parent)) (molecule-callback . ,Text_item::brew_molecule) (break-align-symbol . Instrument_name) (visibility-lambda . ,begin-of-line-visible) - (name . "instrument name") + (name . "InstrumentName") ) - basicKeyProperties = #`( - (molecule-callback . ,Key_item::brew_molecule) + + KeySignature = #`( (interfaces . (key-item-interface)) + (molecule-callback . ,Key_item::brew_molecule) (break-align-symbol . Key_item) (visibility-lambda . ,begin-of-line-visible) (breakable . #t) - (name . "key signature") - ) - basicLocalKeyProperties = #`( + (name . "KeySignature") + ) + + Accidentals = #`( (molecule-callback . ,Local_key_item::brew_molecule) (left-padding . 0.2) (right-padding . 0.4) (interfaces . (accidentals-interface)) - (name . "accidentals") + (name . "Accidentals") ) - basicLineOfScoreProperties = #`( + + LineOfScore = #`( (axes . (0 1)) (interfaces . (axis-group-interface)) - (name . "godzilla") + (name . "LineOfScore") ) - basicLyricExtenderProperties = #`( + + LyricExtender = #`( (interfaces . (lyric-extender-interface)) (molecule-callback . ,Lyric_extender::brew_molecule) (height . 0.8) ; stafflinethickness; (right-trim-amount . 0.5) - (name . "extender line") + (Y-extent-callback . ,Score_element::point_dimension_callback) + (name . "LyricExtender") ) - basicLyricTextProperties = #`( + + LyricText = #`( (interfaces . (lyric-syllable-interface text-item-interface)) (molecule-callback . ,Text_item::brew_molecule) + (X-offset-callbacks . (,Side_position::aligned_on_self)) (self-alignment-X . 0) (non-rhythmic . #t) (word-space . 0.6) - (name . "lyric syllable") + (name . "LyricText") ) - basicMarkProperties = #`( + + RehearsalMark = #`( (interfaces . (mark-interface side-position-interface)) (molecule-callback . ,Text_item::brew_molecule) (breakable . #t) (visibility-lambda . ,end-of-line-invisible) (padding . 4.0) - (name . "rehearsal mark") + (name . "RehearsalMark") ) - basicMultiMeasureRestProperties = #`( + + MultiMeasureRest = #`( (interfaces . (multi-measure-rest-interface)) (spacing-procedure . ,Multi_measure_rest::set_spacing_rods) (molecule-callback . ,Multi_measure_rest::brew_molecule) @@ -644,80 +676,94 @@ ScoreContext = \translator { (expand-limit . 10) (padding . 2.0) ; staffspace (minimum-width . 12.5) ; staffspace - (name . "multi-measure rest") + (name . "MultiMeasureRest") ) - basicNoteColumnProperties = #`( + + NoteColumn = #`( (interfaces . (axis-group-interface note-column-interface)) (axes 0 1) - (name . "note column") + (name . "NoteColumn") ) - basicNoteHeadProperties = #`( + + NoteHead = #`( (interfaces . (note-head-interface rhythmic-head-interface)) (style . default) (molecule-callback . ,Note_head::brew_molecule) - (name . "note head") + (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) + (name . "NoteHead") ) - basicNoteNameProperties = #`( + + NoteName = #`( (molecule-callback . ,Text_item::brew_molecule) - (name . "note name") + (name . "NoteName") ) - basicOctavateEightProperties = #`( + + OctavateEight = #`( (self-alignment-X . 0) -= (text . "8") - (visibility-lambda . ,begin-of-line-visible) + (text . "8") + (visibility-lambda . ,begin-of-line-visible) + (X-offset-callbacks . + (,Side_position::centered_on_parent + ,Side_position::aligned_on_self + ,Side_position::aligned_side + )) (molecule-callback . ,Text_item::brew_molecule) (style . "italic") + (name . "OctavateEight") ) - basicPaperColumnProperties = #`( + + PaperColumn = #`( (interfaces . (paper-column-interface axis-group-interface)) (axes 0) (rank . -1) + (name . "PaperColumn") ) - %% These text props are only used by line-number-engraver... - basicTextProperties = #`( ) - - basicRestProperties = #`( + Rest = #`( (interfaces . (rest-interface rhythmic-head-interface)) (after-line-breaking-callback . ,Rest::after_line_breaking) (molecule-callback . ,Rest::brew_molecule) (minimum-beam-collision-distance . 1.5) - (name . "rest") + (name . "Rest") ) - basicRestCollisionProperties = #`( + RestCollision = #`( (interfaces . (rest-collision-interface)) (minimum-distance . 0.75) - (name . "rest collision") + (name . "RestCollision") ) - basicScriptProperties = #`( + + Script = #`( (molecule-callback . ,Script::brew_molecule) (interfaces . (script-interface side-position-interface)) - (name . "script") + (X-offset-callbacks . (,Side_position::centered_on_parent)) + (name . "Script") ) - basicScriptColumnProperties = #`( + + ScriptColumn = #`( (before-line-breaking-callback . ,Script_column::before_line_breaking) - (name . "script column") + (name . "ScriptColumn") ) - basicSlurProperties = #default-basic-slur-properties - basicSpacingSpannerProperties =#`( + + Slur = #default-basic-slur-properties + + SpacingSpanner =#`( (spacing-procedure . ,Spacing_spanner::set_springs) ;; assume that notes at least this long are present. (maximum-duration-for-spacing . ,(make-moment 1 8)) - (name . "spacing spanner") - ) - basicSpanArpeggioProperties = #`( - (interfaces . (span-arpeggio-interface)) - (molecule-callback . ,Span_arpeggio::brew_molecule) - (name . "span arpeggio") + (name . "SpacingSpanner") ) - basicSpanBarProperties = #`( + + SpanBar = #`( (interfaces . (bar-interface span-bar-interface)) (break-align-symbol . Staff_bar) (barsize-procedure . ,Span_bar::get_bar_size) (molecule-callback . ,Bar::brew_molecule) (visibility-lambda . ,begin-of-line-invisible) + (X-extent-callback . ,Span_bar::width_callback) + (Y-offset-callbacks . (,Span_bar::center_on_spanned_callback)) + (breakable . #t) (glyph . "|") (before-line-breaking-callback . ,Span_bar::before_line_breaking) @@ -730,23 +776,26 @@ ScoreContext = \translator { (thin-kern . 3.0) (hair-thickness . 1.6) (thick-thickness . 6.0) - (name . "cross staff bar-line") + (name . "SpanBar") ) - basicStanzaNumberProperties = #`( + + StanzaNumber = #`( (breakable . #t) (molecule-callback . ,Text_item::brew_molecule) (break-align-symbol . Clef_item) (visibility-lambda . ,begin-of-line-visible) - (name . "stanza number") + (name . "StanzaNumber") ) - basicStaffSymbolProperties = #`( + + StaffSymbol = #`( (interfaces . (staff-symbol-interface )) (molecule-callback . ,Staff_symbol::brew_molecule) (staff-space . 1.0) (line-count . 5 ) - (name . "staff symbol") + (name . "StaffSymbol") ) - basicSystemStartDelimiterProperties = #`( + + SystemStartDelimiter = #`( (molecule-callback . ,System_start_delimiter::brew_molecule) (after-line-breaking-callback . ,System_start_delimiter::after_line_breaking) (collapse-height . 1.0) @@ -757,16 +806,18 @@ ScoreContext = \translator { (arch-width . 1.5) (bracket-thick . 0.25) (bracket-width . 2.0) - (name . "system start bracket") + (name . "SystemStartDelimiter") ) - basicTextScriptProperties = #`( + + TextScript = #`( (molecule-callback . ,Text_item::brew_molecule) (no-spacing-rods . #t) (interfaces . (text-script-interface text-item-interface side-position-interface)) (padding . 3.0) - (name . "text script") + (name . "TextScript") ) - basicTieProperties = #`( + + Tie = #`( (interfaces . (tie-interface)) (molecule-callback . ,Tie::brew_molecule) (spacing-procedure . ,Tie::set_spacing_rods) @@ -775,38 +826,49 @@ ScoreContext = \translator { (thickness . 1.2) (x-gap . 0.2) (minimum-length . 2.5) - (name . "tie") + (name . "Tie") ) - basicTieColumnProperties = #`( + + TieColumn = #`( (after-line-breaking-callback . ,Tie_column::after_line_breaking) (interfaces . (tie-column-interface)) - (name . "tie column") + (name . "TieColumn") ) - basicTimeSignatureProperties = #`( + + TimeSignature = #`( (interfaces . (time-signature-interface)) (molecule-callback . ,Time_signature::brew_molecule) (break-align-symbol . Time_signature) (visibility-lambda . ,all-visible) (breakable . #t) - (name . "time signature") + (name . "TimeSignature") ) - basicTupletSpannerProperties = #`( + + TupletBracket = #`( (number-gap . 2.0) (delta-y . 0) (thick . 1.0) (after-line-breaking-callback . ,Tuplet_spanner::after_line_breaking) (molecule-callback . ,Tuplet_spanner::brew_molecule) (interfaces . (tuplet-spanner-interface)) + (name "TupletBracket") ) - basicSostenutoPedalProperties = #`( + + SostenutoPedal = #`( (molecule-callback . ,Text_item::brew_molecule) + (X-offset-callbacks . (,Side_position::aligned_on_self)) + (Y-offset-callbacks . + (,Side_position::aligned_side + ,Side_position::centered_on_parent)) + (style . "italic") (no-spacing-rods . #t) (self-alignment-X . 0) - (name . "sostenuto pedal") + (name . "SostenutoPedal") ) - basicStemProperties = #`( + + Stem = #`( (interfaces . (stem-interface)) (before-line-breaking-callback . ,Stem::before_line_breaking) (molecule-callback . ,Stem::brew_molecule) @@ -822,40 +884,56 @@ ScoreContext = \translator { (stem-shorten . (0.5)) ; if stem is on middle line, choose this direction. (default-neutral-direction . 1) - (name . "stem") + (X-offset-callbacks . (,Stem::off_callback)) + (name . "Stem") ) - basicStemTremoloProperties = #`( + StemTremolo = #`( (molecule-callback . ,Stem_tremolo::brew_molecule) (beam-width . 2.0) ; staff-space (beam-thickness . 0.42) ; staff-space (beam-space-function . ,default-beam-space-function) - (name . "stem tremolo") + (name . "StemTremolo") ) - basicSeparationItemProperties = #`( + + SeparationItem = #`( (interfaces . (separation-item-interface)) - (name . "separation item") + (name . "SeparationItem") ) - basicSeparatingGroupSpannerProperties = #`( + + SeparatingGroupSpanner = #`( (interfaces . (separation-spanner-interface)) (spacing-procedure . ,Separating_group_spanner::set_spacing_rods) - (name . "separation spanner") + (name . "SeparatingGroupSpanner") ) - basicSustainPedalProperties = #`( + + SustainPedal = #`( (interfaces . (sustain-pedal-interface side-position-interface)) (no-spacing-rods . #t) (molecule-callback . ,Sustain_pedal::brew_molecule) (self-alignment-X . 0) - (name . "sustain pedal") + (X-offset-callbacks . (,Side_position::aligned_on_self)) + (Y-offset-callbacks . + (,Side_position::aligned_side + ,Side_position::centered_on_parent)) + + (name . "SustainPedal") ) - basicUnaChordaPdealProperties = #`( + + UnaChordaPdeal = #`( (molecule-callback . ,Text_item::brew_molecule) (style . "italic") (no-spacing-rods . #t) (self-alignment-X . 0) - (name . "una chorda pedal") + (X-offset-callbacks . (,Side_position::aligned_on_self)) + (Y-offset-callbacks . + (,Side_position::aligned_side + ,Side_position::centered_on_parent)) + + (name . "UnaChordaPedal") ) - basicVoltaBracketProperties = #`( + + VoltaBracket = #`( (molecule-callback . ,Volta_spanner::brew_molecule) (interfaces . (volta-spanner-interface side-position-interface)) (direction . 1) @@ -863,17 +941,22 @@ ScoreContext = \translator { (thickness . 1.6) ; stafflinethickness (height . 2.0) ; staffspace; (minimum-space . 25) - (name . "volta brace") + (name . "VoltaBracket") ) - basicVerticalAlignmentProperties = #`( + + VerticalAlignment = #`( (axes 1) (interfaces . (align-interface axis-group-interface)) - (name . "vertical alignment") + (Y-extent-callback . ,Axis_group_interface::group_extent_callback) + (X-extent-callback . #f) + (stacking-dir . -1) + (name . "VerticalAlignment") ) - basicVerticalAxisGroupProperties = #`( + + VerticalAxisGroup = #`( (axes 1) (interfaces . (axis-group-interface)) - (name . "Y-axis group") + (name . "VerticalAxisGroup") ) diff --git a/ly/fragment.ly b/ly/fragment.ly index 43b2b15806..3989fbe6aa 100644 --- a/ly/fragment.ly +++ b/ly/fragment.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.59"; +\version "1.3.93"; \include "declarations.ly" diff --git a/ly/init-as.fly b/ly/init-as.fly index d8ab51ffa2..76d3082bb8 100644 --- a/ly/init-as.fly +++ b/ly/init-as.fly @@ -1,6 +1,6 @@ % Toplevel AsciiScript initialisation file. -\version "1.3.42"; +\version "1.3.93"; \include "declarations-as.ly" diff --git a/ly/init-as.ly b/ly/init-as.ly index 52e3f002ca..0c581e9733 100644 --- a/ly/init-as.ly +++ b/ly/init-as.ly @@ -1,6 +1,6 @@ % Toplevel AsciiScript initialisation file. -\version "1.3.59"; +\version "1.3.93"; \include "declarations-as.ly" diff --git a/ly/init.fly b/ly/init.fly index cc941a123f..40f7f94c06 100644 --- a/ly/init.fly +++ b/ly/init.fly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.42"; +\version "1.3.93"; \include "declarations.ly" diff --git a/ly/init.ly b/ly/init.ly index b7d9ee49b5..f26b2cc1f4 100644 --- a/ly/init.ly +++ b/ly/init.ly @@ -1,7 +1,7 @@ % Toplevel initialisation file. -\version "1.3.59"; +\version "1.3.93"; \include "declarations.ly"; diff --git a/ly/init.sly b/ly/init.sly index ae387ade84..4484454982 100644 --- a/ly/init.sly +++ b/ly/init.sly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.68"; +\version "1.3.93"; \include "declarations.ly" diff --git a/ly/italiano.ly b/ly/italiano.ly index d29cfaac07..4f741f6b1e 100644 --- a/ly/italiano.ly +++ b/ly/italiano.ly @@ -48,4 +48,4 @@ (sidd . ( -1 6 2 )) ) -\version "1.3.90"; +\version "1.3.93"; diff --git a/ly/norsk.ly b/ly/norsk.ly index 3a2f27e4dd..3ef63e733e 100644 --- a/ly/norsk.ly +++ b/ly/norsk.ly @@ -104,4 +104,4 @@ -\version "1.3.59"; +\version "1.3.93"; diff --git a/ly/paper-as5.ly b/ly/paper-as5.ly index 0e956f669a..78974f206e 100644 --- a/ly/paper-as5.ly +++ b/ly/paper-as5.ly @@ -1,6 +1,6 @@ % paper-as5.ly -\version "1.3.59"; +\version "1.3.93"; paper_as_five = \paper { staffheight = 5.\char; diff --git a/ly/paper-as9.ly b/ly/paper-as9.ly index 2c1fdb044e..323bd921a4 100644 --- a/ly/paper-as9.ly +++ b/ly/paper-as9.ly @@ -1,6 +1,6 @@ % paper-as9.ly -\version "1.3.59"; +\version "1.3.93"; paper_as_nine = \paper { staffheight = 9.\char; diff --git a/ly/paper11.ly b/ly/paper11.ly index 321b7b6e85..10b23e7ab8 100644 --- a/ly/paper11.ly +++ b/ly/paper11.ly @@ -1,6 +1,6 @@ % paper11.ly -\version "1.3.59"; +\version "1.3.93"; paper_eleven = \paper { staffheight = 11.0\pt; diff --git a/ly/paper13.ly b/ly/paper13.ly index bd3855fcef..b1399839a6 100644 --- a/ly/paper13.ly +++ b/ly/paper13.ly @@ -1,6 +1,6 @@ % paper13.ly -\version "1.3.59"; +\version "1.3.93"; paper_thirteen = \paper { staffheight = 13.0\pt; diff --git a/ly/paper16.ly b/ly/paper16.ly index 6cb1bdaedc..b045c81ae0 100644 --- a/ly/paper16.ly +++ b/ly/paper16.ly @@ -2,7 +2,7 @@ -\version "1.3.59"; +\version "1.3.93"; paper_sixteen = \paper { staffheight = 16.0\pt; diff --git a/ly/paper20.ly b/ly/paper20.ly index 40fe2f2067..3af633c2cf 100644 --- a/ly/paper20.ly +++ b/ly/paper20.ly @@ -1,7 +1,7 @@ % paper20.ly -\version "1.3.59"; +\version "1.3.93"; paper_twenty = \paper { staffheight = 20.0\pt; diff --git a/ly/paper23.ly b/ly/paper23.ly index 61889b9c0f..a3148706aa 100644 --- a/ly/paper23.ly +++ b/ly/paper23.ly @@ -1,7 +1,7 @@ % paper23.ly -\version "1.3.59"; +\version "1.3.93"; paper_twentythree = \paper { staffheight = 23.0\pt; diff --git a/ly/paper26.ly b/ly/paper26.ly index 484042d996..5c58adf608 100644 --- a/ly/paper26.ly +++ b/ly/paper26.ly @@ -1,6 +1,6 @@ % paper26.ly -\version "1.3.59"; +\version "1.3.93"; paper_twentysix = \paper { staffheight = 26.0\pt; diff --git a/ly/property.ly b/ly/property.ly index 3c255916de..d5e2211674 100644 --- a/ly/property.ly +++ b/ly/property.ly @@ -1,23 +1,23 @@ % property.ly -\version "1.3.59"; +\version "1.3.93"; -stemup = \property Voice.basicStemProperties \push #'direction = #1 -stemdown = \property Voice.basicStemProperties \push #'direction = #-1 -stemboth= \property basicStemProperties \pop #'direction +stemUp = \property Voice.Stem \push #'direction = #1 +stemDown = \property Voice.Stem \push #'direction = #-1 +stemBoth= \property Voice.Stem \pop #'direction -slurup = \property Voice.basicSlurProperties \push #'direction = #1 -slurboth = \property basicSlurProperties \pop #'direction -slurdown = \property Voice.basicSlurProperties \push #'direction = #-1 -shifton = \property Voice.basicNoteColumnProperties \push #'horizontal-shift = #1 -shiftonn = \property Voice.basicNoteColumnProperties \push #'horizontal-shift = #2 -shiftonnn = \property Voice.basicNoteColumnProperties \push #'horizontal-shift = #3 -shiftoff = \property basicNoteColumnProperties \pop #'horizontal-shift +slurUp = \property Voice.Slur \push #'direction = #1 +slurBoth = \property Voice.Slur \pop #'direction +slurDown = \property Voice.Slur \push #'direction = #-1 +shiftOn = \property Voice.NoteColumn \push #'horizontal-shift = #1 +shiftOnn = \property Voice.NoteColumn \push #'horizontal-shift = #2 +shiftOnnn = \property Voice.NoteColumn \push #'horizontal-shift = #3 +shiftOff = \property Voice.NoteColumn \pop #'horizontal-shift -tieUp = \property Voice.basicTieProperties \push #'direction = #1 -tieDown = \property Voice.basicTieProperties \push #'direction = #-1 -tieBoth = \property basicTieProperties \pop #'direction +tieUp = \property Voice.Tie \push #'direction = #1 +tieDown = \property Voice.Tie \push #'direction = #-1 +tieBoth = \property Voice.Tie \pop #'direction cadenzaOn = \property Score.timing = ##f cadenzaOff = { \property Score.timing = ##t @@ -25,48 +25,31 @@ cadenzaOff = { \property Score.timing = ##t } -onevoice = { - \stemboth +oneVoice = { + \stemBoth \tieBoth + \shiftOff } -voiceone = { \stemup +voiceOne = { \stemUp \tieUp } -voicetwo = { \stemdown +voiceTwo = { \stemDown \tieDown } -voicethree = { - \stemup - \shifton +voiceThree = { + \stemUp + \shiftOn } -voicefour = { - \stemdown - \shifton +voiceFour = { + \stemDown + \shiftOn } -% ugh, cluttering global namespace... - -% ugh2. -infinity=10000 -%{ - -slurnormal = - \property Voice.slurDash = ##f - - -slurdotted = - \property Voice.slurDash = 1 - - -tupletoff = - \property Voice.tupletVisibility = 0 - -tupleton = - \property Voice.tupletVisibility = 3 -%} +slurDotted = \property Voice.Slur \push #'dash = #1 +slurNoDots = \property Voice.Slur \pop #'dash tiny = diff --git a/ly/svenska.ly b/ly/svenska.ly index e25ade6934..39c808c5df 100644 --- a/ly/svenska.ly +++ b/ly/svenska.ly @@ -40,4 +40,4 @@ (hiss . ( -1 6 1 )) (hississ . ( -1 6 2 )) ) -\version "1.3.59"; +\version "1.3.93"; diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 86774d55b9..c1e1c8f272 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,15 +1,15 @@ Begin3 Title: LilyPond -Version: 1.3.93 -Entered-date: 04OCT00 +Version: 1.3.94 +Entered-date: 08OCT00 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.93.tar.gz + 1000k lilypond-1.3.94.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 1000k lilypond-1.3.93.tar.gz + 1000k lilypond-1.3.94.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index 6951325425..43985875f9 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 1.3.93 +Version: 1.3.94 Release: 1 License: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.93.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.94.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond # Icon: lilypond-icon.gif diff --git a/mutopia/Coriolan/bassi-part.ly b/mutopia/Coriolan/bassi-part.ly index af20caefed..cb859ce3ee 100644 --- a/mutopia/Coriolan/bassi-part.ly +++ b/mutopia/Coriolan/bassi-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; \include "bassi.ly" diff --git a/mutopia/Coriolan/bassi.ly b/mutopia/Coriolan/bassi.ly index cd6756fd96..e3df744bf3 100644 --- a/mutopia/Coriolan/bassi.ly +++ b/mutopia/Coriolan/bassi.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; \include "global.ly" \include "violoncello.ly" diff --git a/mutopia/Coriolan/c-midi.ly b/mutopia/Coriolan/c-midi.ly index a7f76b8e84..a46be9e81b 100644 --- a/mutopia/Coriolan/c-midi.ly +++ b/mutopia/Coriolan/c-midi.ly @@ -13,7 +13,7 @@ copyright = "public domain"; %% Hopefully, this can be junked when part-combiner+midi+dynamics work ok. %% -\version "1.3.88"; +\version "1.3.93"; \include "global.ly" diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly index c538c7fe4b..3fbb07fd71 100644 --- a/mutopia/Coriolan/clarinetti-part.ly +++ b/mutopia/Coriolan/clarinetti-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; \include "global.ly" \include "clarinetti.ly" diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly index 2931222184..ac37f17453 100644 --- a/mutopia/Coriolan/clarinetti.ly +++ b/mutopia/Coriolan/clarinetti.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; \include "clarinetto-1.ly" \include "clarinetto-2.ly" diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly index dd1a90b1c1..ab74729a67 100644 --- a/mutopia/Coriolan/clarinetto-1.ly +++ b/mutopia/Coriolan/clarinetto-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; clarinettoI = \notes \relative c { R1 *2 | diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly index f6c936a712..e8558d545e 100644 --- a/mutopia/Coriolan/clarinetto-2.ly +++ b/mutopia/Coriolan/clarinetto-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; clarinettoII = \notes \relative c { R1*2 bes''4-.\ff r r2 | diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly index f7336aa497..d17bc3a298 100644 --- a/mutopia/Coriolan/contrabasso.ly +++ b/mutopia/Coriolan/contrabasso.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; contrabasso = \notes \relative c { % copied 21 from cello diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly index 229b884455..9b117f67cf 100644 --- a/mutopia/Coriolan/coriolan.ly +++ b/mutopia/Coriolan/coriolan.ly @@ -11,7 +11,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; \include "global.ly" \include "paper16.ly" diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly index 419a3f3a38..6df2dd9e39 100644 --- a/mutopia/Coriolan/corni-part.ly +++ b/mutopia/Coriolan/corni-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; \include "global.ly" \include "corni.ly" diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly index 00804fd0c0..33010ced5b 100644 --- a/mutopia/Coriolan/corni.ly +++ b/mutopia/Coriolan/corni.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; \include "corno-1.ly" \include "corno-2.ly" diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly index c355bbf558..18e9317b98 100644 --- a/mutopia/Coriolan/corno-1.ly +++ b/mutopia/Coriolan/corno-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; cornoI = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly index 54df42524d..7b6b8d8902 100644 --- a/mutopia/Coriolan/corno-2.ly +++ b/mutopia/Coriolan/corno-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; cornoII = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/fagotti-part.ly b/mutopia/Coriolan/fagotti-part.ly index 7656907998..13e7689cac 100644 --- a/mutopia/Coriolan/fagotti-part.ly +++ b/mutopia/Coriolan/fagotti-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; \include "global.ly" \include "fagotti.ly" diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly index ff12fd44f7..ae652fb048 100644 --- a/mutopia/Coriolan/fagotti.ly +++ b/mutopia/Coriolan/fagotti.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; \include "fagotto-1.ly" \include "fagotto-2.ly" diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly index b3f185cb28..f50111926c 100644 --- a/mutopia/Coriolan/fagotto-1.ly +++ b/mutopia/Coriolan/fagotto-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; fagottoI = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly index 4156cd812c..0924c20b09 100644 --- a/mutopia/Coriolan/fagotto-2.ly +++ b/mutopia/Coriolan/fagotto-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; fagottoII = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly index 979e7514d3..47697dc50a 100644 --- a/mutopia/Coriolan/flauti-part.ly +++ b/mutopia/Coriolan/flauti-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; \include "global.ly" \include "flauti.ly" diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly index 894ccf822b..af11353197 100644 --- a/mutopia/Coriolan/flauti.ly +++ b/mutopia/Coriolan/flauti.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; \include "flauto-1.ly" \include "flauto-2.ly" diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly index 421655303e..f90d23136f 100644 --- a/mutopia/Coriolan/flauto-1.ly +++ b/mutopia/Coriolan/flauto-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; flautoI = \notes \relative c { R1 *2 | diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly index 5f4712ff7e..1ce6ec3d5a 100644 --- a/mutopia/Coriolan/flauto-2.ly +++ b/mutopia/Coriolan/flauto-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; flautoII = \notes \relative c { R1 *2 | diff --git a/mutopia/Coriolan/global.ly b/mutopia/Coriolan/global.ly index 6e196c4937..4bcb05fd7f 100644 --- a/mutopia/Coriolan/global.ly +++ b/mutopia/Coriolan/global.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; global = \notes { \time 4/4; diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly index 5f51bb7a8f..41f4d80dc7 100644 --- a/mutopia/Coriolan/oboe-1.ly +++ b/mutopia/Coriolan/oboe-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; oboeI = \notes \relative c'' { R1*2 | diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly index 92fed5760b..55122f7ddf 100644 --- a/mutopia/Coriolan/oboe-2.ly +++ b/mutopia/Coriolan/oboe-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; oboeII = \notes \relative c{ R1*2| diff --git a/mutopia/Coriolan/oboi-part.ly b/mutopia/Coriolan/oboi-part.ly index 07e0b59a56..71d3f8343b 100644 --- a/mutopia/Coriolan/oboi-part.ly +++ b/mutopia/Coriolan/oboi-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; \include "global.ly" \include "oboi.ly" diff --git a/mutopia/Coriolan/oboi.ly b/mutopia/Coriolan/oboi.ly index 1c660bec86..c9f69311e3 100644 --- a/mutopia/Coriolan/oboi.ly +++ b/mutopia/Coriolan/oboi.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; \include "oboe-1.ly" \include "oboe-2.ly" diff --git a/mutopia/Coriolan/timpani-part.ly b/mutopia/Coriolan/timpani-part.ly index 0522f75a57..bdf768053e 100644 --- a/mutopia/Coriolan/timpani-part.ly +++ b/mutopia/Coriolan/timpani-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; \include "global.ly" \include "timpani.ly" diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly index 230fa26fb7..7ae6525b9f 100644 --- a/mutopia/Coriolan/timpani.ly +++ b/mutopia/Coriolan/timpani.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; timpani = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/trombe-part.ly b/mutopia/Coriolan/trombe-part.ly index c60d58e7eb..e20953fec7 100644 --- a/mutopia/Coriolan/trombe-part.ly +++ b/mutopia/Coriolan/trombe-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; \include "global.ly" \include "trombe.ly" diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly index c71b550a1c..76d2aa0596 100644 --- a/mutopia/Coriolan/trombe.ly +++ b/mutopia/Coriolan/trombe.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; \include "trombo-1.ly" \include "trombo-2.ly" diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly index 1c5252ec6e..8d063406f0 100644 --- a/mutopia/Coriolan/trombo-1.ly +++ b/mutopia/Coriolan/trombo-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; tromboI = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly index 925a560162..555dd2797b 100644 --- a/mutopia/Coriolan/trombo-2.ly +++ b/mutopia/Coriolan/trombo-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; tromboII = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/viola-1.ly b/mutopia/Coriolan/viola-1.ly index 32c87b6cf2..2bf6cf6cc5 100644 --- a/mutopia/Coriolan/viola-1.ly +++ b/mutopia/Coriolan/viola-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; violaI = \notes \relative c { c'1\ff ~ | diff --git a/mutopia/Coriolan/viola-2.ly b/mutopia/Coriolan/viola-2.ly index 5a66c8c0ed..e010449511 100644 --- a/mutopia/Coriolan/viola-2.ly +++ b/mutopia/Coriolan/viola-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; violaII = \notes \relative c { c1\ff ~ | diff --git a/mutopia/Coriolan/violi-part.ly b/mutopia/Coriolan/violi-part.ly index 71d6c48167..d798aedc63 100644 --- a/mutopia/Coriolan/violi-part.ly +++ b/mutopia/Coriolan/violi-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; \include "violi.ly" diff --git a/mutopia/Coriolan/violi.ly b/mutopia/Coriolan/violi.ly index 465c167c2b..bb7d7f8dfe 100644 --- a/mutopia/Coriolan/violi.ly +++ b/mutopia/Coriolan/violi.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; \include "global.ly" \include "viola-1.ly" diff --git a/mutopia/Coriolan/violino-1-part.ly b/mutopia/Coriolan/violino-1-part.ly index 8ce0a1f83d..c704325214 100644 --- a/mutopia/Coriolan/violino-1-part.ly +++ b/mutopia/Coriolan/violino-1-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; \include "global.ly" \include "violino-1.ly" diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly index fca5ff48e6..71260f1e60 100644 --- a/mutopia/Coriolan/violino-1.ly +++ b/mutopia/Coriolan/violino-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; violinoI = \notes \relative c { c'1\ff ~ | diff --git a/mutopia/Coriolan/violino-2-part.ly b/mutopia/Coriolan/violino-2-part.ly index ee899f6cf7..78735b0e4b 100644 --- a/mutopia/Coriolan/violino-2-part.ly +++ b/mutopia/Coriolan/violino-2-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; \include "global.ly" \include "violino-2.ly" diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly index 87f75ae7f1..49932654a3 100644 --- a/mutopia/Coriolan/violino-2.ly +++ b/mutopia/Coriolan/violino-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; violinoII = \notes \relative c { c'1\ff ~ | diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly index c17fa996b0..86a1992af4 100644 --- a/mutopia/Coriolan/violoncello.ly +++ b/mutopia/Coriolan/violoncello.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.88"; +\version "1.3.93"; violoncello = \notes \relative c { c1\ff ~ | diff --git a/mutopia/D.Zipoli/verso_2.ly b/mutopia/D.Zipoli/verso_2.ly index 82f56b6512..ed46b8e751 100644 --- a/mutopia/D.Zipoli/verso_2.ly +++ b/mutopia/D.Zipoli/verso_2.ly @@ -17,7 +17,7 @@ title = "Verso II"; under the Gnu Public Licence. %} -\version "1.3.59"; +\version "1.3.93"; $voice_one = \notes \relative c' { a'2 bes4. [c16 bes] | a4 d ~ d c ~ | c b ~ [b8 a] a4 ~| @@ -86,8 +86,8 @@ organ={ \clef "G"; \global \context Staff < - { \voiceone \$voice_one } - { \voicetwo \$voice_two } + { \voiceOne \$voice_one } + { \voiceTwo \$voice_two } > } \context Staff = bass { diff --git a/mutopia/E.Satie/gnossienne-4.ly b/mutopia/E.Satie/gnossienne-4.ly index 5b10edcb16..f72e89bc5d 100644 --- a/mutopia/E.Satie/gnossienne-4.ly +++ b/mutopia/E.Satie/gnossienne-4.ly @@ -11,7 +11,7 @@ Tested Features: cross staff auto beams and slurs, grace notes, no bars %} -\version "1.3.59"; +\version "1.3.93"; global = \notes { \key a \minor; @@ -104,8 +104,8 @@ accompany = \notes \relative c { \context Staff=up < \global \context Voice=foo { - \stemup - \property Voice.basicScriptProperties \push #'direction = #1 + \stemUp + \property Voice.Script \push #'direction = #1 \melody } diff --git a/mutopia/E.Satie/petite-ouverture-a-danser.ly b/mutopia/E.Satie/petite-ouverture-a-danser.ly index f7360334e4..160993ac28 100644 --- a/mutopia/E.Satie/petite-ouverture-a-danser.ly +++ b/mutopia/E.Satie/petite-ouverture-a-danser.ly @@ -12,7 +12,7 @@ Tested Features: %} -\version "1.3.59"; +\version "1.3.93"; \include "nederlands.ly" @@ -39,7 +39,7 @@ global = \notes { i = \context Staff \notes\relative c''{ \context Voice=i - \stemup + \stemUp c8.( es16 bes4 ~ | )bes8 r c8.( bes16 | des4 c8. bes16 | c4 ~ ) c8 r | c4( f,8. as16 | bes4 ~ )bes8 r | f8.( es16 f4 | es )f | @@ -67,7 +67,7 @@ i = \context Staff \notes\relative c''{ ii = \context Staff \notes\relative c'{ \context Voice=ii - \stemdown + \stemDown r8 r | r r | r r | r r | r r | r r | @@ -85,9 +85,9 @@ ii = \context Staff \notes\relative c'{ r r | r r | r r | r r | - \translator Staff=bass\stemup + \translator Staff=bass\stemUp r r r | r - \translator Staff=treble\stemdown + \translator Staff=treble\stemDown r r | r r | r r | r r | diff --git a/mutopia/F.Schubert/standchen-16.ly b/mutopia/F.Schubert/standchen-16.ly index 92135491c0..a4664d978e 100644 --- a/mutopia/F.Schubert/standchen-16.ly +++ b/mutopia/F.Schubert/standchen-16.ly @@ -9,6 +9,6 @@ description = "A schubert song in 16 pt"; copyright = "public domain"; } -\version "1.3.59"; +\version "1.3.93"; \include "standchen.ly" diff --git a/mutopia/F.Schubert/standchen-20.ly b/mutopia/F.Schubert/standchen-20.ly index 6e8b094129..38cc5d6d68 100644 --- a/mutopia/F.Schubert/standchen-20.ly +++ b/mutopia/F.Schubert/standchen-20.ly @@ -10,7 +10,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.59"; +\version "1.3.93"; % fool make-website % \include "standchen.ly"; diff --git a/mutopia/F.Schubert/standchen.ly b/mutopia/F.Schubert/standchen.ly index a7025e113d..0dfe91f8da 100644 --- a/mutopia/F.Schubert/standchen.ly +++ b/mutopia/F.Schubert/standchen.ly @@ -41,7 +41,7 @@ multiple \paper{}s in one \score Note: Original key f. %} -\version "1.3.59"; +\version "1.3.93"; vocalVerse = \notes\relative c''{ \property Voice.dynamicDirection=\up diff --git a/mutopia/Hymns/diademata.ly b/mutopia/Hymns/diademata.ly index e010b894aa..afb5494ee0 100644 --- a/mutopia/Hymns/diademata.ly +++ b/mutopia/Hymns/diademata.ly @@ -7,7 +7,7 @@ metre = "6 6. 8 6. D"; } -\version "1.3.59"; +\version "1.3.93"; sop=\notes \transpose c''{ ees2 ees4 ees4 g2 g2 | c'1. @@ -70,8 +70,8 @@ $upper_staff = \context Staff = upper { \clef "treble"; \context Staff < \global - { \voiceone \sop } - { \voicetwo \alt } + { \voiceOne \sop } + { \voiceTwo \alt } > } @@ -79,8 +79,8 @@ $lower_staff = \context Staff = lower { \clef "bass"; \context Staff < \global - { \voiceone \ten } - { \voicetwo \bass } + { \voiceOne \ten } + { \voiceTwo \bass } > } diff --git a/mutopia/Hymns/laudatedom.ly b/mutopia/Hymns/laudatedom.ly index bb01415976..f2ac72c2a1 100644 --- a/mutopia/Hymns/laudatedom.ly +++ b/mutopia/Hymns/laudatedom.ly @@ -4,7 +4,7 @@ composer = "Parry"; metre = "10 10 . 11 11"; } -\version "1.3.59"; +\version "1.3.93"; sop = \notes \transpose c''{ f4 | d' bes c' | f2 \bar "||"; @@ -61,15 +61,15 @@ global = \notes { \context Staff=top { \global \clef "G"; \context Staff < - \notes{\voiceone \sop } - \notes{\voicetwo \alto } + \notes{\voiceOne \sop } + \notes{\voiceTwo \alto } > } \context Staff=bottom { \global \clef "F"; \context Staff < - \notes{\voiceone \tenor} - \notes{\voicetwo \bass } + \notes{\voiceOne \tenor} + \notes{\voiceTwo \bass } > } > diff --git a/mutopia/Hymns/maccabaeus.ly b/mutopia/Hymns/maccabaeus.ly index dd9eb31971..dc83b17e76 100644 --- a/mutopia/Hymns/maccabaeus.ly +++ b/mutopia/Hymns/maccabaeus.ly @@ -7,7 +7,7 @@ title = "Maccabaeus"; metre = "10 11. 11 11. and refrain"; } -\version "1.3.59"; +\version "1.3.93"; sop=\notes \relative c'' { b2 gis4. a8 |b2 e,2 | @@ -85,8 +85,8 @@ $upper_staff = \context Staff = upper { \global \clef "treble"; \context Staff < - {\voiceone \sop } - {\voicetwo \alt } + {\voiceOne \sop } + {\voiceTwo \alt } > } @@ -94,8 +94,8 @@ $lower_staff = \context Staff = lower { \global \clef "bass"; \context Staff < - {\voiceone \ten } - {\voicetwo \bass } + {\voiceOne \ten } + {\voiceTwo \bass } > } diff --git a/mutopia/Hymns/ode.ly b/mutopia/Hymns/ode.ly index fabe4073af..add1588684 100644 --- a/mutopia/Hymns/ode.ly +++ b/mutopia/Hymns/ode.ly @@ -7,7 +7,7 @@ metre = "8 7 8 7 D"; } -\version "1.3.59"; +\version "1.3.93"; sop=\notes \relative c'' { b4 b c d | d c b a | g g a b | b4. a8 a2 | @@ -52,8 +52,8 @@ $upper_staff = \context Staff = upper \notes { \clef "G"; \context Staff < \global - {\voiceone \sop} - {\voicetwo \alto} + {\voiceOne \sop} + {\voiceTwo \alto} > } @@ -61,8 +61,8 @@ $lower_staff = \context Staff = lower \notes { \clef "F"; \context Staff < \global - {\voiceone \tenor} - {\voicetwo \bass } + {\voiceOne \tenor} + {\voiceTwo \bass } > } diff --git a/mutopia/Hymns/stille.ly b/mutopia/Hymns/stille.ly index 8e706d195b..09712891a3 100644 --- a/mutopia/Hymns/stille.ly +++ b/mutopia/Hymns/stille.ly @@ -8,7 +8,7 @@ } -\version "1.3.59"; +\version "1.3.93"; %{ Note: there are other verses, but the three here seem to be @@ -178,8 +178,8 @@ upper= \notes { \clef "treble"; \context Staff < \global - { \voiceone \sop } - { \voicetwo \alt } + { \voiceOne \sop } + { \voiceTwo \alt } > } } @@ -189,8 +189,8 @@ lower = \notes { \clef "bass"; \context Staff < \global - { \voicethree \ten } - { \voicefour \bass } + { \voiceThree \ten } + { \voiceFour \bass } > } } diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly index e88e4afdb7..345ebfa809 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly @@ -4,7 +4,7 @@ piece = "Allemande"; } -\version "1.3.59"; +\version "1.3.93"; global = \notes{ \time 4/4; @@ -28,14 +28,14 @@ hoyreEn = \notes\relative c'''{ [es16 f g8][as,16 g' f es][f g as8][b,16 as' g f] | %5 \context Staff < { - \stemup es4~ [es8. c16] d4~ [d8. b16] | + \stemUp es4~ [es8. c16] d4~ [d8. b16] | c4.~ [c16 b] c4~ [c16 c bes as] | - \stemboth [g c32 d es16 c][g8 as] \stemup bes4~ [bes8 g'~] | - \stemboth [g16 c,32 d es16 c][a f' c32 d es16] \stemup d4~ [d8 d] | + \stemBoth [g c32 d es16 c][g8 as] \stemUp bes4~ [bes8 g'~] | + \stemBoth [g16 c,32 d es16 c][a f' c32 d es16] \stemUp d4~ [d8 d] | [d8 c] r16 [fis g a][es8 d] r16 [g a bes] | [f8 e] r16 [a bes c][g8 fis] r16 [es d c] | } { - \stemdown r16 [b c g][as es f8] r16 [g as f][g d es8~] | + \stemDown r16 [b c g][as es f8] r16 [g as f][g d es8~] | %TODO når du får tak i en til urtekst må denne og neste takt sammenliknes. [es16 f32 g as16 f][d f8.~][f16 f es d][es8 f] | s4 r4 r16 [f g d] es8 r | @@ -50,9 +50,9 @@ hoyreEn = \notes\relative c'''{ [d fis g bes~][bes fis g d][es fis g bes~][bes fis g bes] | [e a, bes fis][g bes a g][fis d es bes][c es d c] | \context Staff < - { \stemup [bes8 d'][bes a16 g] g4~ g16 } - { \stemup s2 s16 d8.~ d16 } - { \stemdown r8 <[g d>] r16 [d16 b8~] b16 } + { \stemUp [bes8 d'][bes a16 g] g4~ g16 } + { \stemUp s2 s16 d8.~ d16 } + { \stemDown r8 <[g d>] r16 [d16 b8~] b16 } > [es'16 d c] | %17 @@ -74,8 +74,8 @@ hoyreEn = \notes\relative c'''{ [es g'( as, )g][f as'16( g][as g fis )g] | fis4.~ [fis16 e32 fis][g16 d f es][d c b a] | \context Staff < - { \stemup [g8 g'][es d16 c] c4. } - { \stemdown r8 <[g c> ] } + { \stemUp [g8 g'][es d16 c] c4. } + { \stemDown r8 <[g c> ] } > s8 } @@ -91,10 +91,10 @@ venstreEn = \notes\relative c{ [c8 es][f, as][b, d][es, g] | [as f][g g'][c, g'] \context Staff < - { \stemup [c8 d] | es4 } - { \stemdown c4 ~ | [c8. g32 f] } + { \stemUp [c8 d] | es4 } + { \stemDown c4 ~ | [c8. g32 f] } > - \stemboth [es, f g16 c,32 d es16][g,8. bes32 as][g as bes16 es,32 f g16] | + \stemBoth [es, f g16 c,32 d es16][g,8. bes32 as][g as bes16 es,32 f g16] | %8 [a,8 c][f a][bes8. f''32 es][d es f16 bes,32 c d16] | [es, g a bes][c d es c][fis, a bes c][d e fis d] | @@ -108,8 +108,8 @@ venstreEn = \notes\relative c{ %16 [g16 a bes c][d8 d,] \context Staff < - { \stemup r8 r16 d' g } - { \stemdown g,4~ g16 } + { \stemUp r8 r16 d' g } + { \stemDown g,4~ g16 } > r16 r8 | %17 diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly index a279987a65..71d4175e33 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly @@ -10,7 +10,7 @@ %% %% Noe liknende skjer også i mellom andre og tredje stemme i takt 28 -\version "1.3.59"; +\version "1.3.93"; global = \notes{ \time 2/4; @@ -264,7 +264,7 @@ vTwo = \context Voice = voiceTwo \notes\relative c{ c4 b8 | } vThree = \context Voice = voiceThree \notes\relative c{ - \stemdown + \stemDown c4 r8 c | d4 r | r8 [es f g] | @@ -389,91 +389,91 @@ vThree = \context Voice = voiceThree \notes\relative c{ vOneSwitch = \context Voice = voiceOne \notes{ s2*4 %5 - \stemup s2*17 + \stemUp s2*17 %22 - \stemdown s16*1 - \stemboth s16*7 + \stemDown s16*1 + \stemBoth s16*7 %23 s2*12 %35 - s4 \stemup s4 + s4 \stemUp s4 s2*3 %39 - \stemboth s2*2 + \stemBoth s2*2 %41 - \stemup s2*8 + \stemUp s2*8 %49 - \stemboth s2*3 + \stemBoth s2*3 %52 - \stemup s2*8 + \stemUp s2*8 %60 - \stemboth s2 + \stemBoth s2 %61 - \stemup s2*35 + \stemUp s2*35 %96 - \stemboth + \stemBoth } vTwoSwitch = \context Voice = voiceTwo \notes{ - \stemup s2*4 + \stemUp s2*4 %5 - \stemdown \translator Staff = treble s2*17 + \stemDown \translator Staff = treble s2*17 %22 - \stemup + \stemUp s2*6 %28 \translator Staff = bass s2*7 %35 - s4 \translator Staff = treble \stemdown s4 + s4 \translator Staff = treble \stemDown s4 s2*3 %39 - \translator Staff = bass \stemup s2*2 + \translator Staff = bass \stemUp s2*2 %41 - s4 \translator Staff = treble \stemdown s4 + s4 \translator Staff = treble \stemDown s4 %42 - s8 \translator Staff = bass \stemup s8*3 + s8 \translator Staff = bass \stemUp s8*3 %43 - s4 \translator Staff = treble \stemdown s4 + s4 \translator Staff = treble \stemDown s4 %44 - s8 \translator Staff = bass \stemup s8*3 + s8 \translator Staff = bass \stemUp s8*3 %45 - \translator Staff = treble \stemdown s2*4 + \translator Staff = treble \stemDown s2*4 %49 - \stemup \translator Staff = bass s2*3 + \stemUp \translator Staff = bass s2*3 %52 - s8*1 \stemdown \translator Staff = treble \stemdown s8*3 + s8*1 \stemDown \translator Staff = treble \stemDown s8*3 s2*7 %60 - \stemup \translator Staff = bass s2 + \stemUp \translator Staff = bass s2 %61 - \translator Staff = treble \stemdown s2*35 + \translator Staff = treble \stemDown s2*35 } vThreeSwitch = \context Voice = voiceThree \notes{ - \stemdown s2*6 + \stemDown s2*6 %7 - \stemboth s2*21 + \stemBoth s2*21 %28 - \stemdown s2*7 + \stemDown s2*7 %35 - s4 \stemboth s4 + s4 \stemBoth s4 %36 s2*3 %39 - \stemdown s2*7 + \stemDown s2*7 %46 - \stemboth s2*3 + \stemBoth s2*3 %49 - \stemdown s2*3 + \stemDown s2*3 %52 - s4 \stemboth s4 + s4 \stemBoth s4 s2 %54 s2*2 %HACK evt endre her, sammenlikne med Henle %56 s2*4 %60 - \stemdown + \stemDown } \score{ diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly index c31dcbc275..5f151f5784 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly @@ -10,7 +10,7 @@ copyright = "Public Domain"; } -\version "1.3.59"; +\version "1.3.93"; global = \notes { \time 4/4; @@ -24,29 +24,29 @@ global = \notes { } hoyreOpp = \notes\relative c'' { - \stemup + \stemUp es4^"Grave adagio" r16 [es d16. es32] f4 r16 [f16 f16. g32] | [as8. as16] [as16 g32 f g16. d32] es4 r16 [g g16. as32] | %3 bes4 r16 [bes,16 bes16. c32] [des8. des16] \context Staff < - { \stemup e4 } - { \stemup \property Voice.horizontalNoteShift = 1 [des16 c32 bes c16. g32] } + { \stemUp e4 } + { \stemUp \property Voice.horizontalNoteShift = 1 [des16 c32 bes c16. g32] } > %4 - f4 \stemboth r16 [f g16. as32] \stemup d,4 r16 [d g16. es32] | + f4 \stemBoth r16 [f g16. as32] \stemUp d,4 r16 [d g16. es32] | c4 ~ [c32 es des c des16. f32] [b,16. c32 b16. c32] d4 ~ | d2 ~ [d16. g,32 a16. b32] [c16. ] | <[es8. c> ] \context Staff < - { \stemup fis4 } - { \stemup \property Voice.horizontalNoteShift = 1 [es16 d32 c d16. a32] } + { \stemUp fis4 } + { \stemUp \property Voice.horizontalNoteShift = 1 [es16 d32 c d16. a32] } > g2 } hoyreNed = \notes\relative c'' { \clef violin; - \stemdown + \stemDown r16 [c b16. c32] d4 r16 [d d16. es32] | [f8. f16] f8 r r16 [es16 es16. f32] | r16 [g16 g16. as32] [bes8. bes16] bes8 r | @@ -59,7 +59,7 @@ hoyreNed = \notes\relative c'' { venstreOpp = \notes\relative c' { \clef bass; - \stemup + \stemUp r r | r r | r r | @@ -67,8 +67,8 @@ venstreOpp = \notes\relative c' { %5 r16 <[g c,>] \context Staff < - {\stemup f4~ f} - {\stemup c4 d} + {\stemUp f4~ f} + {\stemUp c4 d} > r16 [f f16. g32] | %6 [as8. as16]~ [as g32 f g16 d] r | @@ -76,12 +76,12 @@ venstreOpp = \notes\relative c' { } venstreNed = \notes\relative c{ - \stemdown + \stemDown c4 r c r | r c c r | c r r c | c r r16 [c c16. bes32] bes4 | r16 [bes bes16. as32] as4_"tr" g r16 [d' d16. es32] | \context Staff < - { \stemdown \property Voice.horizontalNoteShift = 1 [f8. f16] [b,8. b16] g4 r | } - { \stemdown s4 g} + { \stemDown \property Voice.horizontalNoteShift = 1 [f8. f16] [b,8. b16] g4 r | } + { \stemDown s4 g} > r g g2 } @@ -90,12 +90,12 @@ andanteEn = \notes\relative c''{ [g16^"andante" c32 d es8~] [es16 d32 c es d c b] [c16 g as f] [g c g f] | [es16 c'32 d es d c16] [g' c, as' c,] [b c d b] g16 r16 r8 | %10 - \stemup [g'32 f es d c16 bes~] [bes des8 c16] + \stemUp [g'32 f es d c16 bes~] [bes des8 c16] [as'32 g f e f8~] [f32 g as g f es d es] | [f es d c bes16 as~] [as c8 bes16] [g'32 f es d es8~] [es32 f g f es d c b] %12 - \stemboth + \stemBoth [c bes as g f16 es'~] [es d32 c es d c b] [c d es f g16 c,~] [c b32 c d c b c] | [as'32 g f e f16 des~] [des c32 des es des c des] @@ -135,9 +135,9 @@ andanteEn = \notes\relative c''{ [d c bes a bes d bes g] | r16 [e'32 fis fis16.-\prall \times 2/3 { e64 fis g] } \context Staff < - { \stemup + { \stemUp [bes,32 a g fis g32 bes16.~] [bes16 c32 bes a bes c a] [fis8. g16] } - { \stemdown s8 g8 ~ g4 d} + { \stemDown s8 g8 ~ g4 d} > } @@ -145,11 +145,11 @@ andanteTo = \notes\relative c{ %8 [c8 c'] [f, g] [es c] [es g] | [c as] [es f] [g g,] - \stemdown \translator Staff = treble r16 [f''16 es d] | + \stemDown \translator Staff = treble r16 [f''16 es d] | %10 [es8 g] [e c] [f as] [f c] | [d f] [d bes] [es g] [es c] | - \stemboth \translator Staff = bass [as c] [f as,] [g c] [es g,] | + \stemBoth \translator Staff = bass [as c] [f as,] [g c] [es g,] | [f as] [g f] [es g] [f es] | %14 [d f] [as c,] [b d] [g d] | @@ -169,13 +169,13 @@ andanteTo = \notes\relative c{ [c16 d32 es f g as bes] [c16 c, c'8~] [c32 c, d es f g as bes][c16 c, c'8~]| [c c,] [bes bes'] [fis d] [g es] | \context Staff < - { \stemup r | + { \stemUp r | cis4~ [cis8. cis16] [d8 c16 bes] \context Staff < - { \stemup [a bes c8] } - { \stemdown a4 } > + { \stemUp [a bes c8] } + { \stemDown a4 } > | } - { \slurdown \stemdown cis,4 r d2( | )d1 \slurboth } + { \slurdown \stemDown cis,4 r d2( | )d1 \slurboth } > } @@ -212,10 +212,10 @@ allegroEn = \notes\relative c''{ %55 [e bes' g f] [e f g as] [g bes g f] | [e bes' g f] [e g bes des] [c bes as g]| - [as f' c bes] \stemup [as bes c des] [ c f c bes] | - [as f' c bes] \stemboth [as bes c des] [c f c bes] | - [a es' c bes] \stemup [a bes c des] [c es c bes] | - [a es' c bes] \stemboth [a c es ges] [f es des c] | + [as f' c bes] \stemUp [as bes c des] [ c f c bes] | + [as f' c bes] \stemBoth [as bes c des] [c f c bes] | + [a es' c bes] \stemUp [a bes c des] [c es c bes] | + [a es' c bes] \stemBoth [a c es ges] [f es des c] | %61 [des8 bes c des es des] | [c as bes c des c] [bes as bes g as bes] | @@ -238,27 +238,27 @@ allegroEn = \notes\relative c''{ %78 [f8 f,16 g] [as8 bes c d] | [es16 d c d] [es8 f g as] | - [b,16 g' d c] \stemup [b c d es] [d g d c] | + [b,16 g' d c] \stemUp [b c d es] [d g d c] | [b g' d c] [b c d es] [d g d c] | [b f' d c] [b c d es] [d f d c] | [b f' d c] [b d f as] [g f es d] | %84 [es f g es] [c g' f es] [d c bes as] | - \stemboth [g as bes8~] [bes16 c bes as] [g f e d] | + \stemBoth [g as bes8~] [bes16 c bes as] [g f e d] | [c g' c, bes] [c d e f] [es g c, bes] | [c g' f e] [f c f g] [as bes c d] | [es d c d] [es8 f16 g] [as8 des,] | [f b,] [d g,] [g'16 f es d] | \context Staff < - { \stemup [es8. c16] c4 ~ [b8.-\prall c16] | c2-\fermata } - { \stemdown r8 r16 | } + { \stemUp [es8. c16] c4 ~ [b8.-\prall c16] | c2-\fermata } + { \stemDown r8 r16 | } > } allegroTo = \notes\relative c'{ \clef bass; %30 \context Staff < - { \stemup r r4 r } - { \stemdown g,8 r8 r4 r } + { \stemUp r r4 r } + { \stemDown g,8 r8 r4 r } > r2. | r2. | \clef treble; r8 [c16 d] [es8 f] [g as] | @@ -279,10 +279,10 @@ allegroTo = \notes\relative c'{ [c c,] r16 [d''16 es f][es8 d] | [c c,] r16 [as' bes c][bes8 as] | [g c,] r16 [d' e f][e8 d] | [c c,] r16 [d e f][e8 c] %57 - [f f,] \stemdown \translator Staff = treble r16 [g'' as bes][as8 g] | - [f \stemboth \translator Staff = bass f,] r16 [des'16 es f][es8 des] | - [c f,] \stemdown \translator Staff = treble r16 [g' a bes][a8 g] | - [f \stemdown \translator Staff = bass f,] \stemboth r16 [g a bes][a8 f] | + [f f,] \stemDown \translator Staff = treble r16 [g'' as bes][as8 g] | + [f \stemBoth \translator Staff = bass f,] r16 [des'16 es f][es8 des] | + [c f,] \stemDown \translator Staff = treble r16 [g' a bes][a8 g] | + [f \stemDown \translator Staff = bass f,] \stemBoth r16 [g a bes][a8 f] | [bes16 c des8~][des16 c bes as][g f g bes] | %62 [as bes c8~][c16 bes as g][f e f as] | @@ -306,12 +306,12 @@ allegroTo = \notes\relative c'{ [as f' as, g][f c' des g,][a es' f b,] %79 [c f es d][c g' as d,][es b' c f,] | - [g8 g,] \stemdown \translator Staff = treble r16 [a'' b c][b8 a] | + [g8 g,] \stemDown \translator Staff = treble r16 [a'' b c][b8 a] | [g \translator Staff = bass g,] \translator Staff = treble r16 [es' f g][f8 es] | - [d \stemboth \translator Staff = bass g,] r16 [a b c][b8 a] | - [g8 g,] \stemdown \translator Staff = treble r8 [g''16 f][es d c b] | - [c8 \stemboth \translator Staff = bass c,16 d][es8 f g as] | + [d \stemBoth \translator Staff = bass g,] r16 [a b c][b8 a] | + [g8 g,] \stemDown \translator Staff = treble r8 [g''16 f][es d c b] | + [c8 \stemBoth \translator Staff = bass c,16 d][es8 f g as] | [bes16 as g as][bes8 c des g,] | %86 [bes e,][g c,][c'16 bes as g] | as4~ [as16 bes as g][f g as f] | diff --git a/mutopia/J.S.Bach/Duette/global-i.ly b/mutopia/J.S.Bach/Duette/global-i.ly index ca0b53a981..21fb5840e5 100644 --- a/mutopia/J.S.Bach/Duette/global-i.ly +++ b/mutopia/J.S.Bach/Duette/global-i.ly @@ -1,4 +1,4 @@ -\version "1.3.59"; +\version "1.3.93"; $global_i = \notes{ \time 12/8; diff --git a/mutopia/J.S.Bach/Duette/global-ii.ly b/mutopia/J.S.Bach/Duette/global-ii.ly index cc165b65bb..0cb7a29b63 100644 --- a/mutopia/J.S.Bach/Duette/global-ii.ly +++ b/mutopia/J.S.Bach/Duette/global-ii.ly @@ -1,4 +1,4 @@ -\version "1.3.59"; +\version "1.3.93"; $global_ii = \notes{ \time 4/4; diff --git a/mutopia/J.S.Bach/Duette/viola-i.ly b/mutopia/J.S.Bach/Duette/viola-i.ly index cdb9ef96e1..dc1c67eba1 100644 --- a/mutopia/J.S.Bach/Duette/viola-i.ly +++ b/mutopia/J.S.Bach/Duette/viola-i.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.59"; +\version "1.3.93"; \include "global-i.ly" \include "violoncello-i.ly"; diff --git a/mutopia/J.S.Bach/Duette/viola-ii.ly b/mutopia/J.S.Bach/Duette/viola-ii.ly index 4d10562208..7a593e1296 100644 --- a/mutopia/J.S.Bach/Duette/viola-ii.ly +++ b/mutopia/J.S.Bach/Duette/viola-ii.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.59"; +\version "1.3.93"; \include "global-ii.ly" \include "violoncello-ii.ly"; diff --git a/mutopia/J.S.Bach/Duette/viola-part.ly b/mutopia/J.S.Bach/Duette/viola-part.ly index e1479f2403..341c40e1ed 100644 --- a/mutopia/J.S.Bach/Duette/viola-part.ly +++ b/mutopia/J.S.Bach/Duette/viola-part.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.59"; +\version "1.3.93"; % { diff --git a/mutopia/J.S.Bach/Duette/violino-i.ly b/mutopia/J.S.Bach/Duette/violino-i.ly index 1bbdb808ac..f4a4a3b613 100644 --- a/mutopia/J.S.Bach/Duette/violino-i.ly +++ b/mutopia/J.S.Bach/Duette/violino-i.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.59"; +\version "1.3.93"; $violino_i = \notes\relative c'' { \property Voice.beamAutoEnd = "3/8" diff --git a/mutopia/J.S.Bach/Duette/violino-ii.ly b/mutopia/J.S.Bach/Duette/violino-ii.ly index 28c9e6cb21..2d7a922d9a 100644 --- a/mutopia/J.S.Bach/Duette/violino-ii.ly +++ b/mutopia/J.S.Bach/Duette/violino-ii.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.59"; +\version "1.3.93"; $violino_ii = \notes\relative c''{ R1*8 | @@ -101,4 +101,4 @@ $violino_ii_staff = \context Staff = violino < \$violino_ii \$global_ii > -\version "1.3.59"; +\version "1.3.93"; diff --git a/mutopia/J.S.Bach/Duette/violino-part.ly b/mutopia/J.S.Bach/Duette/violino-part.ly index 3156a1b6ed..dcef893cf0 100644 --- a/mutopia/J.S.Bach/Duette/violino-part.ly +++ b/mutopia/J.S.Bach/Duette/violino-part.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.59"; +\version "1.3.93"; % { diff --git a/mutopia/J.S.Bach/Duette/violino-viola.ly b/mutopia/J.S.Bach/Duette/violino-viola.ly index 0d42aab083..ebd7efa3e9 100644 --- a/mutopia/J.S.Bach/Duette/violino-viola.ly +++ b/mutopia/J.S.Bach/Duette/violino-viola.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.59"; +\version "1.3.93"; % { \include "violino-i.ly"; diff --git a/mutopia/J.S.Bach/Duette/violino-violoncello.ly b/mutopia/J.S.Bach/Duette/violino-violoncello.ly index 56b3a279ff..14d6a8b87f 100644 --- a/mutopia/J.S.Bach/Duette/violino-violoncello.ly +++ b/mutopia/J.S.Bach/Duette/violino-violoncello.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.59"; +\version "1.3.93"; % { \include "violino-i.ly"; diff --git a/mutopia/J.S.Bach/Duette/violoncello-i.ly b/mutopia/J.S.Bach/Duette/violoncello-i.ly index 00237bce7c..def89cf841 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-i.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-i.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.59"; +\version "1.3.93"; $violoncello_i = \notes\relative c{ \property Voice.beamAutoEnd = "3/8" diff --git a/mutopia/J.S.Bach/Duette/violoncello-ii.ly b/mutopia/J.S.Bach/Duette/violoncello-ii.ly index b8d32cb81f..9c56983852 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-ii.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-ii.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.59"; +\version "1.3.93"; $violoncello_ii = \notes\relative c{ r2 a'2|c e,| f8(e)d2 e8()fis| g a bes2 a8()gis| diff --git a/mutopia/J.S.Bach/Duette/violoncello-part.ly b/mutopia/J.S.Bach/Duette/violoncello-part.ly index 59b8371d21..8bb9f8551c 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-part.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-part.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.59"; +\version "1.3.93"; % { diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly index b2e65c266b..30c0047213 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly @@ -44,7 +44,7 @@ Lemoine puts fermatas on ending bar lines everywhere. -\version "1.3.59"; +\version "1.3.93"; lowstaff = \translator "Staff" = "lower" @@ -77,22 +77,22 @@ upper = \context Staff=upper \notes\relative c { r4 - \stemboth - \stemup + \stemBoth + \stemUp r16 g,, b d - [ f \upstaff \stemdown g16 b d ] | - \stemup b - \lowstaff \stemdown + [ f \upstaff \stemDown g16 b d ] | + \stemUp b + \lowstaff \stemDown [ g b d ] f \upstaff [ g16 b d ] b [ g b d ] - \stemup + \stemUp % urg, below translator change affects previous beam too!? % howto separate translator command from previous beam end? \upstaff f g b f | - \stemboth + \stemBoth e c' g f e c' g e d c' f, e d b' f d | c b' e, d c a' e c @@ -108,10 +108,10 @@ upper = \context Staff=upper \notes\relative c { b d b g as f g d es fis a c < - { \stemup r c8 b16 } - \context Voice=ii { \stemdown d,8 f } + { \stemUp r c8 b16 } + \context Voice=ii { \stemDown d,8 f } > - \stemboth | + \stemBoth | \bar "|."; } @@ -130,8 +130,8 @@ lower = \context Staff=lower \notes\relative c{ g'-\mordent g, g'-\mordent g, | g' r s s | s s s s \clef "bass"; | < - { \stemup g1 ~ g ~ g ~ g ~ g ~ g ~ g } - \context Voice=ii { \stemdown g,1 ~ g ~ g ~ g ~ g ~ g ~ g } + { \stemUp g1 ~ g ~ g ~ g ~ g ~ g ~ g } + \context Voice=ii { \stemDown g,1 ~ g ~ g ~ g ~ g ~ g ~ g } > \bar "|."; diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly index 530557f9d1..c8f5e45aae 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly @@ -42,7 +42,7 @@ Old versions of LilyPond include this prelude with dynamics and fingerings. -\version "1.3.59"; +\version "1.3.93"; upper = \context Staff \notes\relative c{ \context Voice=i \property Voice . textStyle = "italic" @@ -55,8 +55,8 @@ upper = \context Staff \notes\relative c{ r4 - < { \stemup [d8 g, 8 b d] } - \context Voice = ii < \stemdown b g > + < { \stemUp [d8 g, 8 b d] } + \context Voice = ii < \stemDown b g > > @@ -64,10 +64,10 @@ upper = \context Staff \notes\relative c{ c2 r4 < - { \stemup c ~ c8} - \context Voice=ii { \stemdown ~ } + { \stemUp c ~ c8} + \context Voice=ii { \stemDown ~ } > - \stemboth + \stemBoth d, fis a fis d c' a | b g b d b g f'! d | e g, c e c g g' e | @@ -87,10 +87,10 @@ upper = \context Staff \notes\relative c{ lower = \context Staff \notes\relative c{ \context Voice=i < - { \stemup c1 ~ | c ~ | c } - \context Voice=ii { \stemdown c,1 ~ | c ~ | c } + { \stemUp c1 ~ | c ~ | c } + \context Voice=ii { \stemDown c,1 ~ | c ~ | c } > - \stemboth | + \stemBoth | r8 c e g e c c' e, | fis d fis a fis d d' fis, | g2 r4 g | diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly index 40145117bd..14863ebbe9 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly @@ -45,7 +45,7 @@ note, some have dotted half notes. %} -\version "1.3.59"; +\version "1.3.93"; upper = \notes \transpose c'' { diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly index 4b12ff5ee5..20326cf01a 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly @@ -31,7 +31,7 @@ } -\version "1.3.59"; +\version "1.3.93"; upper = \context Staff \notes\relative c \context Voice=i { @@ -52,15 +52,15 @@ upper = \context Staff \notes\relative c a gis fis e d' b | < { - \stemup + \stemUp \property Voice . textStyle = "roman" c4-\mordent^"(\\textsharp)" r r | c4-\mordent^"(\\textsharp)" r r \property Voice . textStyle = "italic" } - \context Voice=ii { \stemdown a4 r r | a4 r r } + \context Voice=ii { \stemDown a4 r r | a4 r r } > | - \stemboth + \stemBoth a'8 es d c bes a | g fis e! d c' a | %15 @@ -73,14 +73,14 @@ upper = \context Staff \notes\relative c f d f a d g, | < { - \stemup + \stemUp % ... textnatural % cis8-\prall e8-"poco cresc." cis a e' cis cis8-\prall e8 cis a e' cis } - \context Voice=ii { \stemdown a4 } + \context Voice=ii { \stemDown a4 } > - \stemboth + \stemBoth a8 e' cis a bes! a | g e' cis g e' cis | g e' cis g a g | @@ -103,25 +103,25 @@ upper = \context Staff \notes\relative c d a' f d cis d | e g e bes g' e | bes g' e cis a g' | - f16 d c bes \stemup a s16 s8 s4 | + f16 d c bes \stemUp a s16 s8 s4 | % ugh % s1 | s4 s4 s4 | %40 - s4 s16 [d16 f a] \stemdown [d, f a] \stemup d | - \stemboth + s4 s16 [d16 f a] \stemDown [d, f a] \stemUp d | + \stemBoth f a f d f d b d gis, b a gis | % arpeggio a8 < f4 d a > ~ [f8 e] - < { \stemup + < { \stemUp e4.^\prall d8 } - \context Voice=ii { \stemdown cis2 } + \context Voice=ii { \stemDown cis2 } > - \stemboth + \stemBoth d8 c! a d bes g | %45 c a fis bes g e | @@ -178,16 +178,16 @@ lower = \context Staff \notes\relative c{ cis, r r | cis cis' cis, | d s16 - \stemdown + \stemDown [g'16 f e] f a d, f | - a, \stemup [d c bes] - a \stemdown [ g f e] d f a d | - \stemup + a, \stemUp [d c bes] + a \stemDown [ g f e] d f a d | + \stemUp [f a] - \stemdown + \stemDown [d, f] a s s8 s4-"*" | - \stemboth + \stemBoth % ugh whole rest has duration of one bar R2. | % r4 r r | diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly index ddb0f635f6..3071bcfdbc 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly @@ -31,23 +31,23 @@ } -\version "1.3.59"; +\version "1.3.93"; one = \context Staff \notes\relative c{ \context Voice=i \skip 1; | - \stemup + \stemUp r4 d''2 cis4 | - \stemboth + \stemBoth d16 a' g f e f cis d e8.-\mordent f16 d8.-\prall cis16 | - \stemup + \stemUp cis4 ~ cis16 a d8 ~ d4 a | %5 b2 ~ b4 a ~ | - a16 a \stemup g! f g4 ~ g f ~ | + a16 a \stemUp g! f g4 ~ g f ~ | f16 a g f e16 g8. ~ g16 g f e d f8. ~ | f16 f e d b'4 a g | @@ -61,11 +61,11 @@ two = \context Staff \notes\relative c{ \context Voice=ii r16 d'' c bes a bes f g a8.-\mordent bes16 g8.-\prall f16 | - \stemdown + \stemDown f2 e2 | - \translator Staff=lower \stemup + \translator Staff=lower \stemUp r4 a, bes b | - \translator Staff=upper \stemdown + \translator Staff=upper \stemDown r16 b' a g f8. f16 e2 ~ | %5 e2 ~ e4 ~ e16 e f! d | @@ -79,17 +79,17 @@ two = \context Staff \notes\relative c{ three = \context Staff \notes\relative c{ \context Voice=iii - \stemup + \stemUp f2 e | - \stemboth + \stemBoth d16 d' c bes a bes f g a8.-\mordent bes16 g8.-\prall f16 | f2 g4 gis | a2 ~ a16 a g f e f c d | %5 - e8.-\mordent f16 d8.-\prall c16 \stemboth c4. d8 | - \stemdown + e8.-\mordent f16 d8.-\prall c16 \stemBoth c4. d8 | + \stemDown e4 ~ e16 f e d cis a b cis d e f d | \property Voice . textStyle = "finger" bes!2 a ~ | @@ -102,23 +102,23 @@ three = \context Staff \notes\relative c{ four = \context Staff \notes\relative c{ \context Voice=iv - \stemdown + \stemDown d2 cis | \skip 1*2; | \skip 4*3; - \translator Staff=upper \stemup \property Voice.horizontalNoteShift = 1 + \translator Staff=upper \stemUp \property Voice.horizontalNoteShift = 1 c''4 | %5 a gis ~ gis16 gis fis e \skip 4*1; - \translator Staff=lower \stemdown \property Voice.horizontalNoteShift = 0 - \stemup + \translator Staff=lower \stemDown \property Voice.horizontalNoteShift = 0 + \stemUp b2 a | g a4. gis16 a | gis2 < g8 cis,> e4 | d4. fis16 g r16 bes8. ~ bes4 | %10 - \stemdown + \stemDown d,1 } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly index c117c81428..ec4863e4d5 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly @@ -1,6 +1,6 @@ -\version "1.3.59"; +\version "1.3.93"; \include "allemande-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly index 39788eb40f..fee7c2d782 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly @@ -9,45 +9,45 @@ But merging melodic and scripts doen't work too well yet (see viola_scripts). allemande_a = \context Staff \notes \relative c { \context Voice=i - \stemup + \stemUp a'16 | - a8 bes16()a \stemboth + a8 bes16()a \stemBoth g()f e()d d()cis d()e a,8 bes16()g | - f( a )d f, e8 cis' \stemup d8. e16 \stemboth f g a bes! | + f( a )d f, e8 cis' \stemUp d8. e16 \stemBoth f g a bes! | %3 - \stemup c8 d16()es \stemboth d()c bes()a c()bes a()g d'8. f,16 | + \stemUp c8 d16()es \stemBoth d()c bes()a c()bes a()g d'8. f,16 | e( g )bes d c()bes a()g bes()a g()f < f8. a> | % urg fix - b f( e )d e cis' d cis \stemup d8. e16 \stemboth + b f( e )d e cis' d cis \stemUp d8. e16 \stemBoth f( e d)e | %6 d( c b )c b( a gis)a gis8-\prall fis16()e e' c( a )g | - \stemup e' a, f d d f d b \stemboth + \stemUp e' a, f d d f d b \stemBoth gis( b e )gis b d c b | %8 c( a f )e d( f e )d gis8.-\trill()a16 b d e, d | % urg - c e a d \stemup b8.-\trill a16 a8 s4 s8 \stemboth | + c e a d \stemUp b8.-\trill a16 a8 s4 s8 \stemBoth | %10 - d,!16 gis( a b a gis fis )e \stemup e8 f16()e \stemboth + d,!16 gis( a b a gis fis )e \stemUp e8 f16()e \stemBoth d()c b()a | - \stemup d8 e16()f \stemboth e d c b - \stemup d'16()b c()a \stemboth e8 gis | + \stemUp d8 e16()f \stemBoth e d c b + \stemUp d'16()b c()a \stemBoth e8 gis | a,8. cis16 e g! f! e f a d gis, [ a8. ] %13 - e16 \stemup e8. f16 \stemboth + e16 \stemUp e8. f16 \stemBoth g!()e f()a cis,( d )e bes a8.-\trill()g16 | f a'(f)d g b,()cis a' g(f e)d fis d()es c( | %15 )bes g'(a, )g fis a d c' bes(fis)g bes d()a bes()g | es(d)es g c()a bes()g d c d g bes()fis g()es | %17 - c(bes)c bes' a(c)es g, \stemup fis8-\trill g16 a \stemboth + c(bes)c bes' a(c)es g, \stemUp fis8-\trill g16 a \stemBoth d,8 es16 c | - bes d g bes, d,8 fis' \stemup g8. a16 \stemboth bes d g, f | + bes d g bes, d,8 fis' \stemUp g8. a16 \stemBoth bes d g, f | %19 - \stemup e8.-\trill f16 \stemboth g e c bes + \stemUp e8.-\trill f16 \stemBoth g e c bes a()f' g,()f e g'( a )bes | bes( a g )f a()e f()d bes d(f)a d()a bes()g | @@ -59,12 +59,12 @@ allemande_a = \context Staff \notes \relative c { %23 cis(e g!)bes e()a, bes()g f()cis d()gis, a8 cis! | % knee - \stemup d,16 \stemboth d''(c!)a bes!(g)e cis' d a f d d,8. + \stemUp d,16 \stemBoth d''(c!)a bes!(g)e cis' d a f d d,8. } allemande_b = \notes \relative c { \context Voice=ii - \stemdown + \stemDown s16 | % s8 s2. | s8 s2. | @@ -76,9 +76,9 @@ allemande_b = \notes \relative c { s1 | f!16 s16*3 b, s16*3 s2 | s1 | - \slurdown + \slurDown s4 e [dis8 ~ dis32 e( fis gis] [a b c d! c b c )a] | - \slurboth + \slurBoth %10 s2 s8 s4 | s8 s4 s8 s4 | @@ -99,4 +99,4 @@ allemande = \context Staff \notes< > -\version "1.3.59"; +\version "1.3.93"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly index 3bb73dc71d..fb72fcc333 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly @@ -1,5 +1,5 @@ -\version "1.3.59"; +\version "1.3.93"; \include "allemande-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly index 53aa6f0309..cbad145c5b 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly @@ -1,5 +1,5 @@ -\version "1.3.59"; +\version "1.3.93"; \include "courante-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly index 0d27d057dd..8a35f8aafe 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly @@ -11,13 +11,13 @@ courante_a = \context Staff \notes \relative c { \context Voice=i d'16 | d a f a d, f g a bes a bes g | - \stemup s4 \stemboth g16 f g e | + \stemUp s4 \stemBoth g16 f g e | % urg, a good case for mean-distance-beam-dir-algorithm! f d e c! bes(a)bes a' g f e d | %4 cis e a,(b cis d e f )g bes-- a e | f a d,( e f g a bes )c bes-- d c | - \stemup ~ < c16 f,> bes a g \stemboth f()es d()es | + \stemUp ~ < c16 f,> bes a g \stemBoth f()es d()es | %7 d bes(a)bes d bes e! bes f' bes, g' bes, | e, g c d e f g a bes a bes g | @@ -34,12 +34,12 @@ courante_a = \context Staff \notes \relative c { e'16 %17 e cis a cis e, f g a bes()g cis()g | - \stemup d'4 ~ d16 a d e f d a c! \stemboth | + \stemUp d'4 ~ d16 a d e f d a c! \stemBoth | b16 f(d)f g, d' f g b f d' f, | %20 e g c, d e f g a bes! d c g | - \stemup a s16*3 s4 s4 - d, ~ d16 e! f g \stemboth a bes c d | + \stemUp a s16*3 s4 s4 + d, ~ d16 e! f g \stemBoth a bes c d | %23 e, bes a g a f' g,()f c g' f' e | f a bes a g f e f g e f d | @@ -58,7 +58,7 @@ courante_a = \context Staff \notes \relative c { courante_b = \notes \relative c { \context Voice=ii - \stemdown + \stemDown s16 | s2. | %2 @@ -75,9 +75,9 @@ courante_b = \notes \relative c { f'4 s s | s2.*2 %21 - \slurup + \slurUp f16 c'(bes a g f es d )es c' f, es | - \slurboth + \slurBoth bes4 s s s2.*9 s2 s8. @@ -88,4 +88,4 @@ courante = \context Staff \notes< \$courante_b > -\version "1.3.59"; +\version "1.3.93"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly index 5bb63c9c8f..33a7d5a3f6 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly @@ -1,7 +1,7 @@ -\version "1.3.59"; +\version "1.3.93"; \include "courante-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly index 0cab683945..401d0d13d9 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly @@ -1,7 +1,7 @@ -\version "1.3.59"; +\version "1.3.93"; \include "gigue-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly index 6cf2f6f46e..d31d4893e4 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly @@ -22,8 +22,8 @@ gigue_notes = \context Staff \notes \relative c { f4-\trill a8 | b,()g' cis, | d f16( c bes )a | g8()es' a, | bes d16( a g )f | e!8()cis' bes' a g16( f e)d | %15 - \stemup e(f g e f)d \stemboth e8()a, c'! | - \stemup c16(d es c d)a bes8 r bes | + \stemUp e(f g e f)d \stemBoth e8()a, c'! | + \stemUp c16(d es c d)a bes8 r bes | bes16(c d bes c)g a8 r a | %21 b16()c d()b c()a | d()e f()d e()c | b()c d()b c()a | e'4 gis,8 | @@ -32,7 +32,7 @@ gigue_notes = \context Staff \notes \relative c { %27 a()b c()a d()b | a()b c()a d()b | - f'8 e16()d c()b \stemboth | + f'8 e16()d c()b \stemBoth | e,, e''(d)c b()gis | a f(e)d e()cis | a4 %33 c'!8 | @@ -44,33 +44,33 @@ gigue_notes = \context Staff \notes \relative c { %45 as(g)as fis g es' | d,8 g fis | g16 es(d)c d()bes | g4 bes'8 % what about this? - \stemup\stemdown e,!16(f)g e f d\stemboth + \stemUp\stemDown e,!16(f)g e f d\stemBoth c(d e) c d bes | a(bes)c a bes g | f4 a'8 % what about this? - \stemup\stemdown d,16(e)f d e c\stemboth bes(c)d bes c a + \stemUp\stemDown d,16(e)f d e c\stemBoth bes(c)d bes c a g16(a)bes g a f | e4 g'8 %57 a,16(b cis d)e g-. | f(g a cis )d f, | e(f g a)bes d,-. | cis(d)e a, bes g - \stemup + \stemUp d'()e f()d g()e | %62 d()e f()d g()e | d()e f()d g()e | d()e f()d g()e | - \stemboth + \stemBoth cis bes'(a g f)e | f, a' g f e cis | %67 d bes a g a f | d a' d e f d | - \stemup es()f g()es f()d | g()a bes()g a()f es()f g()es f()d | + \stemUp es()f g()es f()d | g()a bes()g a()f es()f g()es f()d | %72 - cis'4 \stemboth d16()c | bes(a g f e)d | cis(b a g f)e | d f a d f a | + cis'4 \stemBoth d16()c | bes(a g f e)d | cis(b a g f)e | d f a d f a | d4 } gigue_b = \context Staff \notes \relative c { \context Voice=ii - \stemdown + \stemDown s8 s4.*14 a4. | s d | d8 g, d' | e4. | f8 f, f' | @@ -82,9 +82,9 @@ gigue_b = \context Staff \notes \relative c { %33 s8 s4.*16 - \stemup bes4 s8 + \stemUp bes4 s8 s4. s s - a8 s4 \stemdown + a8 s4 \stemDown s4.*7 s s g s s a s s bes s s s4.*4 @@ -102,4 +102,4 @@ gigue = \notes< \$gigue_b > -\version "1.3.59"; +\version "1.3.93"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly index e988b49cba..0fabc3941b 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly @@ -1,6 +1,6 @@ -\version "1.3.59"; +\version "1.3.93"; \include "gigue-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly index ea3b68ee7c..0cbaba1420 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly @@ -1,7 +1,7 @@ -\version "1.3.59"; +\version "1.3.93"; \include "menuetto-urtext.ly"; @@ -14,7 +14,7 @@ menuetto_i_cello_global = \notes{ } \repeat "volta" 2 { \skip 2.*1; - \slurdotted + \slurDotted \skip 2.*14; \emptyText s2._"Fine" @@ -71,7 +71,7 @@ menuetto_ii_cello_global = \notes{ } \repeat "volta" 2 { \skip 2.*1; - \slurdotted + \slurDotted \skip 2.*14; \emptyText s2._"Menuetto I da Capo" diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly index 8c717afbb1..2c6fe350b4 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly @@ -42,14 +42,14 @@ menuetto_i_a = \context Staff \notes \relative c { menuetto_i_b = \context Staff \notes \relative c { \context Voice = ii - \stemdown + \stemDown \skip 2.*1; | \skip 8*5; | \skip 2.*1; | a,8 \skip 8*5; | \skip 2.*1; | e'8 \skip 8*5; | - \stemboth + \stemBoth s2.*2 | s2. g8 \skip 8*5; | @@ -71,24 +71,24 @@ menuetto_i_b = \context Staff \notes \relative c { % UGH, fix this like in sarabande menuetto_i_a_voice_urg = \notes{ \context Voice = i - \skip 2.*1; \stemup - \skip 2.*1; \stemboth - \skip 2.*1; \stemup - \skip 2.*1; \stemboth - \skip 2.*1; \stemup - \skip 2.*1; \stemboth - \skip 2.*3; \stemup - \skip 2.*1; \stemup + \skip 2.*1; \stemUp + \skip 2.*1; \stemBoth + \skip 2.*1; \stemUp + \skip 2.*1; \stemBoth + \skip 2.*1; \stemUp + \skip 2.*1; \stemBoth + \skip 2.*3; \stemUp + \skip 2.*1; \stemUp \skip 2.*3; - \skip 4*2; \stemboth - \skip 4*2; \stemup - \skip2.*1; \stemup - \skip 4*2; \stemboth - \skip2.*1; \stemup - \skip 2.*1; \stemboth - \skip 2*1; \stemup + \skip 4*2; \stemBoth + \skip 4*2; \stemUp + \skip2.*1; \stemUp + \skip 4*2; \stemBoth + \skip2.*1; \stemUp + \skip 2.*1; \stemBoth + \skip 2*1; \stemUp \skip 4*1; - \skip 2.*4; \stemboth + \skip 2.*4; \stemBoth \skip 2.*1; } @@ -99,9 +99,9 @@ menuetto_i_a_voice_urg_urg = \notes< menuetto_i_b_voice_urg = \notes{ \context Voice=ii - \stemdown + \stemDown % urg urg, huh? - \skip 2.*8; \stemdown + \skip 2.*8; \stemDown } menuetto_i_b_voice_urg_urg = \notes< @@ -122,12 +122,12 @@ menuetto_ii = \context Staff\notes \relative c { d8( cis )b cis a g | % ugh, forcing knee % Lily's not yet smart enough to decide for herself. - \stemup fis \stemboth d''( cis b a )g | + \stemUp fis \stemBoth d''( cis b a )g | b( a g fis e )d | %7 cis d g4 fis8( g16 )a | - <\stemdown a,2. \stemup e'> | - \stemboth + <\stemDown a,2. \stemUp e'> | + \stemBoth cis4^\prall e8( d cis )b | cis4 g, cis' | fis,8()a d4 fis | @@ -148,4 +148,4 @@ menuetto_ii = \context Staff\notes \relative c { d2. } -\version "1.3.59"; +\version "1.3.93"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly index 61d0ebc254..633af16bb5 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly @@ -1,7 +1,7 @@ -\version "1.3.59"; +\version "1.3.93"; \include "menuetto-urtext.ly"; @@ -14,7 +14,7 @@ menuetto_i_viola_global = \notes{ \clef violin; \skip 2.*1; } \repeat "volta" 2 { - \slurdotted + \slurDotted \skip 2.*3; \clef alto; \skip 2.*11; @@ -70,7 +70,7 @@ menuetto_ii_viola_global = \notes{ \skip 2.*8; } \repeat "volta" 2 { \skip 2.*1; - \slurdotted + \slurDotted \skip 2.*14; \emptyText s2._"Menuetto I da Capo" diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly index 82cb02b163..0045c3a466 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly @@ -1,7 +1,7 @@ -\version "1.3.59"; +\version "1.3.93"; \include "prelude-urtext.ly"; 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 7a971639f2..ed6835206a 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly @@ -71,7 +71,7 @@ prelude_notes = \notes \relative c { e cis b cis a b cis d e d e cis | %47 d b a b f gis b cis d cis d b | - \stemup \stemboth r r | + \stemUp \stemBoth r r | bes16 g fis g es g d g es g bes d, | cis-- e! g a bes8. a16 g fis g e' | %51 @@ -79,18 +79,18 @@ prelude_notes = \notes \relative c { d bes a g fis-- a c! es d c bes a | bes g fis g es g d g es g bes d, | %54 - \stemup g'8. f16 - e!16 d cis b a g f e \stemboth | + \stemUp g'8. f16 + e!16 d cis b a g f e \stemBoth | d-- a' d e f e d c! bes! a g f | e-- a cis e g f e d cis b a g | f a d f a d, f a d bes! c! a | g, d' g a bes g fis g es' g, d' g, | - \stemup | | | | + \stemUp | | | | } prelude_b = \notes \relative c { \context Voice=ii - \stemdown + \stemDown s2.*47 %48 g4 s2 | @@ -194,4 +194,4 @@ prelude = \context Staff \notes< \$prelude_b > -\version "1.3.59"; +\version "1.3.93"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly index 894a1ca908..84974cdcfb 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly @@ -1,7 +1,7 @@ -\version "1.3.59"; +\version "1.3.93"; \include "prelude-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly index 1b3cb39228..1b82622798 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly @@ -1,7 +1,7 @@ -\version "1.3.59"; +\version "1.3.93"; \include "sarabande-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly index 3a5656491d..7344202daa 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly @@ -9,46 +9,46 @@ But merging melodic and scripts doen't work too well yet (see viola_scripts). sarabande_a = \context Staff \notes \relative c { \context Voice=i - \stemup d8. e16 e4.-\trill d16 e | - f4. \stemboth e8 d c | + \stemUp d8. e16 e4.-\trill d16 e | + f4. \stemBoth e8 d c | [bes g'] f e16(f g a bes)d, | cis4.-\trill b8 a g | % copy bar 1, half bar 2 - \stemup d'8. e16 f4.-\trill d16 e | + \stemUp d'8. e16 f4.-\trill d16 e | %5 - f4. \stemboth d8 e f | + f4. \stemBoth d8 e f | g bes16()a c()bes a()g d'8 f, | - \stemup e4.-\trill \stemboth d8 c bes | + \stemUp e4.-\trill \stemBoth d8 c bes | %8 - \stemup f' g16()a a4. g16()f | + \stemUp f' g16()a a4. g16()f | g8 a16()bes bes4. c16()d | % 11 - \stemboth e,8 f c, g' f' e | + \stemBoth e,8 f c, g' f' e | f4 f,2 | - \stemup a'4 a4.-\trill bes8 | - c bes16 a \stemboth fis8.-\trill es16 d8 c | + \stemUp a'4 a4.-\trill bes8 | + c bes16 a \stemBoth fis8.-\trill es16 d8 c | bes g' a, fis' es' d | %16 - \stemup bes4.-\trill \stemboth a8 g f! | + \stemUp bes4.-\trill \stemBoth a8 g f! | e bes a f' g a | d, as g es' f g | cis, bes' a g16 f e!8 f16 d | cis8 e16 a a,8. g'16 f8()e | %21 - \stemup d e16()f f4. e16()d | + \stemUp d e16()f f4. e16()d | e8 f16()g g4. a16()bes | a8 cis16 d d,8 e16 f32 g f8-\trill e16()d | d4 d,16 a'( b cis d e f )g | %25 a(b c)b c4. b16()a | b cis d cis d4. e16()f | - \stemboth d(cis)d f, a,8 e' d' cis | + \stemBoth d(cis)d f, a,8 e' d' cis | d4 d,,2 | } sarabande_b = \context Staff \notes \relative c { \context Voice=ii - \stemdown + \stemDown % dispute % d4 a2 | % this avoids the clash bug @@ -89,4 +89,4 @@ sarabande = \context Staff \notes< \$sarabande_b > -\version "1.3.59"; +\version "1.3.93"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly index 897411cb12..3619fd9a6b 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly @@ -1,4 +1,4 @@ -\version "1.3.59"; +\version "1.3.93"; \include "sarabande-urtext.ly"; diff --git a/mutopia/J.S.Bach/wtk1-fugue1.ly b/mutopia/J.S.Bach/wtk1-fugue1.ly index a62fc09853..293666b130 100644 --- a/mutopia/J.S.Bach/wtk1-fugue1.ly +++ b/mutopia/J.S.Bach/wtk1-fugue1.ly @@ -19,14 +19,14 @@ enteredby = "Shay Rojansky"; %{ TODO: use autobeaming. %} -\version "1.3.59"; +\version "1.3.93"; tenor = \context Voice = tenor \notes \relative c' { \clef "violin"; - \stemdown + \stemDown r8 [c8 d e] [f8. g32 f] [e8 a] | [d, g] ~ [g16 a g f] [e f e d] [c d c b ] | [a 8 fis'] g4 ~ [g8 fis16 e] [f8 d] | @@ -42,20 +42,20 @@ tenor = [e fis] [g8. a32 g] [fis8 b e, a] ~ | [a16 b a gis] [fis8 f!] [e d] ~ [d16 e fis gis] | [a gis a b] [gis fis gis a] b8 r8 r4 | - r8 [c,8 d e] \stemup [f8. g32 f] [e8 a] | + r8 [c,8 d e] \stemUp [f8. g32 f] [e8 a] | %% 15 - [d, g] ~ [g16 a g f] e8 \stemdown [e fis g] ~ | + [d, g] ~ [g16 a g f] e8 \stemDown [e fis g] ~ | [g8 fis] [gis8 a] ~ [a g! a b] | - \stemboth + \stemBoth [c8. d32 c ] [b8 e ] [a, d ] ~ [d 16 e d c ] | [b8 g' cis, d ] [e cis d e ] | - \stemdown a,8 r8 r e [fis g] \stemboth [a8. b32 a] | + \stemDown a,8 r8 r e [fis g] \stemBoth [a8. b32 a] | %% 20 - [g8 c fis, b] ~ [b16 c b a] \stemdown [g fis e d] \stemboth | - e4 \stemdown d ~ [d16 a' g f!] [e g f! a] | + [g8 c fis, b] ~ [b16 c b a] \stemDown [g fis e d] \stemBoth | + e4 \stemDown d ~ [d16 a' g f!] [e g f! a] | g4 ~ [g16 a bes8] c 4 [d 8 g,] | - \stemboth g4. f8 ~ [f e] d4 | - \stemdown e8 a4 g8 ~ [g8 f g a] | + \stemBoth g4. f8 ~ [f e] d4 | + \stemDown e8 a4 g8 ~ [g8 f g a] | %% 25 [bes8. c32 b] [a8 d ] [g, c ] ~ [c 16 d c bes] | [a bes a g] [f g f e] d4 ~ [d8. g16] | @@ -66,7 +66,7 @@ tenor = soprane = \context Voice = sop \notes \relative c' { - \stemup + \stemUp r1 | r2 r8 [g'8 a b] | [c8. d32 c ] [b8 e ] [a, d ] ~ [d 16 e d c ] | @@ -106,7 +106,7 @@ alt = \clef "bass"; - \stemup + \stemUp r1 | r | r | @@ -146,7 +146,7 @@ bass =\context Voice = bassvoice \clef "bass"; - \stemdown + \stemDown r1 | r | r | diff --git a/mutopia/J.S.Bach/wtk1-fugue2.ly b/mutopia/J.S.Bach/wtk1-fugue2.ly index 56393684cf..adf4f4136f 100644 --- a/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -21,11 +21,11 @@ % It would be nice to squeeze this onto two pages, but I am not sure % if it would work with US paper. -\version "1.3.59"; +\version "1.3.93"; dux = \context Voice=two \notes \relative c''{ - \voicetwo + \voiceTwo \clef violin; r8 c16 b c8 g as c16 b c8 d | @@ -43,7 +43,7 @@ dux = \context Voice=two \notes \relative c''{ as4 r8 a bes bes16 a bes8 f | g4 r8 g as as g f | r8 - \translator Staff = bass \stemup + \translator Staff = bass \stemUp as, bes c r8 as16 g as8 f8 | bes8 c bes as bes g f es | f des' c bes c as g f | @@ -51,8 +51,8 @@ dux = \context Voice=two \notes \relative c''{ g8 g'16 fis g8 c, es \translator Staff = treble - \stemboth - \stemdown + \stemBoth + \stemDown g16 fis! g8 a | d, g16 fis g8 a! c,16 d es4 d16 c | % forced accident! bes8 r8 r16 d e fis g a bes8 ~ bes16 e, f g | @@ -60,10 +60,10 @@ dux = \context Voice=two \notes \relative c''{ as f'16 es f8 a,8 bes g'16 f g8 b, | %%20 c16 f \translator Staff = bass - \stemboth \stemup + \stemBoth \stemUp es d c bes! as g f8 \translator Staff = treble - \stemboth \stemdown + \stemBoth \stemDown as' g f | es d es f b, c d b | c4 r8 e8 f f16 e f8 c | @@ -82,7 +82,7 @@ dux = \context Voice=two \notes \relative c''{ comes = \context Voice=one \notes \relative c'' { - \voiceone + \voiceOne R1 | R1 | r8 g'16 fis g8 c, es g16 fis g8 a | @@ -97,10 +97,10 @@ comes = \context Voice=one \notes \relative c'' { f f16 e f8 c8 d4 r8 d | es8 es16 d es8 bes c es16 d es8 f | bes, es16 d es8 f as,16 bes c4 bes16 as | - \stemboth g16 es f g as bes c d es d c d es f g a | + \stemBoth g16 es f g as bes c d es d c d es f g a | bes f, g as bes c d e f es d es f g a b | %%15 - \stemup c8 b16 a g f! es d c8 es d c | + \stemUp c8 b16 a g f! es d c8 es d c | bes a bes c fis,! g a fis | % forced accident g8 d'16 c d8 r8 r8 e16 d e8 r8 | r fis16 e fis8 r r g,16 f g8 r8 | @@ -149,7 +149,7 @@ bassdux = \context Voice=three \notes \relative c' { c16 d es8~ es16 a, bes c d es f8~ f16 b, c d | %%20 % es8 r r e f f, es! d | % -> \classic_accidentals - es8 r r e \stemboth \stemdown f f, es! d \stemboth | + es8 r r e \stemBoth \stemDown f f, es! d \stemBoth | r as' g f g f16 es f8 g | c16 d es d c bes as g f bes' as g f es d c | bes c d c bes as g f es as' g f es d c bes | @@ -162,8 +162,8 @@ bassdux = \context Voice=three \notes \relative c' { d c g' g, %%30 \context Staff=bass < - {\stemup c2 ~ | c1 ~ | c1 } - \context Voice=four {\stemdown c,2 ~ | c1 ~ | c1 } + {\stemUp c2 ~ | c1 ~ | c1 } + \context Voice=four {\stemDown c,2 ~ | c1 ~ | c1 } > } diff --git a/mutopia/J.S.Bach/wtk1-prelude1.ly b/mutopia/J.S.Bach/wtk1-prelude1.ly index 4d4ae50369..d7b4a48da0 100644 --- a/mutopia/J.S.Bach/wtk1-prelude1.ly +++ b/mutopia/J.S.Bach/wtk1-prelude1.ly @@ -15,7 +15,7 @@ enteredby = "Shay Rojansky"; lastupdated = "1999/Oct/14"; } -\version "1.3.59"; +\version "1.3.93"; % should do programmable input. soprane = @@ -26,7 +26,7 @@ soprane = \time 4/4; \clef "violin"; - \stemup + \stemUp r8 [g16 c'] [e' g c' e'] r8 [g16 c'] [e' g c' e'] | r8 [a16 d'] [f' a d' f'] r8 [a16 d'] [f' a d' f'] | r8 [g16 d'] [f' g d' f'] r8 [g16 d'] [f' g d' f'] | @@ -37,7 +37,7 @@ soprane = r8 [e16 g] [c' e g c'] r8 [e16 g] [c' e g c'] | r8 [e16 g] [c' e g c'] r8 [e16 g] [c' e g c'] } % Tenor - \context Voice = dVoice {\stemdown + \context Voice = dVoice {\stemDown r16 e8. ~ e4 r16 e8. ~ e4 | r16 d8. ~ d4 r16 d8. ~ d4 | r16 d8. ~ d4 r16 d8. ~ d4 | @@ -84,7 +84,7 @@ bass = \clef "bass"; - \stemdown + \stemDown c'2 c' | c' c' | b b | @@ -97,7 +97,7 @@ bass = %% 10 \context Staff < \context Voice = Alt - {\stemup + {\stemUp r16 a8. ~ a4 r16 a8. ~ a4 | r16 b8. ~ b4 r16 b8. ~ b4 | r16 bes8. ~ bes4 r16 bes8. ~ bes4 | @@ -129,7 +129,7 @@ bass = c1 ||} \context Voice = Bass - {\stemdown + {\stemDown d2 d | g g | g g | diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly index 595bf6afd4..dcb6f5a907 100644 --- a/mutopia/gallina.ly +++ b/mutopia/gallina.ly @@ -45,7 +45,7 @@ Voice engraver by uncommenting the lines in the paper definition below. --MB %} -\version "1.3.59"; +\version "1.3.93"; global = \notes { \property StaffGroup.timeSignatureStyle = "old" diff --git a/scm/slur.scm b/scm/slur.scm index f3f010acb3..41150ef8d6 100644 --- a/scm/slur.scm +++ b/scm/slur.scm @@ -113,6 +113,6 @@ (de-uglify-parameters . ( 1.5 0.8 -2.0)) (details . ((height-limit . 2.0) (ratio . 0.333) (force-blowfit . 0.5) (beautiful . 0.5))) (y-free . 0.75) - (name . "slur") + (name . "Slur") ) ) diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py index 5434a4c151..33401136d1 100644 --- a/scripts/convert-mudela.py +++ b/scripts/convert-mudela.py @@ -482,8 +482,6 @@ if 1: if 1: def conv (str): -# if re.search ('latexheaders *= *"\\\\input ',str): -# sys.stderr.write ('\nHello???') str = re.sub (r'latexheaders *= *"\\\\input ', 'latexheaders = "', str) @@ -491,6 +489,57 @@ if 1: conversions.append ((1,3,68), conv, 'latexheaders = "\\input global" -> latexheaders = "global"') + +################ TODO: lots of other syntax change should be done here as well + + + +if 1: + def conv (str): + str = re.sub ('basicCollisionProperties', 'NoteCollision', str) + str = re.sub ('basicVoltaSpannerProperties' , "VoltaBracket", str) + str = re.sub ('basicKeyProperties' , "KeySignature", str) + + str = re.sub ('basicClefItemProperties' ,"Clef", str) + + + str = re.sub ('basicLocalKeyProperties' ,"Accidentals", str) + str = re.sub ('basicMarkProperties' ,"Accidentals", str) + str = re.sub ('basic([A-Za-z_]+)Properties', '\\1', str) + return str + + conversions.append ((1,3,92), conv, 'basicXXXProperties -> XXX') + +if 1: + def conv (str): + str = re.sub ('\\\\stemup', '\\\\stemUp', str) + str = re.sub ('\\\\stemdown', '\\\\stemDown', str) + str = re.sub ('\\\\stemboth', '\\\\stemBoth', str) + str = re.sub ('\\\\slurup', '\\\\slurUp', str) + str = re.sub ('\\\\slurboth', '\\\\slurBoth', str) + str = re.sub ('\\\\slurdown', '\\\\slurDown', str) + str = re.sub ('\\\\slurdotted', '\\\\slurDotted', str) + str = re.sub ('\\\\slurnormal', '\\\\slurNoDots', str) + + str = re.sub ('\\\\shiftoff', '\\\\shiftOff', str) + str = re.sub ('\\\\shifton', '\\\\shiftOn', str) + str = re.sub ('\\\\shiftonn', '\\\\shiftOnn', str) + str = re.sub ('\\\\shiftonnn', '\\\\shiftOnnn', str) + + str = re.sub ('\\\\onevoice', '\\\\oneVoice', str) + str = re.sub ('\\\\voiceone', '\\\\voiceOne', str) + str = re.sub ('\\\\voicetwo', '\\\\voiceTwo', str) + str = re.sub ('\\\\voicethree', '\\\\voiceThree', str) + str = re.sub ('\\\\voicefour', '\\\\voiceFour', str) + + return str + + conversions.append ((1,3,93), conv, + 'property definiton case (eg. onevoice -> oneVoice)') + + + + ############################ diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 35ffdbd78f..e812c5f830 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -177,9 +177,15 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [ fi AC_MSG_CHECKING("Guile version") need_guile_version="1.3.4" - guile_version=`expr "\`$guile_config --version 2>&1\`" : ".*\($need_guile_version\).*"` + need_guile_version_numeric=100304 + guile_version=`$guile_config --version 2>&1 | awk '{print $NF}'` + guile_version_numeric=`echo $guile_version | awk -F. ' +{if ([$]3) {last = [$]3} +else {last =0}} +{printf "%s%s%s\n",[$]1*100, [$]2*10,last}'` AC_MSG_RESULT("$guile_version") - if test "$guile_version" != "$need_guile_version"; then + if test $guile_version_numeric -lt $need_guile_version_numeric + then AC_STEPMAKE_WARN("Guile version "$need_guile_version" or newer is needed") fi GUILE_FLAGS -- 2.39.2