From 4f4418f576aec808ae12bc3ee289ada1e5d12080 Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 27 Mar 2002 00:33:36 +0000 Subject: [PATCH] lilypond-1.3.111 --- CHANGES | 27 +- Documentation/ntweb/angels.ly | 2 +- Documentation/user/bugs.itexi | 41 +- Documentation/user/invoking.itexi | 73 +-- Documentation/user/lilypond.tely | 20 +- Documentation/user/moreinfo.itexi | 32 - Documentation/user/properties.itely | 2 +- Documentation/user/refman.itely | 555 ++++++------------ Documentation/user/tutorial.itely | 2 +- input/bugs/die-staff.ly | 2 +- input/bugs/different-time.ly | 7 +- input/bugs/steep-beam.ly | 2 + input/bugs/voice-switch-slur.ly | 2 + input/bugs/volta.ly | 2 + input/denneboom.ly | 2 +- input/example-3.ly | 2 +- input/just-friends.ly | 2 +- input/les-nereides.ly | 222 +++---- input/praeludium-fuga-E.ly | 2 +- input/rhythm.ly | 2 +- input/scarlatti-paper.ly | 3 +- input/scarlatti-properties.ly | 24 +- input/scarlatti-test.ly | 11 +- input/star-spangled-banner.ly | 2 +- input/test/ac-extra-voice.ly | 5 +- input/test/accidental-single-double.ly | 4 +- input/test/american-chords.ly | 6 +- input/test/ancient-font.ly | 12 +- input/test/arpeggio.ly | 5 +- input/test/auto-beam-4-8.ly | 5 +- input/test/auto-beam-override.ly | 7 +- input/test/auto-isknee.ly | 2 +- input/test/bagpipe.ly | 20 +- input/test/banter-chords.ly | 2 +- input/test/bar-scripts.ly | 2 +- 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 | 5 +- input/test/beam-suspect.ly | 2 +- input/test/beam-trend.ly | 2 +- input/test/beams.ly | 2 +- input/test/breathing-sign.ly | 2 +- input/test/broken.ly | 2 +- input/test/chord-inversion.ly | 2 +- input/test/chord-names.ly | 4 +- input/test/chord-table.ly | 2 +- input/test/chords.ly | 4 +- input/test/clefs.ly | 2 +- input/test/collision-merge-dotted.ly | 2 +- input/test/collisions.ly | 12 +- input/test/cue-notes.ly | 15 +- input/test/defaultbars.ly | 2 +- input/test/dots.ly | 2 +- input/test/drarn-chords.ly | 2 +- input/test/extra-staff.ly | 2 +- input/test/font-body.ly | 2 +- input/test/font.ly | 2 +- input/test/font16.ly | 2 +- input/test/font20.ly | 2 +- input/test/force-hshift.ly | 10 +- input/test/generic-property-override.ly | 2 +- input/test/gmsusd.ly | 2 +- input/test/gourlay.ly | 2 +- input/test/hara-kiri-short.ly | 2 +- input/test/hara-kiri-switch.ly | 2 +- input/test/hara-kiri.ly | 2 +- input/test/hshift.ly | 13 +- input/test/incipit.ly | 2 +- 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 | 7 +- input/test/keys.ly | 2 +- input/test/keys2.ly | 2 +- input/test/knee-mult.ly | 2 +- input/test/knee.ly | 2 +- input/test/lyric-combine.ly | 2 +- input/test/lyric-extender.ly | 2 +- input/test/lyric-hyphen.ly | 2 +- input/test/lyric-phrasing.ly | 2 +- input/test/lyrics-multi-stanza.ly | 6 +- input/test/lyrics.ly | 2 +- input/test/manual-clef.ly | 2 +- input/test/mark.ly | 2 +- input/test/markup.ly | 11 +- input/test/memory.ly | 2 +- input/test/multi-measure-rest.ly | 2 +- input/test/multi-rest.ly | 2 +- input/test/non-empty-text.ly | 20 +- input/test/noteheadstyle.ly | 27 +- input/test/notemode-chords.ly | 2 +- input/test/orchestscore.ly | 2 +- input/test/ossia.ly | 2 +- input/test/ottava.ly | 15 +- input/test/pushproperty.ly | 52 +- input/test/rest-collision.ly | 2 +- input/test/scripts.ly | 2 +- input/test/sleur.ly | 2 +- input/test/slur-cross-staff.ly | 2 +- input/test/slur-damping.ly | 2 +- input/test/slur-dash.ly | 2 +- input/test/slur-follow-music.ly | 2 +- input/test/slur-nice.ly | 2 +- input/test/slurs.ly | 2 +- input/test/spacing-2.ly | 2 +- input/test/spacing.ly | 2 +- input/test/span-bars.ly | 2 +- input/test/staff-margin-partial.ly | 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 | 5 +- input/test/stem-tremolo.ly | 2 +- input/test/stem.ly | 2 +- input/test/tab-staff.ly | 15 +- input/test/tchaikovsky.ly | 2 +- input/test/text-spanner.ly | 19 +- input/test/thumb.ly | 2 +- input/test/tie-chord.ly | 5 +- input/test/title.ly | 2 +- input/test/transposition.ly | 2 +- input/test/tup.ly | 2 +- input/test/tuplet.ly | 2 +- input/test/twinkle-as5.ly | 2 +- input/test/two-slurs.ly | 2 +- input/test/updown.ly | 2 +- input/test/vertical-align.ly | 2 +- input/test/vertical-text.ly | 2 +- input/test/volta.ly | 5 +- input/trip.ly | 4 +- input/twinkle-pop.ly | 2 +- input/twinkle.ly | 2 +- lily/auto-change-music.cc | 3 +- lily/chord-tremolo-engraver.cc | 2 +- lily/context-specced-music.cc | 1 - lily/cxx-function-smob.cc | 72 +++ lily/grace-music.cc | 2 +- lily/grace-position-engraver.cc | 14 +- lily/grob.cc | 2 +- lily/include/cxx-function-smob.hh | 21 + lily/include/music-iterator-ctor.hh | 21 +- lily/include/music-iterator.hh | 2 +- lily/include/spaceable-element.hh | 10 +- lily/local-key-engraver.cc | 6 +- lily/lyric-combine-music.cc | 2 +- lily/main.cc | 7 +- lily/music-iterator.cc | 6 +- lily/music-list.cc | 6 +- lily/my-lily-lexer.cc | 7 +- lily/output-property-engraver.cc | 2 +- lily/paper-column.cc | 4 +- lily/parser.yy | 50 +- lily/part-combine-music.cc | 2 +- lily/property-iterator.cc | 10 +- lily/rod.cc | 2 +- lily/separating-line-group-engraver.cc | 34 +- lily/simple-spacer.cc | 4 +- lily/spaceable-element.cc | 14 +- lily/spring.cc | 2 +- lily/time-scaled-music.cc | 2 +- lilypond-font-lock.el | 26 +- ly/book-fragment.ly | 2 +- ly/book-init.ly | 2 +- ly/catalan.ly | 4 +- ly/center-fragment.ly | 2 +- ly/center.ly | 2 +- ly/deutsch.ly | 4 +- ly/english.ly | 4 +- ly/engraver.ly | 55 +- ly/fragment.ly | 2 +- ly/init-as.fly | 2 +- ly/init-as.ly | 2 +- ly/init.fly | 2 +- ly/init.ly | 2 +- ly/init.sly | 2 +- ly/italiano.ly | 4 +- ly/nederlands.ly | 2 +- ly/norsk.ly | 6 +- ly/paper-as5.ly | 2 +- ly/paper-as9.ly | 2 +- ly/paper11.ly | 2 +- ly/paper13.ly | 2 +- ly/paper16.ly | 2 +- ly/paper20.ly | 2 +- ly/paper23.ly | 2 +- ly/paper26.ly | 2 +- ly/property.ly | 32 +- ly/svenska.ly | 4 +- make/ly-rules.make | 10 +- mutopia/Coriolan/bassi-part.ly | 2 +- mutopia/Coriolan/bassi.ly | 2 +- mutopia/Coriolan/c-midi.ly | 2 +- mutopia/Coriolan/clarinetti-part.ly | 2 +- mutopia/Coriolan/clarinetti.ly | 2 +- mutopia/Coriolan/clarinetto-1.ly | 2 +- mutopia/Coriolan/clarinetto-2.ly | 2 +- mutopia/Coriolan/contrabasso.ly | 2 +- mutopia/Coriolan/coriolan.ly | 2 +- mutopia/Coriolan/corni-part.ly | 2 +- mutopia/Coriolan/corni.ly | 2 +- mutopia/Coriolan/corno-1.ly | 2 +- mutopia/Coriolan/corno-2.ly | 2 +- mutopia/Coriolan/fagotti-part.ly | 2 +- mutopia/Coriolan/fagotti.ly | 2 +- mutopia/Coriolan/fagotto-1.ly | 2 +- mutopia/Coriolan/fagotto-2.ly | 2 +- mutopia/Coriolan/flauti-part.ly | 2 +- mutopia/Coriolan/flauti.ly | 2 +- mutopia/Coriolan/flauto-1.ly | 2 +- mutopia/Coriolan/flauto-2.ly | 2 +- mutopia/Coriolan/global.ly | 2 +- mutopia/Coriolan/oboe-1.ly | 2 +- mutopia/Coriolan/oboe-2.ly | 2 +- mutopia/Coriolan/oboi-part.ly | 2 +- mutopia/Coriolan/oboi.ly | 2 +- mutopia/Coriolan/timpani-part.ly | 2 +- mutopia/Coriolan/timpani.ly | 2 +- mutopia/Coriolan/trombe-part.ly | 2 +- mutopia/Coriolan/trombe.ly | 2 +- mutopia/Coriolan/trombo-1.ly | 2 +- mutopia/Coriolan/trombo-2.ly | 2 +- mutopia/Coriolan/viola-1.ly | 2 +- mutopia/Coriolan/viola-2.ly | 2 +- mutopia/Coriolan/violi-part.ly | 2 +- mutopia/Coriolan/violi.ly | 2 +- mutopia/Coriolan/violino-1-part.ly | 2 +- mutopia/Coriolan/violino-1.ly | 2 +- mutopia/Coriolan/violino-2-part.ly | 2 +- mutopia/Coriolan/violino-2.ly | 2 +- mutopia/Coriolan/violoncello.ly | 2 +- mutopia/D.Zipoli/verso_2.ly | 2 +- mutopia/E.Satie/gnossienne-4.ly | 6 +- mutopia/E.Satie/petite-ouverture-a-danser.ly | 6 +- mutopia/F.Schubert/standchen-16.ly | 2 +- mutopia/F.Schubert/standchen-20.ly | 2 +- mutopia/F.Schubert/standchen.ly | 16 +- mutopia/Hymns/diademata.ly | 2 +- mutopia/Hymns/laudatedom.ly | 2 +- mutopia/Hymns/maccabaeus.ly | 2 +- mutopia/Hymns/ode.ly | 2 +- mutopia/Hymns/passion.ly | 24 +- mutopia/Hymns/stille.ly | 2 +- .../Cembalo-Partitas/Partita_II_Allemande.ly | 2 +- .../Cembalo-Partitas/Partita_II_Capriccio.ly | 2 +- .../Cembalo-Partitas/Partita_II_Sinfonia.ly | 2 +- mutopia/J.S.Bach/Duette/global-i.ly | 2 +- mutopia/J.S.Bach/Duette/global-ii.ly | 2 +- mutopia/J.S.Bach/Duette/viola-i.ly | 2 +- mutopia/J.S.Bach/Duette/viola-ii.ly | 2 +- mutopia/J.S.Bach/Duette/viola-part.ly | 2 +- mutopia/J.S.Bach/Duette/violino-i.ly | 2 +- mutopia/J.S.Bach/Duette/violino-ii.ly | 4 +- mutopia/J.S.Bach/Duette/violino-part.ly | 2 +- mutopia/J.S.Bach/Duette/violino-viola.ly | 2 +- .../J.S.Bach/Duette/violino-violoncello.ly | 2 +- mutopia/J.S.Bach/Duette/violoncello-i.ly | 2 +- mutopia/J.S.Bach/Duette/violoncello-ii.ly | 2 +- mutopia/J.S.Bach/Duette/violoncello-part.ly | 2 +- .../J.S.Bach/Petites-Preludes/preludes-1.ly | 2 +- .../J.S.Bach/Petites-Preludes/preludes-2.ly | 2 +- .../J.S.Bach/Petites-Preludes/preludes-3.ly | 2 +- .../J.S.Bach/Petites-Preludes/preludes-5.ly | 2 +- .../J.S.Bach/Petites-Preludes/preludes-6.ly | 2 +- .../Solo-Cello-Suites/allemande-cello.ly | 2 +- .../Solo-Cello-Suites/allemande-urtext.ly | 2 +- .../Solo-Cello-Suites/allemande-viola.ly | 2 +- .../Solo-Cello-Suites/courante-cello.ly | 2 +- .../Solo-Cello-Suites/courante-urtext.ly | 2 +- .../Solo-Cello-Suites/courante-viola.ly | 2 +- .../J.S.Bach/Solo-Cello-Suites/gigue-cello.ly | 6 +- .../Solo-Cello-Suites/gigue-urtext.ly | 2 +- .../J.S.Bach/Solo-Cello-Suites/gigue-viola.ly | 6 +- .../Solo-Cello-Suites/menuetto-cello.ly | 6 +- .../Solo-Cello-Suites/menuetto-urtext.ly | 2 +- .../Solo-Cello-Suites/menuetto-viola.ly | 6 +- .../Solo-Cello-Suites/prelude-cello.ly | 2 +- .../Solo-Cello-Suites/prelude-urtext.ly | 2 +- .../Solo-Cello-Suites/prelude-viola.ly | 2 +- .../Solo-Cello-Suites/sarabande-cello.ly | 2 +- .../Solo-Cello-Suites/sarabande-urtext.ly | 2 +- .../Solo-Cello-Suites/sarabande-viola.ly | 2 +- mutopia/J.S.Bach/wtk1-fugue1.ly | 2 +- mutopia/J.S.Bach/wtk1-fugue2.ly | 4 +- mutopia/J.S.Bach/wtk1-prelude1.ly | 2 +- mutopia/gallina.ly | 2 +- scm/interface.scm | 42 +- scm/lily.scm | 8 +- scm/music-property.scm | 54 ++ scm/translator-properties.scm | 323 +++++----- scripts/convert-ly.py | 11 + scripts/lilypond-book.py | 1 + stepmake/stepmake/texinfo-rules.make | 2 + 296 files changed, 1406 insertions(+), 1315 deletions(-) create mode 100644 lily/cxx-function-smob.cc create mode 100644 lily/include/cxx-function-smob.hh create mode 100644 scm/music-property.scm diff --git a/CHANGES b/CHANGES index 4b678c9088..38c0a8cc6e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,31 @@ -1.3.109.jcn2 +1.3.110.hwn1 ============ +* Fixed non-empty-text feature. + +* Bugfix for Grob::has_extent_callback_b () + +* Added infrastructure for music property documentation strings. + +* Syntax change: \notenames -> \pitchnames + +* Changed syntax \push -> \override, \pop -> \revert. Add: + + \property Context.Element \set #'foo = #bar + +which does a \revert followed by a \override. + +* Documentation updates. + +* Fixed typechecks for \push, \pop and \property + +* Bugfix: Local_key_engraver. + +* Fixes for lilypond-mode.el (patch by Mark Hindley) + +1.3.110 +======= + * Fixed a mysterious typo in toplevel index. * Enabled property-engraver. diff --git a/Documentation/ntweb/angels.ly b/Documentation/ntweb/angels.ly index c2e512e114..40a9893168 100644 --- a/Documentation/ntweb/angels.ly +++ b/Documentation/ntweb/angels.ly @@ -15,7 +15,7 @@ global = \notes { \clef treble; } -\version "1.3.93"; +\version "1.3.110"; % \include "paper16.ly" flute1 = \notes \relative c'' \context Voice = flute { diff --git a/Documentation/user/bugs.itexi b/Documentation/user/bugs.itexi index 584f49ddf4..1ba2b39783 100644 --- a/Documentation/user/bugs.itexi +++ b/Documentation/user/bugs.itexi @@ -1,26 +1,31 @@ @node Reporting Bugs, , , Top @section Bug reports -There is an extensive list of todoes and bugs. See the file -@file{TODO} distributed with the sources. If you have a problem, -would you please try to find out - -@c ********* The TODO file is no more in the distr. /MB +LilyPond development moves quickly, so if you have a problem, it is +wise to check if it has been fixed in a newer release. If you think +you found a bug, please send in a bugreport including the following +information: @itemize @bullet -@item If the bug has been fixed in a newer release. -@item If the bug has been found earlier, consult @file{TODO} and @file{BUGS}. -@end itemize -If you have really found a bug, then we would appreciate it if you -sent a bugreport. +@item @strong{important:} a sample input which causes the error. + +(and you will do us a favor if send a @strong{small} sample file) + +@item @strong{important:} which LilyPond version you use. + +This information tells us if you've found a new bug, or an old one. + +@item A description of the platform you use (i.e., operating system, +system libraries, whether you downloaded a binary release) + +@item If necessary, send a description of the bug itself. -@itemize @bullet -@item Send a copy of the input which causes the error. -@item Send a description of the platform you use. -@item Send a description of the LilyPond version you use - (with compile/configure options please). -@item Send a description of the bug itself. -@item Send it to @email{bug-gnu-music@@gnu.org}; you don't have to be subscribed - to this mailinglist. @end itemize + + +You can send the report to @email{bug-gnu-music@@gnu.org}---You don't +have to be subscribed to this mailinglist, or you can enter the bug in +the LilyPond wiki, at +@uref{http://appel.lilypond.org/wiki/index.php?LilyPondBugs}. + diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi index 14786887a3..13a40742be 100644 --- a/Documentation/user/invoking.itexi +++ b/Documentation/user/invoking.itexi @@ -14,58 +14,56 @@ @item -f,--format= Output format for sheet music. Choices are tex (for @TeX{} output), ps (for PostScript) and scm (for GUILE) -@item -I,--include= - add @file{FILE} to the search path for input files. -@item -m,--midi +@item -h,--help + Show a summary of usage. +@item --include, -I=DIRECTORY + Add @file{DIRECTORY} to the search path for input files. + +@item -i,--init=FILE + Set init file to @file{FILE} (default: @file{init.ly}). +@item -m,--no-paper Disable @TeX{} output. If you have a \midi definition, it will do the midi output only. @item -M,--dependencies - Also output rules to be included in Makefile. -@item -d,--debug - Turn debugging info on. GNU LilyPond reads the file @file{.dstreamrc}, - which lists what functions and classes may produce copious debugging - output. + Output rules to be included in Makefile. +@item -o,--output=FILE + Set the default output file to @file{FILE}. +@item -Q,--find-old-relative + show all changes needed to convert a file to relative octave syntax. + @item -s,--safe Disallow untrusted @code{\include} directives, backslashes in @TeX{} code and named output. + +WARNING: the --safe option has not been reviewed for over a year; do +not rely on for automatic lily invocation (eg. over the +web). Volunteers are welcome. + +@item -T,--no-timestamps + don't timestamp the output @item -t,--test Switch on any experimental features. Not for general public use. +@item -v,--version + Show version information +@item -V,--verbose + verbose @item -w,--warranty Show the warranty with which GNU LilyPond comes. (It comes with @strong{NO WARRANTY}!) -@item -o,--output=FILE - Set the default output file to @file{FILE}. -@item -h,--help - Show a summary of usage. -@item -i,--init=FILE - Set init file to @file{FILE} (default: @file{init.ly}). -@item --include, -I=DIRECTORY - Add @file{DIRECTORY} to the search path for input files. -@item --ignore-version, -V - Make the incompatible lilypond version warning non-fatal. @end table - When invoked with a filename that has no extension, LilyPond will try adding `@file{.ly}' as an extension first. -@c ****** Is the following on its way out? /MB -If you invoke LilyPond with a file `@file{foo.}@var{ext}' that doesn't -have the `@file{.ly}' extension, then LilyPond will look for a file -called `@file{init.}@var{ext}' and process this file. The file -`@file{init.}@var{ext}' must contain the @code{\maininput} keyword or -LilyPond will not read the user specified file. - When LilyPond processes @file{filename.ly} it will produce -@file{filename.tex} as output. If @file{filename.ly} contains a second -@code{\paper} keyword, then LilyPond will produce @file{filename-1.tex} -as well. Subsequent @code{\paper} keywords will produce sequentially -numbered file names. Several files can be specified; they will each -be processed independently.@footnote{Not entirely true: The status of -GUILE is kept.} - - +@file{filename.tex} as output (or @file{filename.ps} for +PostScript output). If @file{filename.ly} contains more than one +@code{\score} block, then LilyPond will output the rest in numbered +files, starting with @file{filename-1.tex}. Several files can be +specified; they will each be processed independently. @footnote{The +status of GUILE is not reset across invocations, so be careful not to + change defaults settings from within Scheme .} @section Environment variables @@ -73,8 +71,11 @@ GUILE is kept.} @item LILYINCLUDE additional directories for finding lilypond data. The format is like the format of @file{PATH}. -@item LILYPREFIX - [FIXME] +@item LILYPONDPREFIX + This specifies a directory where locale messages and +data-files will be looked up by default. The directory should contain +subdirectories called @file{ly/}, @file{ps/}, @file{tex/}, etc. + @item LANG selects the language for the warning messages of LilyPond. @end table diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely index b1a4a3a92c..ccb2641060 100644 --- a/Documentation/user/lilypond.tely +++ b/Documentation/user/lilypond.tely @@ -80,6 +80,18 @@ than the names being similar :-)" @node Top, , , (dir) @chapter GNU LilyPond --- The music typesetter + +LilyPond produces sheet music from input files. This document describes +how to use LilyPond. + +@cindex web site + +A further source of information is the website, which can be found at +@uref{http://www.lilypond.org/}. The website contains on-line copies of +this and other documentation. + + + @menu * Tutorial:: A tutorial introduction to lilypond. * Invoking LilyPond:: Operation. @@ -87,10 +99,7 @@ than the names being similar :-)" * Reference Manual:: Reference Manual. @c Move to Reference Manual? * Internals:(lilypond-internals). Auto generated detailed documentation. -* More information:: Where to turn to for more help. -* convert-ly:: Upgrading input files. -@c Hmm, having the generated doco in a separate file, -@c the index can't refer to that. +* convert-ly:: Upgrading input files. * Index:: Unified index. @end menu @@ -109,15 +118,12 @@ than the names being similar :-)" @mbinclude tutorial.itely - @include invoking.itexi @include bugs.itexi @mbinclude refman.itely -@include moreinfo.itexi - @include convert-ly.itexi @node Index, , , Top diff --git a/Documentation/user/moreinfo.itexi b/Documentation/user/moreinfo.itexi index 826a3d15fb..ff5b7353d6 100644 --- a/Documentation/user/moreinfo.itexi +++ b/Documentation/user/moreinfo.itexi @@ -1,35 +1,3 @@ @node More information, , , Top @section Resources -A further source for information is the website, which can be found at -@uref{http://www.lilypond.org/}. The website contains on-line -versions of the documentation - -GNU LilyPond is updated very frequently, the latest version is always -available at: @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/}. This FTP -site is mirrored at a number of sites; consult the project web pages -for information about mirrors. - -For programs which are part of the GNU music project, the following -mailing list have been setup: - -@table @samp -@item @email{info-gnu-music@@gnu.org} - For information on the GNU Music project, to subscribe: send mail with - subject "subscribe" to @email{info-gnu-music-request@@gnu.org} -@item @email{help-gnu-music@@gnu.org} - For help with programs from the GNU music project. To subscribe: send - mail with subject "subscribe" to @email{help-gnu-music-request@@gnu.org} -@item @email{bug-gnu-music@@gnu.org} - If you have bugreports, you should send them to this list. If you want - to read all bugreports, you should subscribe to this list. To - subscribe: send mail with subject "subscribe" to - @email{bug-gnu-music-request@@gnu.org} -@item @email{gnu-music-discuss@@gnu.org} - For discussions concerning the GNU Music project, to subscribe: send - mail with subject "subscribe" to - @email{gnu-music-discuss-request@@gnu.org} -@end table - -Announces of new versions will be sent to info-gnu-music and -gnu-music-discuss. diff --git a/Documentation/user/properties.itely b/Documentation/user/properties.itely index 3689d3e7d9..035c187b9b 100644 --- a/Documentation/user/properties.itely +++ b/Documentation/user/properties.itely @@ -14,7 +14,7 @@ property is listed in parentheses after the property name. Sets the instrument for MIDI output. If this property is not set then LilyPond will use the @code{instrument} property. This must be set to one of the strings on the list of MIDI instruments that - appears in section XREF-midilist [FIXME]. If you use a string which + appears in section @ref{midilist}. If you use a string which is not listed, LilyPond will silently substitute piano. @item @code{restStyle}@indexcode{restStyle} @propertytype{string} diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 174e2d2217..7b36399dca 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -12,10 +12,10 @@ @menu * Overview:: Overview * Top level:: Top level -* notenames:: notenames +* Pitch names:: Pitch names * Lexical conventions:: Lexical conventions -* Other languages:: notelang -* modes:: modes +* Other languages:: Note names in various languages +* Lexical modes:: modes * Types:: Types * Music expressions:: Music expressions * Atomic music expressions:: Atomic music expressions @@ -39,6 +39,7 @@ * contextdefs:: contextdefs * Sound output:: Sound output * midilist:: midilist +* Grobs:: Graphical objects * Pre-defined Identifiers:: Pre-defined Identifiers @c May be fragile. Better make single link to generated doco? * Interpretation contexts:(lilypond-internals)LilyPond interpretation contexts. @@ -51,20 +52,21 @@ @node Overview, , , Reference Manual @section Overview -This document@footnote{This document has been revised for -LilyPond 1.2.} describes the the GNU LilyPond input format - -with @emph{Lilypond}-input you can +This document@footnote{This document has been revised for LilyPond 1.2.} +describes the the GNU LilyPond input format This format represents a +piece of music in an elegant way, but contains enough information for +both automatic typesetting and automatic performances. +LilyPond input can be classified into three types: @itemize @bullet - @item create musical expressions by combining pitches, durations - @item output those musical expressions to various formats - @item give those musical expressions and output definitions names, so - you can enter them in manageable chunks. -@end itemize + @item musical expressions: a musical expression is some combination of +rest, notes, lyrics + @item output definitions: recipes for translating those musical +expressions into performances (MIDI) or graphics (eg. PostScript). -@emph{Lilypond} input aims to define a piece of music completely, both from -typesetting and from a performance point of view. + @item declarations: by declaring and naming musical expressions, you +can enter and edit them in manageable chunks. +@end itemize @@ -89,8 +91,6 @@ definition. A score block has the following syntax: @var{outputdefs} are zero or more output definitions. If no output definition is supplied, the default @code{\paper} block will be added. - - @cindex header @keyindex{header} @@ -111,39 +111,25 @@ metre, arranger, piece and tagline. It is customary to put the @code{\header} at the top of the file. -@node notenames, , , Reference Manual - -Note name tables can be specified using +@node Pitch names, , , Reference Manual +Note names and chord modifiers can be customised for nationalities. +languages and conventions. The syntax is as follows. @example - \notenames@keyindex{notenames} - @{ @var{assignmentlist} @} + \pitchnames @keyindex{pitchnames} @var{scheme-alist} + \chordmodifiers@keyindex{chordmodifiers} @var{scheme-alist} @end example -@var{assignmentlist} is a list of definitions of the form - -@example - @var{name} = @var{pitch} -@end example - -Chord modifiers can be set analogously, with -@code{\chordmodifiers}@keyindex{chordmodifiers}. +See @file{ly/nederlands.ly} and @file{ly/chord-modifiers.ly} for +specific examples how to do this. tables can be tailored specified +using. Some national note names have been provided, see @ref{Other +languages}. A @code{\paper} block at top level sets the default paper block. A @code{\midi} block at top level works similarly. -LilyPond contains a Scheme interpreter (the GUILE library) for -internal use. The following commands access the interpreter -directly. - -@example - #@var{scheme} -@end example - -Evaluates the specified Scheme code. The result is discarded. - Identifier assignments may appear at top level. Semicolons are forbidden after top level assignments. @@ -165,71 +151,44 @@ A one line comment is introduced by a `@code{%}' character. Block comments are started by `@code{%@{}' and ended by `@code{%@}}'. They cannot be nested. +@indexcode{#} +LilyPond contains a Scheme interpreter (the GUILE library) for +internal use. The interpreter is accessed by the pound sign: -@cindex keyword - -Keywords start with a backslash, followed by a number of lower case -alphabetic characters. These are all the keywords. +Whereever the syntax allows Scheme expressions, you may enter one as -[FIXME] +@example + #@var{scheme} +@end example +Evaluates the specified Scheme code. If this is used at toplevel, then +the result is discarded. Example: @example - \accepts - \addlyrics - \alternative - \bar - \breathe - \chordmodifiers - \chords - \clef - \cm - \consists - \consistsend - \context - \duration - \font - \grace - \header - \in - \key - \keysignature - \lyrics - \mark - \midi - \mm - \musicalpitch - \name - \notenames - \notes - \paper - \partial - \penalty - \property - \pt - \relative - \remove - \repeat - \repetitions - \scm - \scmfile - \score - \script - \sequential - \simultaneous - \skip - \spanrequest - \tempo - \textscript - \time - \times - \translator - \transpose - \type + \property Staff.TestObject \override #'symbol = #(+ 1 2) @end example +(in this case, @code{\override} expects two Scheme expressions. +[refer appendix/ online intro on Scheme] + +@cindex keyword + +Keywords start with a backslash, followed by a number of lower case +alphabetic characters. These are all the keywords. +@example +apply arpeggio autochange spanrequest commandspanrequest +simultaneous sequential accepts alternative bar breathe +char chordmodifiers chords clef cm consists consistsend +context denies duration dynamicscript elementdescriptions +font grace header in lyrics key mark musicalpitch +time times midi mm name pitchnames notes outputproperty +override set revert partial paper penalty property pt +relative remove repeat addlyrics partcombine score +script stylesheet skip textscript tempo translator +transpose type +@end example @cindex integer @@ -237,8 +196,6 @@ Formed from an optional minus sign followed by digits. Arithmetic operations cannot be done with integers, and integers cannot be mixed with reals. - - @cindex real @@ -264,15 +221,15 @@ is the internal representation of dimensions. Begins and ends with the `@code{"}' character. To include a `@code{"}' character in a string write `@code{\"}'. Various other backslash -sequences have special interpretations as in the C language. A -string that contains no spaces can be written without the quotes. -See section XREF-modes [FIXME] for details on unquoted strings; their -interpretation varies depending on the situation. Strings can be -concatenated with the `@code{+}' operator. +sequences have special interpretations as in the C language. A string +that contains no spaces can be written without the quotes. See +@ref{Lexical modes} for details on unquoted strings; their interpretation varies +depending on the situation. Strings can be concatenated with the +`@code{+}' operator. -The tokenizer accepts the following commands. They can appear -anywhere. +The tokenizer accepts the following commands. They have no grammatical +function, hence they can appear anywhere in the input. @example \maininput@keyindex{maininput} @@ -320,17 +277,14 @@ italiano.ly do re mi fa sol la sib si -d -b catalan.ly do re mi fa sol la sib si -d/-s -b @end example -Pitch names can be redefined using the -@code{\notenames}@keyindex{notenames} command, see -subsection XREF-notenames [FIXME]. +Pitch names can be redefined using the @code{\pitchnames} command, see +@ref{Pitch names}. - - -@cindex lexical modes +@cindex Lexical Modes @cindex modes -@node modes, , , Reference Manual +@node Lexical modes, , , Reference Manual To simplify entering notes, lyrics, and chords, @emph{Lilypond} has three special input modes on top of the default mode. In each mode, words @@ -416,58 +370,61 @@ _ _ _ _ % 4 words, each one a space durations, you can not enter real numbers in this mode. @end table -It is possible to create words that break the rules by prefixing them -with the dollar sign `@code{$}@indexcode{$}'. Regardless of the context, a -word beginning with `@code{$}' extends until the next white space -character. Such words can contain numbers (even in Note mode), or -other forbidden characters. The dollar sign can be used to create -and access identifiers that could not otherwise be used.@footnote{Use -of `@code{$}' hampers readability and portability to future LilyPond -versions, thus the use of the dollar sign is discouraged.} - - +[todo: include short table showign differences] @node Types, , , Reference Manual @section Types -@cindex types and identifiers +@cindex Identifiers -@emph{Lilypond} has a limited set of types: +[say something about types] + +All of the information in a LilyPond input file, is represented as a +Scheme value. In addition to normal Scheme data types (such as pair, +number, boolean, etc.), LilyPond has a number of specialized data types, @itemize @bullet - @item integers - @item reals - @item strings - @item music expressions - @item durations of notes and rests (specified with - @code{\notenames}@keyindex{notenames}) - @item note name tables - @item context definitions, part of output definitions. See - section XREF-contextdefs [FIXME] for more information - @item output definitions (like @code{\paper}@keyindex{paper} blocks - and @code{\midi}@keyindex{midi} blocks) - @item score definitions (@code{\score}@keyindex{score} blocks) + @item Input + @item c++-function + @item Music: see @ref{Music expressions} + @item Identifier + @item Translator_def: +See section @ref{contextdefs} for more information + + @item Duration + @item Pitch + @item Score (TODO, smobme) +@item Music_output_def (TODO, smobme) + + @item Moment (rational number) @end itemize -Type is a syntactical property: @emph{Lilypond} has no real type system, -so there is no support for generic expressions, functions, or user -defined types. For the same reason, it is not possible to mix reals -and integers in arithmetic expressions, and ``type -errors'' -@cindex type error - (e.g., using a string identifier to -initialize a @code{\paper}@keyindex{paper} block) will yield a ``parse -error''. - -Identifiers allow objects to be assigned to names. To assign an -identifier, you use `@var{name}=@var{value}' and to refer to an -identifier, you preceed its name with a backslash: +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 . + +@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) +@end itemize + +Identifiers allow objects to be assigned to names during the parse +stage. To assign an identifier, you use `@var{name}=@var{value}' and to +refer to an identifier, you preceed its name with a backslash: `@code{\}@var{name}'. Identifier assignments must appear at top level in the @emph{Lilypond} file. Semicolons are forbidden after assignments appearing at top level but they are obligatory after assignments -appearing in the @code{\paper} block, see Section XREF-paper [FIXME]. +appearing in the @code{\paper} block, see Section @ref{paper}. -@var{value} is any of the types listed above. +@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 @@ -483,15 +440,19 @@ identifier in terms of its old value, e.g. @end example When an identifier is referenced, the information it points to is -copied. Therefore it only makes sense to put identifiers for -translators, output definitions, and @code{\score}@keyindex{score} -blocks as the first item in a block. For this reason, if you -reference a @code{\foo} variable in a @code{\foo} block, it must be the -first item in the list following @code{\foo}.@footnote{@code{\paper@{\one -\two@}} does not make sense, because the information of @code{\two} -would overwrite the information of @code{\one}, thereby making the -reference to the first identifier useless.} +copied. For this reason, an identifier reference must always be the + first item in a block. +@example +\paper @{ + foo = 1.0 + \paperIdent % wrong and invalid +@} +\paper @{ + \paperIdent % correct + foo = 1.0 +@} +@end example @node Music expressions, , , Reference Manual @@ -517,8 +478,8 @@ first, and then the `@code{d}' (as opposed to playing them simultaneously, for instance). Atomic music expression are discussed in -subsection XREF-atomicmusic [FIXME]. Compound music expressions are -discussed in subsection XREF-compoundmusic [FIXME]. +subsection @ref{Atomic music expressions}. Compound music expressions are +discussed in subsection @ref{Compound music expressions}. @@ -546,7 +507,7 @@ corresponding to C and 7 corresponding to B. The shift is zero for a natural, negative to add flats, or positive to add sharps. In Note and Chord mode, pitches may be designated by names. See -section XREF-notelang [FIXME] for pitch names in different languages. +section @ref{Other languages} for pitch names in different languages. The syntax for duration specification is @@ -561,7 +522,7 @@ note, etc. The number of dots after the note is given by @var{dotcount}. In Note, Chord, and Lyrics mode, durations may be designated by -numbers and dots. See Section XREF-notelang [FIXME] for details. +numbers and dots. @node Note specification, , , Reference Manual @@ -584,15 +545,17 @@ The pitch of the note is specified by the note's name. The default names are the Dutch note names. The notes are specified by the letters `@code{c}' through `@code{b}', where `@code{c}' is an octave below middle C and the letters span the octave above that C. -In Dutchcindex(notenames!Dutch), a sharp is formed by adding -`@code{-is}' to the end of a pitch name. A flat is formed by adding -`@code{-es}'. Double sharps and double flats are obtained by adding -`@code{-isis}' or `@code{-eses}'. `@code{aes}' and `@code{ees}' are -contracted to `@code{as}' and `@code{es}' in Dutch, but both forms will -be accepted. +In Dutch, +@cindex notenames!Dutch +a sharp is formed by adding `@code{-is}' to the end of a pitch name. A +flat is formed by adding `@code{-es}'. Double sharps and double flats +are obtained by adding `@code{-isis}' or `@code{-eses}'. `@code{aes}' +and `@code{ees}' are contracted to `@code{as}' and `@code{es}' in Dutch, +but both forms will be accepted. LilyPond has predefined sets of notenames for various languages. See -section XREF-notelang [FIXME] for details. +@ref{Other languages}. + The optional octave specification takes the form of a series of @@ -734,13 +697,13 @@ Syllables are entered like notes, with pitches replaced by text. For example, `@code{Twin-4 kle4 twin-4 kle4}' enters four syllables, each with quarter note duration. Note that the hyphen has no special meaning for lyrics, and does not introduce special symbols. See -section XREF-modes [FIXME] for a description of what is interpreted as +section @ref{Lexical modes} for a description of what is interpreted as lyrics. Spaces can be introduced into a lyric either by using quotes (`@code{"}') or by using an underscore without quotes: `@code{He_could4 not4}'. All unquoted underscores are converted to spaces. Printing -lyrics is discussed in section XREF-lyricprint [FIXME]. +lyrics is discussed in section @ref{lyricprint}. @@ -798,10 +761,8 @@ the extra-offset of those heads to (5,7.5), shifting them up and right. Use of this feature is entirely on your own risk: if you use this, the -result will depend very heavily on the implentation of the backend, -which we change unscrupulously. - - +result will depend very heavily on the implementation of the backend, +which we change regularly and unscrupulously. @cindex commands @@ -829,23 +790,20 @@ mode names @code{\ionian}@keyindex{ionian}, are also defined. @example - @code{\keysignature}@keyindex{keysignature} @var{pitchseq} @code{;} @end example Specify an arbitrary key signature. The pitches from @var{pitch} will be printed in the key signature in the order that they appear on the list. - @example \mark@keyindex{mark} @var{unsigned}; \mark @var{string}; @end example -Prints a mark over or under (depending on the -@code{markDirection}@indexcode{markDirection} property) the staff. You must add -@code{Mark_engraver}@indexcode{Mark_engraver} to either the Score or Staff context for +Prints a mark over or under the staff. You must add +@code{Mark_engraver}@indexcode{Mark_engraver} to the Score context for this to work. @node barlines, , , Reference Manual @@ -854,45 +812,25 @@ this to work. \bar@keyindex{bar} @var{bartype}; @end example -This is a request to print a special bar symbol. It replaces the -regular bar symbol with a special -symbol. The argument @var{bartype} is a string which specifies the -kind of bar to print. Options are @code{":|"} -@cindex "|A@@@code{:|} -, -@code{"|:"} -@cindex "|B@@@code{|:} -, @code{":|:"} -@cindex "|C@@@code{:|:} -, -@code{"||"} -@cindex "|D@@@code{||} -, @code{"|."} -@cindex "|E@@@code{|.} -, -@code{".|"} -@cindex "|F@@@code{.|} -, and @code{".|."} -@cindex "|G@@@code{.|.} -. -These produce, respectively, a right repeat, a left repeat, a double -repeat, a double bar, a start bar, an end bar, and a thick double -bar. If @var{bartype} is set to @code{"empty"} then nothing is -printed, but a line break is allowed at that spot. - -You are encouraged to use @code{\repeat} for repetitions. -See section XREF-sec-repeats [FIXME]. +This is a short-cut for doing +@example + \property Score.whichBar = @var{bartype} +@end example - +You are encouraged to use @code{\repeat} for repetitions. See +@ref{Repeats}, and the documentation of @code{whichBar}. @example - \time@keyindex{time} @var{numerator}@code{/}@var{denominator} @code{;} @end example -Change the time signature. The default time signature is 4/4. -The time signature is used to generate bar lines. +A short-cut for doing +@example + \property Score.timeSignatureFraction = #'(@var{numerator} . @var{denominator}) +@end example + +See the documentation of @code{timeSignatureFraction} @example @@ -903,18 +841,21 @@ Used to specify the tempo. For example, `@code{\tempo 4 = 76;}' requests output with 76 quarter notes per minute. @example - \partial@keyindex{partial} @var{duration} @code{;} @end example +Short cut for + +@example + \property Score.measurePosition = @var{length of duration} +@end example + +See the documentation of @code{measurePosition}. + @cindex anacrusis @cindex upstep -This creates an incomplete measure (anacrusis, upbeat) at the start of -the music, e.g., `@code{\partial 8*2;}' creates a starting measure -lasting two eighth notes. - @example @code{|}@indexcode{|} @@ -928,9 +869,10 @@ lasting two eighth notes. `@code{|}' is a bar check. Whenever a bar check is encountered during interpretation, a warning message is issued if it doesn't fall at a -measure boundary. This can help you finding errors in the input. -The beginning of the measure will be relocated, so this can also -be used to shorten measures. +measure boundary. This can help you finding errors in the input. +Depending on the value of @code{barCheckNoSynchronize} +@indexcode{barCheckNoSynchronize} The beginning of the measure will be +relocated, so this can also be used to shorten measures. @example @@ -943,61 +885,20 @@ Discourage or encourage line breaks. See identifiers section [on identifiers] [FIXME]. @example - \clef@keyindex{clef} @var{clefname} @code{;} @end example -Music expression that sets the current clef. The argument is a -string which specifies the name of the clef. Several clef names are -supported. If `@code{_8}' or `@code{^8}' is added to the end of a clef -name, then the clef lowered or raised an octave will be generated. -Here are the supported clef names with middle C shown in each -clef: - -@quotation - -@lilypond[] -\score { - \notes { - \cadenzaOn - %\property Voice.textStyle = typewriter - \clef subbass; c'4-"\kern -5mm subbass" - \clef bass; c'4^"\kern -2mm bass" - \clef baritone; c'4_"\kern -5mm baritone" - \clef varbaritone; c'4^"\kern -6mm varbaritone" - \clef tenor; c'4_"\kern -3mm tenor" - \clef "G_8"; c'4^"\kern -2mm G\\_8" - } - \paper { - linewidth = -1.0; - } -} -@end lilypond -@end quotation +Short-cut for -@quotation +@example + \property Clef.clefGlyph = @var{symbol associated with clefname} + \property Clef.clefPosition = @var{clef Y-position for clefname} + \property Clef.clefOctavation = @var{extra pitch of clefname} +@end example -@lilypond[] -\score { - \notes { - \cadenzaOn - \clef alto; c'4_"\kern -2mm alto" - \clef mezzosoprano; c'4^"\kern -9mm mezzosoprano" - \clef soprano; c'4_"\kern -6mm soprano" - \clef treble; c'4^"\kern -4mm treble" - \clef french; c'4_"\kern -4mm french" - } - \paper { - linewidth = 4.5 \in; - } -} -@end lilypond -@end quotation +Supported clef-names include -The three clef symbols can also be obtained using the names `@code{G}', -`@code{C}' or `@code{F}', optionally followed by an integer which -indicates at which note line the clef is located. An as example, the -@code{mezzosoprano} clef can also be given as `@code{C2}'. +[todo] @example @@ -1028,17 +929,15 @@ Some more elaborate constructions: \times 2/3 { [e'8 f' g'] } @end lilypond -Beaming can be generated automatically; see section XREF-autobeam [FIXME]. +Beaming can be generated automatically; see section @ref{autobeam}. [OUTDATED, FIXME] To place tremolo marks between notes, use @code{\repeat} with tremolo style. @cindex tremolo beams - To create tremolo beams on a single note, simply attach -`@code{:}@var{length}' to the note itself (see also section -XREF-tremolo [FIXME]). - +To create tremolo beams on a single note, simply attach +`@code{:}@var{length}' to the note itself. @lilypond[fragment,verbatim,center] \repeat "tremolo" 8 { c16 d16 } @@ -1316,11 +1215,7 @@ chords can be expressed in two different ways: Interpret @var{musicexpr} within a context of type @var{contexttype}. If the context does not exist, it will be created. The new context -can optionally be given a name. See -section XREF-contextselection [FIXME] and XREF-contextdefs [FIXME] for more -information on interpretation contexts. - - +can optionally be given a name. @cindex input modes @@ -1331,14 +1226,9 @@ Mode switching keywords form compound music expressions: @code{\notes} @var{musicexpr}, and @code{\lyrics} @keyindex{lyrics} @var{musicexpr}. These expressions do not add anything to the meaning of their arguments. They are just a way to indicate that the arguments should -be parsed in indicated mode. See section XREF-modes [FIXME] for more +be parsed in indicated mode. See @ref{Lexical modes} for more information on modes. -More information on context selection can be found in -section XREF-contextselection [FIXME]. - - - @cindex sequential music @@ -1478,7 +1368,7 @@ less error-prone, and more readable. Chord names are a way to generate simultaneous music expressions that correspond with traditional chord names. It can only be used in -Chord mode (see section XREF-modes [FIXME]). +Chord mode (see section @ref{Lexical modes}). @example @@ -1929,8 +1819,8 @@ foo = -6 By default, LilyPond will generate beams automatically. This feature can be disabled by setting the @code{Voice.noAutoBeaming}@indexcode{Voice.noAutoBeaming} property to 1. It can be overridden for specific cases by -specifying explicit beams as described in -section XREF-manualbeam [FIXME]. +specifying explicit beams. + A large number of Voice properties are used to decide how to generate beams. Their default values appear in @file{auto-beam-settings.ly}. @@ -2303,10 +2193,9 @@ where each of the items is one of @itemize @bullet @item An assignment. The assignment must be terminated by a - semicolon. See section XREF-papervars [FIXME] for information on - paper variables. + semicolon. - @item A context definition. See section XREF-contextdefs [FIXME] for + @item A context definition. See section @ref{contextdefs} for more information on context definitions. @item @@ -2474,8 +2363,7 @@ one of @itemize @bullet @item @code{\consists} @var{engravername} @code{;} Add @var{engravername} to the list of modules in this context. - Section XREF-engravers [FIXME] contains an overview of the engravers - available. The order of engravers added with @code{\consists} is + The order of engravers added with @code{\consists} is significant. @item @code{\consistsend} @var{engravername} @code{;} @@ -2670,27 +2558,6 @@ piano. @c @end quotation -@cindex MIDI types and performers - -The types available for MIDI translators are: - -@table @samp - @item @code{Performer_group_performer}@indexcode{Performer_group_performer} - @item @code{Score_performer}@indexcode{Score_performer} - @item @code{Staff_performer}@indexcode{Staff_performer} -@end table - -The performers for MIDI translators are: - -@table @samp - @item @code{Key_performer}@indexcode{Key_performer} - @item @code{Time_signature_performer}@indexcode{Time_signature_performer} - @item @code{Note_performer}@indexcode{Note_performer} - @item @code{Lyric_performer}@indexcode{Lyric_performer} - @item @code{Swallow_performer}@indexcode{Swallow_performer} -@end table - - @node Pre-defined Identifiers, , , Reference Manual @@ -2708,59 +2575,29 @@ provide shorthands for some settings. Most of them are in Force a line break in music by using a large argument for the keyword @code{\penalty}. - @item @code{\center}@keyindex{center} - Used for setting direction properties. Equals 0. - - @item @code{\down}@keyindex{down} - Used for setting direction setting properties. Is equal - to -1. - - @item @code{\free}@keyindex{free} - Used for setting direction setting properties. Is equal - to 0. - - @item @code{\left}@keyindex{left} - Used for setting text alignment property. Is equal to -1. - @item @code{\nobreak}@keyindex{nobreak} Prevent a line break in music by using a large negative argument for the keyword @code{\penalty}. - @item @code{\none}@keyindex{none} - Used for setting @code{Score.beamslopedamping} and - @code{Score.beamquantisation} properties. Is equal to 0. - - @item @code{\normal}@keyindex{normal} - Used for setting @code{Score.beamslopedamping} and - @code{Score.beamquantisation} properties. Is equal to 1. - @item @code{\normalkey}@keyindex{normalkey} Select normal key signatures where each octave has the same key signature. This sets the @code{Staff.keyoctaviation} property. - @item @code{\right}@keyindex{right} - Used for setting text alignment property. Is set to 1. - @item @code{\shiftoff}@keyindex{shiftOff} - Disable horizontal shifting of note heads that collide. Sets the - @code{Voice.horizontalNoteShift} property. + Disable horizontal shifting of note heads that collide. @item @code{\shiftOn}@keyindex{shiftOn} Enable note heads that collide with other note heads to be - shifted horiztonally. Sets the @code{Voice.horizontalNoteShift} - property. + shifted horiztonally. @item @code{\slurBoth}@keyindex{slurBoth} - Allow slurs to be above or below notes. This sets the - @code{Voice.slurVerticalDirection} property. + Allow slurs to be above or below notes. @item @code{\slurDown}@keyindex{slurDown} - Force slurs to be below notes. This sets the - @code{Voice.slurVerticalDirection} property. + Force slurs to be below notes. @item @code{\slurUp}@keyindex{slurUp} - Force slurs to be above notes. This sets the - @code{Voice.slurVerticalDirection} property. + Force slurs to be above notes. @item @code{\specialkey}@keyindex{specialkey} Allow key signatures do differ in different octaves. This sets @@ -2768,22 +2605,16 @@ provide shorthands for some settings. Most of them are in @item @code{\stemBoth}@keyindex{stemBoth} Allow stems, beams, and slurs to point either upwards or - downwards, decided automatically by LilyPond. This sets the - @code{Voice.verticalDirection} property. + downwards, decided automatically by LilyPond. @item @code{\stemdown}@keyindex{stemdown} - Force stems, beams, and slurs to point down. This sets the - @code{Voice.verticalDirection} property. + Force stems, beams, and slurs to point down. @item @code{\stemUp}@keyindex{stemUp} - Force stems, beams and slurs to point up. This sets the - @code{Voice.verticalDirection} property. - - @item @code{\traditional}@keyindex{traditional} - Used for setting the @code{Score.beamquantisation} property. Is - equal to 2. + Force stems, beams and slurs to point up. - @item @code{\up}@keyindex{up} - Used for setting various direction properties. Is equal - to 1. @end table + +@node Grobs, , , Reference Manual + + diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index cc4b30e881..27a95c4a1a 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -726,7 +726,7 @@ oboes = \notes \relative c'' \context Voice = oboe { \context Voice = oboeTwo { \stemDown \grace { - \property Grace.Stem \push #'direction = #-1 + \property Grace.Stem \override #'direction = #-1 [f,16 g] } f8 e e2 } > diff --git a/input/bugs/die-staff.ly b/input/bugs/die-staff.ly index 026b97485c..f28bc52fe6 100644 --- a/input/bugs/die-staff.ly +++ b/input/bugs/die-staff.ly @@ -1,7 +1,7 @@ \score { { - \context Staff = i { + \context Staff = q { \notes { a' b' c' d' } } diff --git a/input/bugs/different-time.ly b/input/bugs/different-time.ly index 927fd1af09..4b23edc614 100644 --- a/input/bugs/different-time.ly +++ b/input/bugs/different-time.ly @@ -4,14 +4,13 @@ \score{ \context PianoStaff < \context Staff = upper \notes\relative c''{ - \time 3/4; + \property Staff.timeSignatureFraction = #'(3 . 4) c4 c c c2. } - \context Staff = lower \notes\relative c'{ -% \clef bass; - \time 4/4; + \context Staff = lower \notes\relative c' { + \property Staff.timeSignatureFraction = #'(4 . 4) c4 c c c c1 } diff --git a/input/bugs/steep-beam.ly b/input/bugs/steep-beam.ly index ea7fe134aa..0a62020c2f 100644 --- a/input/bugs/steep-beam.ly +++ b/input/bugs/steep-beam.ly @@ -1,3 +1,5 @@ +% 1st beam should prob. be horizontal. + \score { \notes <{ [ r8 g''16 des'] [r8 c16 a] }>} diff --git a/input/bugs/voice-switch-slur.ly b/input/bugs/voice-switch-slur.ly index f576f20993..c2215de608 100644 --- a/input/bugs/voice-switch-slur.ly +++ b/input/bugs/voice-switch-slur.ly @@ -1,3 +1,5 @@ + + % docme. \score{ \context Staff < \context Voice=one\skip 1; diff --git a/input/bugs/volta.ly b/input/bugs/volta.ly index c7d9f933c7..fe545aa978 100644 --- a/input/bugs/volta.ly +++ b/input/bugs/volta.ly @@ -1,4 +1,6 @@ +% left start of broken volta bracket. + voice4 = \notes { \clef bass; \property Staff.instrument = "Bass" diff --git a/input/denneboom.ly b/input/denneboom.ly index 2600ab0ed0..2ec459d6b2 100644 --- a/input/denneboom.ly +++ b/input/denneboom.ly @@ -7,7 +7,7 @@ copyright = "public domain"; \include "paper20.ly" -\version "1.3.96"; +\version "1.3.110"; oden = \lyrics{ O | diff --git a/input/example-3.ly b/input/example-3.ly index 1819d76805..da97a74ea8 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; one = \notes\relative c{ c'' d e f diff --git a/input/just-friends.ly b/input/just-friends.ly index 8eef71faa1..359affb7ca 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.96"; +\version "1.3.110"; diff --git a/input/les-nereides.ly b/input/les-nereides.ly index 524e109a84..2a0ca45eaa 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -3,6 +3,8 @@ 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"; + \header{ composer = "ARTHUR GRAY"; title = "LES N\\'ER\\'EIDES"; @@ -46,16 +48,16 @@ global = \notes{ treble = \context Voice=treble \notes\relative c''{ % Broken? - \property Voice.NoteColumn \push #'horizontal-shift = #0 + \property Voice.NoteColumn \override #'horizontal-shift = #0 \outputproperty #(make-type-checker 'text-item-interface) #'extra-offset = #'(-6 . 2) %% *Style* = Large?? - \property Voice.TextScript \push #'style = #"Large" + \property Voice.TextScript \override #'style = #"Large" r2^"Allegretto scherzando" - \property Voice.TextScript \pop #'style + \property Voice.TextScript \revert #'style %2 - \property Voice.Stem \pop #'direction - \property Voice.Stem \push #'direction = #1 + \property Voice.Stem \revert #'direction + \property Voice.Stem \override #'direction = #1 r4 r2 %3 r4 r8. @@ -74,18 +76,18 @@ treble = \context Voice=treble \notes\relative c''{ \translator Staff=treble % Get back \context Voice - \property Voice.Slur \pop #'direction - \property Voice.Slur \push #'direction = #1 + \property Voice.Slur \revert #'direction + \property Voice.Slur \override #'direction = #1 \property PianoStaff.connectArpeggios = ##t - \property Voice.TextSpanner \pop #'type + \property Voice.TextSpanner \revert #'type %% Ghostview is ok, but xdvi shows a solid line - \property Voice.TextSpanner \push #'line-thickness = #2 - \property Voice.TextSpanner \push #'dash-period = #0.5 + \property Voice.TextSpanner \override #'line-thickness = #2 + \property Voice.TextSpanner \override #'dash-period = #0.5 - \property Voice.TextSpanner \push #'type = #"dotted-line" - \property Voice.TextSpanner \push #'edge-height = #'(0 . 1.5) - \property Voice.TextSpanner \push #'edge-text = #'("8 " . "") + \property Voice.TextSpanner \override #'type = #"dotted-line" + \property Voice.TextSpanner \override #'edge-height = #'(0 . 1.5) + \property Voice.TextSpanner \override #'edge-text = #'("8 " . "") % Huh, urg? Implicit \context Staff lifts us up to Staff context??? % no, see seq-mus-iter --hwn @@ -102,16 +104,16 @@ treble = \context Voice=treble \notes\relative c''{ #ifndef FAKE_GRACE - \property Voice.Stem \pop #'direction + \property Voice.Stem \revert #'direction % grace is a mess % maybe we should fake this and put 5/4 in this bar? \grace { )cis8 - \property Grace.Stem \pop #'direction - \property Grace.Stem \push #'direction = #0 - \property Grace.Beam \push #'space-function = #grace-beam-space-function + \property Grace.Stem \revert #'direction + \property Grace.Stem \override #'direction = #0 + \property Grace.Beam \override #'space-function = #grace-beam-space-function %% urg, dim. during grace dumps core here %% [a16-5( fis dis \spanrequest \stop "text" ] %% [cis'32 a-1 fis-4 dis] [cis a )fis-2] @@ -122,50 +124,50 @@ treble = \context Voice=treble \notes\relative c''{ #else % FAKE_GRACE - \property Score.PaperColumn \push #'space-factor = #0.6 - \property Score.PaperColumn \push #'to-musical-spacing-factor = #0.04 - \property Voice.NoteHead \push #'font-relative-size = #-1 - \property Voice.Stem \push #'font-relative-size = #-1 - \property Voice.Stem \push #'length = #6 - \property Voice.Stem \push #'beamed-lengths = + \property Score.PaperColumn \override #'space-factor = #0.6 + \property Score.PaperColumn \override #'to-musical-spacing-factor = #0.04 + \property Voice.NoteHead \override #'font-relative-size = #-1 + \property Voice.Stem \override #'font-relative-size = #-1 + \property Voice.Stem \override #'length = #6 + \property Voice.Stem \override #'beamed-lengths = #(map (lambda (x) (* 1.25 x)) '(0.0 2.5 2.0 1.5)) - \property Voice.Stem \push #'beamed-minimum-lengths = + \property Voice.Stem \override #'beamed-minimum-lengths = #(map (lambda (x) (* 1.25 x)) '(0.0 1.5 1.25 1.0)) - \property Voice.Beam \push #'font-relative-size = #-1 - \property Voice.TextScript \push #'font-relative-size = #-1 - \property Voice.Fingering \push #'font-relative-size = #-1 - \property Voice.Slur \push #'font-relative-size = #-1 - \property Staff.Accidentals \push #'font-relative-size = #-1 - \property Voice.Beam \push #'space-function = #grace-beam-space-function + \property Voice.Beam \override #'font-relative-size = #-1 + \property Voice.TextScript \override #'font-relative-size = #-1 + \property Voice.Fingering \override #'font-relative-size = #-1 + \property Voice.Slur \override #'font-relative-size = #-1 + \property Staff.Accidentals \override #'font-relative-size = #-1 + \property Voice.Beam \override #'space-function = #grace-beam-space-function )cis16 - \property Voice.Stem \pop #'direction - \property Voice.Stem \push #'direction = #0 + \property Voice.Stem \revert #'direction + \property Voice.Stem \override #'direction = #0 %% [a16^5( fis dis \spanrequest \stop "text" ] %% [cis'32 a-1 fis-4 dis] [cis a )fis-2] s s s [a16^5( fis dis \spanrequest \stop "text" ] \property Staff."c0-position" = #-6 [cis32 a^1 fis^4 dis] [cis a )fis-2] s % s s - \property Voice.NoteHead \pop #'font-relative-size - \property Voice.Stem \pop #'font-relative-size - \property Voice.Stem \pop #'length - \property Voice.Stem \pop #'beamed-lengths - \property Voice.Stem \pop #'beamed-minimum-lengths - \property Voice.Beam \pop #'font-relative-size - \property Voice.TextScript \pop #'font-relative-size - \property Voice.Fingering \pop #'font-relative-size - \property Voice.Slur \pop #'font-relative-size - \property Staff.Accidentals \pop #'font-relative-size - \property Voice.Beam \pop #'space-function - \property Score.PaperColumn \pop #'space-factor - \property Score.PaperColumn \pop #'to-musical-spacing-factor + \property Voice.NoteHead \revert #'font-relative-size + \property Voice.Stem \revert #'font-relative-size + \property Voice.Stem \revert #'length + \property Voice.Stem \revert #'beamed-lengths + \property Voice.Stem \revert #'beamed-minimum-lengths + \property Voice.Beam \revert #'font-relative-size + \property Voice.TextScript \revert #'font-relative-size + \property Voice.Fingering \revert #'font-relative-size + \property Voice.Slur \revert #'font-relative-size + \property Staff.Accidentals \revert #'font-relative-size + \property Voice.Beam \revert #'space-function + \property Score.PaperColumn \revert #'space-factor + \property Score.PaperColumn \revert #'to-musical-spacing-factor #endif % FAKE_GRACE - \property Voice.Stem \pop #'direction - \property Voice.Stem \push #'direction = #1 + \property Voice.Stem \revert #'direction + \property Voice.Stem \override #'direction = #1 cis'4()bis r8 )e^" "^1^4^5 r| @@ -173,38 +175,38 @@ treble = \context Voice=treble \notes\relative c''{ } trebleTwo = \context Voice=trebleTwo \notes\relative c''{ - \property Voice.NoteColumn \push #'horizontal-shift = #1 + \property Voice.NoteColumn \override #'horizontal-shift = #1 s2 s1*2 s4 - \property Voice.Stem \pop #'direction - \property Voice.Stem \push #'direction = #-1 + \property Voice.Stem \revert #'direction + \property Voice.Stem \override #'direction = #-1 #ifdef FAKE_GRACE s32*16 #endif - \property Voice.NoteColumn \push #'force-hshift = #-0.2 + \property Voice.NoteColumn \override #'force-hshift = #-0.2 % Hmm s/r? %r8 cis4. d4 s8 cis4. d4 - \property Voice.NoteColumn \pop #'force-hshift + \property Voice.NoteColumn \revert #'force-hshift [ | - \property Voice.NoteColumn \push #'force-hshift = #-0.2 + \property Voice.NoteColumn \override #'force-hshift = #-0.2 <)a-2 cis,-1>] cis4. d4 - \property Voice.NoteColumn \pop #'force-hshift + \property Voice.NoteColumn \revert #'force-hshift [ | <)a cis,>] } bass = \context Voice=bass \notes\relative c{ % Allow ugly slurs - \property Voice.Slur \push #'beautiful = #5.0 - \property Voice.Slur \push #'attachment-offset = #'((0 . -3) . (0 . -6)) - \property Voice.Stem \pop #'direction - \property Voice.Slur \push #'direction = #-1 + \property Voice.Slur \override #'beautiful = #5.0 + \property Voice.Slur \override #'attachment-offset = #'((0 . -3) . (0 . -6)) + \property Voice.Stem \revert #'direction + \property Voice.Slur \override #'direction = #-1 % huh, auto-beamer? r8. e,16-2( [ ] | %2 @@ -212,8 +214,8 @@ bass = \context Voice=bass \notes\relative c{ \translator Staff=treble % Get back \context Voice - \property Voice.Stem \pop #'direction - \property Voice.Stem \push #'direction = #-1 + \property Voice.Stem \revert #'direction + \property Voice.Stem \override #'direction = #-1 \property Voice.slurEndAttachment = #'stem <)a''4\arpeggio eis cis> %\stemboth @@ -222,39 +224,39 @@ bass = \context Voice=bass \notes\relative c{ \translator Staff=bass % Get back \context Voice - \property Voice.Stem \pop #'direction - \property Voice.Slur \pop #'y-free - \property Voice.Slur \push #'y-free = #0.1 - \property Voice.Slur \pop #'attachment-offset - \property Voice.Slur \push #'attachment-offset = #'((0 . -3) . (0 . -8)) + \property Voice.Stem \revert #'direction + \property Voice.Slur \revert #'y-free + \property Voice.Slur \override #'y-free = #0.1 + \property Voice.Slur \revert #'attachment-offset + \property Voice.Slur \override #'attachment-offset = #'((0 . -3) . (0 . -8)) r8. cis,,16( %3 - \property Voice.Stem \pop #'length - \property Voice.Stem \push #'length = #5 + \property Voice.Stem \revert #'length + \property Voice.Stem \override #'length = #5 % Huh, urg? Implicit \context Staff lifts us up to Staff context??? \translator Staff=treble % Get back \context Voice - \property Voice.Stem \pop #'length - \property Voice.Stem \pop #'direction - \property Voice.Stem \push #'direction = #-1 + \property Voice.Stem \revert #'length + \property Voice.Stem \revert #'direction + \property Voice.Stem \override #'direction = #-1 <)a'\arpeggio fis cis> % Huh, urg? Implicit \context Staff lifts us up to Staff context??? \translator Staff=bass % Get back \context Voice - \property Voice.Stem \pop #'direction + \property Voice.Stem \revert #'direction r2 %4 - \property Voice.Slur \pop #'beautiful - \property Voice.Slur \pop #'attachment-offset - \property Voice.Stem \pop #'direction - \property Voice.Stem \push #'direction = #-1 + \property Voice.Slur \revert #'beautiful + \property Voice.Slur \revert #'attachment-offset + \property Voice.Stem \revert #'direction + \property Voice.Stem \override #'direction = #-1 \clef treble; - \property Voice.Stem \pop #'direction - \property Voice.Stem \push #'direction = #0 + \property Voice.Stem \revert #'direction + \property Voice.Stem \override #'direction = #0 < %urg: staff-change: ! on dis @@ -268,39 +270,39 @@ bass = \context Voice=bass \notes\relative c{ \grace { } <)gis'2 e> #else s4 s8 s32 s s \clef bass; - \property Score.PaperColumn \push #'space-factor = #0.6 - \property Score.PaperColumn \push #'to-musical-spacing-factor = #0.1 - \property Voice.NoteHead \push #'font-relative-size = #-1 - \property Voice.Stem \push #'font-relative-size = #-1 - \property Voice.Stem \push #'length = #6 - \property Voice.Slur \push #'font-relative-size = #-1 - \property Voice.Slur \push #'attachment-offset = #'((-0.5 . 0) . (0.5 . 0)) + \property Score.PaperColumn \override #'space-factor = #0.6 + \property Score.PaperColumn \override #'to-musical-spacing-factor = #0.1 + \property Voice.NoteHead \override #'font-relative-size = #-1 + \property Voice.Stem \override #'font-relative-size = #-1 + \property Voice.Stem \override #'length = #6 + \property Voice.Slur \override #'font-relative-size = #-1 + \property Voice.Slur \override #'attachment-offset = #'((-0.5 . 0) . (0.5 . 0)) - \property Voice.NoteHead \pop #'font-relative-size - \property Voice.Stem \pop #'font-relative-size - \property Voice.Stem \pop #'length - \property Voice.Slur \pop #'font-relative-size - \property Score.PaperColumn \pop #'space-factor - \property Score.PaperColumn \pop #'to-musical-spacing-factor + \property Voice.NoteHead \revert #'font-relative-size + \property Voice.Stem \revert #'font-relative-size + \property Voice.Stem \revert #'length + \property Voice.Slur \revert #'font-relative-size + \property Score.PaperColumn \revert #'space-factor + \property Score.PaperColumn \revert #'to-musical-spacing-factor <)gis'2 e> - \property Voice.Slur \pop #'attachment-offset + \property Voice.Slur \revert #'attachment-offset #endif %5 - \property Voice.Slur \pop #'direction - \property Voice.Slur \push #'direction = #1 + \property Voice.Slur \revert #'direction + \property Voice.Slur \override #'direction = #1 a,8 [e'-5(<)a-2 cis-3>] r b,-5 - \property Voice.Slur \pop #'direction - \property Voice.Slur \push #'direction = #0 + \property Voice.Slur \revert #'direction + \property Voice.Slur \override #'direction = #0 [e,8-5(| %6 )a-2] - \property Voice.Slur \pop #'direction - \property Voice.Slur \push #'direction = #1 + \property Voice.Slur \revert #'direction + \property Voice.Slur \override #'direction = #1 [e'(<)a cis>] r b, - \property Voice.Slur \pop #'direction - \property Voice.Slur \push #'direction = #0 + \property Voice.Slur \revert #'direction + \property Voice.Slur \override #'direction = #0 [e,8(| %7 )a] @@ -315,10 +317,10 @@ bassTwo = \context Voice=bassTwo \notes\relative c{ \skip 32*16; #endif - \property Voice.Stem \pop #'direction - \property Voice.Stem \push #'direction = #1 - \property Voice.Slur \pop #'direction - \property Voice.Slur \push #'direction = #1 + \property Voice.Stem \revert #'direction + \property Voice.Stem \override #'direction = #1 + \property Voice.Slur \revert #'direction + \property Voice.Slur \override #'direction = #1 cis'4()bis } @@ -418,8 +420,8 @@ lowerDynamics = \context Dynamics=lower \notes{ magnification_italic = 1.; \translator { \ScoreContext - TimeSignature \push #'style = #"C" - SpacingSpanner \push #'maximum-duration-for-spacing = #(make-moment 1 4) + TimeSignature \override #'style = #"C" + SpacingSpanner \override #'maximum-duration-for-spacing = #(make-moment 1 4) \remove Bar_number_engraver; } @@ -430,7 +432,7 @@ lowerDynamics = \context Dynamics=lower \notes{ Generic_property_list = #generic-voice-properties \consists "Property_engraver"; DynamicsMinimumVerticalExtent = #(cons -3 -3) - VerticalAlignment \push #'threshold = #'(9 . 9) + VerticalAlignment \override #'threshold = #'(9 . 9) startSustain = #"Ped." stopSustain = #"*" @@ -443,8 +445,8 @@ lowerDynamics = \context Dynamics=lower \notes{ \consists "Dynamic_engraver"; \consists "Text_engraver"; %GURGURGU, text is initialised using TextScript - TextScript \push #'style = #"italic" - %%% TextScript \push #'font-relative-size = #2 + TextScript \override #'style = #"italic" + %%% TextScript \override #'font-relative-size = #2 \consists "Skip_req_swallow_translator"; @@ -454,11 +456,11 @@ lowerDynamics = \context Dynamics=lower \notes{ \translator { \PianoStaffContext \accepts Dynamics; - VerticalAlignment \push #'threshold = #'(7 . 7) + VerticalAlignment \override #'threshold = #'(7 . 7) } \translator { \GraceContext - Stem \push #'flag-style = #"" + Stem \override #'flag-style = #"" } } } diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly index 6fe81a6229..ddab22209a 100644 --- a/input/praeludium-fuga-E.ly +++ b/input/praeludium-fuga-E.ly @@ -22,7 +22,7 @@ * organ staff... %} -\version "1.3.96"; +\version "1.3.110"; diff --git a/input/rhythm.ly b/input/rhythm.ly index ded45e1890..8c970a2ffc 100644 --- a/input/rhythm.ly +++ b/input/rhythm.ly @@ -7,7 +7,7 @@ TestedFeatures = "multiple meters, beaming, unsynced bars, userdefd engravers"; -\version "1.3.96"; +\version "1.3.110"; ritme = \notes\transpose c'' { \time 4/4; diff --git a/input/scarlatti-paper.ly b/input/scarlatti-paper.ly index 1675adfd8c..f2be1756fc 100644 --- a/input/scarlatti-paper.ly +++ b/input/scarlatti-paper.ly @@ -1,3 +1,4 @@ +\version "1.3.110"; \paper{ %my standard paper block @@ -20,7 +21,7 @@ minVerticalAlign=8.4; } \translator{\StaffContext - TimeSignature \push #'style = #"C" + TimeSignature \override #'style = #"C" } \translator{\VoiceContext noStemExtend = ##t diff --git a/input/scarlatti-properties.ly b/input/scarlatti-properties.ly index 5584a54521..06fbb7a28e 100644 --- a/input/scarlatti-properties.ly +++ b/input/scarlatti-properties.ly @@ -1,19 +1,19 @@ -\version "1.3.96"; +\version "1.3.110"; -rh=\property Thread.NoteHead \push #'style = #'default -lh=\property Thread.NoteHead \push #'style = #'diamond +rh=\property Thread.NoteHead \override #'style = #'default +lh=\property Thread.NoteHead \override #'style = #'diamond -n = \property Thread.NoteHead \pop #'font-relative-size % = #'diamond %\property Thread.fontSize=#0 -sm=\property Thread.NoteHead \push #'font-relative-size = #-1 +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 % sd=\property Voice.verticalDirection=#-1 -su=\property Voice.Stem \push #'direction = #1 -sd=\property Voice.Stem \push #'direction = #-1 +su=\property Voice.Stem \override #'direction = #1 +sd=\property Voice.Stem \override #'direction = #-1 %{ @@ -22,11 +22,11 @@ sls=\property Voice.forceHorizontalShift=#-0.22 rs=\property Voice.forceHorizontalShift=#0.6 srs=\property Voice.forceHorizontalShift=#0.22 %} -zs = \property Voice.NoteColumn \pop #'force-hshift % #0.0 -ls = \property Voice.NoteColumn \push #'force-hshift = #-0.6 -sls= \property Voice.NoteColumn \push #'force-hshift = #-0.22 -rs = \property Voice.NoteColumn \push #'force-hshift = #0.6 -srs= \property Voice.NoteColumn \push #'force-hshift = #0.22 +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 +srs= \property Voice.NoteColumn \override #'force-hshift = #0.22 diff --git a/input/scarlatti-test.ly b/input/scarlatti-test.ly index 6c3f1b5ec0..b6f32ba6f0 100644 --- a/input/scarlatti-test.ly +++ b/input/scarlatti-test.ly @@ -1,4 +1,7 @@ %K000.ly LilyPond 1.2.16 + +\version "1.3.110" + \include "scarlatti-properties.ly" \include "scarlatti-paper.ly" %sonata-specific settings @@ -6,10 +9,10 @@ \translator{\VoiceContext %% huh? %%beamAutoBegin=0; - autoBeamSettings \push #'(end 1 8 * *) = #(make-moment 3 8) - autoBeamSettings \push #'(end 1 16 * *) = #(make-moment 3 8) - autoBeamSettings \push #'(end 1 24 * *) = #(make-moment 1 8) - autoBeamSettings \push #'(end 1 32 * *) = #(make-moment 1 8) + autoBeamSettings \override #'(end 1 8 * *) = #(make-moment 3 8) + autoBeamSettings \override #'(end 1 16 * *) = #(make-moment 3 8) + autoBeamSettings \override #'(end 1 24 * *) = #(make-moment 1 8) + autoBeamSettings \override #'(end 1 32 * *) = #(make-moment 1 8) } } diff --git a/input/star-spangled-banner.ly b/input/star-spangled-banner.ly index f3033e00f8..8af0d07ce2 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.96"; +\version "1.3.110"; % TODO: % diff --git a/input/test/ac-extra-voice.ly b/input/test/ac-extra-voice.ly index 3f0c131b11..4d6b67484d 100644 --- a/input/test/ac-extra-voice.ly +++ b/input/test/ac-extra-voice.ly @@ -1,3 +1,6 @@ + +\version "1.3.110"; + global = \notes { \key a \minor; \time 6/4; @@ -62,7 +65,7 @@ accompany = \notes \relative c{ slurVerticalDirection = #1 verticalDirection = -1 - autoBeamSettings \push (end * * * *) = #(make-moment 1 2) + autoBeamSettings \override (end * * * *) = #(make-moment 1 2) } } \midi { diff --git a/input/test/accidental-single-double.ly b/input/test/accidental-single-double.ly index a4769eea58..3da9842e72 100644 --- a/input/test/accidental-single-double.ly +++ b/input/test/accidental-single-double.ly @@ -1,4 +1,6 @@ +\version "1.3.110"; + thenotes = \notes \relative cis' { \time 4/4; gisis'4 gis gisis ges | @@ -14,7 +16,7 @@ gis g ges g | \score { < \context Staff \thenotes \context NoteNames { - \property NoteNames.basicNoteNameProperties \push #'no-spacing-rods = ##f + \property NoteNames.basicNoteNameProperties \override #'no-spacing-rods = ##f \thenotes } > diff --git a/input/test/american-chords.ly b/input/test/american-chords.ly index 760ab2ab7d..7b92cc0693 100644 --- a/input/test/american-chords.ly +++ b/input/test/american-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.98" +\version "1.3.110" %{ See scm/chord-names.scm: chord::names-alist-american James Hammons @@ -14,7 +14,7 @@ chord::names-alist-american)) chord = \notes\transpose c''\chords{ - \property ChordNames.ChordNames \push #'style = #"american" + \property ChordNames.ChordNames \override #'style = #"american" c % Major triad cs:m % Minor triad df:m5- % Diminished triad @@ -50,7 +50,7 @@ c:m7.9 % Minor ninth { \translator { \ChordNamesContext - ChordNames \push #'word-space = #1 + ChordNames \override #'word-space = #1 } } } diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly index f71d198e5a..4d80891c38 100644 --- a/input/test/ancient-font.ly +++ b/input/test/ancient-font.ly @@ -3,13 +3,13 @@ date = "2000"; } -\version "1.3.59"; +\version "1.3.110"; \include "paper26.ly" global = \notes { \property Score.timing = 1 - \property Staff.TimeSignature \push #'style = #"old" + \property Staff.TimeSignature \override #'style = #"old" \time 2/2; } @@ -17,7 +17,7 @@ upperVoice = \context Staff = upperVoice < \global \property Staff.numberOfStaffLines = 4 \notes \transpose c' { - \property Staff.Custos \push #'style = #'"vaticana" + \property Staff.Custos \override #'style = #'"vaticana" \clef "vaticana_fa2"; c1 d e f g \clef "vaticana_do2"; @@ -26,7 +26,7 @@ upperVoice = \context Staff = upperVoice < \clef "vaticana_fa1"; e d c\breve \bar "|"; - \property Staff.Custos \push #'style = #"medicaea" + \property Staff.Custos \override #'style = #"medicaea" \clef "medicaea_fa2"; c1 d e f g \clef "medicaea_do2"; @@ -35,7 +35,7 @@ upperVoice = \context Staff = upperVoice < \clef "medicaea_fa1"; e d c\breve \bar "|"; - \property Staff.Custos \push #'style = #'"hufnagel" + \property Staff.Custos \override #'style = #'"hufnagel" \clef "hufnagel_fa2"; c1 d e f g \clef "hufnagel_do2"; @@ -50,7 +50,7 @@ lowerVoice = \context Staff = lowerNotes < \global \property Staff.numberOfStaffLines = 5 \notes \transpose c'' { - \property Staff.Custos \push #'style = #'"mensural" + \property Staff.Custos \override #'style = #'"mensural" \clef "mensural1_c2"; c1 d e f g \clef "mensural1_c2"; diff --git a/input/test/arpeggio.ly b/input/test/arpeggio.ly index d2122aa777..f901b1a00f 100644 --- a/input/test/arpeggio.ly +++ b/input/test/arpeggio.ly @@ -1,8 +1,11 @@ + +\version "1.3.110"; + \score{ \context PianoStaff < \context Staff=one \notes\relative c''{ \context Voice < fis,-\arpeggio d a > - %%\property PianoStaff.SpanArpeggio \push #'connect = ##t + %%\property PianoStaff.SpanArpeggio \override #'connect = ##t \property PianoStaff.connectArpeggios = ##t } diff --git a/input/test/auto-beam-4-8.ly b/input/test/auto-beam-4-8.ly index 24a32da104..ced2d67f35 100644 --- a/input/test/auto-beam-4-8.ly +++ b/input/test/auto-beam-4-8.ly @@ -1,3 +1,6 @@ + +\version "1.3.110"; + \score{ \notes\relative c''{ \time 4/8; @@ -18,7 +21,7 @@ x| x| x| x| x| %} %\property Voice.beamAutoEnd = #(make-moment 2 4) - \property Voice.autoBeamSettings \push #'(end * * * *) = #(make-moment 2 4) + \property Voice.autoBeamSettings \override #'(end * * * *) = #(make-moment 2 4) c8 c c c16 c } diff --git a/input/test/auto-beam-override.ly b/input/test/auto-beam-override.ly index 42da5010cf..623a91a351 100644 --- a/input/test/auto-beam-override.ly +++ b/input/test/auto-beam-override.ly @@ -1,3 +1,6 @@ + +\version "1.3.110"; + %{ Currently (1.1.27.jcn3), the auto-beam engraver will only engrave sensible beams, which means that it will end a beam when: @@ -17,7 +20,7 @@ c8 c c c c16 c c c c c c c % from here on consider ending beam every 1/4 note - \property Voice.autoBeamSettings \push #'(end * * * *) = #(make-moment 1 4) + \property Voice.autoBeamSettings \override #'(end * * * *) = #(make-moment 1 4) c8 c c c % manually override autobeam with weird beaming c8 [c c] c @@ -32,7 +35,7 @@ \translator{ \VoiceContext % consider ending beam at every 1/2 note - autoBeamSettings \push #'(end * * * *) = #(make-moment 1 2) + autoBeamSettings \override #'(end * * * *) = #(make-moment 1 2) } } } diff --git a/input/test/auto-isknee.ly b/input/test/auto-isknee.ly index ea22d212a7..03166e1238 100644 --- a/input/test/auto-isknee.ly +++ b/input/test/auto-isknee.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; \score { \notes \context PianoStaff < \context Staff = "up" { diff --git a/input/test/bagpipe.ly b/input/test/bagpipe.ly index 04a13098be..7046af01dd 100644 --- a/input/test/bagpipe.ly +++ b/input/test/bagpipe.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; % bagpipe music. \header @@ -12,20 +12,20 @@ \translator { \GraceContext - NoteHead \push #'font-relative-size = #-2 - NoteHead \push #'font-relative-size = #-2 - Stem \push #'flag-style = ##f + NoteHead \override #'font-relative-size = #-2 + NoteHead \override #'font-relative-size = #-2 + Stem \override #'flag-style = ##f % The following determines the length of stems without beams % default is between 2.8 and 4.0 depending on the number of flags - Stem \push #'length = #6 - Stem \push #'font-relative-size = #-2 - GraceAlignItem \push #'horizontal-space = #1 - Stem \push #'flag-style = #"" + Stem \override #'length = #6 + Stem \override #'font-relative-size = #-2 + GraceAlignItem \override #'horizontal-space = #1 + Stem \override #'flag-style = #"" } \translator { \StaffContext - TimeSignature \push #'style = #"C4/4" - TimeSignature \push #'visibility-function = #begin-of-line-visible + TimeSignature \override #'style = #"C4/4" + TimeSignature \override #'visibility-function = #begin-of-line-visible } } diff --git a/input/test/banter-chords.ly b/input/test/banter-chords.ly index f1f0284d9f..b3c1231a27 100644 --- a/input/test/banter-chords.ly +++ b/input/test/banter-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; \header{ enteredby = "jcn"; diff --git a/input/test/bar-scripts.ly b/input/test/bar-scripts.ly index 2ab1966e14..8a4788a684 100644 --- a/input/test/bar-scripts.ly +++ b/input/test/bar-scripts.ly @@ -1,5 +1,5 @@ -\version "1.3.96"; +\version "1.3.110"; onestaff = \context Staff = foo\notes { \property Staff.instr = instr diff --git a/input/test/beam-abbrev.ly b/input/test/beam-abbrev.ly index 3d64f71efa..45a4b196cc 100644 --- a/input/test/beam-abbrev.ly +++ b/input/test/beam-abbrev.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; \score { \context Voice \notes\relative c { c'1:16 diff --git a/input/test/beam-chord.ly b/input/test/beam-chord.ly index 447c03554e..f639ee0e80 100644 --- a/input/test/beam-chord.ly +++ b/input/test/beam-chord.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; \score{ \notes\transpose c'{ diff --git a/input/test/beam-cross-staff.ly b/input/test/beam-cross-staff.ly index 7ba56ff437..92e9c7eb2e 100644 --- a/input/test/beam-cross-staff.ly +++ b/input/test/beam-cross-staff.ly @@ -22,4 +22,4 @@ > } -\version "1.3.96"; +\version "1.3.110"; diff --git a/input/test/beam-damp.ly b/input/test/beam-damp.ly index b4d50f4560..592f32780b 100644 --- a/input/test/beam-damp.ly +++ b/input/test/beam-damp.ly @@ -17,4 +17,4 @@ linewidth=-1.; } } -\version "1.3.96"; +\version "1.3.110"; diff --git a/input/test/beam-extreme.ly b/input/test/beam-extreme.ly index d538b2318d..83a9d5dfcb 100644 --- a/input/test/beam-extreme.ly +++ b/input/test/beam-extreme.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; \score{ \notes\relative c''{ [g8 c c,] diff --git a/input/test/beam-isknee.ly b/input/test/beam-isknee.ly index 376bb4b369..9462610d40 100644 --- a/input/test/beam-isknee.ly +++ b/input/test/beam-isknee.ly @@ -16,4 +16,4 @@ } } -\version "1.3.96"; +\version "1.3.110"; diff --git a/input/test/beam-position.ly b/input/test/beam-position.ly index a8f63a9de2..1599857298 100644 --- a/input/test/beam-position.ly +++ b/input/test/beam-position.ly @@ -1,7 +1,10 @@ + +\version "1.3.110"; + \score { \context Voice \notes\relative c { [f8 f] [f64 f] \grace { [f8 e8] } - \property Grace.Stem \push #'no-stem-extend = ##t + \property Grace.Stem \override #'no-stem-extend = ##t [f8 f] } diff --git a/input/test/beam-suspect.ly b/input/test/beam-suspect.ly index 46fc2afd7f..4e39bedc79 100644 --- a/input/test/beam-suspect.ly +++ b/input/test/beam-suspect.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; \score{ \notes\relative c'{ \stemUp diff --git a/input/test/beam-trend.ly b/input/test/beam-trend.ly index 7182e5c82d..4b40297710 100644 --- a/input/test/beam-trend.ly +++ b/input/test/beam-trend.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; \score{ \notes\relative c'{ \stemUp diff --git a/input/test/beams.ly b/input/test/beams.ly index 018bd4c032..e3b6b70b18 100644 --- a/input/test/beams.ly +++ b/input/test/beams.ly @@ -6,7 +6,7 @@ copyright = "PD"; TestedFeatures = "beams and beamflags"; } -\version "1.3.96"; +\version "1.3.110"; \score{ < diff --git a/input/test/breathing-sign.ly b/input/test/breathing-sign.ly index 634ee257f2..04e028c163 100644 --- a/input/test/breathing-sign.ly +++ b/input/test/breathing-sign.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; \score { \notes \relative c' { diff --git a/input/test/broken.ly b/input/test/broken.ly index ed1f191cbd..a8e45c9c48 100644 --- a/input/test/broken.ly +++ b/input/test/broken.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests Feta embedded slurs" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.96"; +\version "1.3.110"; shortlong = \notes{ c4()c( c c | diff --git a/input/test/chord-inversion.ly b/input/test/chord-inversion.ly index 5d717e02f9..eaf0acae1d 100644 --- a/input/test/chord-inversion.ly +++ b/input/test/chord-inversion.ly @@ -20,4 +20,4 @@ inversions = \notes\transpose c''\chords{ > } -\version "1.3.96"; +\version "1.3.110"; diff --git a/input/test/chord-names.ly b/input/test/chord-names.ly index 1d029981a8..e370654616 100644 --- a/input/test/chord-names.ly +++ b/input/test/chord-names.ly @@ -1,4 +1,4 @@ -\version "1.3.96" +\version "1.3.110" chord = \notes\transpose c''\chords{ c1 c:m @@ -23,7 +23,7 @@ chord = \notes\transpose c''\chords{ \translator { \ChordNamesContext - ChordName \push #'word-space = #1 + ChordNames \override #'word-space = #1 } } } diff --git a/input/test/chord-table.ly b/input/test/chord-table.ly index 3ec0e0ec1a..86018685ee 100644 --- a/input/test/chord-table.ly +++ b/input/test/chord-table.ly @@ -41,4 +41,4 @@ tab = \notes\transpose c'''\chords{ } -\version "1.3.96"; +\version "1.3.110"; diff --git a/input/test/chords.ly b/input/test/chords.ly index fae83c6f55..e4e74a60df 100644 --- a/input/test/chords.ly +++ b/input/test/chords.ly @@ -1,4 +1,4 @@ -\version "1.3.97"; +\version "1.3.110"; %{ Would this be acceptable/good enough/convenient for entry? @@ -62,7 +62,7 @@ keys = \notes{ \paper{ \translator { \ChordNamesContext - ChordName \push #'word-space = #1 + ChordName \override #'word-space = #1 } } } diff --git a/input/test/clefs.ly b/input/test/clefs.ly index 6ede9ce6cc..a2a077adc3 100644 --- a/input/test/clefs.ly +++ b/input/test/clefs.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; \score { \notes{ diff --git a/input/test/collision-merge-dotted.ly b/input/test/collision-merge-dotted.ly index 21bec97b81..c66912867a 100644 --- a/input/test/collision-merge-dotted.ly +++ b/input/test/collision-merge-dotted.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; \score { \context Voice \notes\relative c { diff --git a/input/test/collisions.ly b/input/test/collisions.ly index e2c3ce45f1..f0c959a588 100644 --- a/input/test/collisions.ly +++ b/input/test/collisions.ly @@ -5,7 +5,7 @@ enteredby = "HWN,JCN"; copyright = "public domain"; Tested = "test the Collision resolution "; } -\version "1.3.96"; +\version "1.3.110"; twovoice = \context Staff \notes < \context Voice=i { \stemDown c4 d e f g2~ g4 a [c8 d e f] c2| } @@ -20,7 +20,7 @@ twovoicesteminvert = \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 \push #'horizontal-shift = #1 + \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 } > @@ -36,19 +36,19 @@ chordstest = \context Staff \notes < hairyChord = \context Staff \notes\relative c' < \context Voice=one { - \property Voice.NoteColumn \push #'horizontal-shift = #0 + \property Voice.NoteColumn \override #'horizontal-shift = #0 \stemUp e4 } \context Voice=two { \stemUp - \property Voice.NoteColumn \push #'horizontal-shift = #1 + \property Voice.NoteColumn \override #'horizontal-shift = #1 cis } \context Voice=three { - \property Voice.NoteColumn \push #'horizontal-shift = #2 + \property Voice.NoteColumn \override #'horizontal-shift = #2 \stemUp ais @@ -56,7 +56,7 @@ hairyChord = \context Staff \notes\relative c' < \context Voice=four { \stemDown - \property Voice.NoteColumn \push #'horizontal-shift = #1 + \property Voice.NoteColumn \override #'horizontal-shift = #1 fis } diff --git a/input/test/cue-notes.ly b/input/test/cue-notes.ly index 876c5b9307..4b15b05096 100644 --- a/input/test/cue-notes.ly +++ b/input/test/cue-notes.ly @@ -1,15 +1,18 @@ +\version "1.3.110"; + + % add cue notes context \paper { CueVoiceContext = \translator { \VoiceContext \name CueVoice; - basicNoteHeadProperties \push #'font-relative-size = #-1 - basicStemProperties \push #'font-relative-size = #-1 - basicBeamProperties \push #'font-relative-size = #-1 - basicTextScriptProperties \push #'font-relative-size = #-1 - basicSlurProperties \push #'font-relative-size = #-1 - basicLocalKeyProperties \push #'font-relative-size = #-1 + basicNoteHeadProperties \override #'font-relative-size = #-1 + basicStemProperties \override #'font-relative-size = #-1 + basicBeamProperties \override #'font-relative-size = #-1 + basicTextScriptProperties \override #'font-relative-size = #-1 + basicSlurProperties \override #'font-relative-size = #-1 + basicLocalKeyProperties \override #'font-relative-size = #-1 }; \translator{ \CueVoiceContext } StaffContext = \translator{\StaffContext diff --git a/input/test/defaultbars.ly b/input/test/defaultbars.ly index 4eaee53619..12ebddb184 100644 --- a/input/test/defaultbars.ly +++ b/input/test/defaultbars.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; \score { diff --git a/input/test/dots.ly b/input/test/dots.ly index b21cd00eee..7b860cfdb6 100644 --- a/input/test/dots.ly +++ b/input/test/dots.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; \score { \context Voice \notes\relative c'' { \time 6/8; diff --git a/input/test/drarn-chords.ly b/input/test/drarn-chords.ly index 875761201a..c4fcddf5f5 100644 --- a/input/test/drarn-chords.ly +++ b/input/test/drarn-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; %{ Would this be acceptable/good enough/convenient for entry? diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly index 25580ed50b..772550d4d8 100644 --- a/input/test/extra-staff.ly +++ b/input/test/extra-staff.ly @@ -42,4 +42,4 @@ extra-staff.ly: } -\version "1.3.96"; +\version "1.3.110"; diff --git a/input/test/font-body.ly b/input/test/font-body.ly index f1643d5438..8cbcb567a5 100644 --- a/input/test/font-body.ly +++ b/input/test/font-body.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; FontBody= \notes\transpose c''{ \bar "|:"; diff --git a/input/test/font.ly b/input/test/font.ly index 32ed3fbaab..4eb59647ae 100644 --- a/input/test/font.ly +++ b/input/test/font.ly @@ -7,7 +7,7 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.96"; +\version "1.3.110"; \include "font-body.ly" \score{ diff --git a/input/test/font16.ly b/input/test/font16.ly index 1126c75eea..90b3617946 100644 --- a/input/test/font16.ly +++ b/input/test/font16.ly @@ -7,7 +7,7 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.96"; +\version "1.3.110"; \include "paper16.ly" \include "font-body.ly" diff --git a/input/test/font20.ly b/input/test/font20.ly index 04b49aa649..8bddc78cb2 100644 --- a/input/test/font20.ly +++ b/input/test/font20.ly @@ -17,5 +17,5 @@ TestedFeatures = gourlay_maxmeasures =5.; } } -\version "1.3.96"; +\version "1.3.110"; diff --git a/input/test/force-hshift.ly b/input/test/force-hshift.ly index 715e9d580c..09ca1434ae 100644 --- a/input/test/force-hshift.ly +++ b/input/test/force-hshift.ly @@ -1,18 +1,18 @@ -\version "1.3.96"; +\version "1.3.110"; \score { \context Voice \notes\relative c { \context Staff < \context Voice = VA { - \property Voice.NoteColumn \push #'forced-hshift = #0.1 + \property Voice.NoteColumn \override #'forced-hshift = #0.1 \stemUp - \property Voice.NoteColumn \push #'horizontal-shift = #1 + \property Voice.NoteColumn \override #'horizontal-shift = #1 } \context Voice = VB { \stemDown - \property Voice.NoteColumn \push #'horizontal-shift = #1 - \property Voice.NoteColumn \push #'forced-hshift = #-0.1 + \property Voice.NoteColumn \override #'horizontal-shift = #1 + \property Voice.NoteColumn \override #'forced-hshift = #-0.1 } > diff --git a/input/test/generic-property-override.ly b/input/test/generic-property-override.ly index c6b503c983..779cd99fce 100644 --- a/input/test/generic-property-override.ly +++ b/input/test/generic-property-override.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; \score { \notes \relative c'' \context Voice { diff --git a/input/test/gmsusd.ly b/input/test/gmsusd.ly index 71b5dd5042..b02d412a34 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.96"; +\version "1.3.110"; gmsus=\notes\relative c \chords{ g1 diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly index 53f5258c61..d253a62eb9 100644 --- a/input/test/gourlay.ly +++ b/input/test/gourlay.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; %{ diff --git a/input/test/hara-kiri-short.ly b/input/test/hara-kiri-short.ly index 3566b27fa0..5b977d5546 100644 --- a/input/test/hara-kiri-short.ly +++ b/input/test/hara-kiri-short.ly @@ -1,5 +1,5 @@ -\version "1.3.96"; +\version "1.3.110"; zager = \context Staff = zager \notes \relative c'' { \clef treble; c1 diff --git a/input/test/hara-kiri-switch.ly b/input/test/hara-kiri-switch.ly index f0219b663c..feef668c61 100644 --- a/input/test/hara-kiri-switch.ly +++ b/input/test/hara-kiri-switch.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; voiceOne = \notes \relative c'' { a1 a a diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly index 918b085f27..c1956b1b80 100644 --- a/input/test/hara-kiri.ly +++ b/input/test/hara-kiri.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; toeter_i = \notes\relative c <{ \property Staff.instrument = #"Toeters" diff --git a/input/test/hshift.ly b/input/test/hshift.ly index b9b011e87c..ff7e6df5ad 100644 --- a/input/test/hshift.ly +++ b/input/test/hshift.ly @@ -1,9 +1,12 @@ -shiftI \property Voice.NoteColumn \push #'horizontal-shift = #0 -shiftII \property Voice.NoteColumn \push #'horizontal-shift = #1 -shiftIII \property Voice.NoteColumn \push #'horizontal-shift = #2 -shiftIV \property Voice.NoteColumn \push #'horizontal-shift = #3 -shiftV \property Voice.NoteColumn \push #'horizontal-shift = #4 +\version "1.3.110"; + + +shiftI \property Voice.NoteColumn \override #'horizontal-shift = #0 +shiftII \property Voice.NoteColumn \override #'horizontal-shift = #1 +shiftIII \property Voice.NoteColumn \override #'horizontal-shift = #2 +shiftIV \property Voice.NoteColumn \override #'horizontal-shift = #3 +shiftV \property Voice.NoteColumn \override #'horizontal-shift = #4 \score { \context Voice \notes\relative c { diff --git a/input/test/incipit.ly b/input/test/incipit.ly index 9cfe6f60e2..cfb8e036bf 100644 --- a/input/test/incipit.ly +++ b/input/test/incipit.ly @@ -6,7 +6,7 @@ /Mats B %} -\version "1.3.96"; +\version "1.3.110"; incipit = \notes\relative c'{ diff --git a/input/test/instrument-name-grandstaff.ly b/input/test/instrument-name-grandstaff.ly index 4e4017467e..f90c721673 100644 --- a/input/test/instrument-name-grandstaff.ly +++ b/input/test/instrument-name-grandstaff.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; \score { \notes diff --git a/input/test/instrument-name-mmrest.ly b/input/test/instrument-name-mmrest.ly index 9393f346eb..130b8fff77 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.97"; +\version "1.3.110"; \score{ \context Staff < \property Staff.instrument = "instrument" diff --git a/input/test/instrument-name.ly b/input/test/instrument-name.ly index b9df662586..7525a7459c 100644 --- a/input/test/instrument-name.ly +++ b/input/test/instrument-name.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; \score { diff --git a/input/test/jazz-chords.ly b/input/test/jazz-chords.ly index 90f1c26eea..6387510fe2 100644 --- a/input/test/jazz-chords.ly +++ b/input/test/jazz-chords.ly @@ -1,3 +1,6 @@ + +\version "1.3.110"; + %% This should only be necessary if your kpathsea setup is broken % % Make sure the correct msamxx.tfm is where lily can find it @@ -9,7 +12,7 @@ % chord = \notes\transpose c''\chords{ -\property ChordNames.ChordNames \push #'style = #"jazz" +\property ChordNames.ChordNames \override #'style = #"jazz" % major chords c c:6 % 6 = major triad with added sixth @@ -58,7 +61,7 @@ c:m5-.7- % o = diminished seventh chord > \paper { - \translator { \ChordNamesContext ChordNames \push #'word-space = #1 } + \translator { \ChordNamesContext ChordNames \override #'word-space = #1 } % \translator { \LyricsContext textScriptWordSpace = #0.3 } } } diff --git a/input/test/keys.ly b/input/test/keys.ly index c4809ee7e5..20dc2b6922 100644 --- a/input/test/keys.ly +++ b/input/test/keys.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; \score { \notes \relative c'' diff --git a/input/test/keys2.ly b/input/test/keys2.ly index 5c161a0641..4c52794c83 100644 --- a/input/test/keys2.ly +++ b/input/test/keys2.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; blah = \notes { diff --git a/input/test/knee-mult.ly b/input/test/knee-mult.ly index c1116065af..5b7e7278c9 100644 --- a/input/test/knee-mult.ly +++ b/input/test/knee-mult.ly @@ -16,4 +16,4 @@ } } -\version "1.3.96"; +\version "1.3.110"; diff --git a/input/test/knee.ly b/input/test/knee.ly index 2c61a32858..c06f5ff95c 100644 --- a/input/test/knee.ly +++ b/input/test/knee.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; \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 85ac0efab4..85f594a020 100644 --- a/input/test/lyric-combine.ly +++ b/input/test/lyric-combine.ly @@ -7,7 +7,7 @@ enteredby = "HWN, chords by Johan Vromans"; copyright = "public domain"; } -\version "1.3.96"; +\version "1.3.110"; m =\notes \relative c'' { \property Staff.automaticMelismata = ##t diff --git a/input/test/lyric-extender.ly b/input/test/lyric-extender.ly index a238fbd742..7705dcf86e 100644 --- a/input/test/lyric-extender.ly +++ b/input/test/lyric-extender.ly @@ -5,4 +5,4 @@ > } -\version "1.3.96"; +\version "1.3.110"; diff --git a/input/test/lyric-hyphen.ly b/input/test/lyric-hyphen.ly index 4efb6251f4..96312fdb61 100644 --- a/input/test/lyric-hyphen.ly +++ b/input/test/lyric-hyphen.ly @@ -5,7 +5,7 @@ > } -\version "1.3.96"; +\version "1.3.110"; diff --git a/input/test/lyric-phrasing.ly b/input/test/lyric-phrasing.ly index 8c790f35fd..eece431c4e 100644 --- a/input/test/lyric-phrasing.ly +++ b/input/test/lyric-phrasing.ly @@ -7,7 +7,7 @@ enteredby = "HWN, chords by Johan Vromans"; copyright = "public domain"; } -\version "1.3.96"; +\version "1.3.110"; m =\notes \relative c'' { \property Staff.automaticMelismata = ##t diff --git a/input/test/lyrics-multi-stanza.ly b/input/test/lyrics-multi-stanza.ly index dba9d1e56a..56a7be277a 100644 --- a/input/test/lyrics-multi-stanza.ly +++ b/input/test/lyrics-multi-stanza.ly @@ -3,7 +3,7 @@ % * Stanza_number_engraver % * Automatic melismata on beamed notes -\version "1.3.96"; +\version "1.3.110"; \include "english.ly" \header{ @@ -16,7 +16,7 @@ allup = \notes{ \stemUp \slurUp \tieUp - \property Voice.DynamicLineSpanner \push #'direction = #1 + \property Voice.DynamicLineSpanner \override #'direction = #1 \autoBeamOff } @@ -24,7 +24,7 @@ alldown = \notes{ \stemDown \slurDown \tieDown - \property Voice.DynamicLineSpanner \push #'direction = #-1 + \property Voice.DynamicLineSpanner \override #'direction = #-1 \autoBeamOff } diff --git a/input/test/lyrics.ly b/input/test/lyrics.ly index 72a2f9a8b6..a832c087c6 100644 --- a/input/test/lyrics.ly +++ b/input/test/lyrics.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; $somewhat_long = \lyrics{ \property Lyrics . textStyle = "roman" diff --git a/input/test/manual-clef.ly b/input/test/manual-clef.ly index f6b08e02d6..17d1d84c6a 100644 --- a/input/test/manual-clef.ly +++ b/input/test/manual-clef.ly @@ -1,4 +1,4 @@ -\version "1.3.105"; +\version "1.3.110"; %{ diff --git a/input/test/mark.ly b/input/test/mark.ly index f48ceba0ff..942e728efa 100644 --- a/input/test/mark.ly +++ b/input/test/mark.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; global = \notes { s1 | \mark "A"; diff --git a/input/test/markup.ly b/input/test/markup.ly index f64a558d4e..d6d882f88d 100644 --- a/input/test/markup.ly +++ b/input/test/markup.ly @@ -1,3 +1,6 @@ + +\version "1.3.110"; + % % Test new font selection and scm text markup % @@ -20,10 +23,10 @@ linewidth = -1.\mm; \translator{ \ScoreContext - TextScript \push #'font-family = #'roman - TextScript \push #'font-shape = #'upright - TextScript \pop #'no-spacing-rods - TextScript \push #'direction = #1 + TextScript \override #'font-family = #'roman + TextScript \override #'font-shape = #'upright + TextScript \revert #'no-spacing-rods + TextScript \override #'direction = #1 } } } diff --git a/input/test/memory.ly b/input/test/memory.ly index 00c039596a..71d3b4f44d 100644 --- a/input/test/memory.ly +++ b/input/test/memory.ly @@ -11,5 +11,5 @@ bla = \notes { > \paper { Gourlay_maxmeaures = 2.; } } -\version "1.3.96"; +\version "1.3.110"; diff --git a/input/test/multi-measure-rest.ly b/input/test/multi-measure-rest.ly index def26a27f3..3fa5193fe1 100644 --- a/input/test/multi-measure-rest.ly +++ b/input/test/multi-measure-rest.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; \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 88e11166bf..914bdc8ca1 100644 --- a/input/test/multi-rest.ly +++ b/input/test/multi-rest.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; voice_one = \notes\transpose c''{ \stemUp R1 * 2 | f'4-. r r2 | R1 * 3 | diff --git a/input/test/non-empty-text.ly b/input/test/non-empty-text.ly index 51b38a8bc6..a9227e3a67 100644 --- a/input/test/non-empty-text.ly +++ b/input/test/non-empty-text.ly @@ -1,12 +1,10 @@ -\version "1.3.96"; - -\score{ - \notes\relative c''{ - \context Staff \property Staff.TextScript \pop #'no-spacing-rods - \context Staff \property Staff.TextScript \push #'no-spacing-rods = ##f - c4_"longlonglonglonglonglong" c4_"text" - } - \paper{ - linewidth=-80.\mm; - } + +\score { \notes { +\property Voice.TextScript \override #'no-spacing-rods = ##f +c4_"very wide and long text" c4 +} + +\paper { + linewidth = -1.0; + } } diff --git a/input/test/noteheadstyle.ly b/input/test/noteheadstyle.ly index 0db7a577c9..bd313628ce 100644 --- a/input/test/noteheadstyle.ly +++ b/input/test/noteheadstyle.ly @@ -1,42 +1,45 @@ +\version "1.3.110"; + + \score { \notes \relative c{ % anyone wanna pop? c''4 c2 c8 c16 c16 c1 c\breve -\property Voice.NoteHead \push #'style = #'diamond +\property Voice.NoteHead \override #'style = #'diamond c4 c2 c8 c16 c16 c1 c\breve -\property Voice.NoteHead \push #'style = #'transparent +\property Voice.NoteHead \override #'style = #'transparent c4 c2 c8 c16 c16 c1 c\breve -\property Voice.NoteHead \push #'style = #'cross +\property Voice.NoteHead \override #'style = #'cross c4 c2 c8 c16 c16 c1 c\breve -\property Voice.NoteHead \push #'style = #'mensural +\property Voice.NoteHead \override #'style = #'mensural c4 c2 c8 c16 c16 c1 c\breve c\longa -\property Voice.NoteHead \push #'style = #'harmonic +\property Voice.NoteHead \override #'style = #'harmonic c4 c2 c8 c16 c16 c1 c\breve -\property Voice.NoteHead \push #'style = #'baroque +\property Voice.NoteHead \override #'style = #'baroque c4 c2 c8 c16 c16 c1 c\breve c\longa \context Voice < \context Thread = TA { - \property Thread.NoteHead \push #'style = #'cross - \property Voice.Stem \push #'direction = #1 + \property Thread.NoteHead \override #'style = #'cross + \property Voice.Stem \override #'direction = #1 c16 } \context Thread = TB - { \property Thread.NoteHead \push #'style = #'default a16 } + { \property Thread.NoteHead \override #'style = #'default a16 } \context Thread = TC - { \property Thread.NoteHead \push #'style = #'mensural d16 } + { \property Thread.NoteHead \override #'style = #'mensural d16 } > \context Voice <\context Thread = TA { - \property Thread.NoteHead \push #'style = #'default + \property Thread.NoteHead \override #'style = #'default c4 c4 } \context Thread = TB { - \property Thread.NoteHead \push #'style = #'mensural + \property Thread.NoteHead \override #'style = #'mensural c'4 \stemDown c } > diff --git a/input/test/notemode-chords.ly b/input/test/notemode-chords.ly index 9290c19b05..9ea9107d0a 100644 --- a/input/test/notemode-chords.ly +++ b/input/test/notemode-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; \score{ \notes \transpose c''{ diff --git a/input/test/orchestscore.ly b/input/test/orchestscore.ly index b2d32460c9..ac6a55e45d 100644 --- a/input/test/orchestscore.ly +++ b/input/test/orchestscore.ly @@ -1,4 +1,4 @@ -\version "1.3.102"; +\version "1.3.110"; m = \notes \relative c''{ diff --git a/input/test/ossia.ly b/input/test/ossia.ly index 6de5602752..c63b4c4d82 100644 --- a/input/test/ossia.ly +++ b/input/test/ossia.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; \score { diff --git a/input/test/ottava.ly b/input/test/ottava.ly index 916943f742..21aaeb4aad 100644 --- a/input/test/ottava.ly +++ b/input/test/ottava.ly @@ -1,9 +1,12 @@ + +\version "1.3.110"; + \score{ \notes\relative c'''{ - \property Voice.TextSpanner \pop #'type - \property Voice.TextSpanner \push #'type = #"dotted-line" - \property Voice.TextSpanner \push #'edge-height = #'(0 . 1.5) - \property Voice.TextSpanner \push #'edge-text = #'("8va " . "") + \property Voice.TextSpanner \revert #'type + \property Voice.TextSpanner \override #'type = #"dotted-line" + \property Voice.TextSpanner \override #'edge-height = #'(0 . 1.5) + \property Voice.TextSpanner \override #'edge-text = #'("8va " . "") \property Staff.centralCPosition = #-13 a\spanrequest \start "text" b c a \spanrequest \stop "text" @@ -12,8 +15,8 @@ a b c a \property Staff.centralCPosition = #1 - \property Voice.TextSpanner \push #'edge-text = #'("8bass " . "") - \property Voice.TextSpanner \push #'direction = #-1 + \property Voice.TextSpanner \override #'edge-text = #'("8bass " . "") + \property Voice.TextSpanner \override #'direction = #-1 a\spanrequest \start "text" b c a \spanrequest \stop "text" } } diff --git a/input/test/pushproperty.ly b/input/test/pushproperty.ly index 2fb31b21ce..ed21fe5b5a 100644 --- a/input/test/pushproperty.ly +++ b/input/test/pushproperty.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; %{ @@ -20,64 +20,64 @@ Generally, you can find interesting element properties associated with which means that setting \property stemVerticalDirection overrides setting \property verticalDirection, and that both have the effect of -setting `direction' in Stem object. You can use \pushproperty for +setting `direction' in Stem object. You can use \overrideproperty for setting stem directions by doing. - \pushproperty #'(Stem) #'direction #1 + \overrideproperty #'(Stem) #'direction #1 (#-1 if you want down). A modest amount of memory is involved each time you do a -\pushproperty. If you do \popproperty in the right order (reversed -from \pushproperty), then \popproperty doesn't cost memory. +\overrideproperty. If you do \revertproperty in the right order (reversed +from \overrideproperty), then \revertproperty doesn't cost memory. Correct: - \pushproperty #'( ... ) #'symbolA #valueA - \pushproperty #'( ... ) #'symbolB #valueB - \popproperty #'( ... ) #'symbolB - \popproperty #'( ... ) #'symbolA + \overrideproperty #'( ... ) #'symbolA #valueA + \overrideproperty #'( ... ) #'symbolB #valueB + \revertproperty #'( ... ) #'symbolB + \revertproperty #'( ... ) #'symbolA -Incorrect (\popproperty costs memory): +Incorrect (\revertproperty costs memory): - \pushproperty #'( ... ) #'symbolA #valueA - \pushproperty #'( ... ) #'symbolB #valueB - \popproperty #'( ... ) #'symbolA - \popproperty #'( ... ) #'symbolB + \overrideproperty #'( ... ) #'symbolA #valueA + \overrideproperty #'( ... ) #'symbolB #valueB + \revertproperty #'( ... ) #'symbolA + \revertproperty #'( ... ) #'symbolB You can use identifiers, eg. - slursUp = \context Voice \pushproperty '(Slur) + slursUp = \context Voice \overrideproperty '(Slur) #'direction #1 - slursBoth = \context Voice \popproperty '(Slur) + slursBoth = \context Voice \revertproperty '(Slur) %} \score { \notes \relative c' { c4-.( - \property Voice.Dots \push #'direction = #-1 - \property Voice.Stem \push #'direction = #-1 - \property Voice.noteColumnProperties \push #'direction = #-1 - \property Voice.Stem \push #'direction = #-1 + \property Voice.Dots \override #'direction = #-1 + \property Voice.Stem \override #'direction = #-1 + \property Voice.noteColumnProperties \override #'direction = #-1 + \property Voice.Stem \override #'direction = #-1 ) c4-. ( ) c4-. ( - \property Voice.Slur \push #'direction = #-1 + \property Voice.Slur \override #'direction = #-1 ) c4-. ( - \property Dots \pop #'direction - \property Stem \pop #'direction - \property Script \pop #'direction - \property Text \pop #'direction + \property Dots \revert #'direction + \property Stem \revert #'direction + \property Script \revert #'direction + \property Text \revert #'direction ) c4-. () c4-. } \paper { \translator { \VoiceContext - NoteHead \push #'font-relative-size = #-2 + NoteHead \override #'font-relative-size = #-2 } } } diff --git a/input/test/rest-collision.ly b/input/test/rest-collision.ly index 5dc05f149b..b55e6cfb09 100644 --- a/input/test/rest-collision.ly +++ b/input/test/rest-collision.ly @@ -49,4 +49,4 @@ restsII = \context Staff \notes { } } -\version "1.3.96"; +\version "1.3.110"; diff --git a/input/test/scripts.ly b/input/test/scripts.ly index 80e18cbbbc..76531d2498 100644 --- a/input/test/scripts.ly +++ b/input/test/scripts.ly @@ -1,5 +1,5 @@ -\version "1.3.96"; +\version "1.3.110"; blah = \notes{ \transpose c'' { diff --git a/input/test/sleur.ly b/input/test/sleur.ly index bc329381ab..e9e280bac0 100644 --- a/input/test/sleur.ly +++ b/input/test/sleur.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests Feta embedded slurs" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.96"; +\version "1.3.110"; shortlong = \notes{ c4()c( c c | diff --git a/input/test/slur-cross-staff.ly b/input/test/slur-cross-staff.ly index 3cb178686a..8e0b0e5325 100644 --- a/input/test/slur-cross-staff.ly +++ b/input/test/slur-cross-staff.ly @@ -28,4 +28,4 @@ > } -\version "1.3.96"; +\version "1.3.110"; diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly index aac38e2428..4a7c7b890b 100644 --- a/input/test/slur-damping.ly +++ b/input/test/slur-damping.ly @@ -1,5 +1,5 @@ % test damping -\version "1.3.96"; +\version "1.3.110"; \score{ \notes\relative c'{ diff --git a/input/test/slur-dash.ly b/input/test/slur-dash.ly index 14da7cbc58..b7d63db3c9 100644 --- a/input/test/slur-dash.ly +++ b/input/test/slur-dash.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; \score{ \notes{ diff --git a/input/test/slur-follow-music.ly b/input/test/slur-follow-music.ly index 8787b5cd91..8ab3ce8c31 100644 --- a/input/test/slur-follow-music.ly +++ b/input/test/slur-follow-music.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; \score { \context Voice \notes\relative c { % CASE 3 diff --git a/input/test/slur-nice.ly b/input/test/slur-nice.ly index 5e30aca285..a0f90f807e 100644 --- a/input/test/slur-nice.ly +++ b/input/test/slur-nice.ly @@ -1,5 +1,5 @@ -\version "1.3.96"; +\version "1.3.110"; \score{ \notes\relative c''{ \time 3/4; diff --git a/input/test/slurs.ly b/input/test/slurs.ly index 05ab47eca7..9597a65305 100644 --- a/input/test/slurs.ly +++ b/input/test/slurs.ly @@ -1,5 +1,5 @@ -\version "1.3.96"; +\version "1.3.110"; \score{ \notes\transpose c'{ diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly index 4b9413cb5d..9b75220f1b 100644 --- a/input/test/spacing-2.ly +++ b/input/test/spacing-2.ly @@ -33,4 +33,4 @@ source = "Petits Preludes et Fugues. Urtext. Editions Henry Lemoine, Paris."; } } -\version "1.3.96"; +\version "1.3.110"; diff --git a/input/test/spacing.ly b/input/test/spacing.ly index 8ef16c4cfa..55237141e9 100644 --- a/input/test/spacing.ly +++ b/input/test/spacing.ly @@ -6,7 +6,7 @@ copyright = "public domain"; TestedFeatures = "This file tests various spacings"; } -\version "1.3.96"; +\version "1.3.110"; multipart = \notes \relative c'{ \context StaffGroup < diff --git a/input/test/span-bars.ly b/input/test/span-bars.ly index a5bbdb81e9..56fd9579ab 100644 --- a/input/test/span-bars.ly +++ b/input/test/span-bars.ly @@ -1,5 +1,5 @@ -\version "1.3.96"; +\version "1.3.110"; nt = \notes { c1 \break c1 c1 } stuff = \notes \relative c'' < \context Staff = stone { \nt } diff --git a/input/test/staff-margin-partial.ly b/input/test/staff-margin-partial.ly index 40bfe1d92c..7f36dd7083 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.96"; +\version "1.3.110"; \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 315d115473..ef9312ceb9 100644 --- a/input/test/staff-margin.ly +++ b/input/test/staff-margin.ly @@ -1,6 +1,6 @@ -\version "1.3.96"; +\version "1.3.110"; \score { diff --git a/input/test/staff-side-slur.ly b/input/test/staff-side-slur.ly index f4c0541ac1..52f456b1c3 100644 --- a/input/test/staff-side-slur.ly +++ b/input/test/staff-side-slur.ly @@ -18,4 +18,4 @@ } -\version "1.3.96"; +\version "1.3.110"; diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly index d53dbc0401..4155311f6d 100644 --- a/input/test/staff-size.ly +++ b/input/test/staff-size.ly @@ -14,4 +14,4 @@ > \paper { linewidth = -1.; } } -\version "1.3.96"; +\version "1.3.110"; diff --git a/input/test/standchen-as5.ly b/input/test/standchen-as5.ly index 2abe8a395b..8b557f0410 100644 --- a/input/test/standchen-as5.ly +++ b/input/test/standchen-as5.ly @@ -1,4 +1,7 @@ +\version "1.3.110"; + + \include "paper-as5.ly" \score { @@ -27,7 +30,7 @@ \translator { \VoiceContext beamHeight = ##f - autoBeamSettings \push (begin * * * *) = #(make-moment 0 1) + autoBeamSettings \override (begin * * * *) = #(make-moment 0 1) textEmptyDimension = ##t } } diff --git a/input/test/stem-tremolo.ly b/input/test/stem-tremolo.ly index 9dce9f94d4..13f1a9ddd0 100644 --- a/input/test/stem-tremolo.ly +++ b/input/test/stem-tremolo.ly @@ -1,5 +1,5 @@ -\version "1.3.96"; +\version "1.3.110"; \score{ \context Voice\notes \relative c''{ %%? diff --git a/input/test/stem.ly b/input/test/stem.ly index f884cc1aab..c64f05c069 100644 --- a/input/test/stem.ly +++ b/input/test/stem.ly @@ -8,7 +8,7 @@ of beams"; } -\version "1.3.96"; +\version "1.3.110"; beamintervals = \notes{ \time 7/4; diff --git a/input/test/tab-staff.ly b/input/test/tab-staff.ly index 74256d0393..87fe60cb06 100644 --- a/input/test/tab-staff.ly +++ b/input/test/tab-staff.ly @@ -1,3 +1,6 @@ + +\version "1.3.110"; + %{ Kludge for half-assed tab notation (you need to fill the numbers @@ -17,16 +20,16 @@ bla = \notes \relative c' { } \translator { \StaffContext \name TabStaff; - basicStaffSymbolProperties \push #'line-count = #6 + basicStaffSymbolProperties \override #'line-count = #6 \remove "Clef_engraver"; \remove "Time_signature_engraver"; \consists "Pitch_squash_engraver"; - basicNoteHeadProperties \push #'transparent = ##t - basicStemProperties \push #'transparent = ##t - basicNoteHeadProperties \push #'staff-position = #-6 - basicDotsProperties \push #'transparent = ##t + basicNoteHeadProperties \override #'transparent = ##t + basicStemProperties \override #'transparent = ##t + basicNoteHeadProperties \override #'staff-position = #-6 + basicDotsProperties \override #'transparent = ##t squashedPosition = #-4 - basicStemProperties \push #'length = #12 + basicStemProperties \override #'length = #12 } \translator { \ScoreContext diff --git a/input/test/tchaikovsky.ly b/input/test/tchaikovsky.ly index 9f70867255..af12e6ea0e 100644 --- a/input/test/tchaikovsky.ly +++ b/input/test/tchaikovsky.ly @@ -7,7 +7,7 @@ enteredby = "Maarten Storm"; instrument= "Violoncello"; } -\version "1.3.96"; +\version "1.3.110"; % this is an example of extreme dynamics diff --git a/input/test/text-spanner.ly b/input/test/text-spanner.ly index 998e9d0851..9016c074dd 100644 --- a/input/test/text-spanner.ly +++ b/input/test/text-spanner.ly @@ -1,19 +1,22 @@ + +\version "1.3.110"; + \score{ \notes\relative c''{ - \property Voice.TextSpanner \push #'edge-text = #'("8 " . "") + \property Voice.TextSpanner \override #'edge-text = #'("8 " . "") a \spanrequest \start "text" b c a \spanrequest \stop "text" - \property Voice.TextSpanner \pop #'type - \property Voice.TextSpanner \push #'type = #"dotted-line" + \property Voice.TextSpanner \revert #'type + \property Voice.TextSpanner \override #'type = #"dotted-line" a \spanrequest \start "text" b c a \spanrequest \stop "text" - \property Voice.TextSpanner \pop #'type - \property Voice.TextSpanner \push #'type = #"dashed-line" - \property Voice.TextSpanner \push #'edge-height = #'(1 . -2) + \property Voice.TextSpanner \revert #'type + \property Voice.TextSpanner \override #'type = #"dashed-line" + \property Voice.TextSpanner \override #'edge-height = #'(1 . -2) a \spanrequest \start "text" b c a \spanrequest \stop "text" @@ -21,8 +24,8 @@ \property Staff."c0-position" = #-13 - \property Voice.TextSpanner \push #'dash-length = #5 - \property Voice.TextSpanner \push #'line-thickness = #10 + \property Voice.TextSpanner \override #'dash-length = #5 + \property Voice.TextSpanner \override #'line-thickness = #10 a \spanrequest \start "text" b c a \spanrequest \stop "text" diff --git a/input/test/thumb.ly b/input/test/thumb.ly index 7dc3a251b7..18e8b24412 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.96"; +\version "1.3.110"; \score { \notes \relative c'' { [ <)b_\thumb b'-3> diff --git a/input/test/tie-chord.ly b/input/test/tie-chord.ly index 23805fadd7..afed40ee00 100644 --- a/input/test/tie-chord.ly +++ b/input/test/tie-chord.ly @@ -1,3 +1,6 @@ + +\version "1.3.110"; + t = \notes \relative c' { ~ } \score { @@ -5,7 +8,7 @@ t = \notes \relative c' { ~ } \t \transpose g' \t - \property Voice.TieColumn \push #'direction = #-1 + \property Voice.TieColumn \override #'direction = #-1 \t } diff --git a/input/test/title.ly b/input/test/title.ly index ea16a1a0ff..b1f09a22fd 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -10,7 +10,7 @@ source = "urtext"; instrument= "Instrument"; } -\version "1.3.96"; +\version "1.3.110"; \score{ \notes diff --git a/input/test/transposition.ly b/input/test/transposition.ly index 926600cd78..88257ec12a 100644 --- a/input/test/transposition.ly +++ b/input/test/transposition.ly @@ -22,7 +22,7 @@ copyright = "public domain"; } -\version "1.3.96"; +\version "1.3.110"; vOne = \notes \relative c''{ \clef"violin"; diff --git a/input/test/tup.ly b/input/test/tup.ly index 4b1e671760..3619e50709 100644 --- a/input/test/tup.ly +++ b/input/test/tup.ly @@ -8,4 +8,4 @@ } } -\version "1.3.96"; +\version "1.3.110"; diff --git a/input/test/tuplet.ly b/input/test/tuplet.ly index 375e9b5c7c..4939630f78 100644 --- a/input/test/tuplet.ly +++ b/input/test/tuplet.ly @@ -1,4 +1,4 @@ -\version "1.3.96" +\version "1.3.110" \score { \context Voice \notes\relative c'' { diff --git a/input/test/twinkle-as5.ly b/input/test/twinkle-as5.ly index 43fa026a46..7bf92248f5 100644 --- a/input/test/twinkle-as5.ly +++ b/input/test/twinkle-as5.ly @@ -6,7 +6,7 @@ enteredby = "hwn and jcn"; copyright = "public domain"; } -\version "1.3.96"; +\version "1.3.110"; \include "paper-as5.ly" diff --git a/input/test/two-slurs.ly b/input/test/two-slurs.ly index 854080fe56..88c25d40cd 100644 --- a/input/test/two-slurs.ly +++ b/input/test/two-slurs.ly @@ -1,4 +1,4 @@ -\version "1.3.96"; +\version "1.3.110"; % % 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 3ae0713b60..865dbe7e59 100644 --- a/input/test/updown.ly +++ b/input/test/updown.ly @@ -10,7 +10,7 @@ {\voiceTwo c}> - \version "1.3.96"; + \version "1.3.110"; } \paper { } diff --git a/input/test/vertical-align.ly b/input/test/vertical-align.ly index 4262f80194..6e1d8aed8b 100644 --- a/input/test/vertical-align.ly +++ b/input/test/vertical-align.ly @@ -1,5 +1,5 @@ -\version "1.3.96"; +\version "1.3.110"; \score { \notes < diff --git a/input/test/vertical-text.ly b/input/test/vertical-text.ly index f51f88c136..ba8f2ea579 100644 --- a/input/test/vertical-text.ly +++ b/input/test/vertical-text.ly @@ -15,4 +15,4 @@ } } -\version "1.3.96"; +\version "1.3.110"; diff --git a/input/test/volta.ly b/input/test/volta.ly index 780c33f140..b470c72fd8 100644 --- a/input/test/volta.ly +++ b/input/test/volta.ly @@ -1,4 +1,7 @@ +\version "1.3.110"; + + voice4 = \notes { \clef bass; \property Staff.instrument = "Bass" @@ -35,7 +38,7 @@ voicedefault = \notes { font_normal = 12.; \translator { \StaffContext - TimeSignature \push #'style = #"C" + TimeSignature \override #'style = #"C" \consists Instrument_name_engraver; } } diff --git a/input/trip.ly b/input/trip.ly index f5503fd7c9..7fd7e290dd 100644 --- a/input/trip.ly +++ b/input/trip.ly @@ -19,7 +19,7 @@ TODO: %} -\version "1.3.96"; +\version "1.3.110"; praeludiumRight = \notes { \key e \major; \clef violin; @@ -67,7 +67,7 @@ praeludiumLeft = \notes \relative c { dis2 cis4 r8 cis } \context Voice = one { \stemUp bis2 } \context Voice = three { - \property Voice.DynamicLineSpanner \push #'direction = #-1 + \property Voice.DynamicLineSpanner \override #'direction = #-1 \stemUp \shiftOn r4 gis ~ [gis8 \< diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index b82341d10b..d2b418173a 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -7,7 +7,7 @@ enteredby = "HWN, chords by Johan Vromans"; copyright = "public domain"; } -\version "1.3.96"; +\version "1.3.110"; melodie = \notes\relative c'' { \clef "violin"; diff --git a/input/twinkle.ly b/input/twinkle.ly index d5788e083d..acfd564db3 100644 --- a/input/twinkle.ly +++ b/input/twinkle.ly @@ -20,7 +20,7 @@ Tested Features: lyrics, interleaving lyrics and staffs, repeats, auto beaming, adding lyrics to notes, hyphens %} -\version "1.3.96"; +\version "1.3.110"; melody = \notes \relative c'' { \clef violin; diff --git a/lily/auto-change-music.cc b/lily/auto-change-music.cc index 71d134cb3c..d98cd8ed29 100644 --- a/lily/auto-change-music.cc +++ b/lily/auto-change-music.cc @@ -13,5 +13,6 @@ Auto_change_music::Auto_change_music (Music * m) : Music_wrapper (m) { - set_mus_property ("type", Auto_change_iterator::constructor_cxx_function); + set_mus_property ("iterator-ctor", Auto_change_iterator::constructor_cxx_function); + } diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index 4c9a9e01a1..b7d8502328 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -77,7 +77,7 @@ Chord_tremolo_engraver::try_music (Music * m) { Repeated_music * rp = dynamic_cast (m); if (rp - && rp->get_mus_property ("type") == Chord_tremolo_iterator::constructor_cxx_function + && rp->get_mus_property ("iterator-ctor") == Chord_tremolo_iterator::constructor_cxx_function && !repeat_) { Moment l = rp->body_length_mom (); diff --git a/lily/context-specced-music.cc b/lily/context-specced-music.cc index 7e52caf957..4c6cbfb47a 100644 --- a/lily/context-specced-music.cc +++ b/lily/context-specced-music.cc @@ -11,7 +11,6 @@ Context_specced_music::Context_specced_music(Music *m) : Music_wrapper (m) { set_mus_property ("type", - ly_symbol2scm ("context-specced-music")); } diff --git a/lily/cxx-function-smob.cc b/lily/cxx-function-smob.cc new file mode 100644 index 0000000000..796e33470a --- /dev/null +++ b/lily/cxx-function-smob.cc @@ -0,0 +1,72 @@ +/* + grob-callback.cc -- implement Callback smob. + + source file of the GNU LilyPond music typesetter + + (c) 2000 Han-Wen Nienhuys + + */ + +#include "cxx-function-smob.hh" +#include "ly-smobs.icc" + +static long callback_tag; + +static +SCM mark_smob (SCM) +{ + return SCM_EOL; +} + +static int +print_smob (SCM, SCM port, scm_print_state *) +{ + scm_puts ("#", port); + return 1; +} + +static +scm_sizet free_smob (SCM) +{ + return 0; +} + + +SCM +cxx_function_type_p (SCM x) +{ + return (SCM_CELL_TYPE(x) == callback_tag) ? SCM_BOOL_T : SCM_BOOL_F; +} + +void init_cxx_function_smobs() +{ + callback_tag = scm_make_smob_type_mfpe ("callback", 0, + mark_smob, free_smob, + print_smob, 0); + + scm_make_gsubr ("c++-function?", 1, 0, 0, (Scheme_function_unknown) cxx_function_type_p); +} + +SCM +smobify_cxx_function (Cxx_function cb) +{ + SCM z; + + SCM_NEWCELL(z); + SCM_SETCDR (z, (SCM)cb); + SCM_SETCAR (z, (SCM)callback_tag); + + return z; +} + + +Cxx_function +unsmob_cxx_function (SCM x) +{ + + if (SCM_NIMP (x) && SCM_CELL_TYPE(x) == callback_tag) + return (Cxx_function) SCM_CELL_WORD_1(x); + else + return 0; +} + diff --git a/lily/grace-music.cc b/lily/grace-music.cc index a072d37a59..e2928ad6ec 100644 --- a/lily/grace-music.cc +++ b/lily/grace-music.cc @@ -25,6 +25,6 @@ Grace_music::length_mom () const Grace_music::Grace_music (Music *p) : Music_wrapper (p) { - set_mus_property ("type", + set_mus_property ("iterator-ctor", Grace_iterator::constructor_cxx_function); } diff --git a/lily/grace-position-engraver.cc b/lily/grace-position-engraver.cc index 1e1d4ec8c3..5a7039016c 100644 --- a/lily/grace-position-engraver.cc +++ b/lily/grace-position-engraver.cc @@ -91,12 +91,18 @@ Grace_position_engraver::stop_translation_timestep () if (elt) return; - warning (_("Unattached grace notes. Attaching to last musical column.")); + if (last_musical_col_l_) + { + warning (_("Unattached grace notes. Attaching to last musical column.")); - align_l_->set_parent (0, X_AXIS); - Axis_group_interface::add_element (last_musical_col_l_, align_l_); + align_l_->set_parent (0, X_AXIS); + Axis_group_interface::add_element (last_musical_col_l_, align_l_); + } + else + { + // tja. + } } - last_musical_col_l_ = dynamic_cast( unsmob_grob (get_property ("currentMusicalColumn"))); } diff --git a/lily/grob.cc b/lily/grob.cc index ac075aba96..3cf09fcc4a 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -682,7 +682,7 @@ Grob::add_offset_callback (SCM cb, Axis a) bool Grob::has_extent_callback_b (SCM cb, Axis a)const { - return scm_equal_p (cb, dim_cache_[a].dimension_); + return scm_equal_p (cb, dim_cache_[a].dimension_) == SCM_BOOL_T; } diff --git a/lily/include/cxx-function-smob.hh b/lily/include/cxx-function-smob.hh new file mode 100644 index 0000000000..c9ac4bed3c --- /dev/null +++ b/lily/include/cxx-function-smob.hh @@ -0,0 +1,21 @@ +/* + cxx-function-smob.hh -- + source file of the GNU LilyPond music typesetter + + (c) 2000 Han-Wen Nienhuys + + */ + +#ifndef CXX_FUNCT_SMOB_HH +#define CXX_FUNCT_SMOB_HH + +#include "lily-proto.hh" +#include "lily-guile.hh" + +typedef void * (*Cxx_function) (SCM param); +Cxx_function unsmob_cxx_function (SCM x); +SCM smobify_cxx_function (Cxx_function cb); + + +#endif /* CXX_FUNCT_SMOB_HH */ + diff --git a/lily/include/music-iterator-ctor.hh b/lily/include/music-iterator-ctor.hh index 5a066988a7..272365ecd4 100644 --- a/lily/include/music-iterator-ctor.hh +++ b/lily/include/music-iterator-ctor.hh @@ -1,22 +1,3 @@ -/* - grob-callback.hh -- declare Grob callbacks - - source file of the GNU LilyPond music typesetter - - (c) 2000 Han-Wen Nienhuys - - */ -#ifndef SCORE_ELEMENT_CALLBACK_HH -#define SCORE_ELEMENT_CALLBACK_HH - -#include "lily-proto.hh" -#include "lily-guile.hh" - -typedef void * (*Cxx_function) (SCM param); -Cxx_function unsmob_cxx_function (SCM x); -SCM smobify_cxx_function (Cxx_function cb); - - -#endif /* SCORE_ELEMENT_CALLBACK_HH */ +#error diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh index 39919db96b..40f24b3576 100644 --- a/lily/include/music-iterator.hh +++ b/lily/include/music-iterator.hh @@ -15,7 +15,7 @@ #include "moment.hh" #include "virtual-methods.hh" #include "interpretation-context-handle.hh" -#include "music-iterator-ctor.hh" +#include "cxx-function-smob.hh" /** Conceptually a music-iterator operates on a queue of musical events diff --git a/lily/include/spaceable-element.hh b/lily/include/spaceable-element.hh index 94a6f2efa5..2730ea6996 100644 --- a/lily/include/spaceable-element.hh +++ b/lily/include/spaceable-element.hh @@ -1,5 +1,5 @@ /* - spaceable-element.hh -- declare Spaceable_element + spaceable-grob.hh -- declare Spaceable_grob source file of the GNU LilyPond music typesetter @@ -7,13 +7,13 @@ */ -#ifndef SPACEABLE_ELEMENT_HH -#define SPACEABLE_ELEMENT_HH +#ifndef SPACEABLE_GROB_HH +#define SPACEABLE_GROB_HH #include "lily-guile.hh" #include "lily-proto.hh" -struct Spaceable_element +struct Spaceable_grob { /// set a minimum distance static void add_rod (Grob*me, Grob * to, Real distance); @@ -24,5 +24,5 @@ struct Spaceable_element static SCM get_ideal_distances (Grob*); }; -#endif /* SPACEABLE_ELEMENT_HH */ +#endif /* SPACEABLE_GROB_HH */ diff --git a/lily/local-key-engraver.cc b/lily/local-key-engraver.cc index 8156cecba0..9d921602b0 100644 --- a/lily/local-key-engraver.cc +++ b/lily/local-key-engraver.cc @@ -31,7 +31,7 @@ struct Local_key_engraver : Engraver { Item *key_item_p_; protected: VIRTUAL_COPY_CONS(Translator); - void deprecated_process_music(); + virtual void process_music(); virtual void acknowledge_grob (Grob_info); virtual void stop_translation_timestep(); virtual void initialize (); @@ -74,8 +74,6 @@ Local_key_engraver::initialize () void Local_key_engraver::create_grobs () { - deprecated_process_music (); - if (!key_item_p_ && mel_l_arr_.size()) { SCM localsig = get_property ("localKeySignature"); @@ -239,7 +237,7 @@ Local_key_engraver::acknowledge_grob (Grob_info info) ugh. repeated deep_copy generates lots of garbage. */ void -Local_key_engraver::deprecated_process_music() +Local_key_engraver::process_music() { SCM smp = get_property ("measurePosition"); Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc index 4b9ca36048..a91dcb5644 100644 --- a/lily/lyric-combine-music.cc +++ b/lily/lyric-combine-music.cc @@ -16,7 +16,7 @@ Lyric_combine_music::Lyric_combine_music (Music * m, Music * l) set_mus_property ("music", m->self_scm ()); set_mus_property ("lyrics", l->self_scm ()); - set_mus_property ("type", + set_mus_property ("iterator-ctor", Lyric_combine_music_iterator::constructor_cxx_function); } diff --git a/lily/main.cc b/lily/main.cc index 23bd451fde..8a998eb9f0 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -70,7 +70,6 @@ String distill_inname_str (String name_str, String& ext_r); follow regular localisation guidelines). */ Long_option_init theopts[] = { - {0, "debug", 'd', _i ("enable debugging output")}, {_i ("EXT"), "output-format", 'f', _i ("use output format EXT (scm, ps, tex or as)")}, {0, "help", 'h', _i ("this help")}, {_i ("DIR"), "include", 'I', _i ("add DIR to search path")}, @@ -227,7 +226,8 @@ setup_paths () */ char *suffixes[] = {"ly", "afm", "scm", "tfm", "ps", 0}; String prefix = prefix_directory; - if (prefix.empty_b ()) prefix = DIR_DATADIR; + if (prefix.empty_b ()) + prefix = DIR_DATADIR; for (char **s = suffixes; *s; s++) { String p = prefix + to_str ('/') + String (*s); @@ -380,9 +380,6 @@ main (int argc, char **argv) case 'M': dependency_global_b = true; break; - case 'd': - set_debug (true); - break; case 'm': no_paper_global_b = true; break; diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index 93de6c3e3b..eb05061be1 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -89,10 +89,10 @@ Music_iterator::static_get_iterator_p (Music *m) { Music_iterator * p =0; - SCM type = m->get_mus_property ("type") ; - if (unsmob_cxx_function (type)) + SCM ctor = m->get_mus_property ("iterator-ctor") ; + if (unsmob_cxx_function (ctor)) { - Cxx_function f = unsmob_cxx_function (type); + Cxx_function f = unsmob_cxx_function (ctor); p = (Music_iterator*) (*f) (SCM_EOL); } diff --git a/lily/music-list.cc b/lily/music-list.cc index a2a82aeccc..4761761884 100644 --- a/lily/music-list.cc +++ b/lily/music-list.cc @@ -27,14 +27,14 @@ Simultaneous_music::length_mom () const Simultaneous_music::Simultaneous_music(SCM head) : Music_sequence (head) { - set_mus_property ("type", + set_mus_property ("iterator-ctor", Simultaneous_music_iterator::constructor_cxx_function); } Sequential_music::Sequential_music(SCM head) : Music_sequence (head) { - set_mus_property ("type", + set_mus_property ("iterator-ctor", Sequential_music_iterator::constructor_cxx_function); } @@ -54,7 +54,7 @@ Simultaneous_music::to_relative_octave (Pitch p) Request_chord::Request_chord(SCM s) : Simultaneous_music (s) { - set_mus_property ("type", + set_mus_property ("iterator-ctor", Request_chord_iterator::constructor_cxx_function); } diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index 44c2597ed7..bf1cb58de9 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -59,11 +59,12 @@ static Keyword_ent the_key_tab[]={ {"midi", MIDI}, {"mm", MM_T}, {"name", NAME}, - {"notenames", NOTENAMES}, + {"pitchnames", PITCHNAMES}, {"notes", NOTES}, {"outputproperty", OUTPUTPROPERTY}, - {"push", PUSH}, - {"pop", POP}, + {"override", OVERRIDE}, + {"set", SET}, + {"revert", REVERT}, {"partial", PARTIAL}, {"paper", PAPER}, {"penalty", PENALTY}, diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc index d12b6530fc..13e089e85b 100644 --- a/lily/output-property-engraver.cc +++ b/lily/output-property-engraver.cc @@ -40,7 +40,7 @@ protected: bool Output_property_engraver::try_music (Music* m) { - if (m->get_mus_property ("type") == + if (m->get_mus_property ("iterator-ctor") == Output_property_music_iterator::constructor_cxx_function) { props_.push (m); diff --git a/lily/paper-column.cc b/lily/paper-column.cc index e644ce6d98..cc09a3d1b1 100644 --- a/lily/paper-column.cc +++ b/lily/paper-column.cc @@ -15,7 +15,7 @@ void Paper_column::do_break_processing () { - Spaceable_element::remove_interface(this); + Spaceable_grob::remove_interface(this); Item::do_break_processing (); } @@ -42,7 +42,7 @@ Paper_column::Paper_column (SCM l) { Axis_group_interface::set_interface (this); Axis_group_interface::set_axes (this, X_AXIS, X_AXIS); - Spaceable_element::set_interface (this); + Spaceable_grob::set_interface (this); line_l_=0; rank_i_ = -1; diff --git a/lily/parser.yy b/lily/parser.yy index 50b08cb8e3..e290df52a9 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -172,13 +172,13 @@ yylex (YYSTYPE *s, void * v_l) %token MM_T %token MUSICAL_PITCH %token NAME -%token NOTENAMES +%token PITCHNAMES %token NOTES %token PAPER %token PARTIAL %token PENALTY %token PROPERTY -%token PUSH POP +%token OVERRIDE SET REVERT %token PT_T %token RELATIVE %token REMOVE @@ -332,7 +332,7 @@ chordmodifiers_block: notenames_block: - NOTENAMES notenames_body { $$ = $2; } + PITCHNAMES notenames_body { $$ = $2; } ; @@ -450,11 +450,11 @@ translator_spec_body: | translator_spec_body STRING '=' embedded_scm { unsmob_translator_def ($$)->add_property_assign ($2, $4); } - | translator_spec_body STRING PUSH embedded_scm '=' embedded_scm { + | translator_spec_body STRING OVERRIDE embedded_scm '=' embedded_scm { unsmob_translator_def ($$) ->add_push_property (scm_string_to_symbol ($2), $4, $6); } - | translator_spec_body STRING POP embedded_scm { + | translator_spec_body STRING REVERT embedded_scm { unsmob_translator_def($$)->add_pop_property ( scm_string_to_symbol ($2), $4); } @@ -717,7 +717,7 @@ Simple_music: m->set_mus_property ("predicate", pred); m->set_mus_property ("symbol", $3); m->set_mus_property ("value", $5); - m->set_mus_property ("type", + m->set_mus_property ("iterator-ctor", Output_property_music_iterator::constructor_cxx_function); $$ = m; @@ -841,7 +841,7 @@ part_combined_music: translator_change: TRANSLATOR STRING '=' STRING { Music * t = new Music; - t->set_mus_property ("type", + t->set_mus_property ("iterator-ctor", Change_iterator::constructor_cxx_function); t-> set_mus_property ("change-to-type", $2); t-> set_mus_property ("change-to-id", $4); @@ -855,7 +855,7 @@ property_def: PROPERTY STRING '.' STRING '=' scalar { Music *t = new Music; - t->set_mus_property ("type", + t->set_mus_property ("iterator-ctor", Property_iterator::constructor_cxx_function); t->set_mus_property ("symbol", scm_string_to_symbol ($4)); t->set_mus_property ("value", $6); @@ -866,25 +866,39 @@ property_def: csm-> set_mus_property ("context-type", $2); } - | PROPERTY STRING '.' STRING PUSH embedded_scm '=' embedded_scm { + | PROPERTY STRING '.' STRING SET embedded_scm '=' embedded_scm { Music *t = new Music; - t->set_mus_property ("type", + t->set_mus_property ("iterator-ctor", Push_property_iterator::constructor_cxx_function); t->set_mus_property ("symbols", scm_string_to_symbol ($4)); - t->set_mus_property ("element-property", $6); - t->set_mus_property ("element-value", $8); + t->set_mus_property ("pop-first", SCM_BOOL_T); + t->set_mus_property ("grob-property", $6); + t->set_mus_property ("grob-value", $8); Context_specced_music *csm = new Context_specced_music (t); $$ = csm; $$->set_spot (THIS->here_input ()); csm-> set_mus_property ("context-type", $2); } - | PROPERTY STRING '.' STRING POP embedded_scm { + | PROPERTY STRING '.' STRING OVERRIDE embedded_scm '=' embedded_scm { Music *t = new Music; - t->set_mus_property ("type", + t->set_mus_property ("iterator-ctor", + Push_property_iterator::constructor_cxx_function); + t->set_mus_property ("symbols", scm_string_to_symbol ($4)); + t->set_mus_property ("grob-property", $6); + t->set_mus_property ("grob-value", $8); + Context_specced_music *csm = new Context_specced_music (t); + $$ = csm; + $$->set_spot (THIS->here_input ()); + + csm-> set_mus_property ("context-type", $2); + } + | PROPERTY STRING '.' STRING REVERT embedded_scm { + Music *t = new Music; + t->set_mus_property ("iterator-ctor", Pop_property_iterator::constructor_cxx_function); t->set_mus_property ("symbols", scm_string_to_symbol ($4)); - t->set_mus_property ("element-property", $6); + t->set_mus_property ("grob-property", $6); Context_specced_music *csm = new Context_specced_music (t); $$ = csm; @@ -927,7 +941,7 @@ command_element: | BAR STRING ';' { Music *t = new Music; - t->set_mus_property ("type", + t->set_mus_property ("iterator-ctor", Property_iterator::constructor_cxx_function); t->set_mus_property ("symbol", ly_symbol2scm ("whichBar")); t->set_mus_property ("value", $2); @@ -941,7 +955,7 @@ command_element: | PARTIAL duration_length ';' { Music * p = new Music; p->set_mus_property ("symbol", ly_symbol2scm ( "measurePosition")); - p->set_mus_property ("type", + p->set_mus_property ("iterator-ctor", Property_iterator::constructor_cxx_function); Moment m = - unsmob_duration($2)->length_mom (); @@ -972,7 +986,7 @@ command_element: Music * p = new Music; p->set_mus_property ("symbol", ly_symbol2scm ( "timeSignatureFraction")); - p->set_mus_property ("type", + p->set_mus_property ("iterator-ctor", Property_iterator::constructor_cxx_function); p->set_mus_property ("value", gh_cons (gh_int2scm ($2), diff --git a/lily/part-combine-music.cc b/lily/part-combine-music.cc index ea53d706b5..27617f77e8 100644 --- a/lily/part-combine-music.cc +++ b/lily/part-combine-music.cc @@ -21,7 +21,7 @@ Part_combine_music::Part_combine_music (SCM what, Music * f, Music * s) scm_unprotect_object (f->self_scm()); scm_unprotect_object (s->self_scm()); - set_mus_property ("type", + set_mus_property ("iterator-ctor", Part_combine_music_iterator::constructor_cxx_function); } diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc index 525b55d260..bb7a40395f 100644 --- a/lily/property-iterator.cc +++ b/lily/property-iterator.cc @@ -35,8 +35,12 @@ void Push_property_iterator::process (Moment m) { SCM syms = music_l_->get_mus_property ("symbols"); - SCM eprop = music_l_->get_mus_property ("element-property"); - SCM val = music_l_->get_mus_property ("element-value"); + SCM eprop = music_l_->get_mus_property ("grob-property"); + SCM val = music_l_->get_mus_property ("grob-value"); + + if (to_boolean (music_l_->get_mus_property ( "pop-first"))) + Translator_def::apply_pushpop_property (report_to_l (), + syms, eprop, SCM_UNDEFINED); Translator_def::apply_pushpop_property (report_to_l (), syms, eprop, val); @@ -47,7 +51,7 @@ void Pop_property_iterator::process (Moment m) { SCM syms = music_l_->get_mus_property ("symbols"); - SCM eprop = music_l_->get_mus_property ("element-property"); + SCM eprop = music_l_->get_mus_property ("grob-property"); Translator_def::apply_pushpop_property (report_to_l (), syms, eprop, SCM_UNDEFINED); Simple_music_iterator::process (m); diff --git a/lily/rod.cc b/lily/rod.cc index 621fd15de2..4071293a8d 100644 --- a/lily/rod.cc +++ b/lily/rod.cc @@ -37,7 +37,7 @@ Rod::add_to_cols () { columnize(); if (item_l_drul_[LEFT] != item_l_drul_[RIGHT]) - Spaceable_element::add_rod (item_l_drul_[LEFT], + Spaceable_grob::add_rod (item_l_drul_[LEFT], item_l_drul_[RIGHT], distance_f_ ); } diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc index 024dd9b5f1..7b26a9b9a8 100644 --- a/lily/separating-line-group-engraver.cc +++ b/lily/separating-line-group-engraver.cc @@ -12,6 +12,7 @@ #include "paper-column.hh" #include "paper-def.hh" #include "engraver.hh" +#include "axis-group-interface.hh" class Separating_line_group_engraver : public Engraver { @@ -57,23 +58,28 @@ void Separating_line_group_engraver::acknowledge_grob (Grob_info i) { Item * it = dynamic_cast (i.elem_l_); - if (it && !it->parent_l (X_AXIS)) - { - bool ib =Item::breakable_b (it); - Item *&p_ref_ (ib ? break_malt_p_ - : nobreak_malt_p_); + if (!it) + return; + if (it->parent_l (X_AXIS) + && it->parent_l (X_AXIS)->has_extent_callback_b + (Axis_group_interface::group_extent_callback_proc, X_AXIS)) + return; + + + bool ib =Item::breakable_b (it); + Item *&p_ref_ (ib ? break_malt_p_ + : nobreak_malt_p_); - if (!p_ref_) - { - p_ref_ = new Item - (get_property ("SeparationItem")); + if (!p_ref_) + { + p_ref_ = new Item + (get_property ("SeparationItem")); - if (ib) - p_ref_->set_grob_property ("breakable", SCM_BOOL_T); - announce_grob (p_ref_, 0); - } - Separation_item::add_item (p_ref_,it); + if (ib) + p_ref_->set_grob_property ("breakable", SCM_BOOL_T); + announce_grob (p_ref_, 0); } + Separation_item::add_item (p_ref_,it); } void diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc index dce34304d6..5053db6a43 100644 --- a/lily/simple-spacer.cc +++ b/lily/simple-spacer.cc @@ -170,7 +170,7 @@ Simple_spacer::add_columns (Link_array cols) for (int i=0; i < cols.size () - 1; i++) { SCM spring_params = SCM_UNDEFINED; - for (SCM s = Spaceable_element::get_ideal_distances (cols[i]); + for (SCM s = Spaceable_grob::get_ideal_distances (cols[i]); spring_params == SCM_UNDEFINED && gh_pair_p (s); s = gh_cdr (s)) { @@ -207,7 +207,7 @@ Simple_spacer::add_columns (Link_array cols) for (int i=0; i < cols.size () - 1; i++) { - for (SCM s = Spaceable_element::get_minimum_distances (cols[i]); + for (SCM s = Spaceable_grob::get_minimum_distances (cols[i]); gh_pair_p (s); s = gh_cdr (s)) { Grob * other = unsmob_grob (gh_caar (s)); diff --git a/lily/spaceable-element.cc b/lily/spaceable-element.cc index fe47ec1c65..fdfeb3ee1d 100644 --- a/lily/spaceable-element.cc +++ b/lily/spaceable-element.cc @@ -1,5 +1,5 @@ /* - spaceable-element.cc -- implement Spaceable_element + spaceable-element.cc -- implement Spaceable_grob source file of the GNU LilyPond music typesetter @@ -12,7 +12,7 @@ #include "warn.hh" SCM -Spaceable_element::get_minimum_distances ( Grob*me) +Spaceable_grob::get_minimum_distances ( Grob*me) { return me->get_grob_property ("minimum-distances"); } @@ -20,7 +20,7 @@ Spaceable_element::get_minimum_distances ( Grob*me) /*todo: merge code of spring & rod? */ void -Spaceable_element::add_rod (Grob *me , Grob * p, Real d) +Spaceable_grob::add_rod (Grob *me , Grob * p, Real d) { SCM mins = get_minimum_distances (me); SCM newdist = gh_double2scm (d); @@ -40,7 +40,7 @@ Spaceable_element::add_rod (Grob *me , Grob * p, Real d) } void -Spaceable_element::add_spring (Grob*me, Grob * p, Real d, Real strength) +Spaceable_grob::add_spring (Grob*me, Grob * p, Real d, Real strength) { SCM mins = get_ideal_distances (me); SCM newdist= gh_double2scm (d); @@ -60,14 +60,14 @@ Spaceable_element::add_spring (Grob*me, Grob * p, Real d, Real strength) } SCM -Spaceable_element::get_ideal_distances (Grob*me) +Spaceable_grob::get_ideal_distances (Grob*me) { return me->get_grob_property ("ideal-distances"); } void -Spaceable_element::remove_interface (Grob*me) +Spaceable_grob::remove_interface (Grob*me) { me->remove_grob_property ("minimum-distances"); me->remove_grob_property ("ideal-distances"); @@ -76,7 +76,7 @@ Spaceable_element::remove_interface (Grob*me) void -Spaceable_element::set_interface (Grob*me) +Spaceable_grob::set_interface (Grob*me) { me->set_interface (ly_symbol2scm ("spaceable-element-interface")); } diff --git a/lily/spring.cc b/lily/spring.cc index e5136a82ff..c4f03890cd 100644 --- a/lily/spring.cc +++ b/lily/spring.cc @@ -23,7 +23,7 @@ Spring::Spring () void Spring::add_to_cols () { - Spaceable_element::add_spring (item_l_drul_[LEFT]->column_l (), + Spaceable_grob::add_spring (item_l_drul_[LEFT]->column_l (), item_l_drul_[RIGHT]->column_l (), distance_f_, strength_f_); } diff --git a/lily/time-scaled-music.cc b/lily/time-scaled-music.cc index a0d355ef9d..74559e404a 100644 --- a/lily/time-scaled-music.cc +++ b/lily/time-scaled-music.cc @@ -15,7 +15,7 @@ Time_scaled_music::Time_scaled_music (int n, int d,Music *mp) { set_mus_property ("numerator", gh_int2scm (n)); set_mus_property ("denominator", gh_int2scm (d)); - set_mus_property ("type", + set_mus_property ("iterator-ctor", Time_scaled_music_iterator::constructor_cxx_function); compress (Moment (n,d)); diff --git a/lilypond-font-lock.el b/lilypond-font-lock.el index c760f093a4..04553830ba 100644 --- a/lilypond-font-lock.el +++ b/lilypond-font-lock.el @@ -27,19 +27,19 @@ ;; - fontlock: \melodic \melodic (defconst LilyPond-font-lock-keywords - (let* ((keywords '("spanrequest" "simultaneous" "sequential" "accepts" - "autochange" "alternative" "bar" "breathe" - "cadenza" "chordmodifiers" "chords" "clef" "cm" "consists" - "consistsend" "context" - "duration" "font" "grace" "header" "in" "lyrics" - "key" "keysignature" "mark" "musicalpitch" - "time" "times" "midi" "mm" "name" "notenames" - "notes" "partial" "paper" "penalty" "push" "pop" "property" "pt" - "relative" "remove" "repeat" "repetitions" "addlyrics" - "scm" "scmfile" "score" "script" - "shape" "skip" "textscript" "tempo" "translator" "transpose" - "type" "version" - )) + (let* ((keywords '( + +"apply" "arpeggio" "autochange" "spanrequest" "commandspanrequest" +"simultaneous" "sequential" "accepts" "alternative" "bar" "breathe" +"char" "chordmodifiers" "chords" "clef" "cm" "consists" "consistsend" +"context" "denies" "duration" "dynamicscript" "elementdescriptions" +"font" "grace" "header" "in" "lyrics" "key" "mark" "musicalpitch" +"time" "times" "midi" "mm" "name" "notenames" "notes" "outputproperty" +"override" "set" "revert" "partial" "paper" "penalty" "property" "pt" +"relative" "remove" "repeat" "addlyrics" "partcombine" "score" +"script" "stylesheet" "skip" "textscript" "tempo" "translator" +"transpose" "type" + )) (kwregex (mapconcat (lambda (x) (concat "\\\\" x)) keywords "\\|"))) (list diff --git a/ly/book-fragment.ly b/ly/book-fragment.ly index 3124f362a1..ce0674f8eb 100644 --- a/ly/book-fragment.ly +++ b/ly/book-fragment.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.96"; +\version "1.3.110"; \include "declarations.ly" diff --git a/ly/book-init.ly b/ly/book-init.ly index adf2523e79..994200cfb5 100644 --- a/ly/book-init.ly +++ b/ly/book-init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.96"; +\version "1.3.110"; \include "declarations.ly"; diff --git a/ly/catalan.ly b/ly/catalan.ly index c55565c8d0..fce6df63f4 100644 --- a/ly/catalan.ly +++ b/ly/catalan.ly @@ -17,7 +17,7 @@ % For using "sostingut" notation, which is also correct -\notenames #`( +\pitchnames #`( (dobb . ,(make-pitch -1 0 -2 )) (dob . ,(make-pitch -1 0 -1 )) (do . ,(make-pitch -1 0 0 )) @@ -71,4 +71,4 @@ -\version "1.3.96"; +\version "1.3.110"; diff --git a/ly/center-fragment.ly b/ly/center-fragment.ly index 52ac0fde26..64a127cb9c 100644 --- a/ly/center-fragment.ly +++ b/ly/center-fragment.ly @@ -1,7 +1,7 @@ % Toplevel initialisation file. -\version "1.3.96"; +\version "1.3.110"; \include "declarations.ly" diff --git a/ly/center.ly b/ly/center.ly index 1ccfa5bc74..a53dc01fd9 100644 --- a/ly/center.ly +++ b/ly/center.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.96"; +\version "1.3.110"; \include "declarations.ly" diff --git a/ly/deutsch.ly b/ly/deutsch.ly index 4ac2fd4022..7dc6a29b31 100644 --- a/ly/deutsch.ly +++ b/ly/deutsch.ly @@ -7,7 +7,7 @@ % added asas and marked ases as `unusual' -\notenames #'( +\pitchnames #`( (ceses . ,(make-pitch -1 0 -2 )) (ces . ,(make-pitch -1 0 -1 )) (c . ,(make-pitch -1 0 0 )) @@ -49,4 +49,4 @@ -\version "1.3.96"; +\version "1.3.110"; diff --git a/ly/english.ly b/ly/english.ly index 0ce982f826..4216d75b26 100644 --- a/ly/english.ly +++ b/ly/english.ly @@ -3,7 +3,7 @@ with s for sharp and f for flat. %} -\notenames #`( +\pitchnames #`( (cflatflat . ,(make-pitch -1 0 -2 )) (cflat . ,(make-pitch -1 0 -1 )) (c . ,(make-pitch -1 0 0 )) @@ -77,5 +77,5 @@ (bss . ,(make-pitch -1 6 2 )) ) -\version "1.3.96"; +\version "1.3.110"; diff --git a/ly/engraver.ly b/ly/engraver.ly index be2d0f15e7..e6cca6f7ec 100644 --- a/ly/engraver.ly +++ b/ly/engraver.ly @@ -1,5 +1,5 @@ -\version "1.3.96" +\version "1.3.110" % % setup for Request->Element conversion. Guru-only % @@ -55,7 +55,7 @@ ChoirStaffContext = \translator { \name ChoirStaff; alignmentReference = \center; \consists "System_start_delimiter_engraver"; - SystemStartDelimiter \push #'glyph = #'bracket + SystemStartDelimiter \override #'glyph = #'bracket \accepts "Staff"; \accepts "RhythmicStaff"; @@ -77,10 +77,10 @@ RhythmicStaffContext=\translator{ \consists "Pitch_squash_engraver"; \consists "Separating_line_group_engraver"; \name RhythmicStaff; - Bar \push #'bar-size = #4 - VoltaBracket \push #'minimum-space = #15 % urg, in \pt - VoltaBracket \push #'padding = #5 % urg, in \pt - StaffSymbol \push #'line-count = #1 + Bar \override #'bar-size = #4 + VoltaBracket \override #'minimum-space = #15 % urg, in \pt + VoltaBracket \override #'padding = #5 % urg, in \pt + StaffSymbol \override #'line-count = #1 % \consists "Repeat_engraver"; \consists "Volta_engraver"; @@ -153,25 +153,24 @@ GraceContext=\translator { \consists "Property_engraver"; - Stem \push #'style = #"grace" - Stem \push #'flag-style = #"grace" - Stem \push #'stem-length = #6.0 - Stem \push #'direction = #1 - - NoteHead \push #'font-relative-size = #-1 - Stem \push #'font-relative-size = #-1 - Stem \push #'stem-shorten = #'(0) - Beam \push #'font-relative-size = #-1 - TextScript \push #'font-relative-size = #-1 - Slur \push #'font-relative-size = #-1 - Accidentals \push #'font-relative-size = #-1 - Beam \push #'thickness = #0.3 - Beam \push #'space-function = #(lambda (x) 0.5) - - Stem \push #'lengths = #(map (lambda (x) (* 0.8 x)) '(3.5 3.5 3.5 4.5 5.0)) - Stem \push #'beamed-lengths = + Stem \override #'flag-style = #"grace" + Stem \override #'stem-length = #6.0 + Stem \override #'direction = #1 + + NoteHead \override #'font-relative-size = #-1 + Stem \override #'font-relative-size = #-1 + Stem \override #'stem-shorten = #'(0) + Beam \override #'font-relative-size = #-1 + TextScript \override #'font-relative-size = #-1 + Slur \override #'font-relative-size = #-1 + Accidentals \override #'font-relative-size = #-1 + Beam \override #'thickness = #0.3 + Beam \override #'space-function = #(lambda (x) 0.5) + + Stem \override #'lengths = #(map (lambda (x) (* 0.8 x)) '(3.5 3.5 3.5 4.5 5.0)) + Stem \override #'beamed-lengths = #'(0.0 2.5 2.0 1.5) - Stem \push #'beamed-minimum-lengths + Stem \override #'beamed-minimum-lengths = #(map (lambda (x) (* 0.8 x)) '(0.0 2.5 2.0 1.5)) weAreGraceContext = ##t @@ -194,7 +193,7 @@ GrandStaffContext=\translator{ \consists "Span_bar_engraver"; \consists "Span_arpeggio_engraver"; \consists "System_start_delimiter_engraver"; - SystemStartDelimiter \push #'glyph = #'brace + SystemStartDelimiter \override #'glyph = #'brace \consists "Property_engraver"; Generic_property_list = #generic-grand-staff-properties @@ -208,7 +207,7 @@ PianoStaffContext = \translator{ \consists "Vertical_align_engraver"; alignmentReference = \center; - VerticalAlignment \push #'threshold = #'(12 . 12) + VerticalAlignment \override #'threshold = #'(12 . 12) % \consistsend "Axis_group_engraver"; } @@ -220,7 +219,7 @@ StaffGroupContext= \translator { \consists "Span_bar_engraver"; \consists "Span_arpeggio_engraver"; \consists "Output_property_engraver"; - SystemStartDelimiter \push #'glyph = #'bracket + SystemStartDelimiter \override #'glyph = #'bracket \consists "System_start_delimiter_engraver"; \accepts "Staff"; @@ -286,7 +285,7 @@ ChordNamesContext = \translator { \consists "Output_property_engraver"; \accepts "ChordNamesVoice"; - VerticalAxisGroup \push #'invisible-staff = ##t + VerticalAxisGroup \override #'invisible-staff = ##t \consistsend "Axis_group_engraver"; } diff --git a/ly/fragment.ly b/ly/fragment.ly index 13973739a0..4e3d664877 100644 --- a/ly/fragment.ly +++ b/ly/fragment.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.96"; +\version "1.3.110"; \include "declarations.ly" diff --git a/ly/init-as.fly b/ly/init-as.fly index 1b73300c31..826e840974 100644 --- a/ly/init-as.fly +++ b/ly/init-as.fly @@ -1,6 +1,6 @@ % Toplevel AsciiScript initialisation file. -\version "1.3.97"; +\version "1.3.110"; \include "declarations-as.ly" diff --git a/ly/init-as.ly b/ly/init-as.ly index 191ae8741e..3e727da657 100644 --- a/ly/init-as.ly +++ b/ly/init-as.ly @@ -1,6 +1,6 @@ % Toplevel AsciiScript initialisation file. -\version "1.3.96"; +\version "1.3.110"; \include "declarations-as.ly" diff --git a/ly/init.fly b/ly/init.fly index 423594cb63..32073dbab8 100644 --- a/ly/init.fly +++ b/ly/init.fly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.97"; +\version "1.3.110"; \include "declarations.ly" diff --git a/ly/init.ly b/ly/init.ly index ae95b0139f..a5df75caf9 100644 --- a/ly/init.ly +++ b/ly/init.ly @@ -1,7 +1,7 @@ % Toplevel initialisation file. -\version "1.3.96"; +\version "1.3.110"; \include "declarations.ly"; diff --git a/ly/init.sly b/ly/init.sly index 34bcf9312d..c05fa2c456 100644 --- a/ly/init.sly +++ b/ly/init.sly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.97"; +\version "1.3.110"; \include "declarations.ly" diff --git a/ly/italiano.ly b/ly/italiano.ly index 3db0e86dbe..442528b175 100644 --- a/ly/italiano.ly +++ b/ly/italiano.ly @@ -10,7 +10,7 @@ % contributed by Paolo Zuliani -\notenames #'( +\pitchnames #'( (dobb . ,(make-pitch -1 0 -2 )) (dob . ,(make-pitch -1 0 -1 )) (do . ,(make-pitch -1 0 0 )) @@ -48,4 +48,4 @@ (sidd . ,(make-pitch -1 6 2 )) ) -\version "1.3.96"; +\version "1.3.110"; diff --git a/ly/nederlands.ly b/ly/nederlands.ly index 9d16eb3cbb..8a8c53418a 100644 --- a/ly/nederlands.ly +++ b/ly/nederlands.ly @@ -2,7 +2,7 @@ common dutch names for notes. es means flat, is means sharp %} -\notenames #`( +\pitchnames #`( (ceses . ,(make-pitch -1 0 -2)) (ces . ,(make-pitch -1 0 -1 )) (c . ,(make-pitch -1 0 0 )) diff --git a/ly/norsk.ly b/ly/norsk.ly index 36a2dae712..fe86bb8f50 100644 --- a/ly/norsk.ly +++ b/ly/norsk.ly @@ -1,5 +1,5 @@ -% $Id: norsk.ly,v 1.8 2000/11/12 22:29:58 fred Exp $ +% $Id: norsk.ly,v 1.9 2000/11/26 19:05:12 fred Exp $ %{ @@ -27,7 +27,7 @@ %} -\notenames #'( +\pitchnames #'( (ceses . ,(make-pitch -1 0 -2 )) (cessess . ,(make-pitch -1 0 -2 )) (ces . ,(make-pitch -1 0 -1 )) @@ -104,4 +104,4 @@ -\version "1.3.96"; +\version "1.3.110"; diff --git a/ly/paper-as5.ly b/ly/paper-as5.ly index 2c7689ef9a..f4ca1af14c 100644 --- a/ly/paper-as5.ly +++ b/ly/paper-as5.ly @@ -1,6 +1,6 @@ % paper-as5.ly -\version "1.3.96"; +\version "1.3.110"; paper_as_five = \paper { staffheight = 5.\char; diff --git a/ly/paper-as9.ly b/ly/paper-as9.ly index 2c183e4e6c..c2bfcbec98 100644 --- a/ly/paper-as9.ly +++ b/ly/paper-as9.ly @@ -1,6 +1,6 @@ % paper-as9.ly -\version "1.3.96"; +\version "1.3.110"; paper_as_nine = \paper { staffheight = 9.\char; diff --git a/ly/paper11.ly b/ly/paper11.ly index 734e8ec438..3880420dc0 100644 --- a/ly/paper11.ly +++ b/ly/paper11.ly @@ -1,6 +1,6 @@ % paper11.ly -\version "1.3.96"; +\version "1.3.110"; paper_eleven = \paper { staffheight = 11.0\pt; diff --git a/ly/paper13.ly b/ly/paper13.ly index b326908210..488165dca6 100644 --- a/ly/paper13.ly +++ b/ly/paper13.ly @@ -1,6 +1,6 @@ % paper13.ly -\version "1.3.96"; +\version "1.3.110"; paper_thirteen = \paper { staffheight = 13.0\pt; diff --git a/ly/paper16.ly b/ly/paper16.ly index 6f202c7bd7..779b810675 100644 --- a/ly/paper16.ly +++ b/ly/paper16.ly @@ -1,6 +1,6 @@ % paper16.ly -\version "1.3.96"; +\version "1.3.110"; paper_sixteen = \paper { staffheight = 16.0\pt; diff --git a/ly/paper20.ly b/ly/paper20.ly index 9370521da8..7b30c4a7d2 100644 --- a/ly/paper20.ly +++ b/ly/paper20.ly @@ -1,7 +1,7 @@ % paper20.ly -\version "1.3.96"; +\version "1.3.110"; paper_twenty = \paper { staffheight = 20.0\pt; diff --git a/ly/paper23.ly b/ly/paper23.ly index 62dca4d362..6b6203078c 100644 --- a/ly/paper23.ly +++ b/ly/paper23.ly @@ -1,7 +1,7 @@ % paper23.ly -\version "1.3.96"; +\version "1.3.110"; paper_twentythree = \paper { staffheight = 23.0\pt; diff --git a/ly/paper26.ly b/ly/paper26.ly index a3f163fc81..593b6bd33b 100644 --- a/ly/paper26.ly +++ b/ly/paper26.ly @@ -1,6 +1,6 @@ % paper26.ly -\version "1.3.96"; +\version "1.3.110"; paper_twentysix = \paper { staffheight = 26.0\pt; diff --git a/ly/property.ly b/ly/property.ly index 754e2854cc..f51b8c8519 100644 --- a/ly/property.ly +++ b/ly/property.ly @@ -1,23 +1,23 @@ % property.ly -\version "1.3.96"; +\version "1.3.110"; -stemUp = \property Voice.Stem \push #'direction = #1 -stemDown = \property Voice.Stem \push #'direction = #-1 -stemBoth= \property Voice.Stem \pop #'direction +stemUp = \property Voice.Stem \override #'direction = #1 +stemDown = \property Voice.Stem \override #'direction = #-1 +stemBoth= \property Voice.Stem \revert #'direction -slurUp = \property Voice.Slur \push #'direction = #1 -slurBoth = \property Voice.Slur \pop #'direction -slurDown = \property Voice.Slur \push #'direction = #-1 -shiftOn = \property Voice.NoteColumn \push #'horizontal-shift = #1 -shiftOnn = \property Voice.NoteColumn \push #'horizontal-shift = #2 -shiftOnnn = \property Voice.NoteColumn \push #'horizontal-shift = #3 -shiftOff = \property Voice.NoteColumn \pop #'horizontal-shift +slurUp = \property Voice.Slur \override #'direction = #1 +slurBoth = \property Voice.Slur \revert #'direction +slurDown = \property Voice.Slur \override #'direction = #-1 +shiftOn = \property Voice.NoteColumn \override #'horizontal-shift = #1 +shiftOnn = \property Voice.NoteColumn \override #'horizontal-shift = #2 +shiftOnnn = \property Voice.NoteColumn \override #'horizontal-shift = #3 +shiftOff = \property Voice.NoteColumn \revert #'horizontal-shift -tieUp = \property Voice.Tie \push #'direction = #1 -tieDown = \property Voice.Tie \push #'direction = #-1 -tieBoth = \property Voice.Tie \pop #'direction +tieUp = \property Voice.Tie \override #'direction = #1 +tieDown = \property Voice.Tie \override #'direction = #-1 +tieBoth = \property Voice.Tie \revert #'direction cadenzaOn = \property Score.timing = ##f cadenzaOff = { \property Score.timing = ##t @@ -48,8 +48,8 @@ voiceFour = { \shiftOn } -slurDotted = \property Voice.Slur \push #'dashed = #1 -slurNoDots = \property Voice.Slur \pop #'dashed +slurDotted = \property Voice.Slur \override #'dashed = #1 +slurNoDots = \property Voice.Slur \revert #'dashed tiny = diff --git a/ly/svenska.ly b/ly/svenska.ly index 8fdb6abcc1..b0d8c4469c 100644 --- a/ly/svenska.ly +++ b/ly/svenska.ly @@ -3,7 +3,7 @@ % % by Mats Bengtsson. -\notenames #'( +\pitchnames #'( (cessess . ,(make-pitch -1 0 -2 )) (cess . ,(make-pitch -1 0 -1 )) (c . ,(make-pitch -1 0 0 )) @@ -40,4 +40,4 @@ (hiss . ,(make-pitch -1 6 1 )) (hississ . ,(make-pitch -1 6 2 )) ) -\version "1.3.96"; +\version "1.3.110"; diff --git a/make/ly-rules.make b/make/ly-rules.make index d7af4be24e..e95bfafe62 100644 --- a/make/ly-rules.make +++ b/make/ly-rules.make @@ -5,21 +5,27 @@ SUBST_TEXI_DEPS=sed 's! \.\./! !g' < $(basename $@).dep > $(outdir)/temp.dep ; mv $(outdir)/temp.dep $(basename $@).dep $(outdir)/%.latex: %.doc - LILYPONDPREFIX=$(LILYPONDPREFIX)/.. $(PYTHON) $(script-dir)/lilypond-book.py --outdir=$(outdir) -I .. -I $(input-dir)/test/ --dependencies --dep-prefix=$(outdir)/ $< + rm -f $@ + LILYPONDPREFIX=$(LILYPONDPREFIX)/.. $(PYTHON) $(script-dir)/lilypond-book.py --outdir=$(outdir) -I .. -I $(input-dir)/test/ --dependencies --dep-prefix=$(outdir)/ $< + chmod -w $@ $(SUBST_TEXI_DEPS) # don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir. # it is not, for --scrdir builds $(outdir)/%.texi: %.tely - LILYPONDPREFIX=$(LILYPONDPREFIX)/.. $(PYTHON) $(script-dir)/lilypond-book.py --outdir=$(outdir) -I .. -I $(input-dir)/test/ --dependencies --dep-prefix=$(outdir)/ --format=texi $< + rm -f $@ + LILYPONDPREFIX=$(LILYPONDPREFIX)/.. $(PYTHON) $(script-dir)/lilypond-book.py --outdir=$(outdir) -I .. -I $(input-dir)/test/ --dependencies --format=texi $< $(SUBST_TEXI_DEPS) + chmod -w $@ # nexi: no-lily texi # for plain info doco: don't run lily $(outdir)/%.nexi: %.tely + rm -f $@ LILYPONDPREFIX=$(LILYPONDPREFIX)/.. $(PYTHON) $(script-dir)/lilypond-book.py --outdir=$(outdir) --no-lily -I .. -I $(input-dir)/test/ --dependencies --dep-prefix=$(outdir)/ --format=texi $< mv $(@D)/$(*F).texi $@ $(SUBST_TEXI_DEPS) + chmod -w $@ # nfo: info from non-lily texi $(outdir)/%.info: $(outdir)/%.nexi diff --git a/mutopia/Coriolan/bassi-part.ly b/mutopia/Coriolan/bassi-part.ly index cb859ce3ee..a9784ac4c5 100644 --- a/mutopia/Coriolan/bassi-part.ly +++ b/mutopia/Coriolan/bassi-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; \include "bassi.ly" diff --git a/mutopia/Coriolan/bassi.ly b/mutopia/Coriolan/bassi.ly index e3df744bf3..423abcac41 100644 --- a/mutopia/Coriolan/bassi.ly +++ b/mutopia/Coriolan/bassi.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; \include "global.ly" \include "violoncello.ly" diff --git a/mutopia/Coriolan/c-midi.ly b/mutopia/Coriolan/c-midi.ly index a46be9e81b..3f2cc6dd43 100644 --- a/mutopia/Coriolan/c-midi.ly +++ b/mutopia/Coriolan/c-midi.ly @@ -13,7 +13,7 @@ copyright = "public domain"; %% Hopefully, this can be junked when part-combiner+midi+dynamics work ok. %% -\version "1.3.93"; +\version "1.3.110"; \include "global.ly" diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly index 3fbb07fd71..bf95ae0098 100644 --- a/mutopia/Coriolan/clarinetti-part.ly +++ b/mutopia/Coriolan/clarinetti-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; \include "global.ly" \include "clarinetti.ly" diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly index ac37f17453..e51cd685e4 100644 --- a/mutopia/Coriolan/clarinetti.ly +++ b/mutopia/Coriolan/clarinetti.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; \include "clarinetto-1.ly" \include "clarinetto-2.ly" diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly index ab74729a67..5a6985ea5c 100644 --- a/mutopia/Coriolan/clarinetto-1.ly +++ b/mutopia/Coriolan/clarinetto-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; clarinettoI = \notes \relative c { R1 *2 | diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly index e8558d545e..620d75b7b5 100644 --- a/mutopia/Coriolan/clarinetto-2.ly +++ b/mutopia/Coriolan/clarinetto-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; clarinettoII = \notes \relative c { R1*2 bes''4-.\ff r r2 | diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly index d17bc3a298..6268000a9e 100644 --- a/mutopia/Coriolan/contrabasso.ly +++ b/mutopia/Coriolan/contrabasso.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; contrabasso = \notes \relative c { % copied 21 from cello diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly index 9b117f67cf..2155476460 100644 --- a/mutopia/Coriolan/coriolan.ly +++ b/mutopia/Coriolan/coriolan.ly @@ -11,7 +11,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; \include "global.ly" \include "paper16.ly" diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly index 187677232a..db90c940b7 100644 --- a/mutopia/Coriolan/corni-part.ly +++ b/mutopia/Coriolan/corni-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; \include "global.ly" \include "corni.ly" diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly index 00bef26000..3a1cb0cb5e 100644 --- a/mutopia/Coriolan/corni.ly +++ b/mutopia/Coriolan/corni.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; \include "corno-1.ly" \include "corno-2.ly" diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly index 18e9317b98..554ab1fcba 100644 --- a/mutopia/Coriolan/corno-1.ly +++ b/mutopia/Coriolan/corno-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; cornoI = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly index 7b6b8d8902..f1661a387c 100644 --- a/mutopia/Coriolan/corno-2.ly +++ b/mutopia/Coriolan/corno-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; cornoII = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/fagotti-part.ly b/mutopia/Coriolan/fagotti-part.ly index 13e7689cac..95d5988536 100644 --- a/mutopia/Coriolan/fagotti-part.ly +++ b/mutopia/Coriolan/fagotti-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; \include "global.ly" \include "fagotti.ly" diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly index ae652fb048..cbc1588246 100644 --- a/mutopia/Coriolan/fagotti.ly +++ b/mutopia/Coriolan/fagotti.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; \include "fagotto-1.ly" \include "fagotto-2.ly" diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly index f50111926c..11f71f9317 100644 --- a/mutopia/Coriolan/fagotto-1.ly +++ b/mutopia/Coriolan/fagotto-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; fagottoI = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly index 0924c20b09..18de3c36ed 100644 --- a/mutopia/Coriolan/fagotto-2.ly +++ b/mutopia/Coriolan/fagotto-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; fagottoII = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly index 47697dc50a..8bf47d39e1 100644 --- a/mutopia/Coriolan/flauti-part.ly +++ b/mutopia/Coriolan/flauti-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; \include "global.ly" \include "flauti.ly" diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly index af11353197..11cedc0c75 100644 --- a/mutopia/Coriolan/flauti.ly +++ b/mutopia/Coriolan/flauti.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; \include "flauto-1.ly" \include "flauto-2.ly" diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly index f90d23136f..1d8fa42e75 100644 --- a/mutopia/Coriolan/flauto-1.ly +++ b/mutopia/Coriolan/flauto-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; flautoI = \notes \relative c { R1 *2 | diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly index 1ce6ec3d5a..76ac71fdc0 100644 --- a/mutopia/Coriolan/flauto-2.ly +++ b/mutopia/Coriolan/flauto-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; flautoII = \notes \relative c { R1 *2 | diff --git a/mutopia/Coriolan/global.ly b/mutopia/Coriolan/global.ly index 4bcb05fd7f..f1ee718ee4 100644 --- a/mutopia/Coriolan/global.ly +++ b/mutopia/Coriolan/global.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; global = \notes { \time 4/4; diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly index 41f4d80dc7..504f82990c 100644 --- a/mutopia/Coriolan/oboe-1.ly +++ b/mutopia/Coriolan/oboe-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; oboeI = \notes \relative c'' { R1*2 | diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly index 55122f7ddf..5b36406107 100644 --- a/mutopia/Coriolan/oboe-2.ly +++ b/mutopia/Coriolan/oboe-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; oboeII = \notes \relative c{ R1*2| diff --git a/mutopia/Coriolan/oboi-part.ly b/mutopia/Coriolan/oboi-part.ly index 71d3f8343b..bdf573be45 100644 --- a/mutopia/Coriolan/oboi-part.ly +++ b/mutopia/Coriolan/oboi-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; \include "global.ly" \include "oboi.ly" diff --git a/mutopia/Coriolan/oboi.ly b/mutopia/Coriolan/oboi.ly index c9f69311e3..b061eb4175 100644 --- a/mutopia/Coriolan/oboi.ly +++ b/mutopia/Coriolan/oboi.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; \include "oboe-1.ly" \include "oboe-2.ly" diff --git a/mutopia/Coriolan/timpani-part.ly b/mutopia/Coriolan/timpani-part.ly index bdf768053e..e4edbb5003 100644 --- a/mutopia/Coriolan/timpani-part.ly +++ b/mutopia/Coriolan/timpani-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; \include "global.ly" \include "timpani.ly" diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly index 7ae6525b9f..8b7858a79c 100644 --- a/mutopia/Coriolan/timpani.ly +++ b/mutopia/Coriolan/timpani.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; timpani = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/trombe-part.ly b/mutopia/Coriolan/trombe-part.ly index e20953fec7..250c276032 100644 --- a/mutopia/Coriolan/trombe-part.ly +++ b/mutopia/Coriolan/trombe-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; \include "global.ly" \include "trombe.ly" diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly index 76d2aa0596..480351f7c4 100644 --- a/mutopia/Coriolan/trombe.ly +++ b/mutopia/Coriolan/trombe.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; \include "trombo-1.ly" \include "trombo-2.ly" diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly index 8d063406f0..a1fe9120f1 100644 --- a/mutopia/Coriolan/trombo-1.ly +++ b/mutopia/Coriolan/trombo-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; tromboI = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly index 555dd2797b..0e614705c0 100644 --- a/mutopia/Coriolan/trombo-2.ly +++ b/mutopia/Coriolan/trombo-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; tromboII = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/viola-1.ly b/mutopia/Coriolan/viola-1.ly index 2bf6cf6cc5..e59fe71f42 100644 --- a/mutopia/Coriolan/viola-1.ly +++ b/mutopia/Coriolan/viola-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; violaI = \notes \relative c { c'1\ff ~ | diff --git a/mutopia/Coriolan/viola-2.ly b/mutopia/Coriolan/viola-2.ly index e010449511..62affe5bd4 100644 --- a/mutopia/Coriolan/viola-2.ly +++ b/mutopia/Coriolan/viola-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; violaII = \notes \relative c { c1\ff ~ | diff --git a/mutopia/Coriolan/violi-part.ly b/mutopia/Coriolan/violi-part.ly index d798aedc63..c54d49c4bd 100644 --- a/mutopia/Coriolan/violi-part.ly +++ b/mutopia/Coriolan/violi-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; \include "violi.ly" diff --git a/mutopia/Coriolan/violi.ly b/mutopia/Coriolan/violi.ly index bb7d7f8dfe..b5de2798d5 100644 --- a/mutopia/Coriolan/violi.ly +++ b/mutopia/Coriolan/violi.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; \include "global.ly" \include "viola-1.ly" diff --git a/mutopia/Coriolan/violino-1-part.ly b/mutopia/Coriolan/violino-1-part.ly index c704325214..eb20a83deb 100644 --- a/mutopia/Coriolan/violino-1-part.ly +++ b/mutopia/Coriolan/violino-1-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; \include "global.ly" \include "violino-1.ly" diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly index 71260f1e60..4ea23aae7d 100644 --- a/mutopia/Coriolan/violino-1.ly +++ b/mutopia/Coriolan/violino-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; violinoI = \notes \relative c { c'1\ff ~ | diff --git a/mutopia/Coriolan/violino-2-part.ly b/mutopia/Coriolan/violino-2-part.ly index 78735b0e4b..2955553364 100644 --- a/mutopia/Coriolan/violino-2-part.ly +++ b/mutopia/Coriolan/violino-2-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; \include "global.ly" \include "violino-2.ly" diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly index 49932654a3..eeb0faa3d7 100644 --- a/mutopia/Coriolan/violino-2.ly +++ b/mutopia/Coriolan/violino-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; violinoII = \notes \relative c { c'1\ff ~ | diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly index 86a1992af4..3063d7d6e3 100644 --- a/mutopia/Coriolan/violoncello.ly +++ b/mutopia/Coriolan/violoncello.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; violoncello = \notes \relative c { c1\ff ~ | diff --git a/mutopia/D.Zipoli/verso_2.ly b/mutopia/D.Zipoli/verso_2.ly index ed46b8e751..2c316f3608 100644 --- a/mutopia/D.Zipoli/verso_2.ly +++ b/mutopia/D.Zipoli/verso_2.ly @@ -17,7 +17,7 @@ title = "Verso II"; under the Gnu Public Licence. %} -\version "1.3.93"; +\version "1.3.110"; $voice_one = \notes \relative c' { a'2 bes4. [c16 bes] | a4 d ~ d c ~ | c b ~ [b8 a] a4 ~| diff --git a/mutopia/E.Satie/gnossienne-4.ly b/mutopia/E.Satie/gnossienne-4.ly index f72e89bc5d..605af74b4f 100644 --- a/mutopia/E.Satie/gnossienne-4.ly +++ b/mutopia/E.Satie/gnossienne-4.ly @@ -11,7 +11,7 @@ Tested Features: cross staff auto beams and slurs, grace notes, no bars %} -\version "1.3.93"; +\version "1.3.110"; global = \notes { \key a \minor; @@ -105,7 +105,7 @@ accompany = \notes \relative c { \global \context Voice=foo { \stemUp - \property Voice.Script \push #'direction = #1 + \property Voice.Script \override #'direction = #1 \melody } @@ -134,7 +134,7 @@ accompany = \notes \relative c { slurVerticalDirection = #1 verticalDirection = #-1 - beamAutoEnd = #(make-moment 1 2) + autoBeamSettings \override #'(end * * * *) = #(make-moment 1 2) } } \midi { diff --git a/mutopia/E.Satie/petite-ouverture-a-danser.ly b/mutopia/E.Satie/petite-ouverture-a-danser.ly index b7ec74559c..8e8f34d0e8 100644 --- a/mutopia/E.Satie/petite-ouverture-a-danser.ly +++ b/mutopia/E.Satie/petite-ouverture-a-danser.ly @@ -12,7 +12,7 @@ Tested Features: %} -\version "1.3.93"; +\version "1.3.110"; \include "nederlands.ly" @@ -152,8 +152,8 @@ lower = \context Staff \notes \relative c{ \translator{ \OrchestralScoreContext } \translator{ \VoiceContext - beamAutoEnd_8 = #(make-moment 1 4) - beamAutoEnd_16 = #(make-moment 1 4) + autoBeamSettings \override #'(end 1 8 * *) = #(make-moment 1 4) + autoBeamSettings \override #'(end 1 16 * *) = #(make-moment 1 4) } } \midi { diff --git a/mutopia/F.Schubert/standchen-16.ly b/mutopia/F.Schubert/standchen-16.ly index a4664d978e..bc9a4e9c25 100644 --- a/mutopia/F.Schubert/standchen-16.ly +++ b/mutopia/F.Schubert/standchen-16.ly @@ -9,6 +9,6 @@ description = "A schubert song in 16 pt"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; \include "standchen.ly" diff --git a/mutopia/F.Schubert/standchen-20.ly b/mutopia/F.Schubert/standchen-20.ly index 38cc5d6d68..b43bbbb48a 100644 --- a/mutopia/F.Schubert/standchen-20.ly +++ b/mutopia/F.Schubert/standchen-20.ly @@ -10,7 +10,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.110"; % fool make-website % \include "standchen.ly"; diff --git a/mutopia/F.Schubert/standchen.ly b/mutopia/F.Schubert/standchen.ly index 0d1006949b..e62ae2ec61 100644 --- a/mutopia/F.Schubert/standchen.ly +++ b/mutopia/F.Schubert/standchen.ly @@ -41,10 +41,10 @@ multiple \paper{}s in one \score Note: Original key f. %} -\version "1.3.93"; +\version "1.3.110"; -dynamicUp = \property Voice.DynamicLineSpanner \push #'direction = #1 -dynamicRevert = \property Voice.DynamicLineSpanner \pop #'direction +dynamicUp = \property Voice.DynamicLineSpanner \override #'direction = #1 +dynamicRevert = \property Voice.DynamicLineSpanner \revert #'direction vocalVerse = \notes\relative c''{ @@ -226,9 +226,9 @@ trebleThrough = \notes \relative c'{ < { a4.-> )f8 } { a'4. f8 } > | r4 | r4 | - \property Voice . TextItem \push #'font-style = #'italic + \property Voice . TextItem \override #'font-style = #'italic r4 | - \property Voice . TextItem \pop #'font-style + \property Voice . TextItem \revert #'font-style %75 r4 | @@ -240,9 +240,9 @@ trebleThrough = \notes \relative c'{ | %80 - \property Voice . TextItem \push #'font-style = #'italic + \property Voice . TextItem \override #'font-style = #'italic | - \property Voice . TextItem \pop #'font-style + \property Voice . TextItem \revert #'font-style | | @@ -376,7 +376,7 @@ vocalStaff = \context Staff = vocal< treble = { \clef treble; - \property Voice.beamAutoBegin= #(make-moment 0 1) + \property Voice.autoBeamSettings \override #'(begin * * * *) = #(make-moment 0 1) \trebleIntro \trebleVerseOne \trebleEentje diff --git a/mutopia/Hymns/diademata.ly b/mutopia/Hymns/diademata.ly index afb5494ee0..ee2563d96b 100644 --- a/mutopia/Hymns/diademata.ly +++ b/mutopia/Hymns/diademata.ly @@ -7,7 +7,7 @@ metre = "6 6. 8 6. D"; } -\version "1.3.93"; +\version "1.3.110"; sop=\notes \transpose c''{ ees2 ees4 ees4 g2 g2 | c'1. diff --git a/mutopia/Hymns/laudatedom.ly b/mutopia/Hymns/laudatedom.ly index f2ac72c2a1..8acd722abf 100644 --- a/mutopia/Hymns/laudatedom.ly +++ b/mutopia/Hymns/laudatedom.ly @@ -4,7 +4,7 @@ composer = "Parry"; metre = "10 10 . 11 11"; } -\version "1.3.93"; +\version "1.3.110"; sop = \notes \transpose c''{ f4 | d' bes c' | f2 \bar "||"; diff --git a/mutopia/Hymns/maccabaeus.ly b/mutopia/Hymns/maccabaeus.ly index dc83b17e76..087f85f5bd 100644 --- a/mutopia/Hymns/maccabaeus.ly +++ b/mutopia/Hymns/maccabaeus.ly @@ -7,7 +7,7 @@ title = "Maccabaeus"; metre = "10 11. 11 11. and refrain"; } -\version "1.3.93"; +\version "1.3.110"; sop=\notes \relative c'' { b2 gis4. a8 |b2 e,2 | diff --git a/mutopia/Hymns/ode.ly b/mutopia/Hymns/ode.ly index add1588684..fe5a5015df 100644 --- a/mutopia/Hymns/ode.ly +++ b/mutopia/Hymns/ode.ly @@ -7,7 +7,7 @@ metre = "8 7 8 7 D"; } -\version "1.3.93"; +\version "1.3.110"; sop=\notes \relative c'' { b4 b c d | d c b a | g g a b | b4. a8 a2 | diff --git a/mutopia/Hymns/passion.ly b/mutopia/Hymns/passion.ly index be7e855c7a..a2d31c6ca4 100644 --- a/mutopia/Hymns/passion.ly +++ b/mutopia/Hymns/passion.ly @@ -5,22 +5,22 @@ composer = "J. S. Bach"; enteredby = "Peter Chubb"; } -\version "1.0.16"; +\version "1.3.110"; sop=\notes \transpose c'' { - \repeat 2 { + \repeat "volta" 2 { \partial 2; - e2 | a g f e | d1 e2 ^"{\kern1em\Huge ,}" b | c' b4([c'8 + e2 | a g f e | d1 e2 \breathe b | c' b4([c'8 )d'] c'2 b4( )a4 | a1. } - c'2 | b4( )a4 g2 a b | c'1 c'2 ^"{\kern1em\Huge ,}" g2 | - a g a4( )g f2 | e1. ^"{\kern3em\Huge ,}" - c'2 | b4( )c'4 d'2 c' b | a1 b2 ^"{\kern1em\Huge ,}" + c'2 | b4( )a4 g2 a b | c'1 c'2\breathe g2 | + a g a4( )g f2 | e1. \breathe + c'2 | b4( )c'4 d'2 c' b | a1 b2\breathe e2 | f e d g4( )f4 | e1. \bar "||"; } alt=\notes \transpose c'' { - \repeat 2 { + \repeat "volta" 2 { \partial 2; c2 | c4( )d4 e2 a,4( )b,4 c2 | c2( )b, c e | e f e d4( )c4 | @@ -34,7 +34,7 @@ alt=\notes \transpose c'' { ten=\notes{ - \repeat 2 { + \repeat "volta" 2 { \partial 2; a2 | a4( )b c'2 d' g | a( )g g b | a a a gis | @@ -46,7 +46,7 @@ ten=\notes{ } bass=\notes{ - \repeat 2 { + \repeat "volta" 2 { \partial 2; a4( )g | f2 e d c | fis,( )g, c gis,2 | a, d e e | @@ -58,7 +58,7 @@ bass=\notes{ } global=\notes{ - \key c; + \key c \major; \time 4/2; \property Staff.timeSignatureStyle="none" } @@ -68,12 +68,12 @@ global=\notes{ \context Staff = "top" { \clef "treble"; \global - \context Staff <{\voiceone \sop}{\voicetwo \alt} > + \context Staff <{\voiceOne \sop}{\voiceTwo \alt} > } \context Staff = "bottom" { \clef "bass"; \global - \context Staff < {\voiceone \ten}{\voicetwo \bass} > + \context Staff < {\voiceOne \ten}{\voiceTwo \bass} > } > diff --git a/mutopia/Hymns/stille.ly b/mutopia/Hymns/stille.ly index 09712891a3..ffa06d9dff 100644 --- a/mutopia/Hymns/stille.ly +++ b/mutopia/Hymns/stille.ly @@ -8,7 +8,7 @@ } -\version "1.3.93"; +\version "1.3.110"; %{ Note: there are other verses, but the three here seem to be 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 345ebfa809..f6af1ccbd4 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly @@ -4,7 +4,7 @@ piece = "Allemande"; } -\version "1.3.93"; +\version "1.3.110"; global = \notes{ \time 4/4; 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 71d4175e33..2f4ede1f39 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly @@ -10,7 +10,7 @@ %% %% Noe liknende skjer også i mellom andre og tredje stemme i takt 28 -\version "1.3.93"; +\version "1.3.110"; global = \notes{ \time 2/4; 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 5f151f5784..d5d6d8b1ef 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly @@ -10,7 +10,7 @@ copyright = "Public Domain"; } -\version "1.3.93"; +\version "1.3.110"; global = \notes { \time 4/4; diff --git a/mutopia/J.S.Bach/Duette/global-i.ly b/mutopia/J.S.Bach/Duette/global-i.ly index 21fb5840e5..b5c97728a8 100644 --- a/mutopia/J.S.Bach/Duette/global-i.ly +++ b/mutopia/J.S.Bach/Duette/global-i.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.110"; $global_i = \notes{ \time 12/8; diff --git a/mutopia/J.S.Bach/Duette/global-ii.ly b/mutopia/J.S.Bach/Duette/global-ii.ly index 0cb7a29b63..c7806b219e 100644 --- a/mutopia/J.S.Bach/Duette/global-ii.ly +++ b/mutopia/J.S.Bach/Duette/global-ii.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.110"; $global_ii = \notes{ \time 4/4; diff --git a/mutopia/J.S.Bach/Duette/viola-i.ly b/mutopia/J.S.Bach/Duette/viola-i.ly index dc1c67eba1..3d909cc048 100644 --- a/mutopia/J.S.Bach/Duette/viola-i.ly +++ b/mutopia/J.S.Bach/Duette/viola-i.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.93"; +\version "1.3.110"; \include "global-i.ly" \include "violoncello-i.ly"; diff --git a/mutopia/J.S.Bach/Duette/viola-ii.ly b/mutopia/J.S.Bach/Duette/viola-ii.ly index 7a593e1296..5ebe0297ef 100644 --- a/mutopia/J.S.Bach/Duette/viola-ii.ly +++ b/mutopia/J.S.Bach/Duette/viola-ii.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.93"; +\version "1.3.110"; \include "global-ii.ly" \include "violoncello-ii.ly"; diff --git a/mutopia/J.S.Bach/Duette/viola-part.ly b/mutopia/J.S.Bach/Duette/viola-part.ly index 341c40e1ed..8224368ba4 100644 --- a/mutopia/J.S.Bach/Duette/viola-part.ly +++ b/mutopia/J.S.Bach/Duette/viola-part.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.93"; +\version "1.3.110"; % { diff --git a/mutopia/J.S.Bach/Duette/violino-i.ly b/mutopia/J.S.Bach/Duette/violino-i.ly index f4a4a3b613..63c9a31c5e 100644 --- a/mutopia/J.S.Bach/Duette/violino-i.ly +++ b/mutopia/J.S.Bach/Duette/violino-i.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.93"; +\version "1.3.110"; $violino_i = \notes\relative c'' { \property Voice.beamAutoEnd = "3/8" diff --git a/mutopia/J.S.Bach/Duette/violino-ii.ly b/mutopia/J.S.Bach/Duette/violino-ii.ly index 2d7a922d9a..bef12a79cf 100644 --- a/mutopia/J.S.Bach/Duette/violino-ii.ly +++ b/mutopia/J.S.Bach/Duette/violino-ii.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.93"; +\version "1.3.110"; $violino_ii = \notes\relative c''{ R1*8 | @@ -101,4 +101,4 @@ $violino_ii_staff = \context Staff = violino < \$violino_ii \$global_ii > -\version "1.3.93"; +\version "1.3.110"; diff --git a/mutopia/J.S.Bach/Duette/violino-part.ly b/mutopia/J.S.Bach/Duette/violino-part.ly index dcef893cf0..dfbb98c219 100644 --- a/mutopia/J.S.Bach/Duette/violino-part.ly +++ b/mutopia/J.S.Bach/Duette/violino-part.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.93"; +\version "1.3.110"; % { diff --git a/mutopia/J.S.Bach/Duette/violino-viola.ly b/mutopia/J.S.Bach/Duette/violino-viola.ly index ebd7efa3e9..234b82fe42 100644 --- a/mutopia/J.S.Bach/Duette/violino-viola.ly +++ b/mutopia/J.S.Bach/Duette/violino-viola.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.93"; +\version "1.3.110"; % { \include "violino-i.ly"; diff --git a/mutopia/J.S.Bach/Duette/violino-violoncello.ly b/mutopia/J.S.Bach/Duette/violino-violoncello.ly index 14d6a8b87f..585f51e4df 100644 --- a/mutopia/J.S.Bach/Duette/violino-violoncello.ly +++ b/mutopia/J.S.Bach/Duette/violino-violoncello.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.93"; +\version "1.3.110"; % { \include "violino-i.ly"; diff --git a/mutopia/J.S.Bach/Duette/violoncello-i.ly b/mutopia/J.S.Bach/Duette/violoncello-i.ly index def89cf841..a277c149ca 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-i.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-i.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.93"; +\version "1.3.110"; $violoncello_i = \notes\relative c{ \property Voice.beamAutoEnd = "3/8" diff --git a/mutopia/J.S.Bach/Duette/violoncello-ii.ly b/mutopia/J.S.Bach/Duette/violoncello-ii.ly index 9c56983852..381f89cffe 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-ii.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-ii.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.93"; +\version "1.3.110"; $violoncello_ii = \notes\relative c{ r2 a'2|c e,| f8(e)d2 e8()fis| g a bes2 a8()gis| diff --git a/mutopia/J.S.Bach/Duette/violoncello-part.ly b/mutopia/J.S.Bach/Duette/violoncello-part.ly index 8bb9f8551c..518ca29713 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-part.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-part.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.93"; +\version "1.3.110"; % { diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly index 30c0047213..c1a7cbe971 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly @@ -44,7 +44,7 @@ Lemoine puts fermatas on ending bar lines everywhere. -\version "1.3.93"; +\version "1.3.110"; lowstaff = \translator "Staff" = "lower" diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly index c8f5e45aae..478eb2e3e1 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly @@ -42,7 +42,7 @@ Old versions of LilyPond include this prelude with dynamics and fingerings. -\version "1.3.93"; +\version "1.3.110"; upper = \context Staff \notes\relative c{ \context Voice=i \property Voice . textStyle = "italic" diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly index 14863ebbe9..f0ca8ebd51 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly @@ -45,7 +45,7 @@ note, some have dotted half notes. %} -\version "1.3.93"; +\version "1.3.110"; upper = \notes \transpose c'' { diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly index 20326cf01a..c723fdcae8 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly @@ -31,7 +31,7 @@ } -\version "1.3.93"; +\version "1.3.110"; upper = \context Staff \notes\relative c \context Voice=i { diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly index 3071bcfdbc..9080ca86dc 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly @@ -31,7 +31,7 @@ } -\version "1.3.93"; +\version "1.3.110"; 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 ec4863e4d5..bc5d23d48d 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly @@ -1,6 +1,6 @@ -\version "1.3.93"; +\version "1.3.110"; \include "allemande-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly index 480995effd..9e12920ed3 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly @@ -100,4 +100,4 @@ allemande = \context Staff \notes< > -\version "1.3.93"; +\version "1.3.110"; 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 fb72fcc333..596b498f6d 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly @@ -1,5 +1,5 @@ -\version "1.3.93"; +\version "1.3.110"; \include "allemande-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly index cbad145c5b..ee6e1331f5 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly @@ -1,5 +1,5 @@ -\version "1.3.93"; +\version "1.3.110"; \include "courante-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly index ff7f05d526..caf96612d1 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly @@ -89,4 +89,4 @@ courante = \context Staff \notes< \$courante_b > -\version "1.3.93"; +\version "1.3.110"; 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 33a7d5a3f6..1c2c9be1e3 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly @@ -1,7 +1,7 @@ -\version "1.3.93"; +\version "1.3.110"; \include "courante-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly index 401d0d13d9..866900fe33 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly @@ -1,7 +1,7 @@ -\version "1.3.93"; +\version "1.3.110"; \include "gigue-urtext.ly"; @@ -39,8 +39,8 @@ gigue_cello_staff = \context Staff < \paper{ \translator{ \VoiceContext - beamAutoEnd_8 = #(make-moment 3 4) - beamAutoEnd_16 = #(make-moment 3 4) + autoBeamSettings \override #'(end 1 8 * *) = #(make-moment 3 4) + autoBeamSettings \override #'(end 1 16 * *) = #(make-moment 3 4) } } \midi{ \tempo 4 = 60; } 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 d300e28aeb..32cd4f5271 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly @@ -103,4 +103,4 @@ gigue = \notes< \$gigue_b > -\version "1.3.93"; +\version "1.3.110"; 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 0fabc3941b..88740aaa7e 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly @@ -1,6 +1,6 @@ -\version "1.3.93"; +\version "1.3.110"; \include "gigue-urtext.ly"; @@ -37,8 +37,8 @@ gigue_viola_staff = \context Staff < \paper{ \translator{ \VoiceContext - beamAutoEnd_8 = #(make-moment 3 4) - beamAutoEnd_16 = #(make-moment 3 4) + autoBeamSettings \override #'(end 1 8 * *) = #(make-moment 3 4) + autoBeamSettings \override #'(end 1 16 * *) = #(make-moment 3 4) } } \midi{ \tempo 4 = 60; } 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 6b4fcf1a64..7f97744d9c 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly @@ -1,7 +1,7 @@ -\version "1.3.93"; +\version "1.3.110"; \include "menuetto-urtext.ly"; @@ -53,7 +53,7 @@ menuetto_i_cello_staff = \context Staff < \paper{ \translator{ \VoiceContext - beamAutoEnd_8 = #(make-moment 3 4) + autoBeamSettings \override #'(end 1 8 * *) = #(make-moment 3 4) } } \midi{ \tempo 4 = 110; } @@ -90,7 +90,7 @@ menuetto_ii_cello_staff = \context Staff < \paper{ \translator{ \VoiceContext - beamAutoEnd_8 = #(make-moment 3 4) + autoBeamSettings \override #'(end 1 8 * *) = #(make-moment 3 4) } } 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 a00f3c8a86..a9de8047f5 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly @@ -150,4 +150,4 @@ menuetto_ii = \context Staff\notes \relative c { \bar "|."; } -\version "1.3.93"; +\version "1.3.110"; 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 c5bb695392..9cb5b68435 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly @@ -1,7 +1,7 @@ -\version "1.3.93"; +\version "1.3.110"; \include "menuetto-urtext.ly"; @@ -52,7 +52,7 @@ menuetto_i_viola_staff = \context Staff < gourlay_maxmeasures = 7.0; \translator{ \VoiceContext - beamAutoEnd_8 = #(make-moment 3 4) + autoBeamSettings \override #'(end 1 8 * *) = #(make-moment 3 4) } } @@ -89,7 +89,7 @@ menuetto_ii_viola_staff = \context Staff < \paper{ \translator{ \VoiceContext - beamAutoEnd_8 = #(make-moment 3 4) + autoBeamSettings \override #'(end 1 8 * *) = #(make-moment 3 4) } } 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 0045c3a466..b4ce17122d 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly @@ -1,7 +1,7 @@ -\version "1.3.93"; +\version "1.3.110"; \include "prelude-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly index ed6835206a..b079a9e2b9 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly @@ -194,4 +194,4 @@ prelude = \context Staff \notes< \$prelude_b > -\version "1.3.93"; +\version "1.3.110"; 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 84974cdcfb..75cb1eedc6 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly @@ -1,7 +1,7 @@ -\version "1.3.93"; +\version "1.3.110"; \include "prelude-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly index 1b82622798..1e90926b38 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly @@ -1,7 +1,7 @@ -\version "1.3.93"; +\version "1.3.110"; \include "sarabande-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly index a2f8b2f4c6..458000d158 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly @@ -90,4 +90,4 @@ sarabande = \context Staff \notes< \$sarabande_b > -\version "1.3.93"; +\version "1.3.110"; 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 3619fd9a6b..54a2e94913 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.110"; \include "sarabande-urtext.ly"; diff --git a/mutopia/J.S.Bach/wtk1-fugue1.ly b/mutopia/J.S.Bach/wtk1-fugue1.ly index 293666b130..5dbf5183ed 100644 --- a/mutopia/J.S.Bach/wtk1-fugue1.ly +++ b/mutopia/J.S.Bach/wtk1-fugue1.ly @@ -19,7 +19,7 @@ enteredby = "Shay Rojansky"; %{ TODO: use autobeaming. %} -\version "1.3.93"; +\version "1.3.110"; tenor = diff --git a/mutopia/J.S.Bach/wtk1-fugue2.ly b/mutopia/J.S.Bach/wtk1-fugue2.ly index adf4f4136f..56b4360156 100644 --- a/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -21,7 +21,7 @@ % 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.93"; +\version "1.3.110"; dux = \context Voice=two \notes \relative c''{ @@ -186,7 +186,7 @@ bassdux = \context Voice=three \notes \relative c' { \paper { linewidth = 18.0 \cm; \translator{ \OrchestralScoreContext - timeSignatureStyle \push #'style = #"C" + timeSignatureStyle \override #'style = #"C" } diff --git a/mutopia/J.S.Bach/wtk1-prelude1.ly b/mutopia/J.S.Bach/wtk1-prelude1.ly index d7b4a48da0..3c964f2686 100644 --- a/mutopia/J.S.Bach/wtk1-prelude1.ly +++ b/mutopia/J.S.Bach/wtk1-prelude1.ly @@ -15,7 +15,7 @@ enteredby = "Shay Rojansky"; lastupdated = "1999/Oct/14"; } -\version "1.3.93"; +\version "1.3.110"; % should do programmable input. soprane = diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly index dcb6f5a907..6425674342 100644 --- a/mutopia/gallina.ly +++ b/mutopia/gallina.ly @@ -45,7 +45,7 @@ Voice engraver by uncommenting the lines in the paper definition below. --MB %} -\version "1.3.93"; +\version "1.3.110"; global = \notes { \property StaffGroup.timeSignatureStyle = "old" diff --git a/scm/interface.scm b/scm/interface.scm index b1728e7479..a989bdbef8 100644 --- a/scm/interface.scm +++ b/scm/interface.scm @@ -305,13 +305,46 @@ object." (define bar-line-interface (lily-interface 'bar-line-interface - "Bar line" + "Bar line. + +This is a request to print a special bar symbol. It replaces the +regular bar symbol with a special +symbol. The argument @var{bartype} is a string which specifies the +kind of bar to print. Options are @code{\":|\"} +@cindex \"|A@@@code{:|} +, +@code{\"|:\"} +@cindex \"|B@@@code{|:} +, @code{\":|:\"} +@cindex \"|C@@@code{:|:} +, +@code{\"||\"} +@cindex \"|D@@@code{||} +, @code{\"|.\"} +@cindex \"|E@@@code{|.} +, +@code{\".|\"} +@cindex \"|F@@@code{.|} +, and @code{\".|.\"} +@cindex \"|G@@@code{.|.} +. + +These produce, respectively, a right repeat, a left repeat, a double +repeat, a double bar, a start bar, an end bar, and a thick double bar. +If @var{bartype} is set to @code{\"empty\"} then nothing is printed, +but a line break is allowed at that spot. + +" '( barsize-procedure kern thin-kern hair-thickness thick-thickness glyph bar-size break-glyph-function ))) (define hairpin-interface (lily-interface 'hairpin-interface - "hairpin crescendo" + "hairpin crescendo. + +padding -- horizontal padding. This is useful if a crescendo is set next to a text like `mf' + +" '( grow-direction thickness height padding ) )) @@ -496,7 +529,10 @@ syllables. The length of the hyphen line should stretch based on the (lily-interface 'multi-measure-rest-interface "A rest that spans a whole number of measures. For typesetting the -numbers, fields from font-interface may be used. +numbers, fields from font-interface may be used. + +padding is the space between number and rest. Measured in staffspace. + " '( diff --git a/scm/lily.scm b/scm/lily.scm index 2d4b2aafd9..3079ac70a0 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -854,16 +854,16 @@ (define (repeat-name-to-ctor name) (let* ((supported-reps - `(("volta" . ((type . ,Volta_repeat_iterator::constructor) + `(("volta" . ((iterator-ctor . ,Volta_repeat_iterator::constructor) (length . ,Repeated_music::volta_music_length) )) - ("unfold" . ((type . ,Unfolded_repeat_iterator::constructor) + ("unfold" . ((iterator-ctor . ,Unfolded_repeat_iterator::constructor) (length . ,Repeated_music::unfolded_music_length) )) - ("fold" . ((type . ,Folded_repeat_iterator::constructor) + ("fold" . ((iterator-ctor . ,Folded_repeat_iterator::constructor) (length . ,Repeated_music::folded_music_length) )) - ("tremolo" . ((type . ,Chord_tremolo_iterator::constructor) + ("tremolo" . ((iterator-ctor . ,Chord_tremolo_iterator::constructor) (length . ,Repeated_music::volta_music_length) )) )) diff --git a/scm/music-property.scm b/scm/music-property.scm new file mode 100644 index 0000000000..55ab7ec545 --- /dev/null +++ b/scm/music-property.scm @@ -0,0 +1,54 @@ +(define all-music-properties '()) + +(define (music-property-description symbol type? description) + (set-object-property! symbol 'music-type? type?) + (set-object-property! symbol 'music-doc description) + (set! all-music-properties (cons symbol all-music-properties)) + ) +(define (true? x) #t) + +(music-property-description 'iterator-ctor c++-function? "") +(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 'articulation-type symbol? "key for scriptDefinitions alist") +(music-property-description 'bass boolean? "") +(music-property-description 'body music? "") +(music-property-description 'cautionary boolean? "") +(music-property-description 'change-to-id string? "") +(music-property-description 'change-to-type string? "") +(music-property-description 'context-id string? "") +(music-property-description 'context-type string? "") +(music-property-description 'denominator integer? "") +(music-property-description 'direction dir? "") +(music-property-description 'text-type symbol? "") +(music-property-description 'element music ) +(music-property-description 'grob-property symbol? "") +(music-property-description 'grob-value true? "") +(music-property-description 'elements list? "") +(music-property-description 'force-accidental boolean? "") +(music-property-description 'inversion boolean? "") +(music-property-description 'label string? "") +(music-property-description 'last-pitch pitch? "") +(music-property-description 'length procedure? "") +(music-property-description 'lyrics music? "") +(music-property-description 'mark-label string? "") +(music-property-description 'numerator integer? "") +(music-property-description 'one music? ""); part-combine, fixme, naming. +(music-property-description 'origin input? "") +(music-property-description 'penalty number? "") +(music-property-description 'pitch pitch? "") +(music-property-description 'pitch-alist list? "") +(music-property-description 'predicate procedure? "") +(music-property-description 'type symbol? "") +(music-property-description 'repeat-count integer? "") +(music-property-description 'span-direction dir? "") +(music-property-description 'symbol symbol? "") +(music-property-description 'symbols list? "") +(music-property-description 'tempo duration? "") +(music-property-description 'text string? "");; markup? +(music-property-description 'tremolo-type integer? "") +(music-property-description 'two music? ""); part-combine, fixme, naming. +(music-property-description 'value true? "") +(music-property-description 'what string? "") diff --git a/scm/translator-properties.scm b/scm/translator-properties.scm index 8af2094287..b3c6366574 100644 --- a/scm/translator-properties.scm +++ b/scm/translator-properties.scm @@ -7,77 +7,29 @@ (set! all-translation-properties (cons symbol all-translation-properties)) ) -(translator-property-description 'tremoloFlags integer? "") -(translator-property-description 'stemLeftBeamCount integer? " -Specify the number of beams to draw on the left side of the next note. -Overrides automatic beaming. The value is only used once, and then it -is erased. -") -(translator-property-description 'stemRightBeamCount integer? "idem, for the right side") -(translator-property-description - 'CONTEXTNAMEVerticalExtent number-pair? "hard coded vertical extent. + + +(translator-property-description 'CONTEXTNAMEMinimumVerticalExtent number-pair? "minimum vertical extent, same format as CONTEXTNAMEVerticalExtent [fixme, naming]") +(translator-property-description 'CONTEXTNAMEVerticalExtent number-pair? "hard coded vertical extent. The format is a pair of dimensions, for example, this sets the sizes of a staff to 10 (5+5) staffspaces high. @example -\property Staff.StaffVerticalExtent = #(-5.0 . 5.0) +property Staff.StaffVerticalExtent = #(-5.0 . 5.0) @end example [fixme, naming]") -(translator-property-description 'CONTEXTNAMEMinimumVerticalExtent number-pair? - "minimum vertical extent, same format as CONTEXTNAMEVerticalExtent [fixme, naming]") -(translator-property-description 'CONTEXTNAMExtraVerticalExtent number-pair? - "extra vertical extent, same format -CONTEXTNAMEMinimumVerticalExtent [fixme, naming]") -(translator-property-description 'localKeySignature list? "the key signature at this point in the measure") -(translator-property-description 'forgetAccidentals boolean? "do -not set localKeySignature when a note alterated differently from -localKeySignature is found. - -Causes accidentals to be printed at every note instead of -remembered for the duration of a measure. -") -(translator-property-description 'noResetKey boolean? "Do not -reset local key to the value of keySignature at the start of a measure, -as determined by measurePosition. - -Do not reset the key at the start of a measure. Accidentals will be -printed only once and are in effect until overridden, possibly many -measures later. -") -(translator-property-description 'repeatCommands list? - "This property is read to find any command of the form (volta . X), where X is a string or #f") -(translator-property-description 'voltaSpannerDuration moment? - "maximum duration of the volta bracket. +(translator-property-description 'CONTEXTNAMExtraVerticalExtent number-pair? "extra vertical extent, same format +CONTEXTNAMEMinimumVerticalExtent [fixme, naming]") +(translator-property-description 'Generic_property_list list? "description of the conversion. - Set to a duration to control the size of the brackets printed by -@code{\alternative}. It specifies the number of whole notes duration -to use for the brackets. This can be used to shrink the length of -brackets in the situation where one alternative is very large. It may -have odd effects if the specified duration is longer than the music -given in an @code{\alternative}. +Defines names and types for generic properties. These are properties +than can be plugged into the backend directly. See the init file +@file{generic-property.scm} for details. For internal use only, +deprecated. ") -(translator-property-description 'clefPosition number? "Where should the center of the symbol go?") -(translator-property-description 'clefGlyph string? "Name of the symbol within the music font") -(translator-property-description 'centralCPosition number? "Place of the central C. Usually determined by looking at clefPosition and clefGlyph.") -(translator-property-description 'clefOctavation integer? "Add -this much extra octavation. Values of 7 and -7 are common.") -(translator-property-description 'explicitClefVisibility procedure? "visibility-lambda function for clef changes.") -(translator-property-description 'clefPitches list? "an alist mapping GLYPHNAME to the position of the central C for that symbol") -(translator-property-description 'combineParts boolean? "try to combine parts?") -(translator-property-description 'soloADue boolean? "set Solo/A due texts?") -(translator-property-description 'soloText string? "text for begin of solo") -(translator-property-description 'soloIIText string? "text for begin of solo for voice ``two''") (translator-property-description 'aDueText string? "text for begin of a due") -(translator-property-description 'split-interval number-pair? "always split into two voices for contained intervals") -(translator-property-description 'unison boolean? "set if unisono is detected ") -(translator-property-description 'solo boolean? "set if solo is detected") -(translator-property-description 'unisilence boolean? "set if unisilence is detected") -(translator-property-description 'unirhythm boolean? "set if unirhythm is detected") -(translator-property-description 'graceAlignPosition dir? "put the grace note before or after the main note?") -(translator-property-description 'graceAccidentalSpace number? "amount space to alot for an accidental") -(translator-property-description 'noAutoBeaming boolean? " If set to true then beams are not generated automatically. -") +(translator-property-description 'associatedVoice string? "") (translator-property-description 'autoBeamSettings list? " Specifies when automatically generated beams should begin and end. The elements have the format: @@ -97,7 +49,7 @@ are given by * * The user can override beam begin or end time by pushing a wildcard entries '(begin * * * *) or '(end * * * *) resp., eg: - \property Voice.autoBeamSettings \push #'(end * * * *) = #(make-moment 1 4) + property Voice.autoBeamSettings push #'(end * * * *) = #(make-moment 1 4) The head of the list: '( @@ -108,19 +60,20 @@ The head of the list: ) @end example") -(translator-property-description 'whichBar string? "This property is read to determine what type of barline to create. -Example: -@example -\\property Staff.whichBar = \"|:\" -@end example -will create a start-repeat bar in this staff only +(translator-property-description 'automaticPhrasing boolean? "") +(translator-property-description 'barAlways boolean? " If set to true a bar line is drawn after each note. +") +(translator-property-description 'barCheckNoSynchronize boolean? "If set, don't reset measurePosition when finding a bbarcheck. This +makes bar-checks for polyphonic music easier.") +(translator-property-description 'barNonAuto boolean? " If set to true then bar lines will not be printed + automatically; they must be explicitly created with @code{bar} + keywords. Unlike with the @code{cadenza} keyword, measures are + still counted. Bar generation will resume according to that + count if this property is set to zero. ") -(translator-property-description 'staffsFound list? "list of all staff-symbols found.") -(translator-property-description 'currentBarNumber integer? "this is read to determine - the number to put on the bar ") (translator-property-description 'beamMelismaBusy boolean? "Signal if a beam is set when automaticMelismata is set") -(translator-property-description 'breakAlignOrder list? - "Defines the order in which +(translator-property-description 'beamMelismaBusy boolean? "") +(translator-property-description 'breakAlignOrder list? "Defines the order in which prefatory matter (clefs, key signatures) appears, eg. this puts the key signatures after the bar lines: @@ -134,11 +87,45 @@ key signatures after the bar lines: Time_signature ) @end example -") (translator-property-description 'chordInversion boolean? " Determines whether LilyPond should look for chord inversions when +") +(translator-property-description 'centralCPosition number? "Place of the central C. Usually determined by looking at clefPosition and clefGlyph.") +(translator-property-description 'chordInversion boolean? " Determines whether LilyPond should look for chord inversions when translating from notes to chord names. Set to 1 to find inversions. The default is 0 which does not look for inversions.") +(translator-property-description 'clefGlyph string? "Name of the symbol within the music font") +(translator-property-description 'clefOctavation integer? "Add +this much extra octavation. Values of 7 and -7 are common.") +(translator-property-description 'clefPitches list? "an alist mapping GLYPHNAME to the position of the central C for that symbol") +(translator-property-description 'clefPosition number? "Where should the center of the symbol go?") +(translator-property-description 'combineParts boolean? "try to combine parts?") +(translator-property-description 'connectArpeggios boolean? " If +set, connect all arpeggios that are found. In this way, you can make +arpeggios that cross staffs. +") +(translator-property-description 'createKeyOnClefChange boolean? "") +(translator-property-description 'currentBarNumber integer? "this is read to determine + the number to put on the bar ") +(translator-property-description 'currentBarNumber integer? "Contains the current barnumber. This property is incremented at +every barline. +") +(translator-property-description 'currentCommandColumn ly-grob? "") +(translator-property-description 'currentMusicalColumn ly-grob? "") +(translator-property-description 'defaultBarType string? "Sets the default type of bar line. Available bar types: [FIXME] +") (translator-property-description 'drarnChords boolean? "") +(translator-property-description 'explicitClefVisibility procedure? "visibility-lambda function for clef changes.") +(translator-property-description 'explicitKeySignatureVisibility procedure? "") +(translator-property-description 'forgetAccidentals boolean? "do +not set localKeySignature when a note alterated differently from +localKeySignature is found. + +Causes accidentals to be printed at every note instead of +remembered for the duration of a measure. +") +(translator-property-description 'graceAccidentalSpace number? "amount space to alot for an accidental") +(translator-property-description 'graceAlignPosition dir? "put the grace note before or after the main note?") +(translator-property-description 'instr string? "see @code{instrument}") (translator-property-description 'instrument string? " If @code{Instrument_name_engraver} @cindex Instrument_name_engraver is @@ -147,96 +134,45 @@ key signatures after the bar lines: property is used to label subsequent lines. If the @code{midiInstrument} property is not set, then @code{instrument} is used to determine the instrument for MIDI output.") -(translator-property-description 'instr string? "see @code{instrument}") -(translator-property-description 'keySignature list? "") -(translator-property-description 'keyOctaviation boolean? "") -(translator-property-description 'explicitKeySignatureVisibility procedure? "") -(translator-property-description 'createKeyOnClefChange boolean? "") (translator-property-description 'keyAccidentalOrder list? "") +(translator-property-description 'keyOctaviation boolean? "") (translator-property-description 'keySignature list? "") -(translator-property-description 'automaticPhrasing boolean? "") - -(translator-property-description 'weAreGraceContext boolean? "") - -(translator-property-description 'melismaEngraverBusy boolean? "") - -(translator-property-description 'associatedVoice string? "") - -(translator-property-description 'phrasingPunctuation string? "") - -(translator-property-description 'rehearsalMark number-or-string? "") -(translator-property-description 'staffsFound list? "") -(translator-property-description 'melismaBusy boolean? "") -(translator-property-description 'slurMelismaBusy boolean? "") -(translator-property-description 'tieMelismaBusy boolean? "") -(translator-property-description 'beamMelismaBusy boolean? "") +(translator-property-description 'keySignature list? "") +(translator-property-description 'localKeySignature list? "the key signature at this point in the measure") +(translator-property-description 'measureLength moment? " How long does one measure in the current time signature last?") +(translator-property-description 'measurePosition moment? " + How much of the current measure (measured in whole notes) have we had? -(translator-property-description 'startSustain string? "") -(translator-property-description 'stopSustain string? "") -(translator-property-description 'stopStartSustain string? "") -(translator-property-description 'startUnaChorda string? "") -(translator-property-description 'stopUnaChorda string? "") -(translator-property-description 'squashedPosition integer? " Vertical position of -squashing.") -(translator-property-description 'Generic_property_list list? "description of the conversion. +Set this manually to create incomplete measures (anacrusis, upbeat), eg. at the start of +the music. +") +(translator-property-description 'melismaBusy boolean? "") +(translator-property-description 'melismaEngraverBusy boolean? "") +(translator-property-description 'noAutoBeaming boolean? " If set to true then beams are not generated automatically. +") +(translator-property-description 'noResetKey boolean? "Do not +reset local key to the value of keySignature at the start of a measure, +as determined by measurePosition. -Defines names and types for generic properties. These are properties -than can be plugged into the backend directly. See the init file -@file{generic-property.scm} for details. For internal use only, -deprecated. +Do not reset the key at the start of a measure. Accidentals will be +printed only once and are in effect until overridden, possibly many +measures later. ") +(translator-property-description 'oneBeat moment? " How long does one beat in the current time signature last?") +(translator-property-description 'phrasingPunctuation string? "") +(translator-property-description 'rehearsalMark number-or-string? "") +(translator-property-description 'repeatCommands list? "This property is read to find any command of the form (volta . X), where X is a string or #f") (translator-property-description 'repeatCommands list? "") -(translator-property-description 'whichBar string? "") (translator-property-description 'scriptDefinitions list? " Description of scripts to use. (fixme) ") - (translator-property-description 'scriptHorizontal boolean? " Put scripts left or right of note heads. Support for this is limited. Accidentals will collide with scripts. ") -(translator-property-description 'currentMusicalColumn ly-grob? "") -(translator-property-description 'currentCommandColumn ly-grob? "") -(translator-property-description 'slurBeginAttachment symbol? "translates to the car of Slur.element-property 'attachment.") -(translator-property-description 'slurEndAttachment symbol? "translates to the cdr of Slur.element-property 'attachment.") -(translator-property-description 'slurMelismaBusy boolean? "Signal a slur if automaticMelismata is set") -(translator-property-description 'connectArpeggios boolean? " If -set, connect all arpeggios that are found. In this way, you can make -arpeggios that cross staffs. -") -(translator-property-description 'stz string? "") -(translator-property-description 'stanza string? "Stanza `number' to print at start of a verse") (translator-property-description 'scriptHorizontal boolean? " Put scripts left or right of note heads. Support for this is limited. Accidentals will collide with scripts. -") -(translator-property-description 'textNonEmpty boolean? " If set -to true then text placed above or below the staff is not assumed to -have zero width. @code{fatText} and @code{emptyText} are predefined -settings. -") -(translator-property-description 'sparseTies boolean? "only create one tie per chord.") -(translator-property-description 'tieMelismaBusy boolean? "Signal ties when automaticMelismata is set") -(translator-property-description 'timeSignatureFraction number-pair? " -pair of numbers, signifying the time signature. For example #'(4 . 4) is a 4/4time signature.") -(translator-property-description 'barCheckNoSynchronize boolean? -"If set, don't reset measurePosition when finding a bbarcheck. This -makes bar-checks for polyphonic music easier.") - -(translator-property-description 'barNonAuto boolean? " If set to true then bar lines will not be printed - automatically; they must be explicitly created with @code{\bar} - keywords. Unlike with the @code{\cadenza} keyword, measures are - still counted. Bar generation will resume according to that - count if this property is set to zero. -") -(translator-property-description 'whichBar string? "if not set -explicitly (by \property or \bar), this is set according to values of -defaultBarType, barAlways, barNonAuto and measurePosition. - ") - -(translator-property-description 'barAlways boolean? " If set to true a bar line is drawn after each note. -") -(translator-property-description 'defaultBarType string? "Sets the default type of bar line. Available bar types: [FIXME] ") (translator-property-description 'skipBars boolean? " Set to true to skip the empty bars that are produced by multimeasure notes and rests. These bars will not appear on the @@ -248,42 +184,93 @@ defaultBarType, barAlways, barNonAuto and measurePosition. @c my @vebatim patch would help... @example @@lilypond[fragment,verbatim,center] -r1 r1*3 R1*3\property Score.skipBars=1 r1*3 R1*3 +r1 r1*3 R1*3property Score.skipBars=1 r1*3 R1*3 @@end lilypond @end example ") -(translator-property-description 'timing boolean? " Keep administration of measure length, position, bar number, etc? -Switch off for cadenzas.") -(translator-property-description 'oneBeat moment? " How long does one beat in the current time signature last?") -(translator-property-description 'measureLength moment? " How long does one measure in the current time signature last?") -(translator-property-description 'measurePosition moment? " - How much of the current measure (measured in whole notes) have we had? +(translator-property-description 'slurBeginAttachment symbol? "translates to the car of Slur.element-property 'attachment.") +(translator-property-description 'slurEndAttachment symbol? "translates to the cdr of Slur.element-property 'attachment.") +(translator-property-description 'slurMelismaBusy boolean? "") +(translator-property-description 'slurMelismaBusy boolean? "Signal a slur if automaticMelismata is set") +(translator-property-description 'solo boolean? "set if solo is detected") +(translator-property-description 'soloADue boolean? "set Solo/A due texts?") +(translator-property-description 'soloIIText string? "text for begin of solo for voice ``two''") +(translator-property-description 'soloText string? "text for begin of solo") +(translator-property-description 'sparseTies boolean? "only create one tie per chord.") +(translator-property-description 'split-interval number-pair? "always split into two voices for contained intervals") +(translator-property-description 'squashedPosition integer? " Vertical position of +squashing.") +(translator-property-description 'staffsFound list? "list of all staff-symbols found.") +(translator-property-description 'staffsFound list? "") +(translator-property-description 'stanza string? "Stanza `number' to print at start of a verse") +(translator-property-description 'startSustain string? "") +(translator-property-description 'startUnaChorda string? "") +(translator-property-description 'stemLeftBeamCount integer? " +Specify the number of beams to draw on the left side of the next note. +Overrides automatic beaming. The value is only used once, and then it +is erased. ") -(translator-property-description 'currentBarNumber integer? "Contains the current barnumber. This property is incremented at -every barline. +(translator-property-description 'stemRightBeamCount integer? "idem, for the right side") +(translator-property-description 'stopStartSustain string? "") +(translator-property-description 'stopSustain string? "") +(translator-property-description 'stopUnaChorda string? "") +(translator-property-description 'stz string? "") +(translator-property-description 'textNonEmpty boolean? " If set +to true then text placed above or below the staff is not assumed to +have zero width. @code{fatText} and @code{emptyText} are predefined +settings. ") +(translator-property-description 'tieMelismaBusy boolean? "") +(translator-property-description 'tieMelismaBusy boolean? "Signal ties when automaticMelismata is set") +(translator-property-description 'timeSignatureFraction number-pair? " +pair of numbers, signifying the time signature. For example #'(4 . 4) is a 4/4time signature.") +(translator-property-description 'timing boolean? " Keep administration of measure length, position, bar number, etc? +Switch off for cadenzas.") +(translator-property-description 'tremoloFlags integer? "") +(translator-property-description 'tupletInvisible boolean? " + If set to true, tuplet bracket creation is switched off +entirely. This has the same effect as setting both +@code{tupletNumberVisibility} and @code{tupletBracketVisibility} to +@code{#f}, but as this does not even create elements, this setting +uses less memory and time.") (translator-property-description 'tupletSpannerDuration moment? " Normally a tuplet bracket is as wide as the -@code{\times} expression that gave rise to it. By setting this +@code{ imes} expression that gave rise to it. By setting this property, you can make brackets last shorter. Example @example @@lilypond[verbatim,fragment] -\context Voice \times 2/3 @{ - \property Voice.tupletSpannerDuration = #(make-moment 1 4) +context Voice imes 2/3 @{ + property Voice.tupletSpannerDuration = #(make-moment 1 4) [c8 c c] [c c c] @} @@end lilypond @end example ") -(translator-property-description 'tupletInvisible boolean? " - If set to true, tuplet bracket creation is switched off -entirely. This has the same effect as setting both -@code{tupletNumberVisibility} and @code{tupletBracketVisibility} to -@code{#f}, but as this does not even create elements, this setting -uses less memory and time.") - - +(translator-property-description 'unirhythm boolean? "set if unirhythm is detected") +(translator-property-description 'unisilence boolean? "set if unisilence is detected") +(translator-property-description 'unison boolean? "set if unisono is detected ") +(translator-property-description 'voltaSpannerDuration moment? "maximum duration of the volta bracket. + Set to a duration to control the size of the brackets printed by +@code{lternative}. It specifies the number of whole notes duration +to use for the brackets. This can be used to shrink the length of +brackets in the situation where one alternative is very large. It may +have odd effects if the specified duration is longer than the music +given in an @code{lternative}. +") +(translator-property-description 'weAreGraceContext boolean? "") +(translator-property-description 'whichBar string? "This property is read to determine what type of barline to create. +Example: +@example +\\property Staff.whichBar = \"|:\" +@end example +will create a start-repeat bar in this staff only +") +(translator-property-description 'whichBar string? "") +(translator-property-description 'whichBar string? "if not set +explicitly (by property or bar), this is set according to values of +defaultBarType, barAlways, barNonAuto and measurePosition. + ") diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index e974394f10..08b3dc1586 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -562,6 +562,17 @@ if 1: conversions.append ((1,3,102), conv, 'beamAutoEnd -> autoBeamSettings \\push (end * * * *)') + +if 1: + def conv (str): + str = re.sub ('\\\\push', '\\\\override', str) + str = re.sub ('\\\\pop', '\\\\revert', str) + + return str + + conversions.append ((1,3,110), conv, '\\push -> \\override, \\pop -> \\revert') + + ############################ diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 07de5b75bd..a871fb4298 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -1031,6 +1031,7 @@ def do_file(input_filename): for c in chunks: fout.write (c[1]) fout.close () + # should chmod -w if do_deps: write_deps (my_depname, foutn) diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make index 032d3a4a38..42889ebec3 100644 --- a/stepmake/stepmake/texinfo-rules.make +++ b/stepmake/stepmake/texinfo-rules.make @@ -25,7 +25,9 @@ $(outdir)/%.txt: $(outdir)/%.texi $(MAKEINFO) -I../ --no-split --no-headers --output $@ $< $(outdir)/%.texi: %.texi + rm -f $@ cp $< $@ + chmod -w $@ -- 2.39.5