From 3b3e161088f1a4be942e67729d0f89f0e8d31c51 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 17 Dec 2000 18:58:06 +0100 Subject: [PATCH] release: 1.3.118 =========== * Bugfix: fetdefs.tex: don't redefine the standard TeX macros \sharp,\natural or \flat. * Bugfix: ly2dvi: handle the --landscape option. Leave the textheight calculation to the geometry package. Remove some dead code. * Bugfix: correct font-family for TextSpanner. * Bugfix: script-engraver.cc: forced script directions work again. 1.3.117.j --- CHANGES | 43 +++--- Documentation/hacking.texi | 4 +- Documentation/user/refman.itely | 43 +++--- VERSION | 4 +- debian/changelog | 7 - flower/include/source-file.hh | 10 +- input/bugs/coda-kludge.ly | 54 ------- input/bugs/guile-state.ly | 54 +++---- input/denneboom.ly | 30 ++-- input/example-3.ly | 6 +- input/just-friends.ly | 2 +- input/les-nereides.ly | 16 +-- input/praeludium-fuga-E.ly | 32 ++--- input/rhythm.ly | 16 +-- input/scarlatti-paper.ly | 2 +- input/scarlatti-properties.ly | 10 +- input/scarlatti-test.ly | 2 +- input/star-spangled-banner.ly | 22 +-- input/test/ac-extra-voice.ly | 10 +- input/test/accidental-single-double.ly | 4 +- input/test/american-chords.ly | 6 +- input/test/ancient-font.ly | 8 +- input/test/arpeggio.ly | 2 +- input/test/auto-beam-4-8.ly | 2 +- input/test/auto-beam-override.ly | 2 +- input/test/auto-isknee.ly | 2 +- input/test/bagpipe.ly | 30 ++-- input/test/banter-chords.ly | 10 +- input/test/bar-scripts.ly | 14 +- input/test/beam-abbrev.ly | 2 +- input/test/beam-chord.ly | 2 +- input/test/beam-cross-staff.ly | 2 +- input/test/beam-damp.ly | 2 +- input/test/beam-extreme.ly | 2 +- input/test/beam-isknee.ly | 2 +- input/test/beam-position.ly | 2 +- input/test/beam-suspect.ly | 2 +- input/test/beam-trend.ly | 2 +- input/test/beams.ly | 12 +- input/test/breathing-sign.ly | 2 +- input/test/broken.ly | 12 +- input/test/chord-inversion.ly | 10 +- input/test/chord-names.ly | 4 +- input/test/chord-table.ly | 10 +- input/test/chords.ly | 6 +- input/test/clefs.ly | 2 +- input/test/collision-merge-dotted.ly | 2 +- input/test/collisions.ly | 22 +-- input/test/cue-notes.ly | 2 +- input/test/defaultbars.ly | 2 +- input/test/dots.ly | 2 +- input/test/drarn-chords.ly | 4 +- input/test/extra-staff.ly | 2 +- input/test/figured-bass.ly | 2 +- input/test/font-body.ly | 2 +- input/test/font.ly | 10 +- input/test/font16.ly | 10 +- input/test/font20.ly | 12 +- input/test/force-hshift.ly | 2 +- input/test/generic-property-override.ly | 2 +- input/test/gmsusd.ly | 2 +- input/test/gourlay.ly | 2 +- input/test/hara-kiri-short.ly | 8 +- input/test/hara-kiri-switch.ly | 12 +- input/test/hara-kiri.ly | 14 +- input/test/hshift.ly | 2 +- input/test/incipit.ly | 8 +- input/test/instrument-name-grandstaff.ly | 2 +- input/test/instrument-name-mmrest.ly | 2 +- input/test/instrument-name.ly | 2 +- input/test/jazz-chords.ly | 8 +- input/test/keys.ly | 2 +- input/test/keys2.ly | 4 +- input/test/knee-mult.ly | 2 +- input/test/knee.ly | 2 +- input/test/lyric-combine.ly | 24 ++-- input/test/lyric-extender.ly | 2 +- input/test/lyric-hyphen.ly | 4 +- input/test/lyric-phrasing.ly | 22 +-- input/test/lyrics-multi-stanza.ly | 18 +-- input/test/lyrics.ly | 32 ++--- input/test/manual-clef.ly | 2 +- input/test/mark.ly | 6 +- input/test/markup.ly | 2 +- input/test/memory.ly | 4 +- input/test/metronome.ly | 2 +- input/test/multi-measure-rest.ly | 2 +- input/test/multi-rest.ly | 10 +- input/test/noteheadstyle.ly | 2 +- input/test/notemode-chords.ly | 2 +- input/test/orchestscore.ly | 6 +- input/test/ossia.ly | 2 +- input/test/ottava.ly | 2 +- input/test/pushproperty.ly | 2 +- input/test/rest-collision.ly | 12 +- input/test/scripts.ly | 4 +- input/test/sleur.ly | 32 ++--- input/test/slur-cross-staff.ly | 2 +- input/test/slur-damping.ly | 2 +- input/test/slur-dash.ly | 2 +- input/test/slur-follow-music.ly | 2 +- input/test/slur-nice.ly | 2 +- input/test/slurs.ly | 2 +- input/test/spacing-2.ly | 8 +- input/test/spacing.ly | 14 +- input/test/span-bars.ly | 6 +- 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 | 2 +- input/test/standchen-as5.ly | 2 +- input/test/stem-tremolo.ly | 2 +- input/test/stem.ly | 12 +- input/test/tab-staff.ly | 4 +- input/test/tchaikovsky.ly | 10 +- input/test/text-spanner.ly | 2 +- input/test/thumb.ly | 2 +- input/test/tie-chord.ly | 4 +- input/test/title.ly | 16 +-- input/test/transposition.ly | 18 +-- input/test/tup.ly | 2 +- input/test/tuplet.ly | 2 +- input/test/twinkle-as5.ly | 18 +-- input/test/two-slurs.ly | 2 +- input/test/updown.ly | 2 +- input/test/vertical-align.ly | 2 +- input/test/vertical-text.ly | 2 +- input/test/volta-start.ly | 108 ++++++++++++++ input/test/volta.ly | 10 +- input/test/warnings.ly | 15 -- input/trip.ly | 14 +- input/twinkle-pop.ly | 20 +-- input/twinkle.ly | 28 ++-- lily/a2-engraver.cc | 4 - lily/align-interface.cc | 32 ++++- lily/break-align-item.cc | 2 - lily/dynamic-engraver.cc | 44 +++--- lily/dynamic-performer.cc | 4 +- lily/grace-position-performer.cc | 8 +- lily/identifier.cc | 136 ------------------ lily/include/file-results.hh | 2 +- lily/include/identifier.hh | 74 ---------- lily/include/lily-proto.hh | 2 +- lily/include/main.hh | 6 +- lily/include/music-output-def.hh | 12 +- lily/include/my-lily-lexer.hh | 4 +- lily/include/paper-def.hh | 7 +- lily/include/paper-outputter.hh | 20 +-- lily/include/paper-stream.hh | 27 ++-- lily/include/performer-group-performer.hh | 4 +- lily/include/performer.hh | 4 +- lily/include/scm-hash.hh | 5 +- lily/include/scope.hh | 10 +- lily/include/score.hh | 10 +- lily/key-performer.cc | 4 +- lily/lexer.ll | 18 +-- lily/lyric-performer.cc | 4 +- lily/main.cc | 4 +- lily/music-output-def.cc | 95 ++++++++++-- lily/music.cc | 2 +- lily/my-lily-lexer.cc | 14 +- lily/my-lily-parser.cc | 5 +- lily/note-performer.cc | 4 +- lily/paper-def.cc | 43 ++---- lily/paper-outputter.cc | 30 ++-- lily/paper-score.cc | 27 ++-- lily/parser.yy | 80 +++++------ lily/performer-group-performer.cc | 18 ++- lily/performer.cc | 4 +- lily/piano-pedal-performer.cc | 4 +- lily/property-engraver.cc | 2 +- lily/scope.cc | 36 +---- lily/score.cc | 45 +++++- lily/scores.cc | 17 ++- lily/span-dynamic-performer.cc | 8 +- lily/staff-performer.cc | 4 +- lily/tempo-performer.cc | 4 +- lily/tie-performer.cc | 8 +- lily/time-signature-performer.cc | 4 +- lily/translator-group.cc | 18 ++- lily/volta-spanner.cc | 35 +++-- make/out/lilypond.lsm | 8 +- make/out/lilypond.spec | 4 +- mutopia/Coriolan/bassi-part.ly | 12 +- mutopia/Coriolan/bassi.ly | 14 +- mutopia/Coriolan/c-midi.ly | 16 +-- mutopia/Coriolan/clarinetti-part.ly | 12 +- mutopia/Coriolan/clarinetti.ly | 14 +- mutopia/Coriolan/clarinetto-1.ly | 16 +-- mutopia/Coriolan/clarinetto-2.ly | 16 +-- mutopia/Coriolan/contrabasso.ly | 16 +-- mutopia/Coriolan/coriolan.ly | 26 ++-- mutopia/Coriolan/corni-part.ly | 12 +- mutopia/Coriolan/corni.ly | 14 +- mutopia/Coriolan/corno-1.ly | 16 +-- mutopia/Coriolan/corno-2.ly | 16 +-- mutopia/Coriolan/fagotti-part.ly | 12 +- mutopia/Coriolan/fagotti.ly | 14 +- mutopia/Coriolan/fagotto-1.ly | 16 +-- mutopia/Coriolan/fagotto-2.ly | 16 +-- mutopia/Coriolan/flauti-part.ly | 12 +- mutopia/Coriolan/flauti.ly | 14 +- mutopia/Coriolan/flauto-1.ly | 16 +-- mutopia/Coriolan/flauto-2.ly | 16 +-- mutopia/Coriolan/global.ly | 16 +-- mutopia/Coriolan/oboe-1.ly | 16 +-- mutopia/Coriolan/oboe-2.ly | 16 +-- mutopia/Coriolan/oboi-part.ly | 12 +- mutopia/Coriolan/oboi.ly | 14 +- mutopia/Coriolan/timpani-part.ly | 12 +- mutopia/Coriolan/timpani.ly | 18 +-- mutopia/Coriolan/trombe-part.ly | 12 +- mutopia/Coriolan/trombe.ly | 14 +- mutopia/Coriolan/trombo-1.ly | 16 +-- mutopia/Coriolan/trombo-2.ly | 16 +-- mutopia/Coriolan/viola-1.ly | 16 +-- mutopia/Coriolan/viola-2.ly | 16 +-- mutopia/Coriolan/violi-part.ly | 12 +- mutopia/Coriolan/violi.ly | 16 +-- mutopia/Coriolan/violino-1-part.ly | 12 +- mutopia/Coriolan/violino-1.ly | 18 +-- mutopia/Coriolan/violino-2-part.ly | 12 +- mutopia/Coriolan/violino-2.ly | 18 +-- mutopia/Coriolan/violoncello.ly | 16 +-- mutopia/D.Zipoli/verso_2.ly | 30 ++-- mutopia/E.Satie/gnossienne-4.ly | 10 +- mutopia/E.Satie/petite-ouverture-a-danser.ly | 10 +- mutopia/F.Schubert/standchen-16.ly | 16 +-- mutopia/F.Schubert/standchen-20.ly | 16 +-- mutopia/F.Schubert/standchen.ly | 66 ++++----- mutopia/Hymns/diademata.ly | 12 +- mutopia/Hymns/laudatedom.ly | 18 +-- mutopia/Hymns/maccabaeus.ly | 24 ++-- mutopia/Hymns/ode.ly | 10 +- mutopia/Hymns/passion.ly | 10 +- mutopia/Hymns/stille.ly | 16 +-- .../Cembalo-Partitas/Partita_II_Allemande.ly | 8 +- .../Cembalo-Partitas/Partita_II_Capriccio.ly | 16 +-- .../Cembalo-Partitas/Partita_II_Sinfonia.ly | 20 +-- mutopia/J.S.Bach/Duette/global-i.ly | 4 +- mutopia/J.S.Bach/Duette/global-ii.ly | 4 +- mutopia/J.S.Bach/Duette/viola-i.ly | 22 +-- mutopia/J.S.Bach/Duette/viola-ii.ly | 22 +-- mutopia/J.S.Bach/Duette/viola-part.ly | 20 +-- mutopia/J.S.Bach/Duette/violino-i.ly | 24 ++-- mutopia/J.S.Bach/Duette/violino-ii.ly | 26 ++-- mutopia/J.S.Bach/Duette/violino-part.ly | 20 +-- mutopia/J.S.Bach/Duette/violino-viola.ly | 24 ++-- .../J.S.Bach/Duette/violino-violoncello.ly | 24 ++-- mutopia/J.S.Bach/Duette/violoncello-i.ly | 24 ++-- mutopia/J.S.Bach/Duette/violoncello-ii.ly | 24 ++-- mutopia/J.S.Bach/Duette/violoncello-part.ly | 20 +-- .../J.S.Bach/Petites-Preludes/preludes-1.ly | 12 +- .../J.S.Bach/Petites-Preludes/preludes-2.ly | 8 +- .../J.S.Bach/Petites-Preludes/preludes-3.ly | 6 +- .../J.S.Bach/Petites-Preludes/preludes-5.ly | 8 +- .../J.S.Bach/Petites-Preludes/preludes-6.ly | 12 +- .../Solo-Cello-Suites/allemande-cello.ly | 16 +-- .../Solo-Cello-Suites/allemande-urtext.ly | 12 +- .../Solo-Cello-Suites/allemande-viola.ly | 16 +-- .../Solo-Cello-Suites/courante-cello.ly | 16 +-- .../Solo-Cello-Suites/courante-urtext.ly | 12 +- .../Solo-Cello-Suites/courante-viola.ly | 16 +-- .../J.S.Bach/Solo-Cello-Suites/gigue-cello.ly | 18 +-- .../Solo-Cello-Suites/gigue-urtext.ly | 16 +-- .../J.S.Bach/Solo-Cello-Suites/gigue-viola.ly | 16 +-- .../Solo-Cello-Suites/menuetto-cello.ly | 28 ++-- .../Solo-Cello-Suites/menuetto-urtext.ly | 30 ++-- .../Solo-Cello-Suites/menuetto-viola.ly | 28 ++-- .../Solo-Cello-Suites/prelude-cello.ly | 16 +-- .../Solo-Cello-Suites/prelude-urtext.ly | 124 ++++++++-------- .../Solo-Cello-Suites/prelude-viola.ly | 16 +-- .../Solo-Cello-Suites/sarabande-cello.ly | 16 +-- .../Solo-Cello-Suites/sarabande-urtext.ly | 12 +- .../Solo-Cello-Suites/sarabande-viola.ly | 16 +-- mutopia/J.S.Bach/wtk1-fugue1.ly | 18 +-- mutopia/J.S.Bach/wtk1-fugue2.ly | 8 +- mutopia/J.S.Bach/wtk1-prelude1.ly | 14 +- mutopia/gallina.ly | 18 +-- scm/music-property.scm | 10 +- scripts/convert-ly.py | 31 ++++ 281 files changed, 1936 insertions(+), 1963 deletions(-) delete mode 100644 input/bugs/coda-kludge.ly create mode 100644 input/test/volta-start.ly delete mode 100644 input/test/warnings.ly delete mode 100644 lily/identifier.cc delete mode 100644 lily/include/identifier.hh diff --git a/CHANGES b/CHANGES index 49d9d23e51..9b193edaf8 100644 --- a/CHANGES +++ b/CHANGES @@ -1,20 +1,3 @@ ---- ../lilypond-1.3.117.jcn1/CHANGES Sat Dec 16 16:27:51 2000 -++ b/CHANGES Sun Dec 17 15:49:08 2000 -@@ -1,3 +1,12 @@ -1.3.117.jcn2 -============ - -* Resurrected direct scheme output, ie. lilypond -fscm - -* Warning message fixes and po update. - -* Bugfix: debian package. - - 1.3.117.jcn1 - ============ - --- ../lilypond-1.3.117/CHANGES Thu Dec 14 18:44:08 2000 -++ b/CHANGES Sat Dec 16 21:58:37 2000 -@@ -1,3 +1,16 @@ 1.3.117.mb1 =========== @@ -28,13 +11,33 @@ * Bugfix: script-engraver.cc: forced script directions work again. - 1.3.116.jcn4 - ============ - 1.3.117.jcn1 +1.3.117.jcn2 ============ +* Resurrected direct scheme output, ie. lilypond -fscm + +* Warning message fixes and po update. + +* Bugfix: debian package. + * Resurrected direct postscript output, ie. lilypond --output-format=ps. +1.3.117.hwn1 +============ + +* Broken left-edge of volta, Again. Now the Final Fix. + +* Smobified Score, smobified Music_output_def, removed Identifier. +Reorganised Scope and Scheme_hash_table to this end. + +* Small cleanups in relations between +Paper_def/Paper_outputter/Paper_stream. + +* lilypond syntax update: deprecate $ syntax for identifiers; Provide +convert-ly method. + +* Rename: don't use grobs in performer methods. + 1.3.116.jcn4 ============ diff --git a/Documentation/hacking.texi b/Documentation/hacking.texi index 79ff8c1879..80aa3de327 100644 --- a/Documentation/hacking.texi +++ b/Documentation/hacking.texi @@ -242,8 +242,8 @@ report a programming_error and try to carry on.q @unnumberedsubsec Languages -C++ and Python are preferred. Perl is forbidden. Python code should -use an indent of 8, using TAB characters. +C++ and Python are preferred. Python code should use an indent of 8, +using TAB characters. @unnumberedsubsec Filenames diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 381fb4f452..55cd7287c8 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -402,13 +402,13 @@ number, boolean, etc.), LilyPond has a number of specialized data types, @item Music: see @ref{Music expressions} @item Identifier @item Translator_def: -See section @ref{contextdefs} for more information +See section @ref{contextdefs} for more information @item Duration @item Pitch - @item Score (TODO, smobme) -@item Music_output_def (TODO, smobme) - + @item Score + @item Music_output_def (TODO: this is not really a Scheme object +yet. Nevertheless, you can use identifiers to make references to them ) @item Moment (rational number) @end itemize @@ -416,16 +416,18 @@ LilyPond also includes some transient object types. Objects of these types are built during a LilyPond run, and do not `exist' per se within your input file. These objects are created as a result of your input file, so you can include commands in the input to manipulate them, -during a lilypond run . +during a lilypond run. @itemize @bullet @item Grob: short for Graphical object. See @ref{Grobs}. - @item Molecule: device-independent paper output object, - including dimensions. Produced by some Grob functions - @item Translator: object that produces audio objects or Grobs - - @item Font_metric: object representing a font. (Not yet user accessible.) - @item Audio_element: (TODO, smobme) + @item Molecule: device-independent page output object, + including dimensions. Produced by some Grob functions + See @ref{Molecules} + @item Translator: object that produces audio objects or Grobs. + @item Font_metric: object representing a font. (Not yet user +accessible.) + +@c @item Audio_element: (todo, smobme) @end itemize Identifiers allow objects to be assigned to names during the parse @@ -439,10 +441,10 @@ appearing in the @code{\paper} block, see Section @ref{paper}. @var{value} is any valid Scheme value or any of the input-types listed above. -An identifier can be created with any string for its name, but you -will only be able to refer to identifiers whose names begin with a -letter, being entirely alphanumeric. It is impossible to refer to an -identifier whose name is the same as the name of a keyword. +An identifier can be created with any string for its name, but you will +only be able to refer to identifiers whose names begin with a letter, +being entirely alphanumeric. It is impossible to refer to an identifier +whose name is the same as the name of a keyword. The right hand side of an identifier assignment is parsed completely before the assignment is done, so it is allowed to redefine an @@ -2833,9 +2835,11 @@ assignment @var{sym} = @var{val} is done. For example @end example This shifts all elements that have a @code{text} property one staff -space to the left. +space to the left. This mechanism is rather clumsy to use, but it allows +you tweak any setting of any grob. @node Items and Spanners, , , Grobs +@unnumberedsubsec Items and Spanners Grobs can also be distinguished in their role in the horizontal spacing. A lot of grobs define constraints on the spacing by their sizes. For @@ -2862,7 +2866,14 @@ direction (-1, 0 or 1) and returns a cons of booleans, signifying wether this grob should be transparent and invisible. @node Pointer substitution, , , Grobs +@unnumberedsubsec Pointer substitution + +Symbols that cross line-breaks (such as slurs) cause some more +complications. When a spanner crosses a line-break, then the spanner is +"broken into pieces", for every line that the spanner is in, a copy of +the grob is made. A substitution process redirects all grob-reference +so that spanner grob will only reference other grobs in the same line. @node Molecule, , , Reference Manual diff --git a/VERSION b/VERSION index 9eee9a0ec2..526c57deed 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 -PATCH_LEVEL=117 -MY_PATCH_LEVEL=jcn3 +PATCH_LEVEL=118 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/debian/changelog b/debian/changelog index 0514490184..672ef00d2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,3 @@ -lilypond1.3 (1.3.117) unstable; urgency=low - - * Don't install native debian package LilyPond1.3's upstream changelog - CHANGES using dh_installchangelogs -k (oh, and I'm still not Anthony :-). - - -- Jan Nieuwenhuizen Sat, 16 Dec 2000 22:25:28 +0100 - lilypond1.3 (1.3.107) unstable; urgency=low * Fixed watch location. diff --git a/flower/include/source-file.hh b/flower/include/source-file.hh index f8a3e4a036..7e590e01c0 100644 --- a/flower/include/source-file.hh +++ b/flower/include/source-file.hh @@ -47,19 +47,15 @@ public: char const* pos_ch_C () { return pos_ch_C_; } String get_str (int n); void set_pos (char const * pos_ch_C); - - // tbd - // String get_line (); - // String get_word (); - // only used in binary-source-file, currently - - public: Slice line_slice (char const* pos_ch_C) const; String line_str (char const* pos_ch_C) const; int column_i (char const* pos_ch_C) const; int char_i (char const* pos_ch_C) const; + /* + DOCUMENT-ME + */ char const* pos_ch_C_; private: diff --git a/input/bugs/coda-kludge.ly b/input/bugs/coda-kludge.ly deleted file mode 100644 index ea590a55eb..0000000000 --- a/input/bugs/coda-kludge.ly +++ /dev/null @@ -1,54 +0,0 @@ -%{ -Hi, - I want to write some music that has the structure: - - Intro - \repeat 4 { Chorus [first-ending] verse } - fifth-ending final - - The obvious: - - \repeat 4 { Chorus \alternative{{first-ending}{}} verse} - \alternative{{}{fifth-ending}} - final - - doesn't work. - - And the (logically correct but ugly) - - \repeat 4 {Chorus} - \alternative {{first-ending verse}{fifth ending}} - final - - is very ugly, because the volta bracket keeps going for so - long. - - Peter C -%} - -\score{ - < - \context Staff \notes\relative c''{ - c c c c - % coda-klugde: let volta span only one bar - \property Staff.voltaSpannerDuration = #(make-moment 1 1) - \repeat "volta" 5 { d d d d } - \alternative { { e e e e f f f f } - { g g g g } } - } - \context Lyrics \lyrics{ - intro1 - \repeat fold 5 {} - \alternative { - { chorus1 one verse1 } - { chorus1 two verse1 } - { chorus1 three verse } - { chorus1 four verse } - } - five1 - } - > -} - - -%\version "1.0.16"; diff --git a/input/bugs/guile-state.ly b/input/bugs/guile-state.ly index 2ca522dd5a..5295650d3e 100644 --- a/input/bugs/guile-state.ly +++ b/input/bugs/guile-state.ly @@ -1,11 +1,11 @@ \header{ -texidoc="Real header: the slurBeginAttachment setting still lives in the +texidoc=3D"Real header: the slurBeginAttachment setting still lives in the second example, breaking the cross staff broken slur. "; } - +=09 \header{ -texidoc=" +texidoc=3D" Slurs can be forced to always attach to note heads. "; } @@ -13,19 +13,19 @@ Slurs can be forced to always attach to note heads. \score{ \notes \relative c''{ - \property Voice.VerticalDirection = #1 - \property Voice.slurBeginAttachment = #'head - \property Voice.slurEndAttachment = #'head + \property Voice.VerticalDirection =3D #1 + \property Voice.slurBeginAttachment =3D #'head + \property Voice.slurEndAttachment =3D #'head g16()g()g()g()d'()d()d()d } \paper{ - indent = 0.0; - linewidth = 60.0\mm; + indent =3D 0.0; + linewidth =3D 60.0\mm; } } - +=09 \header{ -texidoc=" +texidoc=3D" The same goes for slurs. They behave decently when broken across linebreak. "; @@ -33,45 +33,45 @@ linebreak. \score{ \context PianoStaff < - \context Staff=one \notes\relative c'{ + \context Staff=3Done \notes\relative c'{ %{ \stemUp \slurUp - c4( c \translator Staff=two c )c | - \translator Staff=one + c4( c \translator Staff=3Dtwo c )c | + \translator Staff=3Done \stemUp \slurUp - c4( c \translator Staff=two c )c | + c4( c \translator Staff=3Dtwo c )c | \stemUp \slurUp - c4( c \translator Staff=one c )c | - \translator Staff=two + c4( c \translator Staff=3Done c )c | + \translator Staff=3Dtwo \stemUp \slurUp - c4( c \translator Staff=one c )c | - \translator Staff=two + c4( c \translator Staff=3Done c )c | + \translator Staff=3Dtwo \stemUp \slurUp - c4( \translator Staff=one c c )c | + c4( \translator Staff=3Done c c )c | %} r2 - \translator Staff=two + \translator Staff=3Dtwo \stemUp \slurUp - c4( \translator Staff=one c + c4( \translator Staff=3Done c \break c )c r2 %{ \stemDown \slurDown - d4( \translator Staff=two c c \translator Staff=one )d - \translator Staff=two + d4( \translator Staff=3Dtwo c c \translator Staff=3Done )d + \translator Staff=3Dtwo \stemUp \slurUp - c4( \translator Staff=one c c \translator Staff=two )c + c4( \translator Staff=3Done c c \translator Staff=3Dtwo )c r1 %} } - \context Staff=two \notes\relative c'{ + \context Staff=3Dtwo \notes\relative c'{ \clef bass; s1 s1 %s1 s1 s1 s1 s1 s1 s1 s1 } > - \paper { indent = 0.; linewidth = 40.*\staffspace; } + \paper { indent =3D 0.; linewidth =3D 40.*\staffspace; } } -\version "1.3.110"; +\version "1.3.110";=20 diff --git a/input/denneboom.ly b/input/denneboom.ly index 2ec459d6b2..29a964f31b 100644 --- a/input/denneboom.ly +++ b/input/denneboom.ly @@ -1,15 +1,15 @@ \header{ -filename = "denneboom.ly"; -enteredby = "jcn"; -copyright = "public domain"; +filename = "denneboom.ly"; +enteredby = "jcn"; +copyright = "public domain"; } %{ file tests silly line shapes %} \include "paper20.ly" -\version "1.3.110"; +\version "1.3.117"; -oden = \lyrics{ +oden = \lyrics{ O | den- ne- boom, o | den- ne- boom Wat | @@ -17,7 +17,7 @@ oden = \lyrics{ won- der- schoon } -ikheb = \lyrics{ +ikheb = \lyrics{ Ik | heb u laatst in_'t | bos zien staan toen | @@ -25,7 +25,7 @@ ikheb = \lyrics{ kaars- jes aan } -ugloeit = \lyrics{ +ugloeit = \lyrics{ U | gloeit in bar- re | win- ter- tijd, als | @@ -33,7 +33,7 @@ ugloeit = \lyrics{ licht ge- spreid } -oboom = \notes\transpose c''{ +oboom = \notes\transpose c''{ g,8 | c8. c16 c4. d8 | e8. e16 e4. e8 | @@ -41,7 +41,7 @@ oboom = \notes\transpose c''{ d8. c16 c4 r8 } -bos = \notes\transpose c''{ +bos = \notes\transpose c''{ g8 | g e a4. g8 | g8. f16 f4 r8 f8 | @@ -50,7 +50,7 @@ bos = \notes\transpose c''{ } -melody = \notes{ +melody = \notes{ \oboom \oboom \bos @@ -58,29 +58,29 @@ melody = \notes{ } -verse_one = \notes{ +verseOne = \notes{ \oden \oden \ikheb \oden } -verse_one_staff = \context Lyrics = one +verseOneStaff = \context Lyrics = one \verse_one -verse_two = \notes{ +verseTwo = \notes{ \oden \oden \ugloeit \oden } -verse_two_staff = \context Lyrics = two +verseTwoStaff = \context Lyrics = two \verse_two -denneboom_shape = \paper{ +denneboomShape = \paper{ \paper_twenty indent = 20. \mm; diff --git a/input/example-3.ly b/input/example-3.ly index da97a74ea8..5444bb21b9 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -1,10 +1,10 @@ -\version "1.3.110"; +\version "1.3.117"; -one = \notes\relative c{ +one = \notes\relative c{ c'' d e f } -two = \notes\relative c{ +two = \notes\relative c{ \clef "bass"; c'2 g2 } diff --git a/input/just-friends.ly b/input/just-friends.ly index 359affb7ca..0f4082a2d8 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.110"; +\version "1.3.117"; diff --git a/input/les-nereides.ly b/input/les-nereides.ly index 2a0ca45eaa..85a28ffe39 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -3,7 +3,7 @@ cpp -P -traditional -o l.ly les-nereides.ly cpp -P -traditional -o l-fake.ly -DFAKE_GRACE les-nereides.ly %} -\version "1.3.110"; +\version "1.3.117"; \header{ composer = "ARTHUR GRAY"; @@ -30,7 +30,7 @@ cpp -P -traditional -o l-fake.ly -DFAKE_GRACE les-nereides.ly )) -global = \notes{ +global = \notes{ \partial 2; \key a \major; \skip 2; @@ -46,7 +46,7 @@ global = \notes{ \bar "||"; } -treble = \context Voice=treble \notes\relative c''{ +treble = \context Voice=treble \notes\relative c''{ % Broken? \property Voice.NoteColumn \override #'horizontal-shift = #0 \outputproperty #(make-type-checker 'text-item-interface) @@ -174,7 +174,7 @@ treble = \context Voice=treble \notes\relative c''{ r )e r| } -trebleTwo = \context Voice=trebleTwo \notes\relative c''{ +trebleTwo = \context Voice=trebleTwo \notes\relative c''{ \property Voice.NoteColumn \override #'horizontal-shift = #1 s2 s1*2 @@ -201,7 +201,7 @@ trebleTwo = \context Voice=trebleTwo \notes\relative c''{ <)a cis,>] } -bass = \context Voice=bass \notes\relative c{ +bass = \context Voice=bass \notes\relative c{ % Allow ugly slurs \property Voice.Slur \override #'beautiful = #5.0 \property Voice.Slur \override #'attachment-offset = #'((0 . -3) . (0 . -6)) @@ -308,7 +308,7 @@ bass = \context Voice=bass \notes\relative c{ )a] } -bassTwo = \context Voice=bassTwo \notes\relative c{ +bassTwo = \context Voice=bassTwo \notes\relative c{ \skip 2; \skip 1*2; \skip 2; @@ -325,7 +325,7 @@ bassTwo = \context Voice=bassTwo \notes\relative c{ cis'4()bis } -middleDynamics = \context Dynamics=middle \notes{ +middleDynamics = \context Dynamics=middle \notes{ s8 s16 s\f s4 s1*2 %4 @@ -355,7 +355,7 @@ middleDynamics = \context Dynamics=middle \notes{ s8\mf s4 s4 s8\> s32 s s \!s } -lowerDynamics = \context Dynamics=lower \notes{ +lowerDynamics = \context Dynamics=lower \notes{ s2 %2 s2\sustaindown s8. s16\sustainup s4 diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly index ddab22209a..3b421a3525 100644 --- a/input/praeludium-fuga-E.ly +++ b/input/praeludium-fuga-E.ly @@ -22,17 +22,17 @@ * organ staff... %} -\version "1.3.110"; +\version "1.3.117"; -praeludium_commands = \notes { +praeludiumCommands = \notes { \time 4/4; \key e \major; } -praeludium_right = \notes { - \$praeludium_commands +praeludiumRight = \notes { + \praeludiumCommands \clef violin; % 13 -- how to type -- where to split -- this more neatly? @@ -63,8 +63,8 @@ praeludium_right = \notes { % 16 } -praeludium_left = \notes \relative c { - \$praeludium_commands +praeludiumLeft = \notes \relative c { + \praeludiumCommands \clef bass; % 13 @@ -85,8 +85,8 @@ praeludium_left = \notes \relative c { %16 } -praeludium_pedal = \notes \relative c{ - \$praeludium_commands +praeludiumPedal = \notes \relative c{ + \praeludiumCommands \clef bass; %13 @@ -97,13 +97,13 @@ praeludium_pedal = \notes \relative c{ } -fugaII_commands = \notes{ +fugaIICommands = \notes{ \time3/4; \key e \major; % E-major } -fugaII_right = \notes \relative c'' { - \$fugaII_commands +fugaIIRight = \notes \relative c'' { + \fugaIICommands \clef violin; %15 @@ -150,8 +150,8 @@ fugaII_right = \notes \relative c'' { %19 } -fugaII_left = \notes { - \$fugaII_commands +fugaIILeft = \notes { + \fugaIICommands \clef bass; %15 @@ -166,8 +166,8 @@ fugaII_left = \notes { %19 } -fugaII_pedal = \notes \relative c { - \$fugaII_commands +fugaIIPedal = \notes \relative c { + \fugaIICommands \clef bass; %15 @@ -178,7 +178,7 @@ fugaII_pedal = \notes \relative c { %19 } -breakmusic = \notes { +breakmusic = \notes { %\time4/4; r1 } diff --git a/input/rhythm.ly b/input/rhythm.ly index 8c970a2ffc..2593429df9 100644 --- a/input/rhythm.ly +++ b/input/rhythm.ly @@ -1,15 +1,15 @@ \header{ -filename = "rhythm.ly"; -enteredby = "HWN"; -copyright = "public domain"; -TestedFeatures = "multiple meters, beaming, unsynced bars, userdefd engravers"; +filename = "rhythm.ly"; +enteredby = "HWN"; +copyright = "public domain"; +TestedFeatures = "multiple meters, beaming, unsynced bars, userdefd engravers"; } -\version "1.3.110"; +\version "1.3.117"; -ritme = \notes\transpose c'' { +ritme = \notes\transpose c'' { \time 4/4; \partial 8; c8 | @@ -35,13 +35,13 @@ ritme = \notes\transpose c'' { } -another = +another = \notes \relative c'' { \time 6/4; c1. c1. \time 4/4;c4 c4 c4 c4 c1 c1 c1 } -yanother = +yanother = \notes{ \time 4/4; c1 c1 c1 c4 c4 c4 c4 c1 c1 c1 } diff --git a/input/scarlatti-paper.ly b/input/scarlatti-paper.ly index f2be1756fc..e723151862 100644 --- a/input/scarlatti-paper.ly +++ b/input/scarlatti-paper.ly @@ -1,4 +1,4 @@ -\version "1.3.110"; +\version "1.3.117"; \paper{ %my standard paper block diff --git a/input/scarlatti-properties.ly b/input/scarlatti-properties.ly index 06fbb7a28e..0654de3170 100644 --- a/input/scarlatti-properties.ly +++ b/input/scarlatti-properties.ly @@ -1,12 +1,12 @@ -\version "1.3.110"; +\version "1.3.117"; rh=\property Thread.NoteHead \override #'style = #'default lh=\property Thread.NoteHead \override #'style = #'diamond -n = \property Thread.NoteHead \revert #'font-relative-size % = #'diamond %\property Thread.fontSize=#0 +n = \property Thread.NoteHead \revert #'font-relative-size % = #'diamond %\property Thread.fontSize=#0 sm=\property Thread.NoteHead \override #'font-relative-size = #-1 % su=\property Voice.verticalDirection=#1 @@ -22,10 +22,10 @@ sls=\property Voice.forceHorizontalShift=#-0.22 rs=\property Voice.forceHorizontalShift=#0.6 srs=\property Voice.forceHorizontalShift=#0.22 %} -zs = \property Voice.NoteColumn \revert #'force-hshift % #0.0 -ls = \property Voice.NoteColumn \override #'force-hshift = #-0.6 +zs = \property Voice.NoteColumn \revert #'force-hshift % #0.0 +ls = \property Voice.NoteColumn \override #'force-hshift = #-0.6 sls= \property Voice.NoteColumn \override #'force-hshift = #-0.22 -rs = \property Voice.NoteColumn \override #'force-hshift = #0.6 +rs = \property Voice.NoteColumn \override #'force-hshift = #0.6 srs= \property Voice.NoteColumn \override #'force-hshift = #0.22 diff --git a/input/scarlatti-test.ly b/input/scarlatti-test.ly index b6f32ba6f0..47b82b2e36 100644 --- a/input/scarlatti-test.ly +++ b/input/scarlatti-test.ly @@ -1,6 +1,6 @@ %K000.ly LilyPond 1.2.16 -\version "1.3.110" +\version "1.3.117" \include "scarlatti-properties.ly" \include "scarlatti-paper.ly" diff --git a/input/star-spangled-banner.ly b/input/star-spangled-banner.ly index 554628f613..80d7ff72da 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.110"; +\version "1.3.117"; % TODO: % @@ -33,13 +33,13 @@ http://www.Arkkra.com/doc/star.ps copyright="public domain"; } -global = \notes { +global = \notes { \time 3/4; \key d \major; \partial 4; } -$staff1_voice_1 = \notes { +staffBVoiceB = \notes { a8.()fis16 \repeat volta 2 { d4 fis4 a4 d'2 fis'8. e'16 d'4 fis4 gis4 a2 a8 a8 @@ -56,7 +56,7 @@ $staff1_voice_1 = \notes { e'4 d'2 s4 } -$staff1_voice_2 = \notes { +staffBVoiceC = \notes { a8.()fis16 \repeat volta 2 { a,4 d4 e4 d4 () fis4 fis8. fis16 fis4 d4 d4 cis2 @@ -71,7 +71,7 @@ $staff1_voice_2 = \notes { e8. e16 d4.()a8 a8 a8 a2 g8 g8 a4. a8 g4 fis2 s4 } -$staff2_voice_1 = \notes { +staffCVoiceB = \notes { r4 \repeat volta 2 { fis4 a4 a4 b2 cis'8. cis'16 b4 b4 b4 a2 cis'8 cis'8 @@ -87,7 +87,7 @@ $staff2_voice_1 = \notes { a2 s4 } -$staff2_voice_2 = \notes { +staffCVoiceC = \notes { r4 \repeat volta 2 { d4 d4 cis4 b,2 ais,8. ais,16 b,4 b,4 e4 a,2 a8 a8 @@ -102,7 +102,7 @@ $staff2_voice_2 = \notes { g8. g16 fis4.()a,8 d8 e8 fis2 b8 b8 a4. a8 a,4 d2 s4 } -text = \lyrics { +text = \lyrics { Oh __ \repeat "fold" 2 { } \alternative { { @@ -140,12 +140,12 @@ text = \lyrics { \property Staff.automaticMelismata = ##t \context Voice = one \transpose c'' { \stemUp - \$staff1_voice_1 + \staffBVoiceB \bar "|."; } \context Voice = two \transpose c'' { \stemDown - \$staff1_voice_2 + \staffBVoiceC } > \context LyricsVoice = "one-1" \text @@ -155,11 +155,11 @@ text = \lyrics { \property Staff.noVoltaBraces = ##t \context Voice = three { \stemUp - \$staff2_voice_1 + \staffCVoiceB } \context Voice = four { \stemDown - \$staff2_voice_2 + \staffCVoiceC } > > diff --git a/input/test/ac-extra-voice.ly b/input/test/ac-extra-voice.ly index 4d6b67484d..03afe8b2ad 100644 --- a/input/test/ac-extra-voice.ly +++ b/input/test/ac-extra-voice.ly @@ -1,25 +1,25 @@ -\version "1.3.110"; +\version "1.3.117"; -global = \notes { +global = \notes { \key a \minor; \time 6/4; % \skip 1.*34; % \bar ".|"; } -melody = \notes\relative c''{ +melody = \notes\relative c''{ r2 r r r2 r r r4 a'8-- \< a-- a-- a-- c-- \!b-- a--\> gis f \!e es8 \grace b c r4 r2 r } -basloopje = \notes\relative c{ +basloopje = \notes\relative c{ d,8( a' d f a d f d a f d )a } -accompany = \notes \relative c{ +accompany = \notes \relative c{ \notes\relative c \basloopje \notes\relative c \basloopje \notes\relative c \basloopje diff --git a/input/test/accidental-single-double.ly b/input/test/accidental-single-double.ly index 9014bcfa35..765cdff810 100644 --- a/input/test/accidental-single-double.ly +++ b/input/test/accidental-single-double.ly @@ -5,10 +5,10 @@ after a double flat sign is automatically prepended with a natural sign. "; } -\version "1.3.110"; +\version "1.3.117"; -thenotes = \notes \relative cis' { \time 4/4; +thenotes = \notes \relative cis' { \time 4/4; gisis'4 gis gisis ges | geses ges geses gis | gisis g geses g | diff --git a/input/test/american-chords.ly b/input/test/american-chords.ly index 79350c64bf..31a5c3cf37 100644 --- a/input/test/american-chords.ly +++ b/input/test/american-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.110" +\version "1.3.117" %{ See scm/chord-names.scm: chord::names-alist-american James Hammons @@ -13,8 +13,8 @@ ) chord::names-alist-american)) -chord = \notes\transpose c''\chords{ - \property ChordNames.ChordName \override #'style = #'american +chord = \notes\transpose c''\chords{ + \property Chordnames.Chordname \override #'style = #'american c % Major triad cs:m % Minor triad df:m5- % Diminished triad diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly index 4d80891c38..34a26de846 100644 --- a/input/test/ancient-font.ly +++ b/input/test/ancient-font.ly @@ -3,17 +3,17 @@ date = "2000"; } -\version "1.3.110"; +\version "1.3.117"; \include "paper26.ly" -global = \notes { +global = \notes { \property Score.timing = 1 \property Staff.TimeSignature \override #'style = #"old" \time 2/2; } -upperVoice = \context Staff = upperVoice < +upperVoice = \context Staff = upperVoice < \global \property Staff.numberOfStaffLines = 4 \notes \transpose c' { @@ -46,7 +46,7 @@ upperVoice = \context Staff = upperVoice < } > -lowerVoice = \context Staff = lowerNotes < +lowerVoice = \context Staff = lowerNotes < \global \property Staff.numberOfStaffLines = 5 \notes \transpose c'' { diff --git a/input/test/arpeggio.ly b/input/test/arpeggio.ly index 6df0fc762a..1699fa7dc7 100644 --- a/input/test/arpeggio.ly +++ b/input/test/arpeggio.ly @@ -4,7 +4,7 @@ Arpeggios are supported, both cross-staff and broken single staff. "; } -\version "1.3.110"; +\version "1.3.117"; \score{ \context PianoStaff < diff --git a/input/test/auto-beam-4-8.ly b/input/test/auto-beam-4-8.ly index ced2d67f35..14c8b3a412 100644 --- a/input/test/auto-beam-4-8.ly +++ b/input/test/auto-beam-4-8.ly @@ -1,5 +1,5 @@ -\version "1.3.110"; +\version "1.3.117"; \score{ \notes\relative c''{ diff --git a/input/test/auto-beam-override.ly b/input/test/auto-beam-override.ly index 623a91a351..257646facc 100644 --- a/input/test/auto-beam-override.ly +++ b/input/test/auto-beam-override.ly @@ -1,5 +1,5 @@ -\version "1.3.110"; +\version "1.3.117"; %{ Currently (1.1.27.jcn3), the auto-beam engraver will only engrave diff --git a/input/test/auto-isknee.ly b/input/test/auto-isknee.ly index 03166e1238..afe22047f2 100644 --- a/input/test/auto-isknee.ly +++ b/input/test/auto-isknee.ly @@ -1,4 +1,4 @@ -\version "1.3.110"; +\version "1.3.117"; \score { \notes \context PianoStaff < \context Staff = "up" { diff --git a/input/test/bagpipe.ly b/input/test/bagpipe.ly index 7046af01dd..d4ece6d717 100644 --- a/input/test/bagpipe.ly +++ b/input/test/bagpipe.ly @@ -1,4 +1,4 @@ -\version "1.3.110"; +\version "1.3.117"; % bagpipe music. \header @@ -42,29 +42,29 @@ -taor = \notes{ \grace { [g32 d g e]}} -grip = \notes{ \grace { [g32 b g ]}} -thrd = \notes{ \grace { [g32 d c] }} -birl = \notes{ \grace { [g32 a g] }} -gstd = \notes{ \grace { [g'32 d g] }} +taor = \notes{ \grace { [g32 d g e]}} +grip = \notes{ \grace { [g32 b g ]}} +thrd = \notes{ \grace { [g32 d c] }} +birl = \notes{ \grace { [g32 a g] }} +gstd = \notes{ \grace { [g'32 d g] }} lgg = \notes{ \grace { g32 }} lag = \notes{ \grace { a32 }} fgg = \notes{ \grace { [f32 g'32] }} -dblb = \notes{ \grace { [g'32 b d] }} -dblc = \notes{ \grace { [g'32 c d] }} -dble = \notes{ \grace { [g'32 e f] }} -dblf = \notes{ \grace { [g'32 f g'] }} -dblg = \notes{ \grace { [g'32 f] }} -dbla = \notes{ \grace { [a'32 g'] }} +dblb = \notes{ \grace { [g'32 b d] }} +dblc = \notes{ \grace { [g'32 c d] }} +dble = \notes{ \grace { [g'32 e f] }} +dblf = \notes{ \grace { [g'32 f g'] }} +dblg = \notes{ \grace { [g'32 f] }} +dbla = \notes{ \grace { [a'32 g'] }} cg = \notes{ \grace { c32 }} eg = \notes{ \grace { e32 }} gg = \notes{ \grace { g'32 }} dg = \notes{ \grace { d32 }} hag = \notes{ \grace { a'32 }} -gefg = \notes{ \grace { [g'32 e f] }} +gefg = \notes{ \grace { [g'32 e f] }} efg = \notes{ \grace { [e32 f] }} -gdcg = \notes{ \grace { [g'32 d c]}} -gcdg = \notes{ \grace { [g'32 c d]}} +gdcg = \notes{ \grace { [g'32 d c]}} +gcdg = \notes{ \grace { [g'32 c d]}} diff --git a/input/test/banter-chords.ly b/input/test/banter-chords.ly index b3c1231a27..9e34d2327f 100644 --- a/input/test/banter-chords.ly +++ b/input/test/banter-chords.ly @@ -1,9 +1,9 @@ -\version "1.3.110"; +\version "1.3.117"; \header{ -enteredby = "jcn"; -copyright = "public domain"; -TestedFeatures = "Banter named chords"; +enteredby = "jcn"; +copyright = "public domain"; +TestedFeatures = "Banter named chords"; } % test German (Banter) naming @@ -46,7 +46,7 @@ TestedFeatures = "Banter named chords"; % } -chord = \notes\transpose c''\chords{ +chord = \notes\transpose c''\chords{ % dim modifier means: lower all implicit additions c:dim9 c:dim diff --git a/input/test/bar-scripts.ly b/input/test/bar-scripts.ly index a4898e094c..644550de3f 100644 --- a/input/test/bar-scripts.ly +++ b/input/test/bar-scripts.ly @@ -6,15 +6,15 @@ knowing it. Consequently, they fall over often. "; } -\version "1.3.110"; +\version "1.3.117"; -onestaff = \context Staff = foo\notes { +onestaff = \context Staff = foo\notes { \property Staff.instr = instr \property Staff.instrument = instrument \mark "B"; c1 \mark "A"; \break c2 c2 \break } -grstaff = \notes \context GrandStaff < +grstaff = \notes \context GrandStaff < \context Staff = bar { \property Staff.instr = instr @@ -23,15 +23,15 @@ grstaff = \notes \context GrandStaff < \context Staff = bufl { c1 c2 } > -scpaper = \paper {\translator {\OrchestralScoreContext}} -stpaper = \paper{ \translator {\BarNumberingStaffContext }} +scpaper = \paper {\translator {\OrchestralScoreContext}} +stpaper = \paper{ \translator {\BarNumberingStaffContext }} -scscore = \score { \grstaff \paper { +scscore = \score { \grstaff \paper { \scpaper }} -stscore = \score { \onestaff \paper { +stscore = \score { \onestaff \paper { \stpaper }} diff --git a/input/test/beam-abbrev.ly b/input/test/beam-abbrev.ly index 45a4b196cc..8631863bda 100644 --- a/input/test/beam-abbrev.ly +++ b/input/test/beam-abbrev.ly @@ -1,4 +1,4 @@ -\version "1.3.110"; +\version "1.3.117"; \score { \context Voice \notes\relative c { c'1:16 diff --git a/input/test/beam-chord.ly b/input/test/beam-chord.ly index f639ee0e80..c004035c46 100644 --- a/input/test/beam-chord.ly +++ b/input/test/beam-chord.ly @@ -1,4 +1,4 @@ -\version "1.3.110"; +\version "1.3.117"; \score{ \notes\transpose c'{ diff --git a/input/test/beam-cross-staff.ly b/input/test/beam-cross-staff.ly index fc33719539..72b3c288fa 100644 --- a/input/test/beam-cross-staff.ly +++ b/input/test/beam-cross-staff.ly @@ -29,4 +29,4 @@ behave well, wherever the switching point is. > } -\version "1.3.110"; +\version "1.3.117"; diff --git a/input/test/beam-damp.ly b/input/test/beam-damp.ly index 592f32780b..6ca851e206 100644 --- a/input/test/beam-damp.ly +++ b/input/test/beam-damp.ly @@ -17,4 +17,4 @@ linewidth=-1.; } } -\version "1.3.110"; +\version "1.3.117"; diff --git a/input/test/beam-extreme.ly b/input/test/beam-extreme.ly index af48d185f9..653024e70c 100644 --- a/input/test/beam-extreme.ly +++ b/input/test/beam-extreme.ly @@ -4,7 +4,7 @@ Beams should behave reasonably well, even under extreme circumstances. Stems may be short, but noteheads should never touch the beam. "; } -\version "1.3.110"; +\version "1.3.117"; \score{ \notes\relative c''{ [g8 c c,] diff --git a/input/test/beam-isknee.ly b/input/test/beam-isknee.ly index 9462610d40..64da0a5419 100644 --- a/input/test/beam-isknee.ly +++ b/input/test/beam-isknee.ly @@ -16,4 +16,4 @@ } } -\version "1.3.110"; +\version "1.3.117"; diff --git a/input/test/beam-position.ly b/input/test/beam-position.ly index 003639f380..88f5749d5b 100644 --- a/input/test/beam-position.ly +++ b/input/test/beam-position.ly @@ -6,7 +6,7 @@ second staff line. This does not hold for grace note beams. Override with @code{noStemExtend}. "; } -\version "1.3.110"; +\version "1.3.117"; \score { \context Voice \notes\relative c { diff --git a/input/test/beam-suspect.ly b/input/test/beam-suspect.ly index 4e39bedc79..cd78c2344c 100644 --- a/input/test/beam-suspect.ly +++ b/input/test/beam-suspect.ly @@ -1,4 +1,4 @@ -\version "1.3.110"; +\version "1.3.117"; \score{ \notes\relative c'{ \stemUp diff --git a/input/test/beam-trend.ly b/input/test/beam-trend.ly index 4b40297710..2ff53e8386 100644 --- a/input/test/beam-trend.ly +++ b/input/test/beam-trend.ly @@ -1,4 +1,4 @@ -\version "1.3.110"; +\version "1.3.117"; \score{ \notes\relative c'{ \stemUp diff --git a/input/test/beams.ly b/input/test/beams.ly index e3b6b70b18..46544617e7 100644 --- a/input/test/beams.ly +++ b/input/test/beams.ly @@ -1,12 +1,12 @@ \header{ -filename = "beams.ly"; -composer = "heu"; -enteredby = "jcn"; -copyright = "PD"; +filename = "beams.ly"; +composer = "heu"; +enteredby = "jcn"; +copyright = "PD"; -TestedFeatures = "beams and beamflags"; +TestedFeatures = "beams and beamflags"; } -\version "1.3.110"; +\version "1.3.117"; \score{ < diff --git a/input/test/breathing-sign.ly b/input/test/breathing-sign.ly index 31d399f85c..70e375fe7a 100644 --- a/input/test/breathing-sign.ly +++ b/input/test/breathing-sign.ly @@ -9,7 +9,7 @@ two measures all have the same distance from each other: } -\version "1.3.110"; +\version "1.3.117"; \score { \notes \relative c' { diff --git a/input/test/broken.ly b/input/test/broken.ly index a8e45c9c48..96abe81c12 100644 --- a/input/test/broken.ly +++ b/input/test/broken.ly @@ -1,13 +1,13 @@ \header{ -enteredby = "jcn"; -copyright = "PD"; -TestedFeatures = "This file tests Feta embedded slurs" + +enteredby = "jcn"; +copyright = "PD"; +TestedFeatures = "This file tests Feta embedded slurs" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.110"; +\version "1.3.117"; -shortlong = \notes{ +shortlong = \notes{ c4()c( c c | c c c c | c c c c | @@ -15,7 +15,7 @@ shortlong = \notes{ c c c )c | } -broken = \notes\transpose c''{ +broken = \notes\transpose c''{ c c c c() c c c c( diff --git a/input/test/chord-inversion.ly b/input/test/chord-inversion.ly index eaf0acae1d..2570025f69 100644 --- a/input/test/chord-inversion.ly +++ b/input/test/chord-inversion.ly @@ -1,10 +1,10 @@ \header{ -enteredby = "jcn"; -copyright = "public domain"; -TestedFeatures = "chord inversions"; +enteredby = "jcn"; +copyright = "public domain"; +TestedFeatures = "chord inversions"; } -inversions = \notes\transpose c''\chords{ +inversions = \notes\transpose c''\chords{ % inversions c1 c:sus c:6 c/e c/g c/d % this triggers a warning: no 'd' in chord of c @@ -20,4 +20,4 @@ inversions = \notes\transpose c''\chords{ > } -\version "1.3.110"; +\version "1.3.117"; diff --git a/input/test/chord-names.ly b/input/test/chord-names.ly index ef9dd45407..2d233f5e19 100644 --- a/input/test/chord-names.ly +++ b/input/test/chord-names.ly @@ -5,8 +5,8 @@ from guile. For some unlogical names, guile customisation is used by default. "; } -\version "1.3.110" -chord = \notes\transpose c''\chords{ +\version "1.3.117" +chord = \notes\transpose c''\chords{ c1 c:m c:m5- diff --git a/input/test/chord-table.ly b/input/test/chord-table.ly index 86018685ee..0076002a3b 100644 --- a/input/test/chord-table.ly +++ b/input/test/chord-table.ly @@ -1,10 +1,10 @@ \header{ -filename = "chord-table.ly"; -copyright = "public domain"; -enteredby = "jcn"; +filename = "chord-table.ly"; +copyright = "public domain"; +enteredby = "jcn"; } -tab = \notes\transpose c'''\chords{ +tab = \notes\transpose c'''\chords{ c1 c:m c:4 c:m4 c:5+ c:5- c:dim c:5-.5+ c:6\break %c:m6\break } @@ -41,4 +41,4 @@ tab = \notes\transpose c'''\chords{ } -\version "1.3.110"; +\version "1.3.117"; diff --git a/input/test/chords.ly b/input/test/chords.ly index e4e74a60df..260ce11d29 100644 --- a/input/test/chords.ly +++ b/input/test/chords.ly @@ -1,4 +1,4 @@ -\version "1.3.110"; +\version "1.3.117"; %{ Would this be acceptable/good enough/convenient for entry? @@ -16,7 +16,7 @@ Would this be acceptable/good enough/convenient for entry? %} -scales = \notes \transpose c'' \chords{ +scales = \notes \transpose c'' \chords{ % c1:m c:min c4:dim c:aug c:sus c:maj c1:6 c4:7 c:9 c:11 c:13 @@ -32,7 +32,7 @@ scales = \notes \transpose c'' \chords{ c\breve c\longa } -keys = \notes{ +keys = \notes{ s1 s1 s1 s1 s1 s1 diff --git a/input/test/clefs.ly b/input/test/clefs.ly index 47b094b73f..834595b0ca 100644 --- a/input/test/clefs.ly +++ b/input/test/clefs.ly @@ -9,7 +9,7 @@ way, so this is fragile as well. "; } -\version "1.3.110"; +\version "1.3.117"; \score { \notes{ diff --git a/input/test/collision-merge-dotted.ly b/input/test/collision-merge-dotted.ly index c66912867a..9db13c6589 100644 --- a/input/test/collision-merge-dotted.ly +++ b/input/test/collision-merge-dotted.ly @@ -1,4 +1,4 @@ -\version "1.3.110"; +\version "1.3.117"; \score { \context Voice \notes\relative c { diff --git a/input/test/collisions.ly b/input/test/collisions.ly index e072c48182..1933d10097 100644 --- a/input/test/collisions.ly +++ b/input/test/collisions.ly @@ -3,33 +3,33 @@ texidoc=" Normal collisions. We have support for polyphony, where the middle voices are horizontally shifted. "; -filename = "collisions.ly"; -description = "random counterpoint to test collisions"; -enteredby = "HWN,JCN"; -copyright = "public domain"; -Tested = "test the Collision resolution "; +filename = "collisions.ly"; +description = "random counterpoint to test collisions"; +enteredby = "HWN,JCN"; +copyright = "public domain"; +Tested = "test the Collision resolution "; } -\version "1.3.110"; +\version "1.3.117"; -twovoice = \context Staff \notes < +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 } > -twovoicesteminvert = \context Staff \notes < +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 } > -threevoice = \context Staff \notes < +threevoice = \context Staff \notes < \context Voice=i { \stemUp g4 f e f g a g2 } \context Voice=ii { \stemUp \property Voice.NoteColumn \override #'horizontal-shift = #1 e2 e2 e2 e2 } \context Voice=iii { \stemDown c4 d e d c d es } > -chordstest = \context Staff \notes < +chordstest = \context Staff \notes < \context Voice = i \relative c { \stemUp e4 dis c f g f a b b } @@ -38,7 +38,7 @@ chordstest = \context Staff \notes < } > -hairyChord = \context Staff \notes\relative c' < +hairyChord = \context Staff \notes\relative c' < \context Voice=one { \property Voice.NoteColumn \override #'horizontal-shift = #0 \stemUp diff --git a/input/test/cue-notes.ly b/input/test/cue-notes.ly index 4b15b05096..753b2bda79 100644 --- a/input/test/cue-notes.ly +++ b/input/test/cue-notes.ly @@ -1,5 +1,5 @@ -\version "1.3.110"; +\version "1.3.117"; % add cue notes context diff --git a/input/test/defaultbars.ly b/input/test/defaultbars.ly index 12ebddb184..5c55dabafa 100644 --- a/input/test/defaultbars.ly +++ b/input/test/defaultbars.ly @@ -1,4 +1,4 @@ -\version "1.3.110"; +\version "1.3.117"; \score { diff --git a/input/test/dots.ly b/input/test/dots.ly index 624d601d7f..fbb8855d0d 100644 --- a/input/test/dots.ly +++ b/input/test/dots.ly @@ -9,7 +9,7 @@ a column. The dots go along as rests are shifted to avoid collisions. } -\version "1.3.110"; +\version "1.3.117"; \score { \context Voice \notes\relative c'' { \time 6/8; diff --git a/input/test/drarn-chords.ly b/input/test/drarn-chords.ly index c4fcddf5f5..d8eb62b753 100644 --- a/input/test/drarn-chords.ly +++ b/input/test/drarn-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.110"; +\version "1.3.117"; %{ Would this be acceptable/good enough/convenient for entry? @@ -16,7 +16,7 @@ Would this be acceptable/good enough/convenient for entry? %} -scales = \notes \transpose c'' \chords{ +scales = \notes \transpose c'' \chords{ \property ChordNames.drarnChords=##t %c1:m \break c1:m c1:m c1:m diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly index 772550d4d8..458ca1a7e7 100644 --- a/input/test/extra-staff.ly +++ b/input/test/extra-staff.ly @@ -42,4 +42,4 @@ extra-staff.ly: } -\version "1.3.110"; +\version "1.3.117"; diff --git a/input/test/figured-bass.ly b/input/test/figured-bass.ly index f019ea5327..7d97e2c74b 100644 --- a/input/test/figured-bass.ly +++ b/input/test/figured-bass.ly @@ -2,7 +2,7 @@ % (An alternative is to use a lyrics line if you want the figures % aligned vertically.) -\version "1.3.112"; +\version "1.3.117"; % Scheme macros for accidentals. Note how they can be combined % with other strings, for example in: d^#`(rows ,sharp "4") diff --git a/input/test/font-body.ly b/input/test/font-body.ly index 8cbcb567a5..180f262231 100644 --- a/input/test/font-body.ly +++ b/input/test/font-body.ly @@ -1,4 +1,4 @@ -\version "1.3.110"; +\version "1.3.117"; FontBody= \notes\transpose c''{ \bar "|:"; diff --git a/input/test/font.ly b/input/test/font.ly index 4eb59647ae..7c0843f268 100644 --- a/input/test/font.ly +++ b/input/test/font.ly @@ -1,13 +1,13 @@ \header{ title= "The Feta Font"; -subtitle = "proofsheet"; -enteredby = "jcn & hwn"; -copyright = "public domain"; -description = "This file tests the Feta music font"; +subtitle = "proofsheet"; +enteredby = "jcn & hwn"; +copyright = "public domain"; +description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.110"; +\version "1.3.117"; \include "font-body.ly" \score{ diff --git a/input/test/font16.ly b/input/test/font16.ly index 90b3617946..7431a833e9 100644 --- a/input/test/font16.ly +++ b/input/test/font16.ly @@ -1,13 +1,13 @@ \header{ title= "The Feta Font"; -subtitle = "proofsheet"; -enteredby = "jcn & hwn"; -copyright = "public domain"; -description = "This file tests the Feta music font"; +subtitle = "proofsheet"; +enteredby = "jcn & hwn"; +copyright = "public domain"; +description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.110"; +\version "1.3.117"; \include "paper16.ly" \include "font-body.ly" diff --git a/input/test/font20.ly b/input/test/font20.ly index 8bddc78cb2..e6cffda88d 100644 --- a/input/test/font20.ly +++ b/input/test/font20.ly @@ -1,10 +1,10 @@ \header{ title= "The Feta font"; -subtitle = "proofsheet"; -enteredby = "jcn"; -copyright = "public domain"; -description = "This file tests the Feta music-font in the 20pt version"; -TestedFeatures = +subtitle = "proofsheet"; +enteredby = "jcn"; +copyright = "public domain"; +description = "This file tests the Feta music-font in the 20pt version"; +TestedFeatures = "(Feta definitively is not an abbreviation of Font-En-TjA)"; } @@ -17,5 +17,5 @@ TestedFeatures = gourlay_maxmeasures =5.; } } -\version "1.3.110"; +\version "1.3.117"; diff --git a/input/test/force-hshift.ly b/input/test/force-hshift.ly index 09ca1434ae..b6f97fd182 100644 --- a/input/test/force-hshift.ly +++ b/input/test/force-hshift.ly @@ -1,4 +1,4 @@ -\version "1.3.110"; +\version "1.3.117"; \score { \context Voice \notes\relative c { diff --git a/input/test/generic-property-override.ly b/input/test/generic-property-override.ly index c906ed3fb2..c3cb0d25b1 100644 --- a/input/test/generic-property-override.ly +++ b/input/test/generic-property-override.ly @@ -4,7 +4,7 @@ More specific settings take precendence over less specific settings. The second slur has slurDirection set to down, overriding the stemup setting. "; } -\version "1.3.110"; +\version "1.3.117"; \score { \notes \relative c'' \context Voice { diff --git a/input/test/gmsusd.ly b/input/test/gmsusd.ly index b02d412a34..f53b5a92d7 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.110"; +\version "1.3.117"; gmsus=\notes\relative c \chords{ g1 diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly index d253a62eb9..ecf56cefdc 100644 --- a/input/test/gourlay.ly +++ b/input/test/gourlay.ly @@ -1,4 +1,4 @@ -\version "1.3.110"; +\version "1.3.117"; %{ diff --git a/input/test/hara-kiri-short.ly b/input/test/hara-kiri-short.ly index b58e3c9eda..e467acb0bb 100644 --- a/input/test/hara-kiri-short.ly +++ b/input/test/hara-kiri-short.ly @@ -6,18 +6,18 @@ therefore removed. "; } -\version "1.3.110"; -zager = \context Staff = zager \notes \relative c'' { +\version "1.3.117"; +zager = \context Staff = zager \notes \relative c'' { \clef treble; c1 } -zoger = \context Staff = zoger \notes \relative c'' { +zoger = \context Staff = zoger \notes \relative c'' { \clef treble; \skip 1* 1; } -zagers = \context GrandStaff < +zagers = \context GrandStaff < \zager \zoger > diff --git a/input/test/hara-kiri-switch.ly b/input/test/hara-kiri-switch.ly index feef668c61..080882b201 100644 --- a/input/test/hara-kiri-switch.ly +++ b/input/test/hara-kiri-switch.ly @@ -1,18 +1,18 @@ -\version "1.3.110"; +\version "1.3.117"; -voiceOne = \notes \relative c'' { +voiceOne = \notes \relative c'' { a1 a a a2 a2 a2 a8 a a a } -staffOne = \context Staff = one < +staffOne = \context Staff = one < \notes \context Voice=one < \voiceOne > > -voiceTwo = \notes \relative c' { +voiceTwo = \notes \relative c' { % we must have a Thread context before we can switch staffs % in this case, the notes before the switching will do that % implicitely @@ -26,14 +26,14 @@ voiceTwo = \notes \relative c' { c8 c c c } -staffTwo = \context Staff = two < +staffTwo = \context Staff = two < % notes must go to Staff context: we want to switch Staff translators %\notes \context Voice=one < \voiceTwo %> > -grandstaff = \context GrandStaff = one < +grandstaff = \context GrandStaff = one < \staffOne \staffTwo > diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly index c1956b1b80..cdf375b43e 100644 --- a/input/test/hara-kiri.ly +++ b/input/test/hara-kiri.ly @@ -1,6 +1,6 @@ -\version "1.3.110"; +\version "1.3.117"; -toeter_i = \notes\relative c <{ +toeterI = \notes\relative c <{ \property Staff.instrument = #"Toeters" \property Staff.instr = #"Ttr." } \context Voice = lower { \stemDown s1*6 } @@ -16,7 +16,7 @@ toeter_i = \notes\relative c <{ g g g g }> -toeter_ii = \notes \relative c \context Voice = together { +toeterIi = \notes \relative c \context Voice = together { c''4^"toet II" c c c d d d d R1 @@ -28,12 +28,12 @@ toeter_ii = \notes \relative c \context Voice = together { g g g g } -toeters = \context Staff = toeters < +toeters = \context Staff = toeters < \toeter_i \toeter_ii > -zager = \context Staff = zager \notes \relative c'' { +zager = \context Staff = zager \notes \relative c'' { \clef treble; \property Staff.instrument = #"Zager" \property Staff.instr = #"Zag." @@ -48,7 +48,7 @@ zager = \context Staff = zager \notes \relative c'' { f e d c } -zoger = \context Staff = zoger \notes \relative c'' { +zoger = \context Staff = zoger \notes \relative c'' { \clef treble; \property Staff.instrument = #"Zoger" \property Staff.instr = #"Zog." @@ -63,7 +63,7 @@ zoger = \context Staff = zoger \notes \relative c'' { \skip 1*1; } -zagers = \context GrandStaff < +zagers = \context GrandStaff < \zager \zoger > diff --git a/input/test/hshift.ly b/input/test/hshift.ly index ff7e6df5ad..996640bb22 100644 --- a/input/test/hshift.ly +++ b/input/test/hshift.ly @@ -1,5 +1,5 @@ -\version "1.3.110"; +\version "1.3.117"; shiftI \property Voice.NoteColumn \override #'horizontal-shift = #0 diff --git a/input/test/incipit.ly b/input/test/incipit.ly index cfb8e036bf..febbe7127c 100644 --- a/input/test/incipit.ly +++ b/input/test/incipit.ly @@ -6,17 +6,17 @@ /Mats B %} -\version "1.3.110"; +\version "1.3.117"; -incipit = \notes\relative c'{ +incipit = \notes\relative c'{ } -emptyincipit = \notes{ +emptyincipit = \notes{ s1 } -violin = \notes\relative c''{ +violin = \notes\relative c''{ \specialkey \keysignature f' fis'' g' gis''; \time 2/2; \clef "treble"; diff --git a/input/test/instrument-name-grandstaff.ly b/input/test/instrument-name-grandstaff.ly index f90c721673..be169ea15b 100644 --- a/input/test/instrument-name-grandstaff.ly +++ b/input/test/instrument-name-grandstaff.ly @@ -1,4 +1,4 @@ -\version "1.3.110"; +\version "1.3.117"; \score { \notes diff --git a/input/test/instrument-name-mmrest.ly b/input/test/instrument-name-mmrest.ly index 130b8fff77..7b66394b10 100644 --- a/input/test/instrument-name-mmrest.ly +++ b/input/test/instrument-name-mmrest.ly @@ -6,7 +6,7 @@ interesting bug in 1.3.98) %} -\version "1.3.110"; +\version "1.3.117"; \score{ \context Staff < \property Staff.instrument = "instrument" diff --git a/input/test/instrument-name.ly b/input/test/instrument-name.ly index 7525a7459c..3718fcfc2f 100644 --- a/input/test/instrument-name.ly +++ b/input/test/instrument-name.ly @@ -1,4 +1,4 @@ -\version "1.3.110"; +\version "1.3.117"; \score { diff --git a/input/test/jazz-chords.ly b/input/test/jazz-chords.ly index ca0225fb77..f1fc994149 100644 --- a/input/test/jazz-chords.ly +++ b/input/test/jazz-chords.ly @@ -1,5 +1,5 @@ -\version "1.3.110"; +\version "1.3.117"; %% This should only be necessary if your kpathsea setup is broken % @@ -8,11 +8,11 @@ % % For normal (20pt) paper, do % -% cp locate `msam9.tfm` $LILYPONDPREFIX/tfm +% cp locate `msam9.tfm` LILYPONDPREFIXxtfm % -chord = \notes\transpose c''\chords{ -\property ChordNames.ChordName \override #'style = #'jazz +chord = \notes\transpose c''\chords{ +\property Chordnames.Chordname \override #'style = #'jazz % major chords c c:6 % 6 = major triad with added sixth diff --git a/input/test/keys.ly b/input/test/keys.ly index 427cda9010..3013dd1ca4 100644 --- a/input/test/keys.ly +++ b/input/test/keys.ly @@ -7,7 +7,7 @@ also created on a clef change. "; } -\version "1.3.110"; +\version "1.3.117"; \score { \notes \relative c'' diff --git a/input/test/keys2.ly b/input/test/keys2.ly index 4c52794c83..328a723bac 100644 --- a/input/test/keys2.ly +++ b/input/test/keys2.ly @@ -1,7 +1,7 @@ -\version "1.3.110"; +\version "1.3.117"; -blah = \notes { +blah = \notes { \transpose c'' { \time 4/4; diff --git a/input/test/knee-mult.ly b/input/test/knee-mult.ly index 5b7e7278c9..6925c301ba 100644 --- a/input/test/knee-mult.ly +++ b/input/test/knee-mult.ly @@ -16,4 +16,4 @@ } } -\version "1.3.110"; +\version "1.3.117"; diff --git a/input/test/knee.ly b/input/test/knee.ly index c06f5ff95c..2f80ff0cf0 100644 --- a/input/test/knee.ly +++ b/input/test/knee.ly @@ -1,4 +1,4 @@ -\version "1.3.110"; +\version "1.3.117"; \score{ \notes\relative c'{ [c16 \stemDown c'' \stemBoth c,, d] diff --git a/input/test/lyric-combine.ly b/input/test/lyric-combine.ly index 52497a554b..1d67184f26 100644 --- a/input/test/lyric-combine.ly +++ b/input/test/lyric-combine.ly @@ -12,17 +12,17 @@ to work. "; -filename = "twinkle-pop.ly"; -%title = "Ah, vous dirais-je, maman "; -description = "twinkle twinkle in pop-song-settings"; -composer = "traditional"; -enteredby = "HWN, chords by Johan Vromans"; -copyright = "public domain"; +filename = "twinkle-pop.ly"; +xtitle = "Ah, vous dirais-je, maman "; +description = "twinkle twinkle in pop-song-settings"; +composer = "traditional"; +enteredby = "HWN, chords by Johan Vromans"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; -m =\notes \relative c'' { +m = \notes \relative c'' { \property Staff.automaticMelismata = ##t \autoBeamOff g4 r8 \times 2/3 { g'8( f )e } r8 \grace { [d16 c b] } e4 @@ -31,10 +31,10 @@ m =\notes \relative c'' { \melismaEnd b } -noisebeat =\notes \relative c'' {g16 g g g } -noise = { \noisebeat \noisebeat \noisebeat \noisebeat \noisebeat \noisebeat } -textI = \lyrics { la2 __ la -- la __ la la la la la } -textII = \lyrics { da -- da __ da -- da da da da da } +noisebeat = \notes \relative c'' {g16 g g g } +noise = { \noisebeat \noisebeat \noisebeat \noisebeat \noisebeat \noisebeat } +textI = \lyrics { la2 __ la -- la __ la la la la la } +textII = \lyrics { da -- da __ da -- da da da da da } \score { \notes < \context Staff = SA \m diff --git a/input/test/lyric-extender.ly b/input/test/lyric-extender.ly index 7705dcf86e..959e68c061 100644 --- a/input/test/lyric-extender.ly +++ b/input/test/lyric-extender.ly @@ -5,4 +5,4 @@ > } -\version "1.3.110"; +\version "1.3.117"; diff --git a/input/test/lyric-hyphen.ly b/input/test/lyric-hyphen.ly index 96312fdb61..06286fddb1 100644 --- a/input/test/lyric-hyphen.ly +++ b/input/test/lyric-hyphen.ly @@ -1,11 +1,11 @@ \score{ < \context Staff \notes { c' () c' () c' c' } - \context Lyrics \context LyricVoice \lyrics { bla -- alb xxx -- yyy } + \context Lyrics \context LyricsVoice \lyrics { bla -- alb xxx -- yyy } > } -\version "1.3.110"; +\version "1.3.117"; diff --git a/input/test/lyric-phrasing.ly b/input/test/lyric-phrasing.ly index 2927eb62ae..7f0875362a 100644 --- a/input/test/lyric-phrasing.ly +++ b/input/test/lyric-phrasing.ly @@ -1,15 +1,15 @@ \header{ -filename = "twinkle-pop.ly"; -%title = "Ah, vous dirais-je, maman "; -description = "twinkle twinkle in pop-song-settings"; -composer = "traditional"; -enteredby = "HWN, chords by Johan Vromans"; -copyright = "public domain"; +filename = "twinkle-pop.ly"; +xtitle = "Ah, vous dirais-je, maman "; +description = "twinkle twinkle in pop-song-settings"; +composer = "traditional"; +enteredby = "HWN, chords by Johan Vromans"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; -m =\notes \relative c'' { +m = \notes \relative c'' { \property Staff.automaticMelismata = ##t \autoBeamOff g4 r8 \times 2/3 { g'8( f )e } r8 \grace { [d16 c b] } e4 @@ -18,9 +18,9 @@ m =\notes \relative c'' { \melismaEnd b c d e } -textI = \lyrics { la4 __ la -- la I, la dargh la dargh. } -textII = \lyrics { dar -- dargh __ dargh dargh; dargh la dargh loo. } -textIII = \lyrics { la -- da __ doo dah; dargh la dargh loo. } +textI = \lyrics { la4 __ la -- la I, la dargh la dargh. } +textII = \lyrics { dar -- dargh __ dargh dargh; dargh la dargh loo. } +textIII = \lyrics { la -- da __ doo dah; dargh la dargh loo. } \score { diff --git a/input/test/lyrics-multi-stanza.ly b/input/test/lyrics-multi-stanza.ly index 2006b0879a..a7dee3a6a4 100644 --- a/input/test/lyrics-multi-stanza.ly +++ b/input/test/lyrics-multi-stanza.ly @@ -1,5 +1,5 @@ -\version "1.3.110"; +\version "1.3.117"; \include "english.ly" \header{ @@ -18,7 +18,7 @@ Multiple stanzas poet = "Thomas Kelly (1769-1855)"; } -allup = \notes{ +allup = \notes{ \stemUp \slurUp \tieUp @@ -26,7 +26,7 @@ allup = \notes{ \autoBeamOff } -alldown = \notes{ +alldown = \notes{ \stemDown \slurDown \tieDown @@ -34,13 +34,13 @@ alldown = \notes{ \autoBeamOff } -Global = \notes{ +Global = \notes{ \key g \major; \time 4/4; \partial 4; } -Soprano = \notes \relative c' { +Soprano = \notes \relative c' { \allup d4 | g g b b a g a b a g b a g( a )g % modified to test melisma align right @@ -55,26 +55,26 @@ Soprano = \notes \relative c' { g d'2 c b4.( c8 )a4 a g2. } -Alto = \notes \relative c'{ +Alto = \notes \relative c'{ \alldown d4 | d d g g fs g fs g fs e g fs d2. d4 | g d b g' [b8 a] [g fs] g4 fs g2 a g fs4( e8 )g fs2. d4 | g g d g [fs8 e] [fs g] fs4 g f2 e d4.( d8 )d4 fs4 d2. } -Tenor = \notes \relative c{ +Tenor = \notes \relative c{ \allup d4 | b' b d d c b c d c b d c b2. a4 | b a g b [d8 c] [b a] b4 a b2 c b a a2. g4 | b d b d [c8 b] [c d] c4 b g2 g g4.( a8 [fs )a] c4 b2. } -Bass = \notes \relative c{ +Bass = \notes \relative c{ \alldown d4 | g g g g d d d g d e d d g,2. d'4 | g d b g' [b8 a] [g fs] g4 d g2 fs e a d,2. g4 | g g g g d d d e b2 c d2. d4 g,2. } -TheLyrics = \lyrics < +TheLyrics = \lyrics < { \context LyricsVoice = "Soprano-1" \property LyricsVoice .stanza = "1:" diff --git a/input/test/lyrics.ly b/input/test/lyrics.ly index a832c087c6..5680f882e5 100644 --- a/input/test/lyrics.ly +++ b/input/test/lyrics.ly @@ -1,6 +1,6 @@ -\version "1.3.110"; +\version "1.3.117"; -$somewhat_long = \lyrics{ +somewhatLong = \lyrics{ \property Lyrics . textStyle = "roman" AaaaaaA2 BbbbbbB2 @@ -10,7 +10,7 @@ $somewhat_long = \lyrics{ FfffffF2 } -$rather_long = \lyrics{ +ratherLong = \lyrics{ \property Lyrics . textStyle = "roman" LLLLoooonggggg2 Syyllllaaabbble2 @@ -20,7 +20,7 @@ $rather_long = \lyrics{ Syyyylllaaabbble2 } -$quite_long = \lyrics{ +quiteLong = \lyrics{ \property Lyrics . textStyle = "roman" LLLLLLLLLooooongggggggg2 Syyyyyyyyyyyyylllllllaaaaaabbble2 @@ -30,35 +30,35 @@ $quite_long = \lyrics{ Syyyyyyyyyyyyylllllllaaaaaabbble2 } -$somewhat_long_lyrics_staff = \context Lyrics = somewhat < - \$somewhat_long +somewhatLongLyricsStaff = \context Lyrics = somewhat < + \somewhatLong > -$rather_long_lyrics_staff = \context Lyrics = rather < - \$rather_long +ratherLongLyricsStaff = \context Lyrics = rather < + \ratherLong > -$quite_long_lyrics_staff = \context Lyrics = quite < - \$quite_long +quiteLongLyricsStaff = \context Lyrics = quite < + \quiteLong > -melody = \notes +melody = \notes \transpose c'{ c4 e4 g4 e4 c4 e4 g4 e4 c4 e4 g4 e4 c4 e4 g4 e4 c4 e4 g4 e4 c4 e4 g4 e4 c4 e4 g4 e4 c4 e4 g4 e4 } -$melodic_staff = \context Staff = mel < +melodicStaff = \context Staff = mel < \melody > \score { < - \$melodic_staff - \$somewhat_long_lyrics_staff -% \$rather_long_lyrics_staff - \$quite_long_lyrics_staff + \melodicStaff + \somewhatLongLyricsStaff +% \ratherLongLyricsStaff + \quiteLongLyricsStaff > \paper{ diff --git a/input/test/manual-clef.ly b/input/test/manual-clef.ly index 17d1d84c6a..2fc6fd7d05 100644 --- a/input/test/manual-clef.ly +++ b/input/test/manual-clef.ly @@ -1,4 +1,4 @@ -\version "1.3.110"; +\version "1.3.117"; %{ diff --git a/input/test/mark.ly b/input/test/mark.ly index 942e728efa..f037d10dde 100644 --- a/input/test/mark.ly +++ b/input/test/mark.ly @@ -1,6 +1,6 @@ -\version "1.3.110"; +\version "1.3.117"; -global = \notes { +global = \notes { s1 | \mark "A"; s1 | \mark ; s1 | \mark "12"; @@ -8,7 +8,7 @@ global = \notes { s1 } -one = \notes \relative c { +one = \notes \relative c { c''1 c c c c } diff --git a/input/test/markup.ly b/input/test/markup.ly index 4b35fea469..6a46921ef0 100644 --- a/input/test/markup.ly +++ b/input/test/markup.ly @@ -1,5 +1,5 @@ -\version "1.3.110"; +\version "1.3.117"; % % Test new font selection and scm text markup diff --git a/input/test/memory.ly b/input/test/memory.ly index 71d3b4f44d..c5114349a9 100644 --- a/input/test/memory.ly +++ b/input/test/memory.ly @@ -3,7 +3,7 @@ do a memory stress test. %} -bla = \notes { +bla = \notes { c1(((( c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break ))))c1} \score { \context Score < @@ -11,5 +11,5 @@ bla = \notes { > \paper { Gourlay_maxmeaures = 2.; } } -\version "1.3.110"; +\version "1.3.117"; diff --git a/input/test/metronome.ly b/input/test/metronome.ly index 431799d719..3d0ca2068f 100644 --- a/input/test/metronome.ly +++ b/input/test/metronome.ly @@ -1,5 +1,5 @@ -\version "1.3.110"; +\version "1.3.117"; % Test scm markup text and kerning diff --git a/input/test/multi-measure-rest.ly b/input/test/multi-measure-rest.ly index 23f3e335b8..01732e4e88 100644 --- a/input/test/multi-measure-rest.ly +++ b/input/test/multi-measure-rest.ly @@ -6,7 +6,7 @@ multi-measure-rest is a Spanner, minimum distances are set to keep it colliding from barlines. "; } -\version "1.3.110"; +\version "1.3.117"; \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 914bdc8ca1..506e1fc046 100644 --- a/input/test/multi-rest.ly +++ b/input/test/multi-rest.ly @@ -1,6 +1,6 @@ -\version "1.3.110"; +\version "1.3.117"; -voice_one = \notes\transpose c''{ \stemUp +voiceOne = \notes\transpose c''{ \stemUp R1 * 2 | f'4-. r r2 | R1 * 3 | f'4-. r r2 | R1 * 3 | es'4-. r r2 | r1 | @@ -10,7 +10,7 @@ voice_one = \notes\transpose c''{ \stemUp r2 r4 g4-. | } -voice_two = \notes +voiceTwo = \notes { \transpose c' { \stemDown R1 * 2 | f'4-. r r2 | R1 * 3 | f'4-. r r2 | R1 * 3 | @@ -24,8 +24,8 @@ voice_two = \notes \score { \notes \context Staff < - \$voice_two - \$voice_one + \voiceTwo + \voiceOne > } diff --git a/input/test/noteheadstyle.ly b/input/test/noteheadstyle.ly index 808c16020c..c59f40c073 100644 --- a/input/test/noteheadstyle.ly +++ b/input/test/noteheadstyle.ly @@ -10,7 +10,7 @@ either up or down stems. "; } -\version "1.3.110"; +\version "1.3.117"; \score { \notes \relative c{ diff --git a/input/test/notemode-chords.ly b/input/test/notemode-chords.ly index 9ea9107d0a..49819c10ab 100644 --- a/input/test/notemode-chords.ly +++ b/input/test/notemode-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.110"; +\version "1.3.117"; \score{ \notes \transpose c''{ diff --git a/input/test/orchestscore.ly b/input/test/orchestscore.ly index ac6a55e45d..4c1b4f5f99 100644 --- a/input/test/orchestscore.ly +++ b/input/test/orchestscore.ly @@ -1,11 +1,11 @@ -\version "1.3.110"; +\version "1.3.117"; -m = \notes \relative c''{ +m = \notes \relative c''{ c1 | c2 c | c c | c c | \break c c | c c | c c | c c | } -M = \notes \relative c''{ +M = \notes \relative c''{ c1 | c2 c | c c | R1*5 } diff --git a/input/test/ossia.ly b/input/test/ossia.ly index c63b4c4d82..6a887b2e66 100644 --- a/input/test/ossia.ly +++ b/input/test/ossia.ly @@ -1,4 +1,4 @@ -\version "1.3.110"; +\version "1.3.117"; \score { diff --git a/input/test/ottava.ly b/input/test/ottava.ly index ad3b746fe1..b4b0cfa9a0 100644 --- a/input/test/ottava.ly +++ b/input/test/ottava.ly @@ -1,5 +1,5 @@ -\version "1.3.110"; +\version "1.3.117"; \score{ \notes\relative c'''{ diff --git a/input/test/pushproperty.ly b/input/test/pushproperty.ly index ed21fe5b5a..2d176934f1 100644 --- a/input/test/pushproperty.ly +++ b/input/test/pushproperty.ly @@ -1,4 +1,4 @@ -\version "1.3.110"; +\version "1.3.117"; %{ diff --git a/input/test/rest-collision.ly b/input/test/rest-collision.ly index a00046c6ea..276afa516a 100644 --- a/input/test/rest-collision.ly +++ b/input/test/rest-collision.ly @@ -8,14 +8,14 @@ cases. "; } -scale = \notes \relative c' { +scale = \notes \relative c' { c8 d e f g a b c c d e f g a b c } -rests = \notes { +rests = \notes { r r r r r r r r r r r r r r r r } -different =< \context Voice = one { +different = < \context Voice = one { \stemUp \notes \relative c'' { r8 a e4 a e @@ -27,12 +27,12 @@ different =< \context Voice = one { r1 }} > -scales = \context Staff \notes < +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 } > -restsII = \context Staff \notes { +restsII = \context Staff \notes { r4 r8 \context Staff < { \stemUp r8 } { \stemDown r8} > \context Staff < {\stemUp r8} r8 { \stemDown r8} > @@ -58,4 +58,4 @@ restsII = \context Staff \notes { } } -\version "1.3.110"; +\version "1.3.117"; diff --git a/input/test/scripts.ly b/input/test/scripts.ly index 76531d2498..9cb1550d92 100644 --- a/input/test/scripts.ly +++ b/input/test/scripts.ly @@ -1,8 +1,8 @@ -\version "1.3.110"; +\version "1.3.117"; -blah = \notes{ \transpose c'' { +blah = \notes{ \transpose c'' { c,4 ->-.-\fermata-"text" c ->-.-\fermata-"text" diff --git a/input/test/sleur.ly b/input/test/sleur.ly index e9e280bac0..5bbb52da48 100644 --- a/input/test/sleur.ly +++ b/input/test/sleur.ly @@ -1,13 +1,13 @@ \header{ -enteredby = "jcn"; -copyright = "public domain"; -TestedFeatures = "This file tests Feta embedded slurs" + +enteredby = "jcn"; +copyright = "public domain"; +TestedFeatures = "This file tests Feta embedded slurs" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.110"; +\version "1.3.117"; -shortlong = \notes{ +shortlong = \notes{ c4()c( c c | c c c c | c c c c | @@ -15,19 +15,19 @@ shortlong = \notes{ c c c )c | } -dirs = \notes\transpose c' { +dirs = \notes\transpose c' { c'1() g' () c () g () c | } -complex = \notes{ +complex = \notes{ \transpose c'{ c,16( e,( g,( b,( d( f( a( c'())))))))c4 c4 |} \transpose c'''{ c,16( a( f( d( b,( g,( e,( c,())))))))c4 c4 |} } -over = \notes\transpose c'{ +over = \notes\transpose c'{ e( g' g' )e @@ -51,7 +51,7 @@ over = \notes\transpose c'{ e( c'' f )e } -under = \notes\transpose c'{ +under = \notes\transpose c'{ \stemDown f'( \stemBoth d d \stemDown )f' f'( \stemBoth c c \stemDown )f' @@ -75,7 +75,7 @@ under = \notes\transpose c'{ f'( e, f )f' } -eccentric = \notes\transpose c'{ +eccentric = \notes\transpose c'{ \stemUp \times 4/7 { f( a' f f f f )f } | \times 4/7 { f( f f f f a' )f } | @@ -84,7 +84,7 @@ eccentric = \notes\transpose c'{ \times 4/7 { e'( e' e' e' e' c )e' } | } -tiltup = \notes\transpose c'{ +tiltup = \notes\transpose c'{ e( c'' c'' )e' \stemUp e( c'' c'' )e' @@ -98,7 +98,7 @@ tiltup = \notes\transpose c'{ f'( a, a, )f'' } -tiltdown = \notes\transpose c'{ +tiltdown = \notes\transpose c'{ e'( c'' c'' )e \stemUp e'( c'' c'' )e @@ -112,7 +112,7 @@ tiltdown = \notes\transpose c'{ f''( a, a, )f' } -broken = \notes\transpose c''{ +broken = \notes\transpose c''{ c c c c() c c c c( c )c c c( @@ -125,7 +125,7 @@ broken = \notes\transpose c''{ f,( c c )f, } -blend = \notes\transpose c'{ +blend = \notes\transpose c'{ e( c'' c'' )e \stemUp f'( c'' c'' )f' @@ -146,7 +146,7 @@ blend = \notes\transpose c'{ } -bug = \notes\transpose c'{ +bug = \notes\transpose c'{ a()g( f )e b'()a'( g' )f' @@ -155,7 +155,7 @@ bug = \notes\transpose c'{ c' () b () c' c' } -clipping = \notes\transpose c'{ +clipping = \notes\transpose c'{ \stemBoth c( c''' c''')c c( c''' c )c'' diff --git a/input/test/slur-cross-staff.ly b/input/test/slur-cross-staff.ly index b4805b1bea..e2ada8c8e7 100644 --- a/input/test/slur-cross-staff.ly +++ b/input/test/slur-cross-staff.ly @@ -45,4 +45,4 @@ linebreak. > } -\version "1.3.110"; +\version "1.3.117"; diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly index 4a7c7b890b..3b03fbbc89 100644 --- a/input/test/slur-damping.ly +++ b/input/test/slur-damping.ly @@ -1,5 +1,5 @@ % test damping -\version "1.3.110"; +\version "1.3.117"; \score{ \notes\relative c'{ diff --git a/input/test/slur-dash.ly b/input/test/slur-dash.ly index b7d63db3c9..dd190257d9 100644 --- a/input/test/slur-dash.ly +++ b/input/test/slur-dash.ly @@ -1,4 +1,4 @@ -\version "1.3.110"; +\version "1.3.117"; \score{ \notes{ diff --git a/input/test/slur-follow-music.ly b/input/test/slur-follow-music.ly index 8ab3ce8c31..cb4d50a351 100644 --- a/input/test/slur-follow-music.ly +++ b/input/test/slur-follow-music.ly @@ -1,4 +1,4 @@ -\version "1.3.110"; +\version "1.3.117"; \score { \context Voice \notes\relative c { % CASE 3 diff --git a/input/test/slur-nice.ly b/input/test/slur-nice.ly index fdc690766e..fce8f94686 100644 --- a/input/test/slur-nice.ly +++ b/input/test/slur-nice.ly @@ -5,7 +5,7 @@ only to avoid noteheads, and as little as possible. Slurs never run through noteheads or stems. "; } -\version "1.3.110"; +\version "1.3.117"; \score{ \notes\relative c''{ \time 3/4; diff --git a/input/test/slurs.ly b/input/test/slurs.ly index 9597a65305..737c2df43f 100644 --- a/input/test/slurs.ly +++ b/input/test/slurs.ly @@ -1,5 +1,5 @@ -\version "1.3.110"; +\version "1.3.117"; \score{ \notes\transpose c'{ diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly index 9b75220f1b..0cbbadda14 100644 --- a/input/test/spacing-2.ly +++ b/input/test/spacing-2.ly @@ -1,7 +1,7 @@ \header { -opus = "BWV 937 (prelude)"; -composer = "J. S. Bach"; -source = "Petits Preludes et Fugues. Urtext. Editions Henry Lemoine, Paris."; +opus = "BWV 937 (prelude)"; +composer = "J. S. Bach"; +source = "Petits Preludes et Fugues. Urtext. Editions Henry Lemoine, Paris."; } %{ @@ -33,4 +33,4 @@ source = "Petits Preludes et Fugues. Urtext. Editions Henry Lemoine, Paris."; } } -\version "1.3.110"; +\version "1.3.117"; diff --git a/input/test/spacing.ly b/input/test/spacing.ly index 55237141e9..76c52636a3 100644 --- a/input/test/spacing.ly +++ b/input/test/spacing.ly @@ -1,14 +1,14 @@ \header{ title= "Spacing"; -subtitle = "proofsheet"; -enteredby = "jcn"; -copyright = "public domain"; -TestedFeatures = "This file tests various spacings"; +subtitle = "proofsheet"; +enteredby = "jcn"; +copyright = "public domain"; +TestedFeatures = "This file tests various spacings"; } -\version "1.3.110"; +\version "1.3.117"; -multipart = \notes \relative c'{ +multipart = \notes \relative c'{ \context StaffGroup < \context Staff = one \context Voice { c4 @@ -74,7 +74,7 @@ multipart = \notes \relative c'{ > } -singlepart = \notes{ +singlepart = \notes{ c4 d e f c4 d e [f8 f] c4 d e f8 [f16 f] diff --git a/input/test/span-bars.ly b/input/test/span-bars.ly index 56fd9579ab..2ae91398a3 100644 --- a/input/test/span-bars.ly +++ b/input/test/span-bars.ly @@ -1,7 +1,7 @@ -\version "1.3.110"; -nt = \notes { c1 \break c1 c1 } -stuff = \notes \relative c'' < +\version "1.3.117"; +nt = \notes { c1 \break c1 c1 } +stuff = \notes \relative c'' < \context Staff = stone { \nt } \context Staff = sttwo { \nt } > diff --git a/input/test/staff-margin-partial.ly b/input/test/staff-margin-partial.ly index 7f36dd7083..f24531ffcd 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.110"; +\version "1.3.117"; \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 de631bce01..bb2b30f36b 100644 --- a/input/test/staff-margin.ly +++ b/input/test/staff-margin.ly @@ -7,7 +7,7 @@ be on normal staffs, but also on compound staffs, like the PianoStaff } -\version "1.3.110"; +\version "1.3.117"; \score { diff --git a/input/test/staff-side-slur.ly b/input/test/staff-side-slur.ly index 52f456b1c3..769668fd4f 100644 --- a/input/test/staff-side-slur.ly +++ b/input/test/staff-side-slur.ly @@ -18,4 +18,4 @@ } -\version "1.3.110"; +\version "1.3.117"; diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly index 4155311f6d..449f3bfcd0 100644 --- a/input/test/staff-size.ly +++ b/input/test/staff-size.ly @@ -14,4 +14,4 @@ > \paper { linewidth = -1.; } } -\version "1.3.110"; +\version "1.3.117"; diff --git a/input/test/standchen-as5.ly b/input/test/standchen-as5.ly index 8b557f0410..8cc60338a0 100644 --- a/input/test/standchen-as5.ly +++ b/input/test/standchen-as5.ly @@ -1,5 +1,5 @@ -\version "1.3.110"; +\version "1.3.117"; \include "paper-as5.ly" diff --git a/input/test/stem-tremolo.ly b/input/test/stem-tremolo.ly index 4856eb5a00..907608ac5e 100644 --- a/input/test/stem-tremolo.ly +++ b/input/test/stem-tremolo.ly @@ -7,7 +7,7 @@ tremolo must be centered on the note. "; } -\version "1.3.110"; +\version "1.3.117"; \score{ \context Voice\notes \relative c''{ %%? diff --git a/input/test/stem.ly b/input/test/stem.ly index c64f05c069..c1f84ec278 100644 --- a/input/test/stem.ly +++ b/input/test/stem.ly @@ -1,16 +1,16 @@ \header{ title= "Stems and Beams"; -subtitle = "proofsheet"; -enteredby = "jcn"; -copyright = "public domain"; -TestedFeatures = "This file tests the length of stems and placement +subtitle = "proofsheet"; +enteredby = "jcn"; +copyright = "public domain"; +TestedFeatures = "This file tests the length of stems and placement of beams"; } -\version "1.3.110"; +\version "1.3.117"; -beamintervals = \notes{ +beamintervals = \notes{ \time 7/4; \stemUp \transpose c'{ diff --git a/input/test/tab-staff.ly b/input/test/tab-staff.ly index 87fe60cb06..554fbbdca2 100644 --- a/input/test/tab-staff.ly +++ b/input/test/tab-staff.ly @@ -1,5 +1,5 @@ -\version "1.3.110"; +\version "1.3.117"; %{ @@ -8,7 +8,7 @@ yourself.) %} -bla = \notes \relative c' { } +bla = \notes \relative c' { } \score { \notes < diff --git a/input/test/tchaikovsky.ly b/input/test/tchaikovsky.ly index af12e6ea0e..7c78ebaecc 100644 --- a/input/test/tchaikovsky.ly +++ b/input/test/tchaikovsky.ly @@ -1,13 +1,13 @@ \header{ -filename = "tchaikovsky.ly"; -title = "Extracts from 6th symphony"; -subtitle = "Ist movement"; +filename = "tchaikovsky.ly"; +title = "Extracts from 6th symphony"; +subtitle = "Ist movement"; composer= "Pjotr Iljitsj Tchaikovsky"; -enteredby = "Maarten Storm"; +enteredby = "Maarten Storm"; instrument= "Violoncello"; } -\version "1.3.110"; +\version "1.3.117"; % this is an example of extreme dynamics diff --git a/input/test/text-spanner.ly b/input/test/text-spanner.ly index 53784a734a..499b3e9a1b 100644 --- a/input/test/text-spanner.ly +++ b/input/test/text-spanner.ly @@ -1,5 +1,5 @@ -\version "1.3.110"; +\version "1.3.117"; \score{ \notes\relative c''{ diff --git a/input/test/thumb.ly b/input/test/thumb.ly index 18e8b24412..ba6f1259a2 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.110"; +\version "1.3.117"; \score { \notes \relative c'' { [ <)b_\thumb b'-3> diff --git a/input/test/tie-chord.ly b/input/test/tie-chord.ly index 25fffecf9c..2068c371ae 100644 --- a/input/test/tie-chord.ly +++ b/input/test/tie-chord.ly @@ -5,9 +5,9 @@ point away from the center of the staff. Override with @code{tieVerticalDirection}. "; } -\version "1.3.110"; +\version "1.3.117"; -t = \notes \relative c' { ~ } +t = \notes \relative c' { ~ } \score { \notes \context Voice { diff --git a/input/test/title.ly b/input/test/title.ly index b1f09a22fd..dec8970290 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -1,16 +1,16 @@ \header{ -filename = "title.ly"; -title = "Title"; -subtitle = "Subtitle"; +filename = "title.ly"; +title = "Title"; +subtitle = "Subtitle"; composer= "Composer (xxxx-yyyy)"; -arranger = "Arranger"; -copyright = "public domain"; -enteredby = "jcn"; -source = "urtext"; +arranger = "Arranger"; +copyright = "public domain"; +enteredby = "jcn"; +source = "urtext"; instrument= "Instrument"; } -\version "1.3.110"; +\version "1.3.117"; \score{ \notes diff --git a/input/test/transposition.ly b/input/test/transposition.ly index 88257ec12a..40cedf07c4 100644 --- a/input/test/transposition.ly +++ b/input/test/transposition.ly @@ -15,16 +15,16 @@ Eric %} \header{ -title = "Test it"; -description = "Transposition Test file"; -enteredby = "Eric Bullinger"; -copyright = "public domain"; +title = "Test it"; +description = "Transposition Test file"; +enteredby = "Eric Bullinger"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; -vOne = \notes \relative c''{ +vOne = \notes \relative c''{ \clef"violin"; \key d \major; \time 2/4 ; @@ -35,9 +35,9 @@ vOne = \notes \relative c''{ c4 c | } -vTwo = \notes \transpose d' { \vOne } +vTwo = \notes \transpose d' { \vOne } -vThree = \notes \relative c''{ +vThree = \notes \relative c''{ \clef"violin"; \keysignature fis cis; \time 2/4 ; @@ -48,7 +48,7 @@ vThree = \notes \relative c''{ cis4 ais4 | } -vFour = \notes \transpose d' \vThree +vFour = \notes \transpose d' \vThree \score { \context StaffGroup < diff --git a/input/test/tup.ly b/input/test/tup.ly index 83c6bce13f..649feb5d22 100644 --- a/input/test/tup.ly +++ b/input/test/tup.ly @@ -16,4 +16,4 @@ centered in the gap in the bracket. } } -\version "1.3.110"; +\version "1.3.117"; diff --git a/input/test/tuplet.ly b/input/test/tuplet.ly index 7314754d73..0aa77a925c 100644 --- a/input/test/tuplet.ly +++ b/input/test/tuplet.ly @@ -1,4 +1,4 @@ -\version "1.3.110" +\version "1.3.117" \score { \context Voice \notes\relative c'' { diff --git a/input/test/twinkle-as5.ly b/input/test/twinkle-as5.ly index 7bf92248f5..c2b20d66b2 100644 --- a/input/test/twinkle-as5.ly +++ b/input/test/twinkle-as5.ly @@ -1,16 +1,16 @@ \header{ -filename = "twinkle.ly"; -title = "Twinkle Twinkle Little Star"; -composer = "Traditional"; -enteredby = "hwn and jcn"; -copyright = "public domain"; +filename = "twinkle.ly"; +title = "Twinkle Twinkle Little Star"; +composer = "Traditional"; +enteredby = "hwn and jcn"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; \include "paper-as5.ly" -melody = \notes \relative c'' { +melody = \notes \relative c'' { \time 2/4; c4 c | g' g | a a | g g | %{ @@ -24,7 +24,7 @@ melody = \notes \relative c'' { %} } -accompany = \notes \relative c { +accompany = \notes \relative c { \clef "bass"; \time 2/4; c4 c' | e c | f c | e c | @@ -40,7 +40,7 @@ accompany = \notes \relative c { } -text = \lyrics{ +text = \lyrics{ Twin -- kle, twin -- kle, lit -- tle star, " " %{ How I won -- der what you " " are. diff --git a/input/test/two-slurs.ly b/input/test/two-slurs.ly index 88c25d40cd..d089a6475d 100644 --- a/input/test/two-slurs.ly +++ b/input/test/two-slurs.ly @@ -1,4 +1,4 @@ -\version "1.3.110"; +\version "1.3.117"; % % We'd want to combine the stems, but have two slurs too... % Looks like the a-due engraver diff --git a/input/test/updown.ly b/input/test/updown.ly index 865dbe7e59..72ac92165b 100644 --- a/input/test/updown.ly +++ b/input/test/updown.ly @@ -10,7 +10,7 @@ {\voiceTwo c}> - \version "1.3.110"; + \version "1.3.117"; } \paper { } diff --git a/input/test/vertical-align.ly b/input/test/vertical-align.ly index 932e1688f7..924669e953 100644 --- a/input/test/vertical-align.ly +++ b/input/test/vertical-align.ly @@ -1,5 +1,5 @@ -\version "1.3.110"; +\version "1.3.117"; \score { \notes < diff --git a/input/test/vertical-text.ly b/input/test/vertical-text.ly index ba8f2ea579..3039700865 100644 --- a/input/test/vertical-text.ly +++ b/input/test/vertical-text.ly @@ -15,4 +15,4 @@ } } -\version "1.3.110"; +\version "1.3.117"; diff --git a/input/test/volta-start.ly b/input/test/volta-start.ly new file mode 100644 index 0000000000..22da2abbbe --- /dev/null +++ b/input/test/volta-start.ly @@ -0,0 +1,108 @@ + +\header{ + +texidoc = " Volta braces are hung on barlines. At the start of the +line, they should always start after the prefatory matter. "; + +} + +\version "1.3.117"; + +voiceB = \notes { + \clef bass; + \property Staff.instrument = "Bass" + \property Staff.instr = "B" + \key f \minor; + \time 4/4; + f,2 ( ) f,8 r8 f8 e8 + \repeat volta 2 + { + d8. d16 e8. f16 f8 c8 c16 c8. \break + } + \alternative + { + { + f,2 ( ) f,8 r8 f8 e8 + f,2 ( ) f,8 r8 f8 e8 + g1 \break + f,2 ( ) f,8 r8 f8 e8 + f,2 ( ) f,8 r8 f8 e8 + g1 \break + } + { + f,2. r8 c16 c16 | + } + } +} +voiceC = \notes { + \repeat volta 2 + { + bes8 bes8 c'8 c'8 a4 r8 g16 f16 | + d'8. c'16 c'8. d'16 c'8 c'8 f16 g8. | + \break + } + \alternative + { + { a2 ( ) a8 r8 a8 bes8 } + { a2. r8 g16 f16 | + d'8. c'16 c'8. d'16 c'8 c'8 c'16 c'8. | + } + } +} +voiceD = \notes { + \repeat volta 2 + { + bes8 bes8 c'8 c'8 a4 r8 g16 f16 | + d'8. c'16 c'8. d'16 c'8 c'8 f16 g8. | + \break + } + \alternative + { + { a2 \> a8 r8 a8 \! bes8 + } + { a2. r8 g16 f16 | + d'8. c'16 c'8. d'16 c'8 c'8 c'16 c'8. | \break + d'8. c'16 c'8. d'16 c'8 c'8 c'16 c'8. | + } + } +} +voiceE = \notes { + \repeat volta 2 + { + bes8 bes8 c'8 c'8 a4 r8 g16 f16 | + d'8. c'16 c'8. d'16 c'8 c'8 f16 g8. | \break + } + \alternative + { + { + a2 a8 r8 a8 bes8 + + } + { + a2. r8 g16 f16 | + d'8. c'16 c'8. d'16 c'8 c'8 c'16 c'8. | + } + } +} +\score{ + \notes < + + + \context Staff="4" + { + \voiceB + \voiceC + \break + \voiceD + \voiceE + } + + > + \paper { + font_normal = 12.; + \translator { + \StaffContext + \consists Instrument_name_engraver; + } + } +} diff --git a/input/test/volta.ly b/input/test/volta.ly index b470c72fd8..4a038334d4 100644 --- a/input/test/volta.ly +++ b/input/test/volta.ly @@ -1,8 +1,8 @@ -\version "1.3.110"; +\version "1.3.117"; -voice4 = \notes { +voiceE = \notes { \clef bass; \property Staff.instrument = "Bass" \property Staff.instr = "B" @@ -18,7 +18,7 @@ voice4 = \notes { } } } -voicedefault = \notes { +voicedefault = \notes { \time 4/4; \key f \major ; \tempo 4 = 200; @@ -29,8 +29,8 @@ voicedefault = \notes { \context Staff="4" { - \$voicedefault - \$voice4 + \voicedefault + \voiceE } > diff --git a/input/test/warnings.ly b/input/test/warnings.ly deleted file mode 100644 index 655d27c9a8..0000000000 --- a/input/test/warnings.ly +++ /dev/null @@ -1,15 +0,0 @@ -\header { -texidoc="Various warnings -"; -} - -linebreak = \penalty -1000; - -\score { - \notes { - \property Voice.Stem \set #'length = #"foo" - \property Voice.Stem \set #'longth = #2 - \property Staff.clefStyle = #"foo" - \property Staff.clefStyle = #2 - } -} diff --git a/input/trip.ly b/input/trip.ly index 7fd7e290dd..f69c193fea 100644 --- a/input/trip.ly +++ b/input/trip.ly @@ -19,8 +19,8 @@ TODO: %} -\version "1.3.110"; -praeludiumRight = \notes { +\version "1.3.117"; +praeludiumRight = \notes { \key e \major; \clef violin; @@ -46,7 +46,7 @@ praeludiumRight = \notes { % 16 } -praeludiumLeft = \notes \relative c { +praeludiumLeft = \notes \relative c { \key e \major; \clef bass; @@ -85,7 +85,7 @@ praeludiumLeft = \notes \relative c { -fugaIIRight = \notes \relative c'' { +fugaIIRight = \notes \relative c'' { \key e \major; % E-major \clef violin; \time3/4; @@ -134,9 +134,9 @@ fugaIIRight = \notes \relative c'' { %19 } -gracetest = \notes \grace { [c16 ( cis dis] } +gracetest = \notes \grace { [c16 ( cis dis] } -fugaIILeft = \notes { +fugaIILeft = \notes { \key e \major; \clef bass; @@ -154,7 +154,7 @@ fugaIILeft = \notes { %19 } -fugaIIPedal = \notes \relative c { +fugaIIPedal = \notes \relative c { \key e \major; \clef bass; diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index d2b418173a..e47c8317d6 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -1,15 +1,15 @@ \header{ -filename = "twinkle-pop.ly"; -%title = "Ah, vous dirais-je, maman "; -description = "twinkle twinkle in pop-song-settings"; -composer = "traditional"; -enteredby = "HWN, chords by Johan Vromans"; -copyright = "public domain"; +filename = "twinkle-pop.ly"; +xtitle = "Ah, vous dirais-je, maman "; +description = "twinkle twinkle in pop-song-settings"; +composer = "traditional"; +enteredby = "HWN, chords by Johan Vromans"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; -melodie = \notes\relative c'' { +melodie = \notes\relative c'' { \clef "violin"; \time 2/4 ; @@ -22,7 +22,7 @@ melodie = \notes\relative c'' { f4 f | e e | d d | c2 \bar "|."; } -acc = \chords { +acc = \chords { % why don't \skip, s4 work? c2 c f c f c g:7 c @@ -33,7 +33,7 @@ acc = \chords { f c g:7 c } -text = \lyrics{ +text = \lyrics{ \property Lyrics . textStyle = "italic" Ah!4 vous dir -- ai -- je ma man2 diff --git a/input/twinkle.ly b/input/twinkle.ly index acfd564db3..09cb9cff0f 100644 --- a/input/twinkle.ly +++ b/input/twinkle.ly @@ -1,9 +1,9 @@ \header{ -filename = "twinkle.ly"; -title = "Twinkle Twinkle Little Star"; -composer = "Traditional"; -enteredby = "hwn and jcn"; -copyright = "public domain"; +filename = "twinkle.ly"; +title = "Twinkle Twinkle Little Star"; +composer = "Traditional"; +enteredby = "hwn and jcn"; +copyright = "public domain"; } %{ @@ -20,9 +20,9 @@ Tested Features: lyrics, interleaving lyrics and staffs, repeats, auto beaming, adding lyrics to notes, hyphens %} -\version "1.3.110"; +\version "1.3.117"; -melody = \notes \relative c'' { +melody = \notes \relative c'' { \clef violin; \property Staff.instrument = "alto sax" @@ -36,7 +36,7 @@ melody = \notes \relative c'' { f f | e e | d d8.( e16 | )c2 | } -accompany = \notes \relative c { +accompany = \notes \relative c { \clef "bass"; c4 c' | e c | f c | e c | d b | c a | f g | c,2 | @@ -49,7 +49,7 @@ accompany = \notes \relative c { } -tekst = \lyrics{ +tekst = \lyrics{ Al -- tijd is Kort -- jak -- je ziek, " " midden "in de" week maar "'s zon" -- dags " " niet. "'s Zon" -- dags gaat ze naar de kerk, " " @@ -64,7 +64,7 @@ Ja inderdaad. Dit is geen educatieve danwel muzikaal verantwoorde tekst. Mogen wij ook af en toe ergens op afgeven? %} -hegedraagjetekst = \lyrics{ +hegedraagjetekst = \lyrics{ Al -- tijd zuigt Bill Gates mijn piek, " " "\TeX" is slecht -- ser dan mu -- " " ziek. "'s Zon" -- dags gaat het door een raam, " " @@ -73,7 +73,7 @@ hegedraagjetekst = \lyrics{ "\TeX" is slecht -- ser dan mu -- " " ziek. } -texte = \lyrics{ +texte = \lyrics{ \property Lyrics . textStyle" = "italic" % \property Lyrics . textStyle" = "roman" Ah! vous dir -- ai -- je ma -- man " " @@ -84,7 +84,7 @@ texte = \lyrics{ Va -- lent mieux que la rai -- " " son } -texti = \lyrics{ +texti = \lyrics{ \property "Lyrics"."textStyle" = "roman" Twin -- kle, twin -- kle, lit -- tle star, " " How I won -- der what you " " are. @@ -94,7 +94,7 @@ texti = \lyrics{ How I won -- der what you " " are! } -textii = \lyrics{ +textii = \lyrics{ When the bla -- zing sun is gone, " " When he no -- thing shines up -- " " on, Then you show your lit -- tle light, " " @@ -103,7 +103,7 @@ textii = \lyrics{ How I won -- der what you " " are! } -textiii = \lyrics{ +textiii = \lyrics{ Then the tra -- veler in the dark " " Thanks you for your ti -- ny " " spark; He could not see which way to go, diff --git a/lily/a2-engraver.cc b/lily/a2-engraver.cc index d2f56c2ef3..1a0ab2da2e 100644 --- a/lily/a2-engraver.cc +++ b/lily/a2-engraver.cc @@ -20,13 +20,10 @@ class A2_engraver : public Engraver public: A2_engraver (); VIRTUAL_COPY_CONS (Translator); - protected: virtual void acknowledge_grob (Grob_info); - virtual void create_grobs (); virtual void stop_translation_timestep (); - private: Item* text_p_; enum State { SOLO, SPLIT_INTERVAL, UNIRHYTHM, UNISILENCE, UNISON } state_; @@ -40,7 +37,6 @@ A2_engraver::A2_engraver () state_ = UNISILENCE; } - void A2_engraver::create_grobs () { diff --git a/lily/align-interface.cc b/lily/align-interface.cc index 58077373c8..da303bd33e 100644 --- a/lily/align-interface.cc +++ b/lily/align-interface.cc @@ -106,14 +106,14 @@ Align_interface::align_to_extents (Grob * me, Axis a) Array dims; Link_array elems; - Link_array all_elts + Link_array all_grobs = Pointer_group_interface__extract_elements ( me, (Grob*) 0, "elements"); - for (int i=0; i < all_elts.size(); i++) + for (int i=0; i < all_grobs.size(); i++) { - Interval y = all_elts[i]->extent(me, a); + Interval y = all_grobs[i]->extent(me, a); if (!y.empty_b()) { - Grob *e =dynamic_cast(all_elts[i]); + Grob *e =dynamic_cast(all_grobs[i]); // todo: fucks up if item both in Halign & Valign. SCM min_dims = e->remove_grob_property ("minimum-space"); @@ -141,6 +141,7 @@ Align_interface::align_to_extents (Grob * me, Axis a) Real where_f=0; + Array translates ; for (int j=0 ; j < elems.size(); j++) { Real dy = 0.0; @@ -155,10 +156,29 @@ Align_interface::align_to_extents (Grob * me, Axis a) } where_f += stacking_dir * dy; - elems[j]->translate_axis (where_f, a); + translates.push (where_f); } -} + /* + also move the grobs that were empty, to maintain spatial order. + */ + if (translates.size ()) + { + int i =0; + int j =0; + Real w = translates[0]; + while (j < all_grobs.size ()) + { + if (i < elems.size () && all_grobs[j] == elems[i]) + { + w = translates[i++]; + } + all_grobs[j]->translate_axis (w, a); + + j++; + } + } +} Axis Align_interface::axis (Grob*me) diff --git a/lily/break-align-item.cc b/lily/break-align-item.cc index 4b5c956cc7..edf184bed6 100644 --- a/lily/break-align-item.cc +++ b/lily/break-align-item.cc @@ -219,6 +219,4 @@ Break_align_interface::set_interface (Grob*me) { Align_interface::set_interface (me); Align_interface::set_axis (me,X_AXIS); - - } diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index dcbc09cd40..ef3576f881 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -25,6 +25,13 @@ * direction of text-dynamic-request if not equal to direction of line-spanner + + - TODO: this engraver is too complicated. We should split it into + the handling of the basic grobs and the linespanner + + - TODO: the line-spanner is not killed after the (de)crescs are + finished. + */ /** @@ -58,7 +65,8 @@ protected: virtual void acknowledge_grob (Grob_info); virtual bool try_music (Music *req_l); virtual void stop_translation_timestep (); - virtual void create_grobs (); + + virtual void create_grobs (); virtual void start_translation_timestep (); }; @@ -124,7 +132,6 @@ void Dynamic_engraver::create_grobs () { if (accepted_spanreqs_drul_[START] || accepted_spanreqs_drul_[STOP] || script_req_l_) - { if (!line_spanner_) { @@ -142,22 +149,7 @@ Dynamic_engraver::create_grobs () } } - - /* - finish side position alignment if the (de)cresc ends here, and - there are no new dynamics. - - */ - else if (accepted_spanreqs_drul_[STOP] - && !accepted_spanreqs_drul_[START] && !script_req_l_) - { - finished_line_spanner_ = line_spanner_; - line_spanner_ = 0; - } - - /* - todo: resurrect dynamic{direction, padding,minimumspace} - */ + /* During a (de)crescendo, pending request will not be cleared, and a line-spanner will always be created, as \< \! are already @@ -192,25 +184,31 @@ Dynamic_engraver::create_grobs () if (accepted_spanreqs_drul_[STOP]) { - if (!cresc_p_) + /* + finish side position alignment if the (de)cresc ends here, and + there are no new dynamics. + + */ + + if ( !cresc_p_) { accepted_spanreqs_drul_[STOP]->origin ()->warning (_ ("can't find start of (de)crescendo")); + accepted_spanreqs_drul_[STOP] = 0; } else { - assert (!finished_cresc_p_); + assert (!finished_cresc_p_ && cresc_p_); cresc_p_->set_bound (RIGHT, script_p_ - ? script_p_ - : unsmob_grob (get_property ("currentMusicalColumn"))); + ? script_p_ + : unsmob_grob (get_property ("currentMusicalColumn"))); finished_cresc_p_ = cresc_p_; cresc_p_ = 0; current_cresc_req_ = 0; } } - if (accepted_spanreqs_drul_[START]) { if (current_cresc_req_) diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc index d69c38f0f5..fee5a054a9 100644 --- a/lily/dynamic-performer.cc +++ b/lily/dynamic-performer.cc @@ -29,7 +29,7 @@ public: protected: virtual bool try_music (Music* req_l); virtual void stop_translation_timestep (); - virtual void create_grobs (); + virtual void create_audio_elements (); private: Music* script_req_l_; @@ -45,7 +45,7 @@ Dynamic_performer::Dynamic_performer () } void -Dynamic_performer::create_grobs () +Dynamic_performer::create_audio_elements () { if (script_req_l_) { diff --git a/lily/grace-position-performer.cc b/lily/grace-position-performer.cc index 6b3b59016b..168bbd3a0f 100644 --- a/lily/grace-position-performer.cc +++ b/lily/grace-position-performer.cc @@ -21,8 +21,8 @@ protected: Link_array notes_; VIRTUAL_COPY_CONS (Translator); - virtual void acknowledge_grob (Audio_element_info); - virtual void create_grobs (); + virtual void acknowledge_audio_element (Audio_element_info); + virtual void create_audio_elements (); virtual void start_translation_timestep (); Global_translator* global_translator_l (); }; @@ -34,7 +34,7 @@ Grace_position_performer::Grace_position_performer () } void -Grace_position_performer::acknowledge_grob (Audio_element_info i) +Grace_position_performer::acknowledge_audio_element (Audio_element_info i) { if (Audio_note * n = dynamic_cast (i.elem_l_)) { @@ -46,7 +46,7 @@ Grace_position_performer::acknowledge_grob (Audio_element_info i) } void -Grace_position_performer::create_grobs () +Grace_position_performer::create_audio_elements () { if (graces_.size ()) { diff --git a/lily/identifier.cc b/lily/identifier.cc deleted file mode 100644 index 28e450ac49..0000000000 --- a/lily/identifier.cc +++ /dev/null @@ -1,136 +0,0 @@ -/* - identifier.cc -- implement identifier and derived classes - - source file of the GNU LilyPond music typesetter - - (c) 1997--2000 Han-Wen Nienhuys -*/ - - -/* - JUNKTHIS! - */ -#include - -#include "music-output-def.hh" -#include "score.hh" -#include "identifier.hh" -#include "my-lily-lexer.hh" -#include "debug.hh" -#include "ly-smobs.icc" - - -IMPLEMENT_UNSMOB(Identifier, identifier); -IMPLEMENT_SMOBS(Identifier); -IMPLEMENT_DEFAULT_EQUAL_P(Identifier); - -Identifier::Identifier (int code) -{ - token_code_i_ = code; - accessed_b_ = 0; - smobify_self (); -} - -Identifier::Identifier (Identifier const&s) - : Input (s) -{ - smobify_self (); - token_code_i_ = s.token_code_i_; - accessed_b_ = s.accessed_b_; -} - -Identifier::~Identifier() -{ -} - -void -Identifier::error (String expect) const -{ - ::error (_f ("wrong identifier type, expected: `%s'", expect)); -} - -String -Identifier::str () const -{ - return do_str (); -} - -String -Identifier::do_str () const -{ - return ""; -} - - -/* ugh. */ -#define DUMMY_STR(Class) \ -String \ -Class ## _identifier::do_str () const { \ - return String (#Class); \ -} - -DUMMY_STR(Score); -DUMMY_STR(Music_output_def); - - -#define DEFAULT_STR(Class) \ -String \ -Class ## _identifier::do_str () const\ -{\ - return to_str (*data_p_);\ -} - - - -/* - fucking C++ blows me. - */ - -#define DEFAULT_ACCESSOR(Class)\ -Class*\ -Class ## _identifier::access_content_ ## Class (bool copy_b) const {\ - ((Class ## _identifier*)this)->accessed_b_ = true;\ - return copy_b ? new Class (*data_p_) : data_p_;\ -} - -#define VIRTUAL_ACCESSOR(Class)\ -Class*\ -Class ## _identifier::access_content_ ## Class (bool copy_b) const{\ - ((Class ## _identifier*)this)->accessed_b_ = true;\ - return copy_b ? dynamic_cast (data_p_->clone()) : data_p_;\ -} - -#define IMPLEMENT_ID_CLASS(Class) \ - Class ## _identifier::~Class ## _identifier() { delete data_p_; }\ - Class ## _identifier::Class ## _identifier (Class*st, int code) \ - :Identifier (code)\ - {\ - data_p_ = st;\ - }\ -Class ## _identifier::Class ## _identifier (Class ## _identifier const &s) \ - : Identifier (s)\ -{\ - data_p_ = s.access_content_ ## Class (true);\ -} - - -IMPLEMENT_ID_CLASS(Score); -IMPLEMENT_ID_CLASS(Music_output_def); -VIRTUAL_ACCESSOR(Music_output_def); -DEFAULT_ACCESSOR(Score); - - -int -Identifier::print_smob (SCM s, SCM p, scm_print_state*) -{ - return 1; -} - -SCM -Identifier::mark_smob (SCM s) -{ - return SCM_EOL; -} - - - diff --git a/lily/include/file-results.hh b/lily/include/file-results.hh index fad91f8a2c..64ce52bf66 100644 --- a/lily/include/file-results.hh +++ b/lily/include/file-results.hh @@ -12,7 +12,7 @@ #include "flower-proto.hh" void do_one_file (String init_str, String file_str); -extern Scope *header_global_p; +extern Scheme_hash_table *global_header_p; extern Array target_str_global_array; extern Array inclusion_global_array; extern Link_array score_global_array; diff --git a/lily/include/identifier.hh b/lily/include/identifier.hh deleted file mode 100644 index 2a82889757..0000000000 --- a/lily/include/identifier.hh +++ /dev/null @@ -1,74 +0,0 @@ -/* - identifier.hh -- part of GNU LilyPond - - (c) 1996--2000 Han-Wen Nienhuys -*/ - -#ifndef IDENTIFIER_HH -#define IDENTIFIER_HH - -#include "lily-proto.hh" -#include "lily-guile.hh" -#include "string.hh" -#include "input.hh" -#include "virtual-methods.hh" -#include "smobs.hh" - - -class Output_def_identifier; -class Score_identifier; - - -#define IDACCESSOR(Class)\ -virtual Class * access_content_ ## Class (bool) const { error (#Class + String ("_identifier")); return 0; }\ - - -/** - A declarable data structure in lilypond. - - TODO: use SMOBS for the union type, and junk all derived classes. - */ -struct Identifier : public Input { - - bool init_b_; - bool accessed_b_; - int token_code_i_; - Identifier (Identifier const&); - Identifier (int code) ; - - void print() const; - - void error (String) const; - String str () const; - IDACCESSOR(Music_output_def) - IDACCESSOR(Score) - VIRTUAL_COPY_CONS(Identifier); - - DECLARE_SMOBS(Identifier, foo); -protected: - - virtual String do_str () const; -}; - -#define DECLARE_ID_CLASS(Class) \ -struct Class ## _identifier : Identifier {\ - Class *data_p_; \ - \ - Class ## _identifier (Class ## _identifier const&);\ - Class ## _identifier (Class*st, int code);\ - VIRTUAL_COPY_CONS(Identifier);\ - virtual Class* access_content_ ## Class (bool copy_b) const;\ - ~Class ## _identifier();\ - \ - virtual String do_str () const; \ -}\ - - -DECLARE_ID_CLASS(Score); -DECLARE_ID_CLASS(Music_output_def); - -Identifier * unsmob_identifier (SCM); -SCM smobify (Identifier*); - -#endif // IDENTIFIER_HH - diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh index 094879e9ad..63d44ac69d 100644 --- a/lily/include/lily-proto.hh +++ b/lily/include/lily-proto.hh @@ -66,7 +66,7 @@ class Grace_performer_group; class Hara_kiri_engraver; class Hara_kiri_line_group_engraver; class Hyphen_req; -class Identifier; + class Includable_lexer; class Input; class Item; diff --git a/lily/include/main.hh b/lily/include/main.hh index f8b2612d21..401a896ad5 100644 --- a/lily/include/main.hh +++ b/lily/include/main.hh @@ -36,7 +36,11 @@ extern Array get_inclusion_names (); extern void set_inclusion_names (Array); extern File_path global_path; -extern Array global_score_header_fields; + +/* + names of header fields to be dumped to a separate file. +*/ +extern Array global_dumped_header_fieldnames; extern String default_outname_base_global; extern String default_outname_suffix_global; diff --git a/lily/include/music-output-def.hh b/lily/include/music-output-def.hh index b19f89ca32..503a1c8105 100644 --- a/lily/include/music-output-def.hh +++ b/lily/include/music-output-def.hh @@ -14,6 +14,7 @@ #include "lily-proto.hh" #include "lily-guile.hh" #include "virtual-methods.hh" +#include "smobs.hh" /** Definition of how to output lilypond. @@ -23,21 +24,28 @@ class Music_output_def { public: + Scheme_hash_table * translator_tab_; + Scheme_hash_table * variable_tab_; Scope *translator_p_dict_p_; Scope *scope_p_; + SCM scaled_fonts_; + SCM style_sheet_; + VIRTUAL_COPY_CONS(Music_output_def); Music_output_def (Music_output_def const&); Music_output_def (); - virtual ~Music_output_def (); virtual int get_next_default_count () const; - Global_translator *get_global_translator_p (); Translator_group *get_group_translator_p (String type) const; String get_default_output () const; void assign_translator (SCM transdef); SCM find_translator_l (SCM name) const; + String base_output_str () ; + + DECLARE_SMOBS(Music_output_def,); }; +Music_output_def* unsmob_music_output_def (SCM); #endif // Music_output_DEF_HH diff --git a/lily/include/my-lily-lexer.hh b/lily/include/my-lily-lexer.hh index dbe59c6ccd..48a87991f4 100644 --- a/lily/include/my-lily-lexer.hh +++ b/lily/include/my-lily-lexer.hh @@ -31,7 +31,9 @@ class My_lily_lexer : public Includable_lexer public: String main_input_str_; void * lexval_l; - Scope * toplevel_scope_p_; + Scheme_hash_table * toplevel_variable_tab_; + Scope * scope_p_; + bool main_input_b_; /* diff --git a/lily/include/paper-def.hh b/lily/include/paper-def.hh index 6c137247a6..8346074e30 100644 --- a/lily/include/paper-def.hh +++ b/lily/include/paper-def.hh @@ -50,13 +50,11 @@ class Paper_def : public Music_output_def protected: VIRTUAL_COPY_CONS(Music_output_def); - Protected_scm scaled_fonts_; + public: - Protected_scm style_sheet_; SCM font_descriptions ()const; virtual ~Paper_def (); static int default_count_i_; - String current_output_base_; /* JUNKME @@ -73,8 +71,7 @@ public: virtual int get_next_default_count () const; static void reset_default_count(); void output_settings (Paper_outputter*) const; - Paper_stream* paper_stream_p () const; - String base_output_str () const; + Paper_outputter* paper_outputter_p () ; Font_metric * find_font (SCM name, Real mag); diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh index 2f30e86e43..a4149faa92 100644 --- a/lily/include/paper-outputter.hh +++ b/lily/include/paper-outputter.hh @@ -17,17 +17,20 @@ #include "protected-scm.hh" /** - Abstract interface for a Grob to output itself. - */ + Interface for a Grob to output itself; The Paper_score contains a + pointer to a Paper_outputter, and this enables every grob to output + itself. + + The Paper_outputter contains a reference to an output stream + (Paper_stream). */ + class Paper_outputter { bool verbatim_scheme_b_; Paper_stream * stream_p_; public: - /** - Assumes responsibility for deletion of P - */ - Paper_outputter (Paper_stream*p); + String basename_; + Paper_outputter (String nm); ~Paper_outputter (); void dump_scheme (SCM); @@ -43,8 +46,9 @@ public: void output_comment (String s); void output_string (SCM s); void output_scheme (SCM scm); - static void output_score_header_field (String filename, String key, String value); - static void output_score_header_fields (Paper_def *paper); + + static void write_header_field_to_file (String filename, String key, String value); + void write_header_fields_to_file (Scope *); }; #endif // PAPER_OUTPUTTER_HH diff --git a/lily/include/paper-stream.hh b/lily/include/paper-stream.hh index 4b5f51652b..7970ba146d 100644 --- a/lily/include/paper-stream.hh +++ b/lily/include/paper-stream.hh @@ -12,24 +12,25 @@ class Paper_stream { public: - bool outputting_comment_b_; - ostream *os_; - int nest_level; - /// to check linelen in output. TeX has limits. - int line_len_i_; + String basename_; + bool outputting_comment_b_; + ostream *os_; + int nest_level; + /// to check linelen in output. TeX has limits. + int line_len_i_; - /// open a file for writing - Paper_stream (String filename); + /// open a file for writing + Paper_stream (String filename); - /// delegate conversion to scalar class - Paper_stream &operator <<(String); + /// delegate conversion to scalar class + Paper_stream &operator <<(String); - /// close the file - ~Paper_stream(); + /// close the file + ~Paper_stream(); private: - Paper_stream (Paper_stream const&); - void break_line(); + Paper_stream (Paper_stream const&); + void break_line(); }; class ostream; diff --git a/lily/include/performer-group-performer.hh b/lily/include/performer-group-performer.hh index f9d3753d39..986afff64f 100644 --- a/lily/include/performer-group-performer.hh +++ b/lily/include/performer-group-performer.hh @@ -27,8 +27,8 @@ protected: Array announce_info_arr_; private: - void create_grobs (); - void acknowledge_grobs (); + void create_audio_elements (); + void acknowledge_audio_elements (); }; #endif // PERFORMER_GROUP_PERFORMER_HH diff --git a/lily/include/performer.hh b/lily/include/performer.hh index 3b940c6c5a..b5257984aa 100644 --- a/lily/include/performer.hh +++ b/lily/include/performer.hh @@ -27,8 +27,8 @@ public: protected: virtual void announce_element (Audio_element_info); - virtual void acknowledge_grob (Audio_element_info); - virtual void create_grobs (); + virtual void acknowledge_audio_element (Audio_element_info); + virtual void create_audio_elements (); virtual int get_tempo_i() const; virtual void play_element (Audio_element * elem_p ); }; diff --git a/lily/include/scm-hash.hh b/lily/include/scm-hash.hh index a19ed279e7..6f8f5fee6f 100644 --- a/lily/include/scm-hash.hh +++ b/lily/include/scm-hash.hh @@ -52,10 +52,11 @@ typedef map Scm_stl_map; TODO: - This should come from GUILE. We're typically doing double work, + - This should come from GUILE. We're typically doing double work, because KEY already is a symbol, and is looked up in a symbol hashtable. - + + - use GUILE hashtables iso STL. */ class Scheme_hash_table : private Scm_stl_map { diff --git a/lily/include/scope.hh b/lily/include/scope.hh index cf16c0564b..35e19faa62 100644 --- a/lily/include/scope.hh +++ b/lily/include/scope.hh @@ -16,6 +16,7 @@ class Scheme_hash_table; class Scope { Scheme_hash_table *id_dict_; + Scope (Scope const &); public: SCM to_alist () const; bool elem_b (String ) const; @@ -23,18 +24,13 @@ public: bool try_retrieve (SCM key, SCM *val) const; - Identifier *elem (String) const; - Identifier *elem (SCM) const; - SCM scm_elem (String) const; SCM scm_elem (SCM) const; - void set (String, Identifier *); + void set (String, SCM); - Scope (); + Scope (Scheme_hash_table*); - Scope (Scope const &); - ~Scope (); friend class Scope_iter; }; #endif /* SCOPE_HH */ diff --git a/lily/include/score.hh b/lily/include/score.hh index b315574933..ab48fd3c97 100644 --- a/lily/include/score.hh +++ b/lily/include/score.hh @@ -14,26 +14,28 @@ #include "lily-proto.hh" #include "protected-scm.hh" #include "parray.hh" +#include "smobs.hh" /// the total music def of one movement class Score: public Input { public: /// paper_, staffs_ and commands_ form the problem definition. Link_array def_p_arr_; - Protected_scm music_; - Scope * header_p_; + SCM music_; + Scheme_hash_table * header_p_; int errorlevel_i_; /// construction Score(); Score (Score const&); - ~Score(); + void process(); void add_output (Music_output_def *def_p); + DECLARE_SMOBS(Score,foo); private: void run_translator (Music_output_def*); }; - +Score * unsmob_score (SCM); #endif diff --git a/lily/key-performer.cc b/lily/key-performer.cc index 27144dba57..7f2e9e171b 100644 --- a/lily/key-performer.cc +++ b/lily/key-performer.cc @@ -20,7 +20,7 @@ public: protected: virtual bool try_music (Music* req_l); - virtual void create_grobs (); + virtual void create_audio_elements (); virtual void stop_translation_timestep (); private: @@ -41,7 +41,7 @@ Key_performer::~Key_performer () } void -Key_performer::create_grobs () +Key_performer::create_audio_elements () { if (key_req_l_ && gh_list_p (key_req_l_->get_mus_property ("pitch-alist"))) diff --git a/lily/lexer.ll b/lily/lexer.ll index b1c3afab5d..a0e2bb55ee 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -25,6 +25,7 @@ #include #include +#include "score.hh" #include "lily-guile.hh" #include "string.hh" #include "string-convert.hh" @@ -36,10 +37,10 @@ #include "debug.hh" #include "main.hh" #include "musical-request.hh" -#include "identifier.hh" #include "version.hh" #include "lilypond-input-version.hh" #include "translator-def.hh" +#include "music-output-def.hh" /* RH 7 fix (?) @@ -482,6 +483,9 @@ My_lily_lexer::scan_escaped_word (String str) } else if (unsmob_translator_def (sid)) { yylval.scm = sid; return TRANSLATOR_IDENTIFIER; + } else if (unsmob_score (sid)) { + yylval.scm =sid; + return SCORE_IDENTIFIER; } else if (Music * mus =unsmob_music (sid)) { yylval.scm = sid; @@ -489,16 +493,12 @@ My_lily_lexer::scan_escaped_word (String str) } else if (unsmob_duration (sid)) { yylval.scm = sid; return DURATION_IDENTIFIER; + } else if (unsmob_music_output_def (sid)) { + yylval.scm = sid; + return MUSIC_OUTPUT_DEF_IDENTIFIER; } - - - - Identifier * id = unsmob_identifier (sid); - if (id) { - yylval.id = id; - return id->token_code_i_; - } else if (sid != SCM_UNDEFINED) { + if (sid != SCM_UNDEFINED) { yylval.scm = sid; return SCM_IDENTIFIER; } diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc index 4ecb789cab..4a759e8043 100644 --- a/lily/lyric-performer.cc +++ b/lily/lyric-performer.cc @@ -21,7 +21,7 @@ protected: virtual bool try_music (Music* req_l); virtual void stop_translation_timestep (); - virtual void create_grobs (); + virtual void create_audio_elements (); private: Link_array lreq_arr_; @@ -37,7 +37,7 @@ Lyric_performer::Lyric_performer () void -Lyric_performer::create_grobs () +Lyric_performer::create_audio_elements () { // FIXME: won't work with fancy lyrics if (lreq_arr_.size () diff --git a/lily/main.cc b/lily/main.cc index 1946e16dac..82f0e60a15 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -51,7 +51,7 @@ String init_str_global; int default_count_global; File_path global_path; -Array global_score_header_fields; +Array global_dumped_header_fieldnames; bool safe_global_b = false; bool experimental_features_global_b = false; @@ -351,7 +351,7 @@ main (int argc, char **argv) find_old_relative_b= true; break; case 'H': - global_score_header_fields.push (oparser_global_p->optional_argument_ch_C_); + global_dumped_header_fieldnames.push (oparser_global_p->optional_argument_ch_C_); break; case 'I': global_path.push (oparser_global_p->optional_argument_ch_C_); diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc index edc315cb7b..fbb2e12ba8 100644 --- a/lily/music-output-def.cc +++ b/lily/music-output-def.cc @@ -6,40 +6,77 @@ (c) 1997--2000 Han-Wen Nienhuys */ +#include "scm-hash.hh" + #include "dictionary.hh" #include "scope.hh" #include "debug.hh" #include "music-output-def.hh" #include "global-translator.hh" #include "translator-def.hh" -#include "identifier.hh" #include "main.hh" #include "lily-guile.hh" +#include "ly-smobs.icc" + int Music_output_def::get_next_default_count () const { return 0; } - - Music_output_def::Music_output_def () { - scope_p_ = new Scope; - translator_p_dict_p_ = new Scope; + style_sheet_ = SCM_EOL; + scaled_fonts_ = SCM_EOL; + + variable_tab_ = new Scheme_hash_table; + translator_tab_ = new Scheme_hash_table; + scope_p_ = new Scope (variable_tab_); + translator_p_dict_p_ = new Scope (translator_tab_); + + smobify_self (); + scm_unprotect_object (variable_tab_->self_scm ()); + scm_unprotect_object (translator_tab_->self_scm ()); } Music_output_def::~Music_output_def () { - delete scope_p_; - delete translator_p_dict_p_; } Music_output_def::Music_output_def (Music_output_def const &s) { - scope_p_ = new Scope (*s.scope_p_); - translator_p_dict_p_ = new Scope (*s.translator_p_dict_p_); + variable_tab_ = new Scheme_hash_table (*s.variable_tab_); + translator_tab_ = new Scheme_hash_table (*s.translator_tab_); + + style_sheet_ = SCM_EOL; + scaled_fonts_ = SCM_EOL; + smobify_self (); + scm_unprotect_object (variable_tab_->self_scm ()); + scm_unprotect_object (translator_tab_->self_scm ()); + + + scope_p_ = new Scope (variable_tab_); + translator_p_dict_p_ = new Scope (translator_tab_); + + style_sheet_ = scm_list_copy (s.style_sheet_); + scaled_fonts_ = scm_list_copy (s.scaled_fonts_); +} + + +IMPLEMENT_SMOBS(Music_output_def); +IMPLEMENT_UNSMOB(Music_output_def,music_output_def); +IMPLEMENT_DEFAULT_EQUAL_P(Music_output_def); + +SCM +Music_output_def::mark_smob (SCM m) +{ + Music_output_def * mo = (Music_output_def*) SCM_CELL_WORD_1 (m); + scm_gc_mark (mo->style_sheet_); + scm_gc_mark (mo->translator_tab_->self_scm()); + scm_gc_mark (mo->variable_tab_->self_scm()); + + return mo->scaled_fonts_; } void @@ -52,14 +89,17 @@ Music_output_def::assign_translator (SCM transdef) translator_p_dict_p_->set (s, transdef); } +/* + find the translator for NAME. NAME may be a string or a symbol. + */ SCM Music_output_def::find_translator_l (SCM name) const -{ - String s = ly_scm2string (name); +{ + if (gh_string_p (name)) + name = scm_string_to_symbol (name); SCM val =SCM_EOL; - if (translator_p_dict_p_->elem_b (s)) - return translator_p_dict_p_->scm_elem (s); + translator_tab_->try_retrieve (name, &val); return val; } @@ -67,7 +107,9 @@ Music_output_def::find_translator_l (SCM name) const Global_translator * Music_output_def::get_global_translator_p () { - Translator_def * t = unsmob_translator_def (find_translator_l (ly_str02scm ("Score"))); + SCM key = ly_symbol2scm ("Score"); + Translator_def * t = unsmob_translator_def (find_translator_l (key)); + if (!t) error (_f ("can't find `%s' context", "Score")); @@ -92,3 +134,28 @@ Music_output_def::get_default_output () const +int +Music_output_def::print_smob (SCM s, SCM p, scm_print_state *) +{ + scm_puts ("#", p); + return 1; +} + +/* + ugh: should move into Music_output_def (complication: .midi and .tex + need separate counts.) */ +String +Music_output_def::base_output_str () +{ + String str = get_default_output (); + + if (str.empty_b ()) + { + str = default_outname_base_global; + int def = get_next_default_count (); + if (def) + str += "-" + to_str (def); + } + + return str; +} diff --git a/lily/music.cc b/lily/music.cc index 38ecc7f5e2..bcee6a3d24 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -119,7 +119,7 @@ Music::transpose (Pitch ) { } - +IMPLEMENT_TYPE_P(Music, "music?"); IMPLEMENT_UNSMOB(Music,music); IMPLEMENT_SMOBS(Music); IMPLEMENT_DEFAULT_EQUAL_P(Music); diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index 9a5661cb99..5424b0fa72 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -9,8 +9,10 @@ #include #include +#include "lily-proto.hh" +#include "scm-hash.hh" #include "interval.hh" -#include "identifier.hh" + #include "lily-guile.hh" #include "parser.hh" #include "keyword.hh" @@ -91,8 +93,11 @@ static Keyword_ent the_key_tab[]={ My_lily_lexer::My_lily_lexer() { keytable_p_ = new Keyword_table (the_key_tab); - toplevel_scope_p_ = new Scope; - scope_l_arr_.push (toplevel_scope_p_); + toplevel_variable_tab_ = new Scheme_hash_table ; + scope_p_ = new Scope (toplevel_variable_tab_); + + scope_l_arr_.push (scope_p_); + errorlevel_i_ = 0; main_input_b_ = false; } @@ -138,7 +143,8 @@ My_lily_lexer::set_identifier (String name_str, SCM s) My_lily_lexer::~My_lily_lexer() { delete keytable_p_; - delete toplevel_scope_p_ ; + scm_unprotect_object (toplevel_variable_tab_->self_scm ()); + delete scope_p_ ; } diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc index 14b22940d8..b19386cb30 100644 --- a/lily/my-lily-parser.cc +++ b/lily/my-lily-parser.cc @@ -102,7 +102,6 @@ My_lily_parser::here_input() const // move me? #include "paper-def.hh" -#include "identifier.hh" #include "translator-def.hh" My_lily_parser * current_parser; @@ -114,8 +113,8 @@ My_lily_parser::paper_description () { My_lily_parser * me = current_parser; - Identifier *id = unsmob_identifier (me->lexer_p_->lookup_identifier ("$defaultpaper")); - Paper_def *p = dynamic_cast (id->access_content_Music_output_def (false)); + Music_output_def *id = unsmob_music_output_def (me->lexer_p_->lookup_identifier ("$defaultpaper")); + Paper_def *p = dynamic_cast (id->clone ()); SCM al = p->translator_p_dict_p_->to_alist (); SCM l = SCM_EOL; diff --git a/lily/note-performer.cc b/lily/note-performer.cc index 6d51326aa2..75b56be3da 100644 --- a/lily/note-performer.cc +++ b/lily/note-performer.cc @@ -24,7 +24,7 @@ protected: virtual bool try_music (Music *req_l) ; virtual void stop_translation_timestep (); - virtual void create_grobs (); + virtual void create_audio_elements (); Global_translator* global_translator_l (); private: @@ -36,7 +36,7 @@ private: ADD_THIS_TRANSLATOR (Note_performer); void -Note_performer::create_grobs () +Note_performer::create_audio_elements () { if (note_req_l_arr_.size ()) { diff --git a/lily/paper-def.cc b/lily/paper-def.cc index 001e801175..12f787a633 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -17,12 +17,10 @@ #include "main.hh" #include "scope.hh" #include "file-results.hh" // urg? header_global_p -#include "paper-stream.hh" +#include "paper-outputter.hh" Paper_def::Paper_def () { - style_sheet_ = SCM_EOL; - scaled_fonts_ = SCM_EOL; } Paper_def::~Paper_def () @@ -32,8 +30,6 @@ Paper_def::~Paper_def () Paper_def::Paper_def (Paper_def const&src) : Music_output_def (src) { - scaled_fonts_ = SCM_EOL; - style_sheet_ = src.style_sheet_; } @@ -106,46 +102,23 @@ Paper_def::reset_default_count() } -Paper_stream* -Paper_def::paper_stream_p () const +Paper_outputter* +Paper_def::paper_outputter_p () { - String outname = base_output_str (); - + String basename = base_output_str (); + String outname = basename; if (outname != "-") outname += String (".") + output_global_ch; progress_indication (_f ("paper output to %s...", outname == "-" ? String ("") : outname)); target_str_global_array.push (outname); - return new Paper_stream (outname); + Paper_outputter * po = new Paper_outputter (outname); + po->basename_ = basename; + return po; } -/* URGURGUGUUGH - - not const. - - Wat een puinhoop is dit. */ -String -Paper_def::base_output_str () const -{ - String str = get_default_output (); - - if (str.empty_b ()) - { - str = default_outname_base_global; - int def = get_next_default_count (); - if (def) - str += "-" + to_str (def); - } - - /* Must store value, as this function can be called only once */ - Paper_def *urg = (Paper_def*)this; - urg->current_output_base_ = str; - - return str; -} - /* todo: use symbols and hashtable idx? */ diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 5d383c9f34..1c55022e84 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -23,7 +23,7 @@ #include "font-metric.hh" #include "main.hh" #include "scope.hh" -#include "identifier.hh" + #include "lily-version.hh" #include "paper-def.hh" #include "file-results.hh" @@ -33,8 +33,10 @@ Ugh, this is messy. */ -Paper_outputter::Paper_outputter (Paper_stream * ps ) +Paper_outputter::Paper_outputter (String name) { + stream_p_ = new Paper_stream (name); + /* lilypond -f scm x.ly guile -s x.scm @@ -43,7 +45,7 @@ Paper_outputter::Paper_outputter (Paper_stream * ps ) if (verbatim_scheme_b_) { - *ps << "" + *stream_p_ << "" ";;; Usage: guile -s x.scm > x.tex\n" "(primitive-load-path 'standalone.scm)\n" ";(scm-tex-output)\n" @@ -52,7 +54,6 @@ Paper_outputter::Paper_outputter (Paper_stream * ps ) ; } - stream_p_ = ps; } Paper_outputter::~Paper_outputter () @@ -232,7 +233,7 @@ Paper_outputter::output_string (SCM str) } void -Paper_outputter::output_score_header_field (String filename, String key, String value) +Paper_outputter::write_header_field_to_file (String filename, String key, String value) { if (filename != "-") filename += String (".") + key; @@ -247,21 +248,14 @@ Paper_outputter::output_score_header_field (String filename, String key, String } void -Paper_outputter::output_score_header_fields (Paper_def *paper) +Paper_outputter::write_header_fields_to_file (Scope * header) { - if (global_score_header_fields.size ()) + if (global_dumped_header_fieldnames.size ()) { - SCM fields; -#if 0 // ugh, how to reach current Score or Paper_score? - if (paper->header_l_) - fields = paper->header_l_->to_alist (); - else -#endif - fields = header_global_p->to_alist (); - String base = paper->current_output_base_; - for (int i = 0; i < global_score_header_fields.size (); i++) + SCM fields = header->to_alist (); + for (int i = 0; i < global_dumped_header_fieldnames.size (); i++) { - String key = global_score_header_fields[i]; + String key = global_dumped_header_fieldnames[i]; SCM val = gh_assoc (ly_symbol2scm (key.ch_C ()), fields); String s; /* Only write header field to file if it exists */ @@ -269,7 +263,7 @@ Paper_outputter::output_score_header_fields (Paper_def *paper) { s = ly_scm2string (gh_cdr (val)); /* Always write header field file, even if string is empty ... */ - output_score_header_field (base, key, s); + write_header_field_to_file (basename_, key, s); } } } diff --git a/lily/paper-score.cc b/lily/paper-score.cc index b5f5e2d193..82d2287446 100644 --- a/lily/paper-score.cc +++ b/lily/paper-score.cc @@ -92,16 +92,23 @@ Paper_score::process () Array breaking = calc_breaking (); line_l_->break_into_pieces (breaking); - outputter_l_ = new Paper_outputter (paper_l_->paper_stream_p ()); + outputter_l_ = paper_l_->paper_outputter_p (); ; outputter_l_->output_header (); outputter_l_->output_version (); - - if (header_global_p) - outputter_l_->output_scope (header_global_p, "lilypond"); - if (header_l_) - outputter_l_->output_scope (header_l_, "lilypond"); + + if (global_header_p) + { + Scope gh (global_header_p); + outputter_l_->output_scope (&gh, "lilypond"); + } + if (header_l_) + { + if (header_l_) + outputter_l_->output_scope (header_l_, "lilypond"); + } + outputter_l_->output_comment (_ ("Outputting Score, defined at: ")); outputter_l_->output_comment (origin_str_); @@ -124,8 +131,12 @@ Paper_score::process () progress_indication ("\n"); - outputter_l_->output_score_header_fields (paper_l_); - + if (global_header_p) + { + Scope gh (global_header_p); + outputter_l_->write_header_fields_to_file (&gh); + } + // huh? delete outputter_l_; outputter_l_ = 0; diff --git a/lily/parser.yy b/lily/parser.yy index 31894f773a..2cf1bf94a3 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -21,7 +21,6 @@ #include "file-path.hh" #include "debug.hh" #include "dimensions.hh" -#include "identifier.hh" #include "command-request.hh" #include "musical-request.hh" #include "my-lily-parser.hh" @@ -42,6 +41,7 @@ #include "grace-music.hh" #include "auto-change-music.hh" #include "part-combine-music.hh" +#include "scm-hash.hh" #include "chord.hh" @@ -95,12 +95,11 @@ print_lilypond_versions (ostream &os) %union { Link_array *reqvec; - Identifier *id; String * string; Music *music; Score *score; Scope *scope; - + Scheme_hash_table *scmhash; Musical_req* musreq; Music_output_def * outputdef; @@ -215,8 +214,8 @@ yylex (YYSTYPE *s, void * v_l) %token IDENTIFIER -%token SCORE_IDENTIFIER -%token MUSIC_OUTPUT_DEF_IDENTIFIER +%token SCORE_IDENTIFIER +%token MUSIC_OUTPUT_DEF_IDENTIFIER %token NUMBER_IDENTIFIER %token REQUEST_IDENTIFIER @@ -229,7 +228,7 @@ yylex (YYSTYPE *s, void * v_l) %token REAL %type output_def -%type lilypond_header lilypond_header_body +%type lilypond_header lilypond_header_body %type open_request_parens close_request_parens open_request close_request %type request_with_dir request_that_take_dir verbose_request %type sub_quotes sup_quotes @@ -302,19 +301,19 @@ toplevel_expression: THIS->lexer_p_->chordmodifier_tab_ = $1; } | lilypond_header { - delete header_global_p; - header_global_p = $1; + if (global_header_p) + scm_unprotect_object (global_header_p->self_scm ()); + global_header_p = $1; } | score_block { score_global_array.push ($1); + } | output_def { - Identifier * id = new - Music_output_def_identifier ($1, MUSIC_OUTPUT_DEF_IDENTIFIER); if (dynamic_cast ($1)) - THIS->lexer_p_->set_identifier ("$defaultpaper", id->self_scm ()); + THIS->lexer_p_->set_identifier ("$defaultpaper", $1->self_scm ()); else if (dynamic_cast ($1)) - THIS->lexer_p_->set_identifier ("$defaultmidi", id->self_scm ()); + THIS->lexer_p_->set_identifier ("$defaultmidi", $1->self_scm ()); } | embedded_scm { // junk value @@ -357,8 +356,10 @@ notenames_body: lilypond_header_body: { - $$ = new Scope; - THIS->lexer_p_-> scope_l_arr_.push ($$); + $$ = new Scheme_hash_table; + + Scope *sc = new Scope ($$); + THIS->lexer_p_-> scope_l_arr_.push (sc); } | lilypond_header_body assignment semicolon { @@ -368,7 +369,7 @@ lilypond_header_body: lilypond_header: HEADER '{' lilypond_header_body '}' { $$ = $3; - THIS->lexer_p_-> scope_l_arr_.pop (); + delete THIS->lexer_p_-> scope_l_arr_.pop (); } ; @@ -390,9 +391,10 @@ assignment: all objects can be unprotected as soon as they're here. */ - Identifier * id =unsmob_identifier ($4); - Input spot = THIS->pop_spot (); - if (id) id->set_spot (spot); + /* + Should find generic way of associating input with objects. + */ + THIS->pop_spot (); } ; @@ -400,10 +402,12 @@ all objects can be unprotected as soon as they're here. identifier_init: score_block { - $$ = (new Score_identifier ($1, SCORE_IDENTIFIER))->self_scm(); + $$ = $1->self_scm (); + scm_unprotect_object ($$); } | output_def { - $$ = (new Music_output_def_identifier ($1, MUSIC_OUTPUT_DEF_IDENTIFIER))->self_scm(); + $$ = $1->self_scm (); + scm_unprotect_object ($$); } | translator_spec_block { $$ = $1; @@ -507,35 +511,28 @@ score_block: $$ = $4; if (!$$->def_p_arr_.size ()) { - Identifier *id = - unsmob_identifier (THIS->lexer_p_->lookup_identifier ("$defaultpaper")); - $$->add_output (id ? id->access_content_Music_output_def (true) : new Paper_def ); + Music_output_def *id = + unsmob_music_output_def (THIS->lexer_p_->lookup_identifier ("$defaultpaper")); + $$->add_output (id ? id->clone () : new Paper_def ); } } -/* - | SCORE '{' score_body error { - $$ = $3 - $$->set_spot (THIS->here_input ()); - // THIS->here_input ().error ("SCORE INVALID"); - $$->error ("SCORE INVALID"); - THIS->parser_error (_f ("SCORE ERROR")); - } -*/ ; score_body: Music { $$ = new Score; - + $$->set_spot (THIS->here_input ()); SCM m = $1->self_scm (); scm_unprotect_object (m); $$->music_ = m; } | SCORE_IDENTIFIER { - $$ = $1->access_content_Score (true); + $$ = new Score (*unsmob_score ($1)); + $$->set_spot (THIS->here_input ()); } | score_body lilypond_header { + scm_unprotect_object ( $1->self_scm ()); $$->header_p_ = $2; } | score_body output_def { @@ -559,12 +556,12 @@ output_def: music_output_def_body: MIDI '{' { - Identifier *id = unsmob_identifier (THIS->lexer_p_->lookup_identifier ("$defaultmidi")); + Music_output_def *id = unsmob_music_output_def (THIS->lexer_p_->lookup_identifier ("$defaultmidi")); Midi_def* p =0; if (id) - p = dynamic_cast (id->access_content_Music_output_def (true)); + p = dynamic_cast (id->clone ()); else p = new Midi_def; @@ -572,22 +569,25 @@ music_output_def_body: THIS->lexer_p_->scope_l_arr_.push (p->scope_p_); } | PAPER '{' { - Identifier *id = unsmob_identifier (THIS->lexer_p_->lookup_identifier ("$defaultpaper")); + Music_output_def *id = unsmob_music_output_def (THIS->lexer_p_->lookup_identifier ("$defaultpaper")); Paper_def *p = 0; if (id) - p = dynamic_cast (id->access_content_Music_output_def (true)); + p = dynamic_cast (id->clone ()); else p = new Paper_def; THIS-> lexer_p_-> scope_l_arr_.push (p->scope_p_); $$ = p; } | PAPER '{' MUSIC_OUTPUT_DEF_IDENTIFIER { - Music_output_def *p = $3->access_content_Music_output_def (true); + Music_output_def *p = unsmob_music_output_def ($3); + p = p->clone(); THIS->lexer_p_->scope_l_arr_.push (p->scope_p_); $$ = p; } | MIDI '{' MUSIC_OUTPUT_DEF_IDENTIFIER { - Music_output_def *p = $3->access_content_Music_output_def (true); + Music_output_def *p = unsmob_music_output_def ($3); + p = p->clone(); + THIS->lexer_p_->scope_l_arr_.push (p->scope_p_); $$ = p; } diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc index 8952105656..d7d7bae33f 100644 --- a/lily/performer-group-performer.cc +++ b/lily/performer-group-performer.cc @@ -26,19 +26,19 @@ Performer_group_performer::announce_element (Audio_element_info info) void -Performer_group_performer::create_grobs () +Performer_group_performer::create_audio_elements () { for (SCM p = simple_trans_list_; gh_pair_p (p); p = gh_cdr ( p)) { Translator * t = unsmob_translator (gh_car (p)); Performer * eng = dynamic_cast (t); if (eng) - eng->create_grobs (); + eng->create_audio_elements (); } } void -Performer_group_performer::acknowledge_grobs () +Performer_group_performer::acknowledge_audio_elements () { for (int j =0; j < announce_info_arr_.size(); j++) { @@ -49,7 +49,7 @@ Performer_group_performer::acknowledge_grobs () Translator * t = unsmob_translator (gh_car (p)); Performer * eng = dynamic_cast (t); if (eng && eng!= info.origin_trans_l_) - eng->acknowledge_grob (info); + eng->acknowledge_audio_element (info); } } } @@ -64,15 +64,13 @@ Performer_group_performer::do_announces() } - create_grobs (); + create_audio_elements (); - // debug - int i = 0; - while (announce_info_arr_.size () && i++ < 5) + while (announce_info_arr_.size ()) { - acknowledge_grobs (); + acknowledge_audio_elements (); announce_info_arr_.clear (); - create_grobs (); + create_audio_elements (); } if (announce_info_arr_.size ()) diff --git a/lily/performer.cc b/lily/performer.cc index 7e18cfe0e0..f3d2a4eada 100644 --- a/lily/performer.cc +++ b/lily/performer.cc @@ -32,12 +32,12 @@ Performer::daddy_perf_l () const } void -Performer::acknowledge_grob (Audio_element_info) +Performer::acknowledge_audio_element (Audio_element_info) { } void -Performer::create_grobs () +Performer::create_audio_elements () { } diff --git a/lily/piano-pedal-performer.cc b/lily/piano-pedal-performer.cc index f5837a110b..bed707a87c 100644 --- a/lily/piano-pedal-performer.cc +++ b/lily/piano-pedal-performer.cc @@ -33,7 +33,7 @@ public: protected: virtual void initialize (); virtual bool try_music (Music*); - virtual void create_grobs (); + virtual void create_audio_elements (); virtual void stop_translation_timestep (); virtual void start_translation_timestep (); @@ -75,7 +75,7 @@ Piano_pedal_performer::initialize () } void -Piano_pedal_performer::create_grobs () +Piano_pedal_performer::create_audio_elements () { for (Pedal_info*p = info_alist_; p && p->name_; p ++) diff --git a/lily/property-engraver.cc b/lily/property-engraver.cc index 5b6091907f..79227b5590 100644 --- a/lily/property-engraver.cc +++ b/lily/property-engraver.cc @@ -148,7 +148,7 @@ Property_engraver::apply_properties (SCM p, Grob *e, Translator_group*origin) SCM type_name = gh_call1 (typefunc, type_p); warning (_f ("Wrong type for property: %s, type: %s, value found: %s, type: %s", ly_symbol2string (prop_sym).ch_C (), - ly_scm2string (type_name).ch_C (), + ly_symbol2string (type_name).ch_C (), ly_scm2string (ly_write2scm (val)).ch_C (), ly_scm2string (ly_type (val)).ch_C ())); scm_puts ("\n", errport); diff --git a/lily/scope.cc b/lily/scope.cc index 5fd04e4257..7ada75b65d 100644 --- a/lily/scope.cc +++ b/lily/scope.cc @@ -8,23 +8,13 @@ */ #include "scope.hh" -#include "identifier.hh" +#include "string.hh" #include "scm-hash.hh" - -Scope::~Scope () +Scope::Scope (Scheme_hash_table * st) { - scm_unprotect_object (id_dict_->self_scm ()); -} - -Scope::Scope (Scope const&s) -{ - id_dict_ =new Scheme_hash_table (*s.id_dict_); -} - -Scope::Scope () -{ - id_dict_ = new Scheme_hash_table; + assert (st); + id_dict_ =st; } bool @@ -33,17 +23,12 @@ Scope::elem_b (String s) const return id_dict_->elem_b (ly_symbol2scm (s.ch_C())); } - bool Scope::elem_b (SCM s) const { return id_dict_->elem_b (s); } -Identifier* -Scope::elem (SCM s)const -{ - return unsmob_identifier (id_dict_->get (s)); -} + SCM Scope::scm_elem (SCM s)const @@ -57,11 +42,6 @@ Scope::scm_elem (String s) const return scm_elem (ly_symbol2scm (s.ch_C())); } -Identifier* -Scope::elem (String s)const -{ - return elem (ly_symbol2scm (s.ch_C())); -} void Scope::set (String s, SCM id) @@ -69,12 +49,6 @@ Scope::set (String s, SCM id) return id_dict_->set (ly_symbol2scm (s.ch_C()), id); } -void -Scope::set (String s, Identifier * id) -{ - return id_dict_->set (ly_symbol2scm (s.ch_C()), id->self_scm ()); -} - SCM Scope::to_alist () const { diff --git a/lily/score.cc b/lily/score.cc index ed53e2b0d1..9e774cd6c5 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -6,14 +6,13 @@ (c) 1997--2000 Han-Wen Nienhuys */ -#include +#include "ly-smobs.icc" +#include "scm-hash.hh" #include "score.hh" #include "debug.hh" #include "music-output-def.hh" #include "music-output.hh" -#include "source.hh" -#include "source-file.hh" #include "music-iterator.hh" #include "music.hh" #include "global-translator.hh" @@ -33,23 +32,28 @@ Score::Score() header_p_ = 0; music_ = SCM_EOL; errorlevel_i_ = 0; + smobify_self (); } Score::Score (Score const &s) : Input (s) { + music_ = SCM_EOL; + + smobify_self (); + Music * m =unsmob_music (s.music_); music_ = m?m->clone()->self_scm () : SCM_EOL; + for (int i=0; i < s.def_p_arr_.size (); i++) def_p_arr_.push(s.def_p_arr_[i]->clone()); errorlevel_i_ = s.errorlevel_i_; - header_p_ = (s.header_p_) ? new Scope (*s.header_p_): 0; + header_p_ = (s.header_p_) ? new Scheme_hash_table (*s.header_p_): 0; } Score::~Score() { - delete header_p_; - junk_pointer_array (def_p_arr_); + } void @@ -100,7 +104,10 @@ Score::run_translator (Music_output_def *odef_l) if(verbose_global_b) progress_indication (_f ("elapsed time: %.2f seconds", timer.read ())); - output->header_l_ = header_p_; + if (!header_p_) + header_p_ = new Scheme_hash_table; // ugh + Scope bla (header_p_); + output->header_l_ = &bla; output->origin_str_ = location_str(); progress_indication ("\n"); @@ -139,3 +146,27 @@ Score::add_output (Music_output_def *pap_p) { def_p_arr_.push(pap_p); } + +IMPLEMENT_SMOBS(Score); +IMPLEMENT_DEFAULT_EQUAL_P(Score); +IMPLEMENT_UNSMOB(Score, score); + +SCM +Score::mark_smob (SCM s) +{ + Score * sc = (Score*) SCM_CELL_WORD_1(s); + if (sc->header_p_) + scm_gc_mark (sc->header_p_->self_scm ()); + for (int i = sc->def_p_arr_.size (); i--;) + scm_gc_mark (sc->def_p_arr_[i]->self_scm ()); + + return sc->music_; +} + +int +Score::print_smob (SCM s, SCM p, scm_print_state*) +{ + scm_puts ("#", p); + + return 1; +} diff --git a/lily/scores.cc b/lily/scores.cc index 7d611e494a..3310a88fc4 100644 --- a/lily/scores.cc +++ b/lily/scores.cc @@ -18,12 +18,13 @@ #include "my-lily-parser.hh" #include "source.hh" #include "lily-version.hh" +#include "scm-hash.hh" Sources* source_global_l = 0; Array inclusion_global_array; Array target_str_global_array; Link_array score_global_array; -Scope * header_global_p; +Scheme_hash_table * global_header_p; void write_dependency_file (String fn, Array targets, @@ -68,8 +69,8 @@ do_deps() void do_scores() { - if (!header_global_p) - header_global_p = new Scope; + if (!global_header_p) + global_header_p = new Scheme_hash_table; for (int i=0; i < score_global_array.size(); i++) { Score* is_p = score_global_array[i]; @@ -90,11 +91,13 @@ do_scores() void clear_scores () { - junk_pointer_array (score_global_array); - + for (int i=0; i < score_global_array.size (); i++) + scm_unprotect_object (score_global_array[i]->self_scm ()); + score_global_array.clear(); + inclusion_global_array.clear (); - delete header_global_p ; - header_global_p =0; + scm_unprotect_object (global_header_p ->self_scm ()); + global_header_p =0; } diff --git a/lily/span-dynamic-performer.cc b/lily/span-dynamic-performer.cc index ff0ea71474..edc3add567 100644 --- a/lily/span-dynamic-performer.cc +++ b/lily/span-dynamic-performer.cc @@ -29,8 +29,8 @@ public: protected: virtual bool try_music (Music*); - virtual void acknowledge_grob (Audio_element_info); - virtual void create_grobs (); + virtual void acknowledge_audio_element (Audio_element_info); + virtual void process_music (); virtual void stop_translation_timestep (); virtual void start_translation_timestep (); @@ -57,7 +57,7 @@ Span_dynamic_performer::Span_dynamic_performer () } void -Span_dynamic_performer::acknowledge_grob (Audio_element_info i) +Span_dynamic_performer::acknowledge_audio_element (Audio_element_info i) { if (Audio_dynamic * d = dynamic_cast (i.elem_l_)) { @@ -66,7 +66,7 @@ Span_dynamic_performer::acknowledge_grob (Audio_element_info i) } void -Span_dynamic_performer::create_grobs () +Span_dynamic_performer::process_music () { if (span_start_req_l_ || span_req_l_drul_[START]) { diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc index baffba0432..356bd2557b 100644 --- a/lily/staff-performer.cc +++ b/lily/staff-performer.cc @@ -33,7 +33,7 @@ protected: virtual void play_element (Audio_element* p); virtual void finalize (); virtual void initialize (); - virtual void create_grobs (); + virtual void create_audio_elements (); virtual void stop_translation_timestep (); private: @@ -75,7 +75,7 @@ Staff_performer::initialize () } void -Staff_performer::create_grobs () +Staff_performer::create_audio_elements () { String str = new_instrument_str (); if (str.length_i ()) diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc index 78492a6dbb..2c0f70e5ac 100644 --- a/lily/tempo-performer.cc +++ b/lily/tempo-performer.cc @@ -22,7 +22,7 @@ protected: virtual bool try_music (Music* req_l); virtual void stop_translation_timestep (); - virtual void create_grobs (); + virtual void create_audio_elements (); private: Tempo_req* tempo_req_l_; @@ -43,7 +43,7 @@ Tempo_performer::~Tempo_performer () void -Tempo_performer::create_grobs () +Tempo_performer::create_audio_elements () { if (tempo_req_l_) { diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc index fca448b622..5261055c87 100644 --- a/lily/tie-performer.cc +++ b/lily/tie-performer.cc @@ -53,9 +53,9 @@ protected: virtual void initialize (); virtual void start_translation_timestep (); virtual void stop_translation_timestep (); - virtual void acknowledge_grob (Audio_element_info); + virtual void acknowledge_audio_element (Audio_element_info); virtual bool try_music (Music*); - virtual void create_grobs (); + virtual void create_audio_elements (); }; @@ -101,7 +101,7 @@ Tie_performer::try_music (Music *m) } void -Tie_performer::acknowledge_grob (Audio_element_info i) +Tie_performer::acknowledge_audio_element (Audio_element_info i) { if (Audio_note *nh = dynamic_cast (i.elem_l_)) { @@ -113,7 +113,7 @@ Tie_performer::acknowledge_grob (Audio_element_info i) } void -Tie_performer::create_grobs () +Tie_performer::create_audio_elements () { if (req_l_ && ! done_) { diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc index 66d2acc428..0f65b322b4 100644 --- a/lily/time-signature-performer.cc +++ b/lily/time-signature-performer.cc @@ -22,7 +22,7 @@ public: protected: virtual void stop_translation_timestep (); - virtual void create_grobs (); + virtual void create_audio_elements (); SCM prev_fraction_; private: @@ -43,7 +43,7 @@ Time_signature_performer::~Time_signature_performer () void -Time_signature_performer::create_grobs () +Time_signature_performer::create_audio_elements () { SCM fr = get_property ("timeSignatureFraction"); if (gh_pair_p (fr) diff --git a/lily/translator-group.cc b/lily/translator-group.cc index 08b5033451..0dd0ea5d3a 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -413,16 +413,30 @@ type_check_assignment (SCM val, SCM sym, SCM type_symbol) && gh_procedure_p (type_p) && gh_call1 (type_p, val) == SCM_BOOL_F) { + ok = false; + scm_puts (_("Failed typecheck for `").ch_C (),errport); + scm_display (sym,errport); + scm_puts ( _("', value `").ch_C (), errport); + scm_write (val, errport); + scm_puts (_("' must be of type ").ch_C (), errport); + SCM typefunc = scm_eval2 (ly_symbol2scm ("type-name"), SCM_EOL); + scm_display (gh_call1 (typefunc, type_p), errport); + scm_puts ("\n", errport); +#if 0 ok = false; SCM typefunc = scm_eval2 (ly_symbol2scm ("type-name"), SCM_EOL); SCM type_name = gh_call1 (typefunc, type_p); /* warning () ? */ + scm_puts (_f ("Failed typecheck for `%s', value `%s' must be of type `%s'", ly_symbol2string (sym).ch_C (), - ly_scm2string (ly_write2scm( val)).ch_C (), - ly_scm2string (type_name).ch_C ()).ch_C (), + ly_symbol2string (val).ch_C (), + ly_scm2string (ly_write2scm (val)).ch_C (), + ly_symbol2string (type_name).ch_C ()).ch_C (), errport); scm_puts ("\n", errport); +#endif + } } return ok; diff --git a/lily/volta-spanner.cc b/lily/volta-spanner.cc index 3046205792..eeb1f83aa4 100644 --- a/lily/volta-spanner.cc +++ b/lily/volta-spanner.cc @@ -49,25 +49,36 @@ Volta_spanner::brew_molecule (SCM smob) bool no_vertical_start = false; bool no_vertical_end = to_boolean (me->get_grob_property ("last-volta")); Spanner *orig_span = dynamic_cast (me->original_l_); - if (orig_span && (orig_span->broken_into_l_arr_[0] != (Spanner*)me)) - no_vertical_start = true; - if (orig_span && (orig_span->broken_into_l_arr_.top () != (Spanner*)me)) - no_vertical_end = true; -#if 0 - // FIXME - if (bar_arr.top ()->me->get_grob_property (type_str_.length_i () > 1) - no_vertical_end = false; -#endif + bool first_bracket = orig_span && (orig_span->broken_into_l_arr_[0] == (Spanner*)me); + + bool last_bracket = orig_span && (orig_span->broken_into_l_arr_.top () == (Spanner*)me); + + no_vertical_start = orig_span && !first_bracket; + no_vertical_end = orig_span && !last_bracket; Real staff_thick = me->paper_l ()->get_var ("stafflinethickness"); Real half_space = 0.5; + Item * bound = dynamic_cast(me)->get_bound (LEFT); + /* - the volta spanner is attached to the bar-line, which is moved - to the right. We don't need to compensate for the left edge. + not a start, but really broken in two */ - Real left = 0.0; + Real left =0.; + if (bound->break_status_dir () == RIGHT) + { + Paper_column *pc = bound->column_l (); + left = pc->extent (pc, X_AXIS)[RIGHT] - bound->relative_coordinate (pc, X_AXIS); + } + else + { + /* + the volta spanner is attached to the bar-line, which is moved + to the right. We don't need to compensate for the left edge. + */ + } + Real w = dynamic_cast(me)->spanner_length () - left - half_space; Real h = gh_scm2double (me->get_grob_property ("height")); Real t = staff_thick * gh_scm2double (me->get_grob_property ("thickness")); diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 66f9edb958..90aff62e5f 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,15 +1,15 @@ Begin3 Title: LilyPond -Version: 1.3.117 -Entered-date: 14DEC00 +Version: 1.3.118 +Entered-date: 17DEC00 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.117.tar.gz + 1000k lilypond-1.3.118.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 1000k lilypond-1.3.117.tar.gz + 1000k lilypond-1.3.118.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index d8619ec6e9..d789c64523 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,11 +1,11 @@ %define info yes Name: lilypond -Version: 1.3.117 +Version: 1.3.118 Release: 1 License: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.117.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.118.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 a9784ac4c5..4ed8e7dcdc 100644 --- a/mutopia/Coriolan/bassi-part.ly +++ b/mutopia/Coriolan/bassi-part.ly @@ -1,13 +1,13 @@ \header{ -filename = "bassi-part.ly"; +filename = "bassi-part.ly"; % %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; \include "bassi.ly" diff --git a/mutopia/Coriolan/bassi.ly b/mutopia/Coriolan/bassi.ly index 423abcac41..087d52081e 100644 --- a/mutopia/Coriolan/bassi.ly +++ b/mutopia/Coriolan/bassi.ly @@ -1,19 +1,19 @@ \header{ -filename = "bassi.ly"; +filename = "bassi.ly"; % %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; \include "global.ly" \include "violoncello.ly" \include "contrabasso.ly" -bassiGroup = \context PianoStaff = bassi_group \notes < +bassiGroup = \context PianoStaff = bassi_group \notes < %\global \context StaffCombineStaff=oneBassi { \property StaffCombineStaff.midiInstrument = #"cello" diff --git a/mutopia/Coriolan/c-midi.ly b/mutopia/Coriolan/c-midi.ly index 3f2cc6dd43..27f88fbaf1 100644 --- a/mutopia/Coriolan/c-midi.ly +++ b/mutopia/Coriolan/c-midi.ly @@ -1,11 +1,11 @@ \header{ -filename = "c-midi.ly"; -title = "Ouverture"; -subtitle = "Coriolan"; -opus = "Op. 62"; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +filename = "c-midi.ly"; +title = "Ouverture"; +subtitle = "Coriolan"; +opus = "Op. 62"; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } @@ -13,7 +13,7 @@ copyright = "public domain"; %% Hopefully, this can be junked when part-combiner+midi+dynamics work ok. %% -\version "1.3.110"; +\version "1.3.117"; \include "global.ly" diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly index bf95ae0098..951bbf06df 100644 --- a/mutopia/Coriolan/clarinetti-part.ly +++ b/mutopia/Coriolan/clarinetti-part.ly @@ -1,13 +1,13 @@ \header{ -filename = "clarinetti-part.ly"; +filename = "clarinetti-part.ly"; % %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; \include "global.ly" \include "clarinetti.ly" diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly index e51cd685e4..97b6180eed 100644 --- a/mutopia/Coriolan/clarinetti.ly +++ b/mutopia/Coriolan/clarinetti.ly @@ -1,18 +1,18 @@ \header{ -filename = "clarinetti.ly"; +filename = "clarinetti.ly"; % %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; \include "clarinetto-1.ly" \include "clarinetto-2.ly" -clarinettiStaff = \context VoiceCombineStaff = clarinetti < +clarinettiStaff = \context VoiceCombineStaff = clarinetti < \property VoiceCombineStaff.midiInstrument = #"clarinet" \property VoiceCombineStaff.instrument = #"2 Clarinetti\n(B\\textflat)" \property VoiceCombineStaff.instr = #"Cl.\n(B\\textflat)" diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly index 5a6985ea5c..f3e81496fb 100644 --- a/mutopia/Coriolan/clarinetto-1.ly +++ b/mutopia/Coriolan/clarinetto-1.ly @@ -1,15 +1,15 @@ \header{ -filename = "clarinetto-1.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +filename = "clarinetto-1.ly"; +xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; -clarinettoI = \notes \relative c { +clarinettoI = \notes \relative c { R1 *2 | d''4-.\ff r r2 | R1 *3 | diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly index 620d75b7b5..ac5558bbc8 100644 --- a/mutopia/Coriolan/clarinetto-2.ly +++ b/mutopia/Coriolan/clarinetto-2.ly @@ -1,15 +1,15 @@ \header{ -filename = "clarinetto-2.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +filename = "clarinetto-2.ly"; +xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; -clarinettoII = \notes \relative c { +clarinettoII = \notes \relative c { R1*2 bes''4-.\ff r r2 | R1*3 | cis4-. r r2 | diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly index 6268000a9e..2e9469c4da 100644 --- a/mutopia/Coriolan/contrabasso.ly +++ b/mutopia/Coriolan/contrabasso.ly @@ -1,15 +1,15 @@ \header{ -filename = "contrabasso.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +filename = "contrabasso.ly"; +xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; -contrabasso = \notes \relative c { +contrabasso = \notes \relative c { % copied 21 from cello c1\ff ~ | c | diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly index 2155476460..4b8ba99b66 100644 --- a/mutopia/Coriolan/coriolan.ly +++ b/mutopia/Coriolan/coriolan.ly @@ -2,16 +2,16 @@ %% on my printer, I use dvips -O 5mm,0mm -o x.ps coriolan \header{ -filename = "coriolan.ly"; -title = "Ouverture"; -subtitle = "Coriolan"; -opus = "Op. 62"; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +filename = "coriolan.ly"; +title = "Ouverture"; +subtitle = "Coriolan"; +opus = "Op. 62"; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; \include "global.ly" \include "paper16.ly" @@ -29,30 +29,30 @@ copyright = "public domain"; \include "violino-2.ly" -legniGroup = \context StaffGroup = legni_group < +legniGroup = \context StaffGroup = legni_group < \flautiStaff \oboiStaff \clarinettiStaff \fagottiStaff > -ottoniGroup = \context StaffGroup = otonni_group < +ottoniGroup = \context StaffGroup = otonni_group < \corniStaff \trombeStaff > -timpaniGroup = \context StaffGroup = timpani_group < +timpaniGroup = \context StaffGroup = timpani_group < \timpaniStaff % Force a staff bracket (?) \context Staff = timpany { \skip 1*314; } > -violiniGroup = \context GrandStaff = violini_group < +violiniGroup = \context GrandStaff = violini_group < \violinoIStaff \violinoIIStaff > -archiGroup = \context StaffGroup = archi_group < +archiGroup = \context StaffGroup = archi_group < \violiniGroup \violiGroup \bassiGroup diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly index db90c940b7..c2df5e5c07 100644 --- a/mutopia/Coriolan/corni-part.ly +++ b/mutopia/Coriolan/corni-part.ly @@ -1,13 +1,13 @@ \header{ -filename = "corni-part.ly"; +filename = "corni-part.ly"; % %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; \include "global.ly" \include "corni.ly" diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly index 3a1cb0cb5e..4768d87429 100644 --- a/mutopia/Coriolan/corni.ly +++ b/mutopia/Coriolan/corni.ly @@ -1,18 +1,18 @@ \header{ -filename = "corni.ly"; +filename = "corni.ly"; % %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; \include "corno-1.ly" \include "corno-2.ly" -corniStaff = \context VoiceCombineStaff = corni < +corniStaff = \context VoiceCombineStaff = corni < \property VoiceCombineStaff.midiInstrument = #"french horn" \property VoiceCombineStaff.instrument = #"2 Corni\n(E\\textflat)" \property VoiceCombineStaff.instr = #"Cor.\n(E\\textflat)" diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly index 554ab1fcba..8084a1bf68 100644 --- a/mutopia/Coriolan/corno-1.ly +++ b/mutopia/Coriolan/corno-1.ly @@ -1,15 +1,15 @@ \header{ -filename = "corno-1.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +filename = "corno-1.ly"; +xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; -cornoI = \notes \relative c { +cornoI = \notes \relative c { R1*2 | f''4-.\ff r r2 | R1*3 | diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly index f1661a387c..d5c5a54aee 100644 --- a/mutopia/Coriolan/corno-2.ly +++ b/mutopia/Coriolan/corno-2.ly @@ -1,15 +1,15 @@ \header{ -filename = "corno-2.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +filename = "corno-2.ly"; +xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; -cornoII = \notes \relative c { +cornoII = \notes \relative c { R1*2 | d''4-.\ff r r2 | R1*3 | diff --git a/mutopia/Coriolan/fagotti-part.ly b/mutopia/Coriolan/fagotti-part.ly index 95d5988536..f1bb43748b 100644 --- a/mutopia/Coriolan/fagotti-part.ly +++ b/mutopia/Coriolan/fagotti-part.ly @@ -1,13 +1,13 @@ \header{ -filename = "fagotti-part.ly"; +filename = "fagotti-part.ly"; % %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; \include "global.ly" \include "fagotti.ly" diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly index cbc1588246..6011c88044 100644 --- a/mutopia/Coriolan/fagotti.ly +++ b/mutopia/Coriolan/fagotti.ly @@ -1,18 +1,18 @@ \header{ -filename = "fagotti.ly"; +filename = "fagotti.ly"; % %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; \include "fagotto-1.ly" \include "fagotto-2.ly" -fagottiStaff = \context VoiceCombineStaff = fagotti < +fagottiStaff = \context VoiceCombineStaff = fagotti < \property VoiceCombineStaff.midiInstrument = #"bassoon" \property VoiceCombineStaff.instrument = #"2 Fagotti" \property VoiceCombineStaff.instr = #"Fg." diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly index 11f71f9317..7a9272fed5 100644 --- a/mutopia/Coriolan/fagotto-1.ly +++ b/mutopia/Coriolan/fagotto-1.ly @@ -1,15 +1,15 @@ \header{ -filename = "fagotto-1.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +filename = "fagotto-1.ly"; +xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; -fagottoI = \notes \relative c { +fagottoI = \notes \relative c { R1*2 | as'4-.\ff r r2 | R1 *3 | diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly index 18de3c36ed..8c01a540e1 100644 --- a/mutopia/Coriolan/fagotto-2.ly +++ b/mutopia/Coriolan/fagotto-2.ly @@ -1,15 +1,15 @@ \header{ -filename = "fagotto-2.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +filename = "fagotto-2.ly"; +xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; -fagottoII = \notes \relative c { +fagottoII = \notes \relative c { R1*2 | f4-.\ff r r2 | R1*3 | diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly index 8bf47d39e1..fdcb1881f1 100644 --- a/mutopia/Coriolan/flauti-part.ly +++ b/mutopia/Coriolan/flauti-part.ly @@ -1,13 +1,13 @@ \header{ -filename = "flauti-part.ly"; +filename = "flauti-part.ly"; % %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; \include "global.ly" \include "flauti.ly" diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly index 11cedc0c75..1b9fe58c3b 100644 --- a/mutopia/Coriolan/flauti.ly +++ b/mutopia/Coriolan/flauti.ly @@ -1,18 +1,18 @@ \header{ -filename = "flauti.ly"; +filename = "flauti.ly"; % %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; \include "flauto-1.ly" \include "flauto-2.ly" -flautiStaff = \notes \context VoiceCombineStaff = flauti < +flautiStaff = \notes \context VoiceCombineStaff = flauti < \property VoiceCombineStaff.midiInstrument = #"flute" \property VoiceCombineStaff.instrument = #"2 Flauti" \property VoiceCombineStaff.instr = #"Fl." diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly index 1d8fa42e75..bbddad9bf5 100644 --- a/mutopia/Coriolan/flauto-1.ly +++ b/mutopia/Coriolan/flauto-1.ly @@ -1,15 +1,15 @@ \header{ -filename = "flauto-1.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +filename = "flauto-1.ly"; +xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; -flautoI = \notes \relative c { +flautoI = \notes \relative c { R1 *2 | c'''4-.\ff r r2 | R1 *3 | diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly index 76ac71fdc0..5373ec6940 100644 --- a/mutopia/Coriolan/flauto-2.ly +++ b/mutopia/Coriolan/flauto-2.ly @@ -1,15 +1,15 @@ \header{ -filename = "flauto-2.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +filename = "flauto-2.ly"; +xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; -flautoII = \notes \relative c { +flautoII = \notes \relative c { R1 *2 | as'''4-.\ff r r2 | R1 *3 | diff --git a/mutopia/Coriolan/global.ly b/mutopia/Coriolan/global.ly index f1ee718ee4..ad6f880a69 100644 --- a/mutopia/Coriolan/global.ly +++ b/mutopia/Coriolan/global.ly @@ -1,15 +1,15 @@ \header{ -filename = "global.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +filename = "global.ly"; +xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; -global = \notes { +global = \notes { \time 4/4; \key es \major; \skip 1*314; \bar "|."; diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly index 504f82990c..95149d3abe 100644 --- a/mutopia/Coriolan/oboe-1.ly +++ b/mutopia/Coriolan/oboe-1.ly @@ -1,15 +1,15 @@ \header{ -filename = "oboe-1.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +filename = "oboe-1.ly"; +xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; -oboeI = \notes \relative c'' { +oboeI = \notes \relative c'' { R1*2 | as'4-.\ff r r2 | R1*3 | diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly index 5b36406107..e02d063176 100644 --- a/mutopia/Coriolan/oboe-2.ly +++ b/mutopia/Coriolan/oboe-2.ly @@ -1,15 +1,15 @@ \header{ -filename = "oboe-2.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +filename = "oboe-2.ly"; +xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; -oboeII = \notes \relative c{ +oboeII = \notes \relative c{ R1*2| f''4-.\ff r r2 | R1*3 | diff --git a/mutopia/Coriolan/oboi-part.ly b/mutopia/Coriolan/oboi-part.ly index bdf573be45..64b9f7170b 100644 --- a/mutopia/Coriolan/oboi-part.ly +++ b/mutopia/Coriolan/oboi-part.ly @@ -1,13 +1,13 @@ \header{ -filename = "oboi-part.ly"; +filename = "oboi-part.ly"; % %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; \include "global.ly" \include "oboi.ly" diff --git a/mutopia/Coriolan/oboi.ly b/mutopia/Coriolan/oboi.ly index b061eb4175..1196885079 100644 --- a/mutopia/Coriolan/oboi.ly +++ b/mutopia/Coriolan/oboi.ly @@ -1,18 +1,18 @@ \header{ -filename = "oboi.ly"; +filename = "oboi.ly"; % %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; \include "oboe-1.ly" \include "oboe-2.ly" -oboiStaff = \context VoiceCombineStaff = oboi < +oboiStaff = \context VoiceCombineStaff = oboi < \property VoiceCombineStaff.midiInstrument = #"oboe" \property VoiceCombineStaff.instrument = #"2 Oboi" \property VoiceCombineStaff.instr = #"Ob." diff --git a/mutopia/Coriolan/timpani-part.ly b/mutopia/Coriolan/timpani-part.ly index e4edbb5003..e69c8fd071 100644 --- a/mutopia/Coriolan/timpani-part.ly +++ b/mutopia/Coriolan/timpani-part.ly @@ -1,13 +1,13 @@ \header{ -filename = "timpani-part.ly"; +filename = "timpani-part.ly"; % %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; \include "global.ly" \include "timpani.ly" diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly index 8b7858a79c..3426d0cad9 100644 --- a/mutopia/Coriolan/timpani.ly +++ b/mutopia/Coriolan/timpani.ly @@ -1,15 +1,15 @@ \header{ -filename = "timpani.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +filename = "timpani.ly"; +xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; -timpani = \notes \relative c { +timpani = \notes \relative c { R1*2 | c4-.\ff r r2 | R1*3 | @@ -143,7 +143,7 @@ timpani = \notes \relative c { R1*18| } -timpaniStaff = \context Staff = timpani < +timpaniStaff = \context Staff = timpani < \property Staff.midiInstrument = #"timpani" \property Staff.instrument = #"2 Timpani\n(C-G)" \property Staff.instr = #"Timp." diff --git a/mutopia/Coriolan/trombe-part.ly b/mutopia/Coriolan/trombe-part.ly index 250c276032..1c1fcf3fe8 100644 --- a/mutopia/Coriolan/trombe-part.ly +++ b/mutopia/Coriolan/trombe-part.ly @@ -1,13 +1,13 @@ \header{ -filename = "trombe-part.ly"; +filename = "trombe-part.ly"; % %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; \include "global.ly" \include "trombe.ly" diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly index 480351f7c4..1e900b66ce 100644 --- a/mutopia/Coriolan/trombe.ly +++ b/mutopia/Coriolan/trombe.ly @@ -1,18 +1,18 @@ \header{ -filename = "trombe.ly"; +filename = "trombe.ly"; % %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; \include "trombo-1.ly" \include "trombo-2.ly" -trombeStaff = \context VoiceCombineStaff = trombe < +trombeStaff = \context VoiceCombineStaff = trombe < \context VoiceCombineStaff=trombe { \property VoiceCombineStaff.midiInstrument = #"trumpet" \property VoiceCombineStaff.instrument = #"2 Trombe\n(C)" diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly index a1fe9120f1..5fca22aecf 100644 --- a/mutopia/Coriolan/trombo-1.ly +++ b/mutopia/Coriolan/trombo-1.ly @@ -1,15 +1,15 @@ \header{ -filename = "trombo-1.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +filename = "trombo-1.ly"; +xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; -tromboI = \notes \relative c { +tromboI = \notes \relative c { R1*2 | c''4-.\ff r r2 | R1*3 | diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly index 0e614705c0..1bd4d977b5 100644 --- a/mutopia/Coriolan/trombo-2.ly +++ b/mutopia/Coriolan/trombo-2.ly @@ -1,15 +1,15 @@ \header{ -filename = "trombo-2.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +filename = "trombo-2.ly"; +xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; -tromboII = \notes \relative c { +tromboII = \notes \relative c { R1*2 | c'4-.\ff r r2 | R1*3 | diff --git a/mutopia/Coriolan/viola-1.ly b/mutopia/Coriolan/viola-1.ly index e59fe71f42..dad0fd085a 100644 --- a/mutopia/Coriolan/viola-1.ly +++ b/mutopia/Coriolan/viola-1.ly @@ -1,15 +1,15 @@ \header{ -filename = "viola-1.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +filename = "viola-1.ly"; +xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; -violaI = \notes \relative c { +violaI = \notes \relative c { c'1\ff ~ | c | f,4-. r r2 | diff --git a/mutopia/Coriolan/viola-2.ly b/mutopia/Coriolan/viola-2.ly index 62affe5bd4..05244d8d70 100644 --- a/mutopia/Coriolan/viola-2.ly +++ b/mutopia/Coriolan/viola-2.ly @@ -1,15 +1,15 @@ \header{ -filename = "viola-2.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +filename = "viola-2.ly"; +xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; -violaII = \notes \relative c { +violaII = \notes \relative c { c1\ff ~ | c | f4-. r r2 | diff --git a/mutopia/Coriolan/violi-part.ly b/mutopia/Coriolan/violi-part.ly index c54d49c4bd..cbb5dab06f 100644 --- a/mutopia/Coriolan/violi-part.ly +++ b/mutopia/Coriolan/violi-part.ly @@ -1,13 +1,13 @@ \header{ -filename = "violi-part.ly"; +filename = "violi-part.ly"; % %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; \include "violi.ly" diff --git a/mutopia/Coriolan/violi.ly b/mutopia/Coriolan/violi.ly index b5de2798d5..5c03c23d6a 100644 --- a/mutopia/Coriolan/violi.ly +++ b/mutopia/Coriolan/violi.ly @@ -1,20 +1,20 @@ \header{ -filename = "violi.ly"; +filename = "violi.ly"; % %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; \include "global.ly" \include "viola-1.ly" \include "viola-2.ly" %{ -violiGroup = \context PianoStaff = violi_group \notes < +violiGroup = \context PianoStaff = violi_group \notes < \context StaffCombineStaff=oneVioli { \property StaffCombineStaff.midiInstrument = #"viola" \property StaffCombineStaff.instrument = #"Viola" @@ -40,7 +40,7 @@ violiGroup = \context PianoStaff = violi_group \notes < > %} -violiGroup = \notes \context VoiceCombineStaff = violi < +violiGroup = \notes \context VoiceCombineStaff = violi < \context VoiceCombineStaff=violi { \property VoiceCombineStaff.midiInstrument = #"viola" \property VoiceStaffCombineStaff.instrument = #"Viola" diff --git a/mutopia/Coriolan/violino-1-part.ly b/mutopia/Coriolan/violino-1-part.ly index eb20a83deb..a8042c3505 100644 --- a/mutopia/Coriolan/violino-1-part.ly +++ b/mutopia/Coriolan/violino-1-part.ly @@ -1,13 +1,13 @@ \header{ -filename = "violino-1-part.ly"; +filename = "violino-1-part.ly"; % %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; \include "global.ly" \include "violino-1.ly" diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly index 4ea23aae7d..e373879bf2 100644 --- a/mutopia/Coriolan/violino-1.ly +++ b/mutopia/Coriolan/violino-1.ly @@ -1,15 +1,15 @@ \header{ -filename = "violino-1.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +filename = "violino-1.ly"; +xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; -violinoI = \notes \relative c { +violinoI = \notes \relative c { c'1\ff ~ | c | r r2 | @@ -454,7 +454,7 @@ violinoI = \notes \relative c { c4 r r2 | } -violinoIStaff = \context Staff = violino1 < +violinoIStaff = \context Staff = violino1 < \property Staff.midiInstrument = #"violin" \property Staff.instrument = #"Violino I" \property Staff.instr = #"Vl. I" diff --git a/mutopia/Coriolan/violino-2-part.ly b/mutopia/Coriolan/violino-2-part.ly index 2955553364..f7b5899f6d 100644 --- a/mutopia/Coriolan/violino-2-part.ly +++ b/mutopia/Coriolan/violino-2-part.ly @@ -1,13 +1,13 @@ \header{ -filename = "violino-2-part.ly"; +filename = "violino-2-part.ly"; % %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; \include "global.ly" \include "violino-2.ly" diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly index eeb0faa3d7..d5beb5653e 100644 --- a/mutopia/Coriolan/violino-2.ly +++ b/mutopia/Coriolan/violino-2.ly @@ -1,15 +1,15 @@ \header{ -filename = "violino-2.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +filename = "violino-2.ly"; +xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; -violinoII = \notes \relative c { +violinoII = \notes \relative c { c'1\ff ~ | c | r r2 | @@ -448,7 +448,7 @@ violinoII = \notes \relative c { c4 r r2 | } -violinoIIStaff = \context Staff = violino2 < +violinoIIStaff = \context Staff = violino2 < % MIDI hoort geeneens verschil tussen een % eerste en tweede viool ;-) \property Staff.midiInstrument = #"violin" diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly index 3063d7d6e3..3313fa8d67 100644 --- a/mutopia/Coriolan/violoncello.ly +++ b/mutopia/Coriolan/violoncello.ly @@ -1,15 +1,15 @@ \header{ -filename = "violoncello.ly"; -%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; -description = ""; -composer = "Ludwig van Beethoven (1770-1827)"; -enteredby = "JCN"; -copyright = "public domain"; +filename = "violoncello.ly"; +xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +description = ""; +composer = "Ludwig van Beethoven (1770-1827)"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; -violoncello = \notes \relative c { +violoncello = \notes \relative c { c1\ff ~ | c | f,4-. r r2 | diff --git a/mutopia/D.Zipoli/verso_2.ly b/mutopia/D.Zipoli/verso_2.ly index 2c316f3608..99f5be0792 100644 --- a/mutopia/D.Zipoli/verso_2.ly +++ b/mutopia/D.Zipoli/verso_2.ly @@ -1,10 +1,10 @@ \header{ filename="verso_2.ly"; -enteredby = "Peter Chubb"; -arranger = "Peter Chubb"; -composer = "Domenico Zipoli"; -date = "c1700"; -title = "Verso II"; +enteredby = "Peter Chubb"; +arranger = "Peter Chubb"; +composer = "Domenico Zipoli"; +date = "c1700"; +title = "Verso II"; } %{ @@ -17,23 +17,23 @@ title = "Verso II"; under the Gnu Public Licence. %} -\version "1.3.110"; +\version "1.3.117"; -$voice_one = \notes \relative c' { +voiceOne = \notes \relative c' { a'2 bes4. [c16 bes] | a4 d ~ d c ~ | c b ~ [b8 a] a4 ~| [a8 gis16 fis16] gis4 a4^"'" e'4 | f2 ~ [f8 g16 f] e4 ~| [e8 f16 e] [d8 c] d2 | c2 bes4 ~ [bes8 c16 bes] | a4~[a8 bes16 a] g4~ [g8 a16 g] f4 ~ [ f8 g16 f] e4 a4~| [a8 g16 fis] g4 ~ g f | e2 ~ e4 g4 ~ | g [fis8 e] fis2 \bar "|."; } -$voice_two = \notes \relative c' { +voiceTwo = \notes \relative c' { [d8 e f d ] g4 c, | f d e2 | f4 ~ [f8 g16 f] e4 a| d,4. d8 c4 a'4 | r4 a4 bes4 ~ [bes8 c16 bes] | a2 ~ [a8 bes16 a] g4 ~| [ g8 a16 g ] f4 ~ [f8 g16 f] e4 | f2 ~ f4 e4 ~| e4 d4~ d4 cis4 | d2 cis4 d4~ | d4 [cis8 b] cis2 | d1 \bar "|."; } -$voice_three = \notes \relative c' +voiceThree = \notes \relative c' { r1 | r2 [a8 b c a] | d4 g, c4. [d16 c] | b4. b8 [a b c a ] | [d, e f d ] g4 c,4 | f2 bes4 ~ [bes8 c16 bes]| @@ -56,19 +56,19 @@ recorder= { \context Staff = descant { \property Staff.Instrument = "Descant" \clef "G^8"; - \notes \transpose bes' {\global \$voice_one } + \notes \transpose bes' {\global \voiceOne } } \context Staff = treble { \property Staff.Instrument = "Treble" \clef "G"; - \notes \transpose bes' {\global \$voice_two } + \notes \transpose bes' {\global \voiceTwo } } \context Staff = lower { \property Staff.Instrument = "Tenor or Treble II" \clef "G"; - \notes \transpose bes'' {\global \$voice_three } + \notes \transpose bes'' {\global \voiceThree } } > } @@ -86,12 +86,12 @@ organ={ \clef "G"; \global \context Staff < - { \voiceOne \$voice_one } - { \voiceTwo \$voice_two } + { \voiceOne \voiceOne } + { \voiceTwo \voiceTwo } > } \context Staff = bass { - \clef "F"; \global \$voice_three + \clef "F"; \global \voiceThree } > } diff --git a/mutopia/E.Satie/gnossienne-4.ly b/mutopia/E.Satie/gnossienne-4.ly index 605af74b4f..7d9de3631e 100644 --- a/mutopia/E.Satie/gnossienne-4.ly +++ b/mutopia/E.Satie/gnossienne-4.ly @@ -11,16 +11,16 @@ Tested Features: cross staff auto beams and slurs, grace notes, no bars %} -\version "1.3.110"; +\version "1.3.117"; -global = \notes { +global = \notes { \key a \minor; \time 6/4; \skip 1.*34; \bar "|."; } -melody = \notes\relative c''{ +melody = \notes\relative c''{ \clef violin; \property Voice.verticalDirection = #1 \property Voice.graceFraction = #(make-moment 1 4) @@ -57,11 +57,11 @@ melody = \notes\relative c''{ ~ } -basloopje = \notes\relative c{ +basloopje = \notes\relative c{ d,8( a' d f a d f d a f d )a } -accompany = \notes \relative c { +accompany = \notes \relative c { % snapnie, hoevaak relative c heeft ze nodig? \basloopje \basloopje diff --git a/mutopia/E.Satie/petite-ouverture-a-danser.ly b/mutopia/E.Satie/petite-ouverture-a-danser.ly index 8e8f34d0e8..e395e418eb 100644 --- a/mutopia/E.Satie/petite-ouverture-a-danser.ly +++ b/mutopia/E.Satie/petite-ouverture-a-danser.ly @@ -12,11 +12,11 @@ Tested Features: %} -\version "1.3.110"; +\version "1.3.117"; \include "nederlands.ly" -global = \notes { +global = \notes { \key a \minor; \time 2/4; s2*10 @@ -37,7 +37,7 @@ global = \notes { \bar "|."; } -i = \context Staff \notes\relative c''{ +i = \context Staff \notes\relative c''{ \context Voice=i \stemUp @@ -65,7 +65,7 @@ i = \context Staff \notes\relative c''{ } -ii = \context Staff \notes\relative c'{ +ii = \context Staff \notes\relative c'{ \context Voice=ii \stemDown @@ -103,7 +103,7 @@ ii = \context Staff \notes\relative c'{ } -lower = \context Staff \notes \relative c{ +lower = \context Staff \notes \relative c{ \context Voice=iii | r | | r | diff --git a/mutopia/F.Schubert/standchen-16.ly b/mutopia/F.Schubert/standchen-16.ly index bc9a4e9c25..eb5f1bca04 100644 --- a/mutopia/F.Schubert/standchen-16.ly +++ b/mutopia/F.Schubert/standchen-16.ly @@ -1,14 +1,14 @@ \header{ -filename = "standchen.ly"; -title = "St\"andchen (Serenade) \"Leise flehen meine Lieder\""; -opus = "D. 957 No. 4"; -composer = "Franz Schubert (1797-1828)"; +filename = "standchen.ly"; +title = "St\"andchen (Serenade) \"Leise flehen meine Lieder\""; +opus = "D. 957 No. 4"; +composer = "Franz Schubert (1797-1828)"; poet= "Text by Ludwig Rellstab (1799-1860)"; -enteredby = "JCN"; -description = "A schubert song in 16 pt"; -copyright = "public domain"; +enteredby = "JCN"; +description = "A schubert song in 16 pt"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; \include "standchen.ly" diff --git a/mutopia/F.Schubert/standchen-20.ly b/mutopia/F.Schubert/standchen-20.ly index b43bbbb48a..b7caa54b3f 100644 --- a/mutopia/F.Schubert/standchen-20.ly +++ b/mutopia/F.Schubert/standchen-20.ly @@ -1,16 +1,16 @@ \header{ -filename = "standchen.ly"; +filename = "standchen.ly"; title = "St\\\"andchen"; -subtitle = "(Serenade)\\\\``Leise flehen meine Lieder''"; -opus = "D. 957 No. 4"; -date = "August 1828"; -composer = "Franz Schubert (1797-1828)"; +subtitle = "(Serenade)\\\\``Leise flehen meine Lieder''"; +opus = "D. 957 No. 4"; +date = "August 1828"; +composer = "Franz Schubert (1797-1828)"; poet= "Text by Ludwig Rellstab (1799-1860)"; -enteredby = "JCN"; -copyright = "public domain"; +enteredby = "JCN"; +copyright = "public domain"; } -\version "1.3.110"; +\version "1.3.117"; % fool make-website % \include "standchen.ly"; diff --git a/mutopia/F.Schubert/standchen.ly b/mutopia/F.Schubert/standchen.ly index e62ae2ec61..0b24dc81a9 100644 --- a/mutopia/F.Schubert/standchen.ly +++ b/mutopia/F.Schubert/standchen.ly @@ -1,5 +1,5 @@ \header{ -filename = "standchen.ly"; +filename = "standchen.ly"; % % From the album: % Schubert-Lieder @@ -10,13 +10,13 @@ filename = "standchen.ly"; % page 60 % title = "St\\\"andchen"; -subtitle = "(Serenade)\\\\``Leise flehen meine Lieder''"; -opus = "D. 957 No. 4"; -date = "August 1828"; -composer = "Franz Schubert (1797-1828)"; +subtitle = "(Serenade)\\\\``Leise flehen meine Lieder''"; +opus = "D. 957 No. 4"; +date = "August 1828"; +composer = "Franz Schubert (1797-1828)"; poet= "Text by Ludwig Rellstab (1799-1860)"; -enteredby = "JCN"; -copyright = "public domain"; +enteredby = "JCN"; +copyright = "public domain"; % mutopia headers. mutopiatitle = "St\\\"andchen"; @@ -41,13 +41,13 @@ multiple \paper{}s in one \score Note: Original key f. %} -\version "1.3.110"; +\version "1.3.117"; -dynamicUp = \property Voice.DynamicLineSpanner \override #'direction = #1 -dynamicRevert = \property Voice.DynamicLineSpanner \revert #'direction +dynamicUp = \property Voice.DynamicLineSpanner \override #'direction = #1 +dynamicRevert = \property Voice.DynamicLineSpanner \revert #'direction -vocalVerse = \notes\relative c''{ +vocalVerse = \notes\relative c''{ \dynamicUp \times 2/3 { [ g8( )as] g } c4. g8 | \times 2/3 { [ f8( )g] f } c'4 f,8 r | @@ -76,7 +76,7 @@ vocalVerse = \notes\relative c''{ c!2. | } -vocalThrough = \notes\relative c{ +vocalThrough = \notes\relative c{ \dynamicUp g''8. g16 b8. b16 d8. d16 | c4 b r | @@ -96,7 +96,7 @@ vocalThrough = \notes\relative c{ e2 r4 | } -lyricVerseOne = \lyrics{ +lyricVerseOne = \lyrics{ Lei- se fleh- en mei- ne Lie- der Durch die Nacht zu dir; In den stil- len Hain her- nie- der @@ -111,7 +111,7 @@ lyricVerseOne = \lyrics{ F\"urch- te, Hol- de, nicht. } -lyricVerseTwo = \lyrics{ +lyricVerseTwo = \lyrics{ H\"orst die Nach- ti- gal- len schla- gen? Ach! sie fleh- en dich, Mit der T\"o- ne s\"u- "\ss en" Kla- gen @@ -126,7 +126,7 @@ lyricVerseTwo = \lyrics{ Jed- es wei- che Herz. } -lyricThrough = \lyrics{ +lyricThrough = \lyrics{ La\ss auch dir die Brust be- we- gen Lieb- chen, h\"o- re mich! Be- bend harr' ich dir ent- ge- gen! @@ -136,7 +136,7 @@ lyricThrough = \lyrics{ Be- gl\"uk- ke mich! } -trebleIntro = \notes\relative c{ +trebleIntro = \notes\relative c{ r8^"\bf M\\\"a\\ss ig"\pp | r8 | r8 | @@ -144,7 +144,7 @@ trebleIntro = \notes\relative c{ \break } -trebleVerseOne = \notes\relative c{ +trebleVerseOne = \notes\relative c{ %5 r8 | r8 | @@ -179,7 +179,7 @@ trebleVerseOne = \notes\relative c{ < {a4.- > )f8} { a'4. f8 } > | } -trebleEentje = \notes \relative c'{ +trebleEentje = \notes \relative c'{ \stemBoth | ( c> <)f16 )as> | @@ -193,7 +193,7 @@ trebleEentje = \notes \relative c'{ | } -trebleThrough = \notes \relative c'{ +trebleThrough = \notes \relative c'{ \stemBoth | %61 @@ -248,7 +248,7 @@ trebleThrough = \notes \relative c'{ | } -bassIntro = \notes\relative c{ +bassIntro = \notes\relative c{ \dynamicUp %1 r4 | @@ -257,7 +257,7 @@ bassIntro = \notes\relative c{ r4 | } -bassVerseOne = \notes\relative c{ +bassVerseOne = \notes\relative c{ % \clef bass; \dynamicUp %5 @@ -289,7 +289,7 @@ bassVerseOne = \notes\relative c{ c,8 [ ] | } -bassEentje = \notes\relative c{ +bassEentje = \notes\relative c{ \dynamicUp [ ] | c,8 [ ] | @@ -301,7 +301,7 @@ bassEentje = \notes\relative c{ c,8 [ ] | } -bassThrough = \notes\relative c{ +bassThrough = \notes\relative c{ \dynamicUp %61 [ b-> d->> ] | @@ -335,7 +335,7 @@ bassThrough = \notes\relative c{ | } -global = \notes{ +global = \notes{ \time 3/4; \key es \major; \skip 4 * 12; @@ -344,17 +344,17 @@ global = \notes{ \bar "|."; } -allLyrics = \lyrics { +allLyrics = \lyrics { \lyricVerseOne \lyricVerseTwo \lyricThrough } -lyricStaff = \context Lyrics = lyric< +lyricStaff = \context Lyrics = lyric< \allLyrics > -vocals = \notes{ +vocals = \notes{ \clef treble; % certainly no auto-beaming for vocals \property Voice.noAutoBeaming = ##t @@ -368,13 +368,13 @@ vocals = \notes{ \vocalThrough } -vocalStaff = \context Staff = vocal< +vocalStaff = \context Staff = vocal< \property Staff.instrument = "synth voice" \global \vocals > -treble = { +treble = { \clef treble; \property Voice.autoBeamSettings \override #'(begin * * * *) = #(make-moment 0 1) \trebleIntro @@ -384,12 +384,12 @@ treble = { \trebleThrough } -trebleStaff = \context Staff = treble< +trebleStaff = \context Staff = treble< \global \treble > -bass = { +bass = { \clef bass; \bassIntro \bassVerseOne @@ -398,12 +398,12 @@ bass = { \bassThrough } -bassStaff = \context Staff = bass< +bassStaff = \context Staff = bass< \global \bass > -grandStaff = \context PianoStaff < +grandStaff = \context PianoStaff < \trebleStaff \bassStaff > diff --git a/mutopia/Hymns/diademata.ly b/mutopia/Hymns/diademata.ly index ee2563d96b..dbfad5a36a 100644 --- a/mutopia/Hymns/diademata.ly +++ b/mutopia/Hymns/diademata.ly @@ -7,7 +7,7 @@ metre = "6 6. 8 6. D"; } -\version "1.3.110"; +\version "1.3.117"; sop=\notes \transpose c''{ ees2 ees4 ees4 g2 g2 | c'1. @@ -55,7 +55,7 @@ bass=\notes \transpose c' { g,2 | aes, ees bes, bes, | ees\breve } -global = \notes{ +global = \notes{ \time 4/2; \key ees \major; \skip 2*4; \skip 1.; \bar "||"; @@ -66,7 +66,7 @@ global = \notes{ \skip 2; \skip 2*12;\skip 1.; \bar "||"; } -$upper_staff = \context Staff = upper { +upperStaff = \context Staff = upper { \clef "treble"; \context Staff < \global @@ -75,7 +75,7 @@ $upper_staff = \context Staff = upper { > } -$lower_staff = \context Staff = lower { +lowerStaff = \context Staff = lower { \clef "bass"; \context Staff < \global @@ -86,8 +86,8 @@ $lower_staff = \context Staff = lower { \score{ \context ChoirStaff\notes < - \$upper_staff - \$lower_staff + \upperStaff + \lowerStaff > \paper { indent = 0.0\mm; diff --git a/mutopia/Hymns/laudatedom.ly b/mutopia/Hymns/laudatedom.ly index 8acd722abf..36ba5b2f12 100644 --- a/mutopia/Hymns/laudatedom.ly +++ b/mutopia/Hymns/laudatedom.ly @@ -1,12 +1,12 @@ \header { -title = "Laudate Dominum"; -composer = "Parry"; -metre = "10 10 . 11 11"; +title = "Laudate Dominum"; +composer = "Parry"; +metre = "10 10 . 11 11"; } -\version "1.3.110"; +\version "1.3.117"; -sop = \notes \transpose c''{ +sop = \notes \transpose c''{ f4 | d' bes c' | f2 \bar "||"; bes4 | g f ees | d2 \bar "||"; f4 | d' c' f | bes2 \bar "||"; @@ -17,7 +17,7 @@ sop = \notes \transpose c''{ ees'4 | d' bes c' | bes2 \bar "||"; } -alto = \notes \transpose c'' { +alto = \notes \transpose c'' { f4 | f f g | f2 \bar "||"; f4 | bes, d c | bes,2 \bar "||"; f4 | bes a f | f ~ g \bar "||"; @@ -28,7 +28,7 @@ alto = \notes \transpose c'' { g | f4. g8 a4 | bes2 \bar "||"; } -tenor = \notes \transpose c' { +tenor = \notes \transpose c' { f4 | bes d' [c'8 ~ bes] | a2 \bar "||"; f4 | g g a | bes2 \bar "||"; d'4 | e' f' c' | d' ~ c' \bar "||"; @@ -39,7 +39,7 @@ tenor = \notes \transpose c' { bes4 | bes d' ees' | d'2 \bar "||"; } -bass = \notes \transpose c'{ +bass = \notes \transpose c'{ f4 | bes d ees | f2 \bar "||"; d4 | ees c f | bes,2 \bar "||"; bes4 | g a a, | d ~ e \bar "||"; @@ -50,7 +50,7 @@ bass = \notes \transpose c'{ c4 | f f f | bes,2 \bar "||"; } -global = \notes { +global = \notes { \time 3/4; \partial 4; \key bes \major; diff --git a/mutopia/Hymns/maccabaeus.ly b/mutopia/Hymns/maccabaeus.ly index 087f85f5bd..795eadba83 100644 --- a/mutopia/Hymns/maccabaeus.ly +++ b/mutopia/Hymns/maccabaeus.ly @@ -1,13 +1,13 @@ \header { -filename = "maccabaeus.ly"; -enteredby = "Peter Chubb"; -composer = "G. F. Handel"; -date = "1680"; -title = "Maccabaeus"; -metre = "10 11. 11 11. and refrain"; +filename = "maccabaeus.ly"; +enteredby = "Peter Chubb"; +composer = "G. F. Handel"; +date = "1680"; +title = "Maccabaeus"; +metre = "10 11. 11 11. and refrain"; } -\version "1.3.110"; +\version "1.3.117"; sop=\notes \relative c'' { b2 gis4. a8 |b2 e,2 | @@ -75,13 +75,13 @@ bass=\notes \relative c { fis4 [gis8 a] b4. e,8 | e1 \bar "|."; } -global = \notes { +global = \notes { \time 2/2; \property Staff.timeSignatureStyle = "C" \key e \major; } -$upper_staff = \context Staff = upper { +upperStaff = \context Staff = upper { \global \clef "treble"; \context Staff < @@ -90,7 +90,7 @@ $upper_staff = \context Staff = upper { > } -$lower_staff = \context Staff = lower { +lowerStaff = \context Staff = lower { \global \clef "bass"; \context Staff < @@ -101,8 +101,8 @@ $lower_staff = \context Staff = lower { \score { < - \$upper_staff - \$lower_staff + \upperStaff + \lowerStaff > \paper { } diff --git a/mutopia/Hymns/ode.ly b/mutopia/Hymns/ode.ly index fe5a5015df..c9b6ab6ead 100644 --- a/mutopia/Hymns/ode.ly +++ b/mutopia/Hymns/ode.ly @@ -7,7 +7,7 @@ metre = "8 7 8 7 D"; } -\version "1.3.110"; +\version "1.3.117"; sop=\notes \relative c'' { b4 b c d | d c b a | g g a b | b4. a8 a2 | @@ -48,7 +48,7 @@ global=\notes{ \skip 1*4; \bar "|."; } -$upper_staff = \context Staff = upper \notes { +upperStaff = \context Staff = upper \notes { \clef "G"; \context Staff < \global @@ -57,7 +57,7 @@ $upper_staff = \context Staff = upper \notes { > } -$lower_staff = \context Staff = lower \notes { +lowerStaff = \context Staff = lower \notes { \clef "F"; \context Staff < \global @@ -68,8 +68,8 @@ $lower_staff = \context Staff = lower \notes { \score{ < - \$upper_staff - \$lower_staff + \upperStaff + \lowerStaff > \paper { } diff --git a/mutopia/Hymns/passion.ly b/mutopia/Hymns/passion.ly index a2d31c6ca4..fd09ae356e 100644 --- a/mutopia/Hymns/passion.ly +++ b/mutopia/Hymns/passion.ly @@ -1,11 +1,11 @@ \header { -filename = "passion.ly"; -title = "Passion Chorale"; -composer = "J. S. Bach"; -enteredby = "Peter Chubb"; +filename = "passion.ly"; +title = "Passion Chorale"; +composer = "J. S. Bach"; +enteredby = "Peter Chubb"; } -\version "1.3.110"; +\version "1.3.117"; sop=\notes \transpose c'' { \repeat "volta" 2 { diff --git a/mutopia/Hymns/stille.ly b/mutopia/Hymns/stille.ly index ffa06d9dff..aa8a13aa5b 100644 --- a/mutopia/Hymns/stille.ly +++ b/mutopia/Hymns/stille.ly @@ -8,7 +8,7 @@ } -\version "1.3.110"; +\version "1.3.117"; %{ Note: there are other verses, but the three here seem to be @@ -118,7 +118,7 @@ harm=\chords{ bes1. } -v1 = \lyrics { +vB = \lyrics { Stil2 -- le4 Nacht,2. hei4. -- li8 -- ge4 Nacht,2. Al2 -- les4 schl\"aft,2. ein2 -- sam4 wacht2. Nur2 das4 trau2 -- te,4 hoch4. -- heil8 ige4 Paar,2. @@ -127,7 +127,7 @@ v1 = \lyrics { Schlaf2 in4 himm4. -- li8 -- scher4 Ruh'!1 __ ""2 } -v2 = \lyrics { +vC = \lyrics { Stil2 -- le4 Nacht,2. hei4. -- li8 -- ge4 Nacht,2. Hir2 -- ten4 erst2. kund2 ge4 -- macht2. Durch2 der4 En2 -- gel4 Ha4. -- lle8 -- lu4 ja2. @@ -136,7 +136,7 @@ v2 = \lyrics { "``Christ,"2 der4 Ret4. -- ter,8 ist4 "da!''"1 __ ""2 } -v3 = \lyrics { +vD = \lyrics { Stil2 -- le4 Nacht,2. hei4. -- li8 -- ge4 Nacht,2. Go2 -- ttes4 Sohn,2. o2 -- wie4 lacht2. Lieb'2 aus4 dei2 -- nem4 g\"ott4. -- li8 -- chen4 Mund,2. @@ -145,7 +145,7 @@ v3 = \lyrics { Christ,2 in4 Dei4. -- ner8 Ge4 -- burt!1 __ ""2 } -v1e = \lyrics { +vBe = \lyrics { Si2 -- lent4 night,2. Ho2 -- ly4 night,2. All2 is4 calm,2. all2 is4 bright,2. 'Round2 yon4 Vir2 -- gin4 Mo4. -- ther8 and4 Child2. @@ -154,7 +154,7 @@ v1e = \lyrics { Sleep4. __ ""8 in4 hea4. -- ven-8 ly4 peace.1 __ ""2 } -v2e = \lyrics { +vCe = \lyrics { Si2 -- lent4 night,2. Ho2 -- ly4 night,2. Shep2 -- herds4 quake2. at2 the4 sight,2. Glo2 -- ries4 stream4. __ ""8 from4 hea4. -- ven8 a4 -- far,2. @@ -163,7 +163,7 @@ v2e = \lyrics { Christ4. __ ""8 the4 Sa4. -- viour8 is4 "born.''"1 __ ""2 } -v3e = \lyrics { +vDe = \lyrics { Si2 -- lent4 night,2. Ho2 -- ly4 night,2. Son2 of4 God,2. love's2 pure4 light2. Ra2 -- diant4 beams4. from8 Thy4 ho2 -- ly4 face,2. @@ -184,7 +184,7 @@ upper= \notes { } } -lower = \notes { +lower = \notes { \context Staff = lower { \clef "bass"; \context Staff < 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 f6af1ccbd4..5baf3e7713 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly @@ -4,9 +4,9 @@ piece = "Allemande"; } -\version "1.3.110"; +\version "1.3.117"; -global = \notes{ +global = \notes{ \time 4/4; \partial 8*3; \key es \major; @@ -19,7 +19,7 @@ global = \notes{ \bar ":|"; } -hoyreEn = \notes\relative c'''{ +hoyreEn = \notes\relative c'''{ % \partial 4.; [as16 g f] | [g16 d es b][c f es d][es b c g][as d c b] | @@ -79,7 +79,7 @@ hoyreEn = \notes\relative c'''{ > s8 } -venstreEn = \notes\relative c{ +venstreEn = \notes\relative c{ \clef bass; % \partial 4.; r16 r8 | 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 2f4ede1f39..fd895d7b92 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly @@ -10,9 +10,9 @@ %% %% Noe liknende skjer også i mellom andre og tredje stemme i takt 28 -\version "1.3.110"; +\version "1.3.117"; -global = \notes{ +global = \notes{ \time 2/4; \key es \major; s2*48 @@ -21,7 +21,7 @@ global = \notes{ \bar "|."; } -vOne = \context Voice = voiceOne \notes\relative c''{ +vOne = \context Voice = voiceOne \notes\relative c''{ r8 g c4~ | [c8 d16 c][b a g f] | [es8 g' d, f'] | @@ -142,7 +142,7 @@ vOne = \context Voice = voiceOne \notes\relative c''{ } -vTwo = \context Voice = voiceTwo \notes\relative c{ +vTwo = \context Voice = voiceTwo \notes\relative c{ es4 r8 es | f4 r8 bes | c4. b8 | @@ -263,7 +263,7 @@ vTwo = \context Voice = voiceTwo \notes\relative c{ \property Voice.horizontalNoteShift = 0 c4 b8 | } -vThree = \context Voice = voiceThree \notes\relative c{ +vThree = \context Voice = voiceThree \notes\relative c{ \stemDown c4 r8 c | d4 r | @@ -386,7 +386,7 @@ vThree = \context Voice = voiceThree \notes\relative c{ } -vOneSwitch = \context Voice = voiceOne \notes{ +vOneSwitch = \context Voice = voiceOne \notes{ s2*4 %5 \stemUp s2*17 @@ -414,7 +414,7 @@ vOneSwitch = \context Voice = voiceOne \notes{ \stemBoth } -vTwoSwitch = \context Voice = voiceTwo \notes{ +vTwoSwitch = \context Voice = voiceTwo \notes{ \stemUp s2*4 %5 \stemDown \translator Staff = treble s2*17 @@ -449,7 +449,7 @@ vTwoSwitch = \context Voice = voiceTwo \notes{ \translator Staff = treble \stemDown s2*35 } -vThreeSwitch = \context Voice = voiceThree \notes{ +vThreeSwitch = \context Voice = voiceThree \notes{ \stemDown s2*6 %7 \stemBoth s2*21 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 d5d6d8b1ef..7e88b4d8bb 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly @@ -10,9 +10,9 @@ copyright = "Public Domain"; } -\version "1.3.110"; +\version "1.3.117"; -global = \notes { +global = \notes { \time 4/4; \key es \major; \skip 1*7; @@ -23,7 +23,7 @@ global = \notes { \bar "|."; } -hoyreOpp = \notes\relative c'' { +hoyreOpp = \notes\relative c'' { \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] | @@ -44,7 +44,7 @@ hoyreOpp = \notes\relative c'' { > g2 } -hoyreNed = \notes\relative c'' { +hoyreNed = \notes\relative c'' { \clef violin; \stemDown r16 [c b16. c32] d4 r16 [d d16. es32] | @@ -57,7 +57,7 @@ hoyreNed = \notes\relative c'' { g4 r } -venstreOpp = \notes\relative c' { +venstreOpp = \notes\relative c' { \clef bass; \stemUp r r | @@ -75,7 +75,7 @@ venstreOpp = \notes\relative c' { r } -venstreNed = \notes\relative c{ +venstreNed = \notes\relative c{ \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] | @@ -86,7 +86,7 @@ venstreNed = \notes\relative c{ r g g2 } -andanteEn = \notes\relative c''{ +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 @@ -141,7 +141,7 @@ andanteEn = \notes\relative c''{ > } -andanteTo = \notes\relative c{ +andanteTo = \notes\relative c{ %8 [c8 c'] [f, g] [es c] [es g] | [c as] [es f] [g g,] @@ -179,7 +179,7 @@ andanteTo = \notes\relative c{ > } -allegroEn = \notes\relative c''{ +allegroEn = \notes\relative c''{ %30 [g8^"allegro" g16 a] [b8 c d es] | [f16 es d es] [f8 g as d,] | @@ -253,7 +253,7 @@ allegroEn = \notes\relative c''{ { \stemDown r8 r16 | } > } -allegroTo = \notes\relative c'{ +allegroTo = \notes\relative c'{ \clef bass; %30 \context Staff < diff --git a/mutopia/J.S.Bach/Duette/global-i.ly b/mutopia/J.S.Bach/Duette/global-i.ly index b5c97728a8..a365e6653a 100644 --- a/mutopia/J.S.Bach/Duette/global-i.ly +++ b/mutopia/J.S.Bach/Duette/global-i.ly @@ -1,6 +1,6 @@ -\version "1.3.110"; +\version "1.3.117"; -$global_i = \notes{ +globalI = \notes{ \time 12/8; \key g \major; } diff --git a/mutopia/J.S.Bach/Duette/global-ii.ly b/mutopia/J.S.Bach/Duette/global-ii.ly index c7806b219e..056f9a2dde 100644 --- a/mutopia/J.S.Bach/Duette/global-ii.ly +++ b/mutopia/J.S.Bach/Duette/global-ii.ly @@ -1,6 +1,6 @@ -\version "1.3.110"; +\version "1.3.117"; -$global_ii = \notes{ +globalIi = \notes{ \time 4/4; \property Staff.timeSignatureStyle = "C2/2" \key a\minor; diff --git a/mutopia/J.S.Bach/Duette/viola-i.ly b/mutopia/J.S.Bach/Duette/viola-i.ly index 3d909cc048..e775ffc451 100644 --- a/mutopia/J.S.Bach/Duette/viola-i.ly +++ b/mutopia/J.S.Bach/Duette/viola-i.ly @@ -1,22 +1,22 @@ \header{ -filename = "viola-i.ly"; -title = "Vier Duette"; -description = "Four duets for Violino and Violoncello (Viola)"; -opus = "BWV"; -composer = "Johann Sebastian Bach (1685-1750)"; -enteredby = "jcn"; -copyright = "Public Domain"; +filename = "viola-i.ly"; +title = "Vier Duette"; +description = "Four duets for Violino and Violoncello (Viola)"; +opus = "BWV"; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "jcn"; +copyright = "Public Domain"; } -\version "1.3.110"; +\version "1.3.117"; \include "global-i.ly" \include "violoncello-i.ly"; -$viola_i_staff = \context Staff = viola < +violaIStaff = \context Staff = viola < \property Staff.instrument = "viola" %\property Staff.instrument = "violin" - \notes\transpose c'' \$violoncello_i + \notes\transpose c'' \violoncelloI \clef alto; - \$global_i + \globalI > diff --git a/mutopia/J.S.Bach/Duette/viola-ii.ly b/mutopia/J.S.Bach/Duette/viola-ii.ly index 5ebe0297ef..e8f02155cc 100644 --- a/mutopia/J.S.Bach/Duette/viola-ii.ly +++ b/mutopia/J.S.Bach/Duette/viola-ii.ly @@ -1,22 +1,22 @@ \header{ -filename = "viola-ii.ly"; -title = "Vier Duette"; -description = "Four duets for Violino and Violoncello (Viola)"; -opus = "BWV"; -composer = "Johann Sebastian Bach (1685-1750)"; -enteredby = "jcn"; -copyright = "Public Domain"; +filename = "viola-ii.ly"; +title = "Vier Duette"; +description = "Four duets for Violino and Violoncello (Viola)"; +opus = "BWV"; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "jcn"; +copyright = "Public Domain"; } -\version "1.3.110"; +\version "1.3.117"; \include "global-ii.ly" \include "violoncello-ii.ly"; -$viola_ii_staff = \context Staff = viola < +violaIiStaff = \context Staff = viola < \property Staff.instrument = "viola" %\property Staff.instrument = "violin" \clef alto; - \$global_ii - \notes\transpose c'' \$violoncello_ii + \globalIi + \notes\transpose c'' \violoncelloIi > diff --git a/mutopia/J.S.Bach/Duette/viola-part.ly b/mutopia/J.S.Bach/Duette/viola-part.ly index 8224368ba4..ef7760a61a 100644 --- a/mutopia/J.S.Bach/Duette/viola-part.ly +++ b/mutopia/J.S.Bach/Duette/viola-part.ly @@ -1,14 +1,14 @@ \header{ -filename = "viola-part.ly"; -title = "Vier Duette"; -description = "Four duets for Violino and Violoncello (Viola)"; -opus = "BWV"; -composer = "Johann Sebastian Bach (1685-1750)"; -enteredby = "jcn"; -copyright = "Public Domain"; +filename = "viola-part.ly"; +title = "Vier Duette"; +description = "Four duets for Violino and Violoncello (Viola)"; +opus = "BWV"; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "jcn"; +copyright = "Public Domain"; } -\version "1.3.110"; +\version "1.3.117"; % { @@ -16,7 +16,7 @@ copyright = "Public Domain"; \include "viola-i.ly" \score{ - \$viola_i_staff + \violaIStaff \paper{ \translator { \BarNumberingStaffContext } } @@ -33,7 +33,7 @@ copyright = "Public Domain"; \include "viola-ii.ly" \score{ - \$viola_ii_staff + \violaIiStaff \paper{ % castingalgorithm=0.0; \translator { \BarNumberingStaffContext } diff --git a/mutopia/J.S.Bach/Duette/violino-i.ly b/mutopia/J.S.Bach/Duette/violino-i.ly index 63c9a31c5e..801484af2c 100644 --- a/mutopia/J.S.Bach/Duette/violino-i.ly +++ b/mutopia/J.S.Bach/Duette/violino-i.ly @@ -1,16 +1,16 @@ \header{ -filename = "violino-i.ly"; -title = "Vier Duette"; -description = "Four duets for Violino and Violoncello (Viola)"; -opus = "BWV"; -composer = "Johann Sebastian Bach (1685-1750)"; -enteredby = "jcn"; -copyright = "Public Domain"; +filename = "violino-i.ly"; +title = "Vier Duette"; +description = "Four duets for Violino and Violoncello (Viola)"; +opus = "BWV"; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "jcn"; +copyright = "Public Domain"; } -\version "1.3.110"; +\version "1.3.117"; -$violino_i = \notes\relative c'' { +violinoI = \notes\relative c'' { \property Voice.beamAutoEnd = "3/8" %% should fix autobeamer: not only check shortest type's end in beam, %%% but also the newly added type's end @@ -76,13 +76,13 @@ $violino_i = \notes\relative c'' { \include "global-i.ly" -$violino_i_staff = \context Staff = violino < +violinoIStaff = \context Staff = violino < %urg % \notes\property Voice.textStyle = "large" s4^"Moderato" % \notes {s4. \property Voice.textStyle = "large" s4^"Moderato"} % urg, timidity violino patches broken? %\property Staff.instrument = "violin" \property Staff.instrument = "viola" - \$violino_i - \$global_i + \violinoI + \globalI > diff --git a/mutopia/J.S.Bach/Duette/violino-ii.ly b/mutopia/J.S.Bach/Duette/violino-ii.ly index bef12a79cf..0f62881ea3 100644 --- a/mutopia/J.S.Bach/Duette/violino-ii.ly +++ b/mutopia/J.S.Bach/Duette/violino-ii.ly @@ -1,16 +1,16 @@ \header{ -filename = "violino-ii.ly"; -title = "Vier Duette"; -description = "Four duets for Violino and Violoncello (Viola)"; -opus = "BWV"; -composer = "Johann Sebastian Bach (1685-1750)"; -enteredby = "jcn"; -copyright = "Public Domain"; +filename = "violino-ii.ly"; +title = "Vier Duette"; +description = "Four duets for Violino and Violoncello (Viola)"; +opus = "BWV"; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "jcn"; +copyright = "Public Domain"; } -\version "1.3.110"; +\version "1.3.117"; -$violino_ii = \notes\relative c''{ +violinoIi = \notes\relative c''{ R1*8 | r2 e | %10 @@ -91,14 +91,14 @@ $violino_ii = \notes\relative c''{ \include "global-ii.ly" -$violino_ii_staff = \context Staff = violino < +violinoIiStaff = \context Staff = violino < %urg % \notes\property Voice.textStyle = "large" s4^"Moderato" % \notes {s4. \property Voice.textStyle = "large" s4^"Moderato"} % urg, timidity violino patches broken? %\property Staff.instrument = "violin" \property Staff.instrument = "viola" - \$violino_ii - \$global_ii + \violinoIi + \globalIi > -\version "1.3.110"; +\version "1.3.117"; diff --git a/mutopia/J.S.Bach/Duette/violino-part.ly b/mutopia/J.S.Bach/Duette/violino-part.ly index dfbb98c219..1e72b403be 100644 --- a/mutopia/J.S.Bach/Duette/violino-part.ly +++ b/mutopia/J.S.Bach/Duette/violino-part.ly @@ -1,14 +1,14 @@ \header{ -filename = "violino-part.ly"; -title = "Vier Duette"; -description = "Four duets for Violino and Violoncello (Viola)"; -opus = "BWV"; -composer = "Johann Sebastian Bach (1685-1750)"; -enteredby = "jcn"; -copyright = "Public Domain"; +filename = "violino-part.ly"; +title = "Vier Duette"; +description = "Four duets for Violino and Violoncello (Viola)"; +opus = "BWV"; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "jcn"; +copyright = "Public Domain"; } -\version "1.3.110"; +\version "1.3.117"; % { @@ -16,7 +16,7 @@ copyright = "Public Domain"; \include "violino-i.ly" \score{ - \$violino_i_staff + \violinoIStaff \paper{ \translator { \BarNumberingStaffContext } } @@ -32,7 +32,7 @@ copyright = "Public Domain"; \include "violino-ii.ly" \score{ - \$violino_ii_staff + \violinoIiStaff \paper{ \translator { \BarNumberingStaffContext } % castingalgorith=0; diff --git a/mutopia/J.S.Bach/Duette/violino-viola.ly b/mutopia/J.S.Bach/Duette/violino-viola.ly index 234b82fe42..7cc2dcd082 100644 --- a/mutopia/J.S.Bach/Duette/violino-viola.ly +++ b/mutopia/J.S.Bach/Duette/violino-viola.ly @@ -1,14 +1,14 @@ \header{ -filename = "violino-viola.ly"; -title = "Vier Duette"; -description = "Four duets for Violino and Violoncello (Viola)"; -opus = "BWV"; -composer = "Johann Sebastian Bach (1685-1750)"; -enteredby = "jcn"; -copyright = "Public Domain"; +filename = "violino-viola.ly"; +title = "Vier Duette"; +description = "Four duets for Violino and Violoncello (Viola)"; +opus = "BWV"; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "jcn"; +copyright = "Public Domain"; } -\version "1.3.110"; +\version "1.3.117"; % { \include "violino-i.ly"; @@ -16,8 +16,8 @@ copyright = "Public Domain"; \score{ \context GrandStaff < - \$violino_i_staff - \$viola_i_staff + \violinoIStaff + \violaIStaff > \paper{ \translator { @@ -38,8 +38,8 @@ copyright = "Public Domain"; \score{ \context GrandStaff < - \$violino_ii_staff - \$viola_ii_staff + \violinoIiStaff + \violaIiStaff > \paper{ \translator { diff --git a/mutopia/J.S.Bach/Duette/violino-violoncello.ly b/mutopia/J.S.Bach/Duette/violino-violoncello.ly index 585f51e4df..222fb716e7 100644 --- a/mutopia/J.S.Bach/Duette/violino-violoncello.ly +++ b/mutopia/J.S.Bach/Duette/violino-violoncello.ly @@ -1,14 +1,14 @@ \header{ -filename = "violino-violoncello.ly"; -title = "Vier Duette"; -description = "Four duets for Violino and Violoncello (Viola)"; -opus = "BWV"; -composer = "Johann Sebastian Bach (1685-1750)"; -enteredby = "jcn"; -copyright = "Public Domain"; +filename = "violino-violoncello.ly"; +title = "Vier Duette"; +description = "Four duets for Violino and Violoncello (Viola)"; +opus = "BWV"; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "jcn"; +copyright = "Public Domain"; } -\version "1.3.110"; +\version "1.3.117"; % { \include "violino-i.ly"; @@ -16,8 +16,8 @@ copyright = "Public Domain"; \score{ \context GrandStaff < - \$violino_i_staff - \$violoncello_i_staff + \violinoIStaff + \violoncelloIStaff > \paper{ \translator { @@ -38,8 +38,8 @@ copyright = "Public Domain"; \score{ \context GrandStaff < - \$violino_ii_staff - \$violoncello_ii_staff + \violinoIiStaff + \violoncelloIiStaff > \paper{ \translator { diff --git a/mutopia/J.S.Bach/Duette/violoncello-i.ly b/mutopia/J.S.Bach/Duette/violoncello-i.ly index a277c149ca..fb2ca5202f 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-i.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-i.ly @@ -1,16 +1,16 @@ \header{ -filename = "violoncello-i.ly"; -title = "Vier Duette"; -description = "Four duets for Violino and Violoncello (Viola)"; -opus = "BWV"; -composer = "Johann Sebastian Bach (1685-1750)"; -enteredby = "jcn"; -copyright = "Public Domain"; +filename = "violoncello-i.ly"; +title = "Vier Duette"; +description = "Four duets for Violino and Violoncello (Viola)"; +opus = "BWV"; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "jcn"; +copyright = "Public Domain"; } -\version "1.3.110"; +\version "1.3.117"; -$violoncello_i = \notes\relative c{ +violoncelloI = \notes\relative c{ \property Voice.beamAutoEnd = "3/8" g8()a d, g b()g d()fis a d a()fis | g()d b' g b()c b()e fis g d()d, | @@ -63,9 +63,9 @@ $violoncello_i = \notes\relative c{ \include "global-i.ly" -$violoncello_i_staff = \context Staff = violoncello < +violoncelloIStaff = \context Staff = violoncello < \property Staff.instrument = "cello" - \$violoncello_i + \violoncelloI \clef bass; - \$global_i + \globalI > diff --git a/mutopia/J.S.Bach/Duette/violoncello-ii.ly b/mutopia/J.S.Bach/Duette/violoncello-ii.ly index 381f89cffe..ac3bbd788a 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-ii.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-ii.ly @@ -1,16 +1,16 @@ \header{ -filename = "violoncello-ii.ly"; -title = "Vier Duette"; -description = "Four duets for Violino and Violoncello (Viola)"; -opus = "BWV"; -composer = "Johann Sebastian Bach (1685-1750)"; -enteredby = "jcn"; -copyright = "Public Domain"; +filename = "violoncello-ii.ly"; +title = "Vier Duette"; +description = "Four duets for Violino and Violoncello (Viola)"; +opus = "BWV"; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "jcn"; +copyright = "Public Domain"; } -\version "1.3.110"; +\version "1.3.117"; -$violoncello_ii = \notes\relative c{ +violoncelloIi = \notes\relative c{ r2 a'2|c e,| f8(e)d2 e8()fis| g a bes2 a8()gis| %5 a(e)a b a(e)a c|b(e,b')c b(e,b')d|c(e,c')d c(e,c')e|b(e,b')c b(e,b')d| @@ -70,9 +70,9 @@ $violoncello_ii = \notes\relative c{ \include "global-ii.ly" -$violoncello_ii_staff = \context Staff = violoncello < +violoncelloIiStaff = \context Staff = violoncello < \property Staff.instrument = "cello" - \$violoncello_ii + \violoncelloIi \clef bass; - \$global_ii + \globalIi > diff --git a/mutopia/J.S.Bach/Duette/violoncello-part.ly b/mutopia/J.S.Bach/Duette/violoncello-part.ly index 518ca29713..26449b6eca 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-part.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-part.ly @@ -1,14 +1,14 @@ \header{ -filename = "violoncello-part.ly"; -title = "Vier Duette"; -description = "Four duets for Violino and Violoncello (Viola)"; -opus = "BWV"; -composer = "Johann Sebastian Bach (1685-1750)"; -enteredby = "jcn"; -copyright = "Public Domain"; +filename = "violoncello-part.ly"; +title = "Vier Duette"; +description = "Four duets for Violino and Violoncello (Viola)"; +opus = "BWV"; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "jcn"; +copyright = "Public Domain"; } -\version "1.3.110"; +\version "1.3.117"; % { @@ -16,7 +16,7 @@ copyright = "Public Domain"; \include "violoncello-i.ly" \score{ - \$violoncello_i_staff + \violoncelloIStaff \paper{ \translator { \BarNumberingStaffContext } } @@ -33,7 +33,7 @@ copyright = "Public Domain"; \include "violoncello-ii.ly" \score{ - \$violoncello_ii_staff + \violoncelloIiStaff \paper{ %castingalgorithm=0.; \translator { \BarNumberingStaffContext } diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly index c1a7cbe971..52ffbdaca8 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly @@ -44,14 +44,14 @@ Lemoine puts fermatas on ending bar lines everywhere. -\version "1.3.110"; +\version "1.3.117"; -lowstaff = \translator "Staff" = "lower" -upstaff = \translator "Staff" = "upper" +lowstaff = \translator "Staff" = "lower" +upstaff = \translator "Staff" = "upper" % upper = \context Staff \notes\relative c { -upper = \context Staff=upper \notes\relative c { +upper = \context Staff=upper \notes\relative c { \context Voice=i \property Voice . textStyle = "italic" @@ -117,7 +117,7 @@ upper = \context Staff=upper \notes\relative c { } % lower = \context Staff \notes\relative c{ -lower = \context Staff=lower \notes\relative c{ +lower = \context Staff=lower \notes\relative c{ \context Voice=i \property Voice . textStyle = "roman" c4 e g^"\\textsharp"-\mordent g,4 | @@ -137,7 +137,7 @@ lower = \context Staff=lower \notes\relative c{ \bar "|."; } -global = \notes{ +global = \notes{ \time 4/4; } diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly index 478eb2e3e1..1c25f3db60 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly @@ -42,8 +42,8 @@ Old versions of LilyPond include this prelude with dynamics and fingerings. -\version "1.3.110"; -upper = \context Staff \notes\relative c{ +\version "1.3.117"; +upper = \context Staff \notes\relative c{ \context Voice=i \property Voice . textStyle = "italic" r8 c' e g e c bes' g | @@ -84,7 +84,7 @@ upper = \context Staff \notes\relative c{ \bar "|."; } -lower = \context Staff \notes\relative c{ +lower = \context Staff \notes\relative c{ \context Voice=i < { \stemUp c1 ~ | c ~ | c } @@ -109,7 +109,7 @@ lower = \context Staff \notes\relative c{ \bar "|."; } -global = \notes{ +global = \notes{ \time 4/4; } diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly index f0ca8ebd51..7720c7d113 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly @@ -45,10 +45,10 @@ note, some have dotted half notes. %} -\version "1.3.110"; +\version "1.3.117"; -upper = \notes \transpose c'' { +upper = \notes \transpose c'' { r16 [c es g] [es c es c] r c r c | r16 [c es g] [es c es c] r c r c | r16 [c f as] [f c f c] r c r c | @@ -100,7 +100,7 @@ upper = \notes \transpose c'' { \bar "|."; } -lower = \notes{ +lower = \notes{ c4 r [g8 es] | c4 r [g8 es] | c4 r [as8 f] | diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly index c723fdcae8..40d38e2ddd 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly @@ -31,9 +31,9 @@ } -\version "1.3.110"; +\version "1.3.117"; -upper = \context Staff \notes\relative c +upper = \context Staff \notes\relative c \context Voice=i { \property Voice . textStyle = "italic" @@ -133,7 +133,7 @@ upper = \context Staff \notes\relative c } -lower = \context Staff \notes\relative c{ +lower = \context Staff \notes\relative c{ \context Voice=i d4-\mordent r r | @@ -199,7 +199,7 @@ lower = \context Staff \notes\relative c{ d2. | } -global = \notes{ +global = \notes{ \time 3/4; \key f \major; } diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly index 9080ca86dc..89a8c28e65 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly @@ -31,11 +31,11 @@ } -\version "1.3.110"; +\version "1.3.117"; -one = \context Staff \notes\relative c{ +one = \context Staff \notes\relative c{ \context Voice=i \skip 1; | \stemUp @@ -57,7 +57,7 @@ one = \context Staff \notes\relative c{ \bar "|."; } -two = \context Staff \notes\relative c{ +two = \context Staff \notes\relative c{ \context Voice=ii r16 d'' c bes a bes f g a8.-\mordent bes16 g8.-\prall f16 | @@ -77,7 +77,7 @@ two = \context Staff \notes\relative c{ fis1 } -three = \context Staff \notes\relative c{ +three = \context Staff \notes\relative c{ \context Voice=iii \stemUp f2 e | @@ -100,7 +100,7 @@ three = \context Staff \notes\relative c{ \bar "|."; } -four = \context Staff \notes\relative c{ +four = \context Staff \notes\relative c{ \context Voice=iv \stemDown d2 cis | @@ -122,7 +122,7 @@ four = \context Staff \notes\relative c{ d,1 } -global = \notes{ +global = \notes{ \time 4/4; \key f \major; } 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 bc5d23d48d..0784c3fda0 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly @@ -1,10 +1,10 @@ -\version "1.3.110"; +\version "1.3.117"; \include "allemande-urtext.ly"; -allemande_cello_global = \notes{ +allemandeCelloGlobal = \notes{ \time 4/4; \key f \major; \clef bass; @@ -20,17 +20,17 @@ allemande_cello_global = \notes{ } } -allemande_cello_scripts = \notes{ +allemandeCelloScripts = \notes{ } -allemande_cello_staff = \context Staff < - \$allemande - \$allemande_cello_global - \$allemande_cello_scripts +allemandeCelloStaff = \context Staff < + \allemande + \allemandeCelloGlobal + \allemandeCelloScripts > \score{ - \$allemande_cello_staff + \allemandeCelloStaff \paper{ } \midi{ \tempo 4 = 45; } \header{ piece = "Allemande"; 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 9e12920ed3..679501b975 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly @@ -7,7 +7,7 @@ Well, there are still some scripts in this "urtext". But merging melodic and scripts doen't work too well yet (see viola_scripts). %} -allemande_a = \context Staff \notes \relative c { +allemandeA = \context Staff \notes \relative c { \context Voice=i \stemUp a'16 | @@ -63,7 +63,7 @@ allemande_a = \context Staff \notes \relative c { \bar "|."; } -allemande_b = \notes \relative c { +allemandeB = \notes \relative c { \context Voice=ii \stemDown s16 | @@ -94,10 +94,10 @@ allemande_b = \notes \relative c { % } } -allemande = \context Staff \notes< - \$allemande_a - \$allemande_b +allemande = \context Staff \notes< + \allemandeA + \allemandeB > -\version "1.3.110"; +\version "1.3.117"; 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 596b498f6d..c6ac0d371d 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly @@ -1,9 +1,9 @@ -\version "1.3.110"; +\version "1.3.117"; \include "allemande-urtext.ly"; -allemande_viola_global = \notes{ +allemandeViolaGlobal = \notes{ \time 4/4; \key f \major; \clef alto; @@ -19,17 +19,17 @@ allemande_viola_global = \notes{ } } -allemande_viola_scripts = \notes{ +allemandeViolaScripts = \notes{ } -allemande_viola_staff = \context Staff < - \notes \transpose c'' \$allemande - \$allemande_viola_global - \$allemande_viola_scripts +allemandeViolaStaff = \context Staff < + \notes \transpose c'' \allemande + \allemandeViolaGlobal + \allemandeViolaScripts > \score{ - \$allemande_viola_staff + \allemandeViolaStaff \paper{ } \midi{ \tempo 4 = 45; } \header{ piece = "Allemande"; 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 ee6e1331f5..f563e3f735 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly @@ -1,9 +1,9 @@ -\version "1.3.110"; +\version "1.3.117"; \include "courante-urtext.ly"; -courante_cello_global = \notes{ +couranteCelloGlobal = \notes{ \time 3/4; \key f \major; \clef bass; @@ -19,17 +19,17 @@ courante_cello_global = \notes{ } } -courante_cello_scripts = \notes{ +couranteCelloScripts = \notes{ } -courante_cello_staff = \context Staff < - \$courante - \$courante_cello_global - \$courante_cello_scripts +couranteCelloStaff = \context Staff < + \courante + \couranteCelloGlobal + \couranteCelloScripts > \score{ - \$courante_cello_staff + \couranteCelloStaff \paper {} \midi{ \tempo 4 = 55; } \header{ piece = "Courante"; 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 caf96612d1..09a67d6225 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly @@ -7,7 +7,7 @@ Well, there are still some scripts in this "urtext". But merging melodic and scripts doen't work too well yet (see viola_scripts). %} -courante_a = \context Staff \notes \relative c { +couranteA = \context Staff \notes \relative c { \context Voice=i d'16 | d a f a d, f g a bes a bes g | @@ -57,7 +57,7 @@ courante_a = \context Staff \notes \relative c { \bar "|."; } -courante_b = \notes \relative c { +couranteB = \notes \relative c { \context Voice=ii \stemDown s16 | @@ -84,9 +84,9 @@ courante_b = \notes \relative c { s2 s8. } -courante = \context Staff \notes< - \$courante_a - \$courante_b +courante = \context Staff \notes< + \couranteA + \couranteB > -\version "1.3.110"; +\version "1.3.117"; 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 1c2c9be1e3..a76fa118b8 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly @@ -1,11 +1,11 @@ -\version "1.3.110"; +\version "1.3.117"; \include "courante-urtext.ly"; -courante_viola_global = \notes{ +couranteViolaGlobal = \notes{ \time 3/4; \key f \major; \clef alto; @@ -21,17 +21,17 @@ courante_viola_global = \notes{ } } -courante_viola_scripts = \notes{ +couranteViolaScripts = \notes{ } -courante_viola_staff = \context Staff < - \notes \transpose c' \$courante - \$courante_viola_global - \$courante_viola_scripts +couranteViolaStaff = \context Staff < + \notes \transpose c' \courante + \couranteViolaGlobal + \couranteViolaScripts > \score{ - \$courante_viola_staff + \couranteViolaStaff \paper{ } \midi{ \tempo 4 = 55; } \header{ 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 866900fe33..6b937b7895 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly @@ -1,11 +1,11 @@ -\version "1.3.110"; +\version "1.3.117"; \include "gigue-urtext.ly"; -gigue_cello_global = \notes{ +gigueCelloGlobal = \notes{ \time 3/8; \key f \major; \clef bass; @@ -25,17 +25,17 @@ gigue_cello_global = \notes{ } } -gigue_cello_scripts = \notes{ +gigueCelloScripts = \notes{ } -gigue_cello_staff = \context Staff < - \$gigue - \$gigue_cello_global - \$gigue_cello_scripts +gigueCelloStaff = \context Staff < + \gigue + \gigueCelloGlobal + \gigueCelloScripts > \score{ - \$gigue_cello_staff + \gigueCelloStaff \paper{ \translator{ \VoiceContext @@ -46,6 +46,6 @@ gigue_cello_staff = \context Staff < \midi{ \tempo 4 = 60; } \header{ opus= "" ; -piece ="Gigue"; } +piece = "Gigue"; } } 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 32cd4f5271..8ca129d245 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly @@ -13,7 +13,7 @@ But merging melodic and scripts doen't work too well yet (see viola_scripts). % * slurs/ties in two different threads (like beams): urtext, and additionals % -gigue_notes = \context Staff \notes \relative c { +gigueNotes = \context Staff \notes \relative c { \context Voice=i a'8 | d,4 bes'8 | cis,4 g'8 | f16 e f g a8 | @@ -69,7 +69,7 @@ gigue_notes = \context Staff \notes \relative c { \bar "|."; } -gigue_b = \context Staff \notes \relative c { +gigueB = \context Staff \notes \relative c { \context Voice=ii \stemDown s8 @@ -94,13 +94,13 @@ gigue_b = \context Staff \notes \relative c { } -gigue_a = \context Voice \notes< - \$gigue_notes +gigueA = \context Voice \notes< + \gigueNotes > -gigue = \notes< - \$gigue_a - \$gigue_b +gigue = \notes< + \gigueA + \gigueB > -\version "1.3.110"; +\version "1.3.117"; 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 88740aaa7e..bc7d291abc 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly @@ -1,10 +1,10 @@ -\version "1.3.110"; +\version "1.3.117"; \include "gigue-urtext.ly"; -gigue_viola_global = \notes{ +gigueViolaGlobal = \notes{ \time 3/8; \key f \major; \clef alto; @@ -23,17 +23,17 @@ gigue_viola_global = \notes{ } } -gigue_viola_scripts = \notes{ +gigueViolaScripts = \notes{ } -gigue_viola_staff = \context Staff < - \notes \transpose c' \$gigue - \$gigue_viola_global - \$gigue_viola_scripts +gigueViolaStaff = \context Staff < + \notes \transpose c' \gigue + \gigueViolaGlobal + \gigueViolaScripts > \score{ - \$gigue_viola_staff + \gigueViolaStaff \paper{ \translator{ \VoiceContext 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 7f97744d9c..5b9f37c81c 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly @@ -1,11 +1,11 @@ -\version "1.3.110"; +\version "1.3.117"; \include "menuetto-urtext.ly"; -menuetto_i_cello_global = \notes{ +menuettoICelloGlobal = \notes{ \time 3/4; \key f \major; \clef bass; @@ -21,7 +21,7 @@ menuetto_i_cello_global = \notes{ } } -menuetto_i_cello_scripts = \notes{ +menuettoICelloScripts = \notes{ \context Voice=i s2. s8^"~"^1_2_4 s8 s4 s^4 @@ -42,14 +42,14 @@ menuetto_i_cello_scripts = \notes{ s8^2_3 s s s^1 s4^1 } -menuetto_i_cello_staff = \context Staff < - \$menuetto_i - \$menuetto_i_cello_global -% \$menuetto_i_cello_scripts +menuettoICelloStaff = \context Staff < + \menuettoI + \menuettoICelloGlobal +% \menuettoICelloScripts > \score{ - \$menuetto_i_cello_staff + \menuettoICelloStaff \paper{ \translator{ \VoiceContext @@ -62,7 +62,7 @@ menuetto_i_cello_staff = \context Staff < piece ="Menuetto I"; } } -menuetto_ii_cello_global = \notes{ +menuettoIiCelloGlobal = \notes{ \time 3/4; \key d \major; \clef bass; @@ -79,14 +79,14 @@ menuetto_ii_cello_global = \notes{ } -menuetto_ii_cello_staff = \context Staff < - \$menuetto_ii - \$menuetto_ii_cello_global -% \$menuetto_ii_cello_scripts +menuettoIiCelloStaff = \context Staff < + \menuettoIi + \menuettoIiCelloGlobal +% \menuettoIiCelloScripts > \score{ - \$menuetto_ii_cello_staff + \menuettoIiCelloStaff \paper{ \translator{ \VoiceContext 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 a9de8047f5..ed0026a3c7 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly @@ -7,7 +7,7 @@ Well, there are still some scripts in this "urtext". But merging melodic and scripts doen't work too well yet (see viola_scripts). %} -menuetto_i_a = \context Staff \notes \relative c { +menuettoIA = \context Staff \notes \relative c { \context Voice=i bes'4 | bes8 a bes g a4 | @@ -40,7 +40,7 @@ menuetto_i_a = \context Staff \notes \relative c { | } -menuetto_i_b = \context Staff \notes \relative c { +menuettoIB = \context Staff \notes \relative c { \context Voice = ii \stemDown \skip 2.*1; | @@ -70,7 +70,7 @@ menuetto_i_b = \context Staff \notes \relative c { } % UGH, fix this like in sarabande -menuetto_i_a_voice_urg = \notes{ +menuettoIAVoiceUrg = \notes{ \context Voice = i \skip 2.*1; \stemUp \skip 2.*1; \stemBoth @@ -93,29 +93,29 @@ menuetto_i_a_voice_urg = \notes{ \skip 2.*1; } -menuetto_i_a_voice_urg_urg = \notes< - \$menuetto_i_a_voice_urg - \$menuetto_i_a +menuettoIAVoiceUrgUrg = \notes< + \menuettoIAVoiceUrg + \menuettoIA > -menuetto_i_b_voice_urg = \notes{ +menuettoIBVoiceUrg = \notes{ \context Voice=ii \stemDown % urg urg, huh? \skip 2.*8; \stemDown } -menuetto_i_b_voice_urg_urg = \notes< - \$menuetto_i_b_voice_urg - \$menuetto_i_b +menuettoIBVoiceUrgUrg = \notes< + \menuettoIBVoiceUrg + \menuettoIB > -menuetto_i = \context Staff \notes< - \repeat "volta" 2 { \$menuetto_i_a_voice_urg_urg } - \repeat "volta" 2 { \$menuetto_i_b_voice_urg_urg } +menuettoI = \context Staff \notes< + \repeat "volta" 2 { \menuettoIAVoiceUrgUrg } + \repeat "volta" 2 { \menuettoIBVoiceUrgUrg } > -menuetto_ii = \context Staff\notes \relative c { +menuettoIi = \context Staff\notes \relative c { \context Voice=i fis4^\trill d8 e fis g | a4 fis, a' | @@ -150,4 +150,4 @@ menuetto_ii = \context Staff\notes \relative c { \bar "|."; } -\version "1.3.110"; +\version "1.3.117"; 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 9cb5b68435..5ac93c3f0a 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly @@ -1,11 +1,11 @@ -\version "1.3.110"; +\version "1.3.117"; \include "menuetto-urtext.ly"; -menuetto_i_viola_global = \notes{ +menuettoIViolaGlobal = \notes{ \time 3/4; \key f \major; \clef alto; @@ -23,7 +23,7 @@ menuetto_i_viola_global = \notes{ } } -menuetto_i_viola_scripts = \notes{ +menuettoIViolaScripts = \notes{ \context Voice=i s2. s8^"~"^1_2_4 s8*5 @@ -39,14 +39,14 @@ menuetto_i_viola_scripts = \notes{ s4-\downbow s4-\upbow } -menuetto_i_viola_staff = \context Staff < - \notes \transpose c' \$menuetto_i - \$menuetto_i_viola_global -% \$menuetto_i_viola_scripts +menuettoIViolaStaff = \context Staff < + \notes \transpose c' \menuettoI + \menuettoIViolaGlobal +% \menuettoIViolaScripts > \score{ - \$menuetto_i_viola_staff + \menuettoIViolaStaff \paper{ \include "scs-paper.ly"; gourlay_maxmeasures = 7.0; @@ -63,7 +63,7 @@ menuetto_i_viola_staff = \context Staff < } } -menuetto_ii_viola_global = \notes{ +menuettoIiViolaGlobal = \notes{ \time 3/4; \key d \major; \clef alto; @@ -78,14 +78,14 @@ menuetto_ii_viola_global = \notes{ } } -menuetto_ii_viola_staff = \context Staff < - \notes \transpose c' \$menuetto_ii - \$menuetto_ii_viola_global -% \$menuetto_ii_viola_scripts +menuettoIiViolaStaff = \context Staff < + \notes \transpose c' \menuettoIi + \menuettoIiViolaGlobal +% \menuettoIiViolaScripts > \score{ - \$menuetto_ii_viola_staff + \menuettoIiViolaStaff \paper{ \translator{ \VoiceContext 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 b4ce17122d..d85d5a703a 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly @@ -1,11 +1,11 @@ -\version "1.3.110"; +\version "1.3.117"; \include "prelude-urtext.ly"; -prelude_cello_global = \notes{ +preludeCelloGlobal = \notes{ \time 3/4; \key f \major; \clef bass; @@ -13,17 +13,17 @@ prelude_cello_global = \notes{ \bar "|."; } -prelude_cello_scripts = \notes{ +preludeCelloScripts = \notes{ } -prelude_cello_staff = \context Staff < - \$prelude - \$prelude_cello_global - \$prelude_cello_scripts +preludeCelloStaff = \context Staff < + \prelude + \preludeCelloGlobal + \preludeCelloScripts > \score{ - \$prelude_cello_staff + \preludeCelloStaff \paper{ } \midi{ \tempo 4 = 40; } \header{ 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 b079a9e2b9..701327fce3 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly @@ -7,7 +7,7 @@ Well, there are still some scripts in this "urtext". But merging melodic and scripts doen't work too well yet see viola_scripts . %} -prelude_notes = \notes \relative c { +preludeNotes = \notes \relative c { \context Voice=i d8 f a4 ~ a16 f e d | cis e g a bes4 ~ bes16 a g f | @@ -88,7 +88,7 @@ prelude_notes = \notes \relative c { \stemUp | | | | } -prelude_b = \notes \relative c { +preludeB = \notes \relative c { \context Voice=ii \stemDown s2.*47 @@ -102,96 +102,96 @@ prelude_b = \notes \relative c { } -fig1 = \notes{ s16( s s )s } -fig2 = \notes{ s16( s ) s s } -fig3 = \notes{ s16 s( s )s } -fig4 = \notes{ s16( s s s s s s )s } -fig5 = \notes{ s8.()s16 } +figB = \notes{ s16( s s )s } +figC = \notes{ s16( s ) s s } +figD = \notes{ s16 s( s )s } +figE = \notes{ s16( s s s s s s )s } +figF = \notes{ s8.()s16 } % of course, i just type fig1, and add the \ and the silly $ later -prelude_slurs = \notes{ +preludeSlurs = \notes{ \context Voice=i - s4 s4 \$fig3 | - \$fig1 s4 \$fig3 | - \$fig1 s4 \$fig3 | - \$fig1 s8( s s )s | + s4 s4 \figD | + \figB s4 \figD | + \figB s4 \figD | + \figB s8( s s )s | %5 - \$fig3 s2 | + \figD s2 | s2. | - s2 \$fig1 | - s2 \$fig1 | - s2 \$fig1 | + s2 \figB | + s2 \figB | + s2 \figB | %10 - \$fig3 \$fig3 \$fig1 | - \$fig3 \$fig3 s4 | - \$fig3 s2 | - s4 s4 \$fig3 | - \$fig3 \$fig3 \$fig3 | + \figD \figD \figB | + \figD \figD s4 | + \figD s2 | + s4 s4 \figD | + \figD \figD \figD | %15 s4 s s16 s s8 | - \$fig3 \$fig3 s4 | + \figD \figD s4 | s2. | - \$fig1 s4 \$fig1 | - s2 \$fig1 | + \figB s4 \figB | + s2 \figB | %20 - \$fig1 s4 \$fig1 | - s4 \$fig3 \$fig3 | - \$fig3 \$fig3 \$fig3 | - s2 \$fig1 | + \figB s4 \figB | + s4 \figD \figD | + \figD \figD \figD | + s2 \figB | s2. | %25 - \$fig3 s4 \$fig1 | - \$fig2 \$fig3 \$fig3 | - \$fig2 \$fig3 \$fig3 | - \$fig2 \$fig3 s4 | - \$fig2 \$fig3 \$fig3 | + \figD s4 \figB | + \figC \figD \figD | + \figC \figD \figD | + \figC \figD s4 | + \figC \figD \figD | %30 - \$fig3 \$fig3 \$fig1 | - \$fig2 \$fig3 \$fig3 | + \figD \figD \figB | + \figC \figD \figD | s2. | - s4 \$fig3 \$fig3 | - \$fig2 \$fig3 \$fig3 | + s4 \figD \figD | + \figC \figD \figD | %35 - \$fig2 s2 | + \figC s2 | s2. | s2. | s2. | s2. | %40 - s4 s4 \$fig3 | - \$fig1 s2 | - s2 \$fig3 | - \$fig2 s2 | + s4 s4 \figD | + \figB s2 | + s2 \figD | + \figC s2 | s2. | %45 s2. | - s4 \$fig2 s4 | - \$fig3 \$fig2 s4 | + s4 \figC s4 | + \figD \figC s4 | s2. | - \$fig3 s2 | + \figD s2 | %50 - \$fig3 s4 \$fig2 | + \figD s4 \figC | s2. | - s4 \$fig3 s4 | - s2 \$fig2 | -% s8()s \$fig4 | -% s8.()s16 \$fig4 | - \$fig5 \$fig4 | + s4 \figD s4 | + s2 \figC | +% s8()s \figE | +% s8.()s16 \figE | + \figF \figE | %55 - \$fig3 \$fig4 | - \$fig3 \$fig4 | - \$fig3 \$fig3 s4 | - s4 \$fig3 s4 | + \figD \figE | + \figD \figE | + \figD \figD s4 | + s4 \figD s4 | } -prelude_a = \notes< - \$prelude_notes - \$prelude_slurs +preludeA = \notes< + \preludeNotes + \preludeSlurs > -prelude = \context Staff \notes< - \$prelude_a - \$prelude_b +prelude = \context Staff \notes< + \preludeA + \preludeB > -\version "1.3.110"; +\version "1.3.117"; 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 75cb1eedc6..405dce2e31 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly @@ -1,11 +1,11 @@ -\version "1.3.110"; +\version "1.3.117"; \include "prelude-urtext.ly"; -prelude_viola_global = \notes{ +preludeViolaGlobal = \notes{ \time 3/4; \key f \major; \clef alto; @@ -13,17 +13,17 @@ prelude_viola_global = \notes{ \bar "|."; } -prelude_viola_scripts = \notes{ +preludeViolaScripts = \notes{ } -prelude_viola_staff = \context Staff < - \notes \transpose c' \$prelude - \$prelude_viola_global - \$prelude_viola_scripts +preludeViolaStaff = \context Staff < + \notes \transpose c' \prelude + \preludeViolaGlobal + \preludeViolaScripts > \score{ - \$prelude_viola_staff + \preludeViolaStaff \paper{ } \midi{ \tempo 4 = 40; } \header{ 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 1e90926b38..c63c2693f8 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly @@ -1,11 +1,11 @@ -\version "1.3.110"; +\version "1.3.117"; \include "sarabande-urtext.ly"; -sarabande_cello_global = \notes{ +sarabandeCelloGlobal = \notes{ \time 3/4; \key f \major; \clef bass; @@ -16,17 +16,17 @@ sarabande_cello_global = \notes{ } } -sarabande_cello_scripts = \notes{ +sarabandeCelloScripts = \notes{ } -sarabande_cello_staff = \context Staff < - \$sarabande - \$sarabande_cello_global - \$sarabande_cello_scripts +sarabandeCelloStaff = \context Staff < + \sarabande + \sarabandeCelloGlobal + \sarabandeCelloScripts > \score{ - \$sarabande_cello_staff + \sarabandeCelloStaff \paper{ } \midi{ \tempo 4 = 40; } \header{ 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 458000d158..eaf25ee969 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly @@ -7,7 +7,7 @@ Well, there are still some scripts in this "urtext". But merging melodic and scripts doen't work too well yet (see viola_scripts). %} -sarabande_a = \context Staff \notes \relative c { +sarabandeA = \context Staff \notes \relative c { \context Voice=i \stemUp d8. e16 e4.-\trill d16 e | f4. \stemBoth e8 d c | @@ -46,7 +46,7 @@ sarabande_a = \context Staff \notes \relative c { d4 d,,2 | } -sarabande_b = \context Staff \notes \relative c { +sarabandeB = \context Staff \notes \relative c { \context Voice=ii \stemDown % dispute @@ -85,9 +85,9 @@ sarabande_b = \context Staff \notes \relative c { } -sarabande = \context Staff \notes< - \$sarabande_a - \$sarabande_b +sarabande = \context Staff \notes< + \sarabandeA + \sarabandeB > -\version "1.3.110"; +\version "1.3.117"; 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 54a2e94913..d82f07b299 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly @@ -1,8 +1,8 @@ -\version "1.3.110"; +\version "1.3.117"; \include "sarabande-urtext.ly"; -sarabande_viola_global = \notes{ +sarabandeViolaGlobal = \notes{ \time 3/4; \key f \major; \clef alto; @@ -13,17 +13,17 @@ sarabande_viola_global = \notes{ } } -sarabande_viola_scripts = \notes{ +sarabandeViolaScripts = \notes{ } -sarabande_viola_staff = \context Staff < - \notes \transpose c' \$sarabande - \$sarabande_viola_global - \$sarabande_viola_scripts +sarabandeViolaStaff = \context Staff < + \notes \transpose c' \sarabande + \sarabandeViolaGlobal + \sarabandeViolaScripts > \score{ - \$sarabande_viola_staff + \sarabandeViolaStaff \paper{ } \midi{ \tempo 4 = 40; } \header{ diff --git a/mutopia/J.S.Bach/wtk1-fugue1.ly b/mutopia/J.S.Bach/wtk1-fugue1.ly index 5dbf5183ed..1a6d2159df 100644 --- a/mutopia/J.S.Bach/wtk1-fugue1.ly +++ b/mutopia/J.S.Bach/wtk1-fugue1.ly @@ -1,8 +1,8 @@ \header{ -title = "Fuga a 4"; -opus = "BWV 846"; -composer = "Johann Sebastian Bach (1685-1750)"; -enteredby = "Shay Rojansky"; +title = "Fuga a 4"; +opus = "BWV 846"; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "Shay Rojansky"; % mutopia headers. @@ -19,10 +19,10 @@ enteredby = "Shay Rojansky"; %{ TODO: use autobeaming. %} -\version "1.3.110"; +\version "1.3.117"; -tenor = +tenor = \context Voice = tenor \notes \relative c' { \clef "violin"; @@ -63,7 +63,7 @@ tenor = } -soprane = +soprane = \context Voice = sop \notes \relative c' { \stemUp @@ -101,7 +101,7 @@ soprane = [f32 c d e f16 g] [a8. b16] | } -alt = +alt = \context Voice = alt \notes \relative c { \clef "bass"; @@ -141,7 +141,7 @@ alt = c 1 | } -bass =\context Voice = bassvoice +bass = \context Voice = bassvoice \notes \relative c { \clef "bass"; diff --git a/mutopia/J.S.Bach/wtk1-fugue2.ly b/mutopia/J.S.Bach/wtk1-fugue2.ly index 56b4360156..3a539395ae 100644 --- a/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -21,10 +21,10 @@ % 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.110"; +\version "1.3.117"; -dux = \context Voice=two \notes \relative c''{ +dux = \context Voice=two \notes \relative c''{ \voiceTwo \clef violin; @@ -81,7 +81,7 @@ dux = \context Voice=two \notes \relative c''{ } -comes = \context Voice=one \notes \relative c'' { +comes = \context Voice=one \notes \relative c'' { \voiceOne R1 | R1 | @@ -122,7 +122,7 @@ comes = \context Voice=one \notes \relative c'' { f,16 g as4 g16 f e2 | } -bassdux = \context Voice=three \notes \relative c' { +bassdux = \context Voice=three \notes \relative c' { \clef bass; R1 | R | diff --git a/mutopia/J.S.Bach/wtk1-prelude1.ly b/mutopia/J.S.Bach/wtk1-prelude1.ly index 3c964f2686..02ab1ff2b7 100644 --- a/mutopia/J.S.Bach/wtk1-prelude1.ly +++ b/mutopia/J.S.Bach/wtk1-prelude1.ly @@ -1,8 +1,8 @@ \header{ -title = "Preludium"; -opus = "BWV 846"; -composer = "Johann Sebastian Bach (1685-1750)"; -enteredby = "Shay Rojansky"; +title = "Preludium"; +opus = "BWV 846"; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "Shay Rojansky"; % mutopia headers. @@ -15,10 +15,10 @@ enteredby = "Shay Rojansky"; lastupdated = "1999/Oct/14"; } -\version "1.3.110"; +\version "1.3.117"; % should do programmable input. -soprane = +soprane = \notes \transpose c'' { \context Staff < % Real soprane @@ -79,7 +79,7 @@ soprane = \bar "|."; } -bass = +bass = \notes { \clef "bass"; diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly index 6425674342..d8a1295712 100644 --- a/mutopia/gallina.ly +++ b/mutopia/gallina.ly @@ -1,12 +1,12 @@ \header{ -title = "La Gallina à 2 violini"; -date = "1637"; -source = "the manuscript of Canzoni overo Sonate Concertate " +title = "La Gallina à 2 violini"; +date = "1637"; +source = "the manuscript of Canzoni overo Sonate Concertate " + "libro terzo, opera duodecima "; -composer = "Tarquinio Merula (1594/95-1665)"; -enteredby = "Mats Bengtsson"; -copyright = "Public Domain "; -subtitle = "from Canzoni overo Sonate Concertate libro terzo, " +composer = "Tarquinio Merula (1594/95-1665)"; +enteredby = "Mats Bengtsson"; +copyright = "Public Domain "; +subtitle = "from Canzoni overo Sonate Concertate libro terzo, " + "opera duodecima 1637"; } @@ -45,9 +45,9 @@ Voice engraver by uncommenting the lines in the paper definition below. --MB %} -\version "1.3.110"; +\version "1.3.117"; -global = \notes { +global = \notes { \property StaffGroup.timeSignatureStyle = "old" \time 4/4; \tempo 4=100; diff --git a/scm/music-property.scm b/scm/music-property.scm index 55ab7ec545..99807cfe50 100644 --- a/scm/music-property.scm +++ b/scm/music-property.scm @@ -1,3 +1,5 @@ + + (define all-music-properties '()) (define (music-property-description symbol type? description) @@ -7,11 +9,11 @@ ) (define (true? x) #t) -(music-property-description 'iterator-ctor c++-function? "") +(music-property-description 'iterator-ctor c++-function? "Function to construct music-event-iterator object for this Music") (music-property-description 'duration duration? "") -(music-property-description 'metronome-count number? "") -(music-property-description 'span-type symbol? "") -(music-property-description 'alternatives list? "") +(music-property-description 'metronome-count number? "How many beats in a minute?") +(music-property-description 'span-type symbol? "What kind of spanner should be created?") +(music-property-description 'alternatives music? "Music_sequence of alternatives for repeated music.") (music-property-description 'articulation-type symbol? "key for scriptDefinitions alist") (music-property-description 'bass boolean? "") (music-property-description 'body music? "") diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 23eb571ca2..e132f6fb71 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -581,6 +581,37 @@ if 1: conversions.append (((1,3,113), conv, 'LyricVoice -> LyricsVoice')) +def regularize_id (str): + s = '' + lastx = '' + for x in str: + if x == '_': + lastx = x + continue + elif x in string.digits: + x = chr(ord (x) - ord ('0') +ord ('A')) + elif x not in string.letters: + x = 'x' + elif x in string.lowercase and lastx == '_': + x = string.upper (x) + s = s + x + lastx = x + return s + +if 1: + def conv (str): + + def regularize_dollar_reference (match): + return regularize_id (match.group (1)) + def regularize_assignment (match): + return '\n' + regularize_id (match.group (1)) + ' = ' + str = re.sub ('\$([^\t\n ]+)', regularize_dollar_reference, str) + str = re.sub ('\n([^ \t\n]+) = ', regularize_assignment, str) + return str + + conversions.append (((1,3,117), conv, 'identifier names: $!foo_bar_123 -> xfooBarABC')) + + ############################ -- 2.39.2