From 72972afb27cf99f5ae432f4a1463d4f6de6107a0 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 18 Apr 2003 22:27:05 +0000 Subject: [PATCH] * Documentation/user/refman.itely: updates. * input/regression/collisions.ly (threevoice): cleanup. * scripts/convert-ly.py: linewidth = -1 -> raggedright = ##t. --- ChangeLog | 8 + Documentation/user/invoking.itexi | 134 ++++ Documentation/user/macros.itexi | 12 + Documentation/user/refman.itely | 683 +++++++----------- Documentation/user/tutorial.itely | 1 - input/regression/+.ly | 2 +- input/regression/abe.ly | 2 +- input/regression/accidental-cautionary.ly | 2 +- input/regression/accidental-double.ly | 2 +- input/regression/accidental-ledger.ly | 4 +- input/regression/accidental-octave.ly | 2 +- input/regression/accidental-placement.ly | 4 +- input/regression/accidental-single-double.ly | 2 +- .../accidental-unbroken-tie-spacing.ly | 4 +- input/regression/accidental-voice.ly | 2 +- input/regression/accidental.ly | 2 +- input/regression/accidentals.ly | 2 +- input/regression/ambitus.ly | 2 +- input/regression/arpeggio-collision.ly | 4 +- input/regression/arpeggio.ly | 2 +- input/regression/auto-beam-bar.ly | 4 +- input/regression/auto-beam-triplet.ly | 2 +- input/regression/auto-beam-tuplets.ly | 2 +- input/regression/auto-change.ly | 2 +- input/regression/bar-number.ly | 4 +- input/regression/bar-scripts.ly | 2 +- input/regression/beam-auto-knee.ly | 2 +- input/regression/beam-center-slope.ly | 2 +- input/regression/beam-concave.ly | 4 +- .../regression/beam-cross-staff-auto-knee.ly | 4 +- input/regression/beam-cross-staff-slope.ly | 4 +- input/regression/beam-cross-staff.ly | 2 +- input/regression/beam-default-lengths.ly | 4 +- input/regression/beam-extreme.ly | 4 +- input/regression/beam-french.ly | 2 +- input/regression/beam-funky-beamlet.ly | 4 +- input/regression/beam-funky.ly | 4 +- input/regression/beam-length.ly | 2 +- input/regression/beam-manual.ly | 4 +- input/regression/beam-multiple-cross-staff.ly | 2 +- input/regression/beam-over-barline.ly | 2 +- input/regression/beam-position.ly | 4 +- input/regression/beam-postfix-notation.ly | 2 +- input/regression/beam-quarter.ly | 4 +- input/regression/beam-rest.ly | 4 +- input/regression/beam-shortened-lengths.ly | 4 +- input/regression/beamed-chord.ly | 2 +- input/regression/beaming-ternary-metrum.ly | 4 +- input/regression/beaming.ly | 2 +- input/regression/beams.ly | 2 +- input/regression/between-systems.ly | 2 +- input/regression/break.ly | 2 +- input/regression/breathing-sign.ly | 2 +- input/regression/chord-changes.ly | 2 +- input/regression/chord-scripts.ly | 2 +- input/regression/chord-tremolo.ly | 2 +- input/regression/clefs.ly | 2 +- input/regression/cluster.ly | 2 +- input/regression/collision-2.ly | 2 +- input/regression/collision-dots.ly | 5 +- input/regression/collision-head-chords.ly | 4 +- input/regression/collision-heads.ly | 2 +- input/regression/collision-mesh.ly | 2 +- input/regression/collisions.ly | 49 +- .../regression/completion-heads-polyphony.ly | 2 +- input/regression/completion-heads.ly | 2 +- input/regression/custos.ly | 2 +- input/regression/dot-flag-collision.ly | 4 +- input/regression/dots.ly | 2 +- input/regression/drums.ly | 2 +- input/regression/dynamics-broken-hairpin.ly | 2 +- input/regression/dynamics-glyphs.ly | 2 +- input/regression/dynamics-line.ly | 2 +- input/regression/dynamics-unbound-hairpin.ly | 4 +- input/regression/easy-notation.ly | 4 +- input/regression/figured-bass.ly | 2 +- input/regression/finger-chords.ly | 2 +- input/regression/fingering.ly | 2 +- input/regression/font-magnification.ly | 2 +- input/regression/generic-output-property.ly | 4 +- input/regression/glissando.ly | 2 +- input/regression/grace-auto-beam.ly | 2 +- input/regression/grace-bar-line.ly | 4 +- input/regression/grace-bar-number.ly | 2 +- input/regression/grace-beam.ly | 2 +- input/regression/grace-dynamic.ly | 2 +- input/regression/grace-nest.ly | 2 +- input/regression/grace-nest1.ly | 2 +- input/regression/grace-nest2.ly | 2 +- input/regression/grace-nest3.ly | 2 +- input/regression/grace-nest4.ly | 2 +- input/regression/grace-nest5.ly | 2 +- input/regression/grace-part-combine.ly | 2 +- input/regression/grace-staff-length.ly | 2 +- input/regression/grace-start.ly | 4 +- input/regression/grace-stems.ly | 4 +- input/regression/grace-sync.ly | 4 +- input/regression/grace-unfold-repeat.ly | 2 +- input/regression/grace-volta-repeat.ly | 4 +- input/regression/grace.ly | 4 +- input/regression/hairpin-ending.ly | 4 +- input/regression/hara-kiri-pianostaff.ly | 2 +- input/regression/hara-kiri-short.ly | 2 +- input/regression/instrument-name-markup.ly | 2 +- input/regression/instrument-name.ly | 4 +- input/regression/key-signature-scordatura.ly | 2 +- input/regression/keys.ly | 2 +- input/regression/lyric-align.ly | 4 +- input/regression/lyric-combine-polyphonic.ly | 4 +- input/regression/lyric-combine.ly | 2 +- input/regression/lyric-phrasing.ly | 4 +- input/regression/lyrics-bar.ly | 4 +- input/regression/lyrics-extender.ly | 2 +- input/regression/lyrics-multi-stanza.ly | 4 +- input/regression/markup-stack.ly | 4 +- input/regression/measure-grouping.ly | 4 +- input/regression/mensural.ly | 2 +- input/regression/merge-differently-dotted.ly | 2 +- input/regression/mm-rests2.ly | 2 +- input/regression/molecule-hacking.ly | 4 +- input/regression/multi-measure-rest-center.ly | 4 +- input/regression/multi-measure-rest.ly | 4 +- input/regression/music-map.ly | 2 +- input/regression/new-markup-syntax.ly | 2 +- input/regression/non-empty-text.ly | 2 +- input/regression/note-group-bracket.ly | 4 +- input/regression/note-head-chord.ly | 2 +- input/regression/note-head-style.ly | 2 +- input/regression/note-line.ly | 2 +- input/regression/number-staff-lines.ly | 2 +- input/regression/pc-mmrest.ly | 2 +- input/regression/pc-switch-slur.ly | 2 +- input/regression/pedal.ly | 2 +- input/regression/percent-repeat.ly | 2 +- input/regression/phrasing-slur.ly | 4 +- input/regression/prefatory-empty-spacing.ly | 2 +- input/regression/prefatory-spacing-matter.ly | 4 +- input/regression/property-once.ly | 2 +- input/regression/rehearsal-mark.ly | 2 +- input/regression/repeat-fold.ly | 2 +- input/regression/repeat-line-break.ly | 2 +- input/regression/repeat-unfold-all.ly | 4 +- input/regression/repeat-unfold.ly | 2 +- .../repeat-volta-skip-alternatives.ly | 2 +- input/regression/repeat-volta.ly | 2 +- input/regression/rest-collision-default.ly | 2 +- input/regression/rest-collision.ly | 2 +- input/regression/rest-ledger.ly | 2 +- input/regression/rest-pitch.ly | 2 +- input/regression/rest.ly | 2 +- input/regression/rhythmic-staff.ly | 2 +- input/regression/script-collision.ly | 4 +- input/regression/script-stack-order.ly | 4 +- input/regression/script-stacked.ly | 2 +- input/regression/slur-attachment.ly | 2 +- input/regression/slur-broken-trend.ly | 2 +- input/regression/slur-cross-staff.ly | 2 +- input/regression/slur-dots.ly | 4 +- input/regression/slur-nice.ly | 2 +- input/regression/slur-rest.ly | 4 +- input/regression/slur-staccato.ly | 4 +- input/regression/slur-stem-broken.ly | 2 +- input/regression/slur-symmetry-1.ly | 4 +- input/regression/slur-symmetry.ly | 4 +- input/regression/spacing-accidental-staffs.ly | 4 +- input/regression/spacing-accidental.ly | 4 +- input/regression/spacing-bar-stem.ly | 4 +- input/regression/spacing-clef-first-note.ly | 4 +- input/regression/spacing-end-of-line.ly | 2 +- input/regression/spacing-ended-voice.ly | 22 +- input/regression/spacing-folded-clef.ly | 4 +- input/regression/spacing-folded-clef2.ly | 4 +- input/regression/spacing-grace-duration.ly | 4 +- input/regression/spacing-grace.ly | 4 +- input/regression/spacing-knee.ly | 4 +- input/regression/spacing-loose.ly | 2 +- input/regression/spacing-natural.ly | 4 +- input/regression/spacing-note-flags.ly | 4 +- input/regression/spacing-rest.ly | 4 +- input/regression/spacing-short-notes.ly | 4 +- input/regression/spacing-stem-bar.ly | 4 +- input/regression/spacing-stem-direction.ly | 4 +- .../regression/spacing-stem-same-direction.ly | 4 +- input/regression/spacing-tight.ly | 2 +- input/regression/spacing-to-grace.ly | 4 +- input/regression/spacing-very-tight.ly | 2 +- input/regression/span-bar.ly | 2 +- input/regression/staccato-pos.ly | 4 +- input/regression/staff-tweak.ly | 4 +- input/regression/stanza-number.ly | 2 +- input/regression/stem-direction-down.ly | 2 +- input/regression/stem-direction.ly | 4 +- input/regression/stem-spacing.ly | 6 +- input/regression/stem-tremolo.ly | 2 +- input/regression/system-extents.ly | 2 +- input/regression/system-start-bracket.ly | 4 +- input/regression/text-spanner.ly | 2 +- input/regression/tie-accidental.ly | 2 +- input/regression/tie-break-accidental.ly | 2 +- input/regression/tie-busy-grobs.ly | 2 +- input/regression/tie-chord-partial.ly | 2 +- input/regression/tie-chord.ly | 2 +- input/regression/tie-dots.ly | 2 +- input/regression/tie-grace.ly | 2 +- input/regression/tie.ly | 2 +- input/regression/triplets.ly | 2 +- input/regression/tup.ly | 2 +- input/regression/tuplet-beam.ly | 2 +- input/regression/tuplet-nest.ly | 4 +- input/regression/tuplet-properties.ly | 2 +- .../regression/tuplet-staffline-collision.ly | 2 +- input/regression/volta-broken-left-edge.ly | 2 +- scripts/convert-ly.py | 6 + 213 files changed, 710 insertions(+), 772 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa4f144bc6..84ab9d293e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-04-19 Han-Wen Nienhuys + + * Documentation/user/refman.itely: updates. + + * input/regression/collisions.ly (threevoice): cleanup. + + * scripts/convert-ly.py: linewidth = -1 -> raggedright = ##t. + 2003-04-18 Han-Wen Nienhuys * Documentation/user/*.itely: various updates. diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi index 726d267b6a..f82db08d24 100644 --- a/Documentation/user/invoking.itexi +++ b/Documentation/user/invoking.itexi @@ -230,6 +230,140 @@ website contains updates to the manual. You can find the lilypond website at @uref{http://www.lilypond.org/}. +@c . {Point and click} +@node Point and click +@subsection Point and click +@cindex poind and click + +Point and click lets you find notes in the input by clicking on them in +the Xdvi window. This makes it easier to find input that causes some +error in the sheet music. + +To use it, you need the following software +@itemize @bullet +@item A dvi viewer that supports src specials. +@itemize @bullet +@item Xdvi, version 22.36 or newer. Available from +@uref{ftp://ftp.math.berkeley.edu/pub/Software/TeX/xdvi.tar.gz,ftp.math.berkeley.edu}. + + Most @TeX{} distributions ship with xdvik, which is always + a few versions behind the official Xdvi. To find out which Xdvi you + are running, try @code{xdvi -version} or @code{xdvi.bin -version}. +@item KDVI. A dvi viewer for KDE. You need KDVI from KDE 3.0 or +newer. Enable option @emph{Inverse search} in the menu @emph{Settings}. + +@cindex Xdvi +@cindex KDVI +@cindex KDE + + + +@end itemize +@item An editor with a client/server interface (or a lightweight GUI +editor). + +@cindex editor + +@itemize @bullet +@item Emacs. Emacs is an extensible text-editor. It is available from +@uref{http://www.gnu.org/software/emacs/}. You need version 21 to use +column location. + +@c move this elsewhere? + +LilyPond also comes with support files for emacs: lilypond-mode for +emacs provides indentation, autocompletion, syntax coloring, handy +compile short-cuts and reading Info documents of lilypond inside emacs. +If lilypond-mode is not installed on your platform, +then refer to the installation instructions for more information. + +@cindex emacs +@cindex emacs mode +@cindex lilypond-mode for emacs +@cindex syntax coloring + +@item XEmacs. Xemacs is very similar to emacs. + +@cindex XEmacs + +@item NEdit. NEdit runs under Windows, and Unix. + It is available from @uref{http://www.nedit.org}. + +@cindex NEdit + +@item GVim. GVim is a GUI variant of VIM, the popular VI +clone. It is available from @uref{http://www.vim.org}. + +@cindex GVim +@cindex Vim + +@end itemize +@end itemize + + +Xdvi must be configured to find the @TeX{} fonts and music +fonts. Refer to the Xdvi documentation for more information. + +To use point-and-click, add one of these lines to the top of your .ly +file. +@example +#(ly:set-point-and-click 'line) +@end example +@cindex line-location + +When viewing, Control-Mousebutton 1 will take you to the originating +spot in the @file{.ly} file. Control-Mousebutton 2 will show all +clickable boxes. + +If you correct large files with point-and-click, be sure to start +correcting at the end of the file. When you start at the top, and +insert one line, all following locations will be off by a line. + +@cindex Emacs +For using point-and-click with emacs, add the following +In your emacs startup file (usually @file{~/.emacs}), +@example +(server-start) +@end example + +Make sure that the environment variable @var{XEDITOR} is set to +@example +emacsclient --no-wait +%l %f +@end example +@cindex @var{XEDITOR} +If you use xemacs instead of emacs, you use @code{(gnuserve-start)} in +your @file{.emacs}, and set @code{XEDITOR} to @code{gnuclient -q +%l %f} + +For using Vim, set @code{XEDITOR} to @code{gvim --remote +%l %f}, or +use this argument with Xdvi's @code{-editor} option. + +@cindex NEdit +For using NEdit, set @code{XEDITOR} to @code{nc -noask +%l %f}, or +use this argument with Xdvi's @code{-editor} option. + +If can also make your editor jump to the exact location of the note +you clicked. This is only supported on Emacs and VIM. Users of Emacs version +20 must apply the patch @file{emacsclient.patch}. Users of version 21 +must apply @file{server.el.patch} (version 21.2 and earlier). At the +top of the @code{ly} file, replace the @code{set-point-and-click} line +with the following line, +@example +#(ly:set-point-and-click 'line-column) +@end example +@cindex line-colomn-location +and set @code{XEDITOR} to @code{emacsclient --no-wait +%l:%c %f}. Vim +users can set @var{XEDITOR} to @code{gvim --remote +:%l:norm%c| %f}. + + + +@refbugs + +When you convert the @TeX{} file to PostScript using @code{dvips}, it +will complain about not finding @code{src:X:Y} files. These complaints +are harmless, and can be ignored. + + + @node Invoking ly2dvi @section Invoking ly2dvi diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi index b3dc51087d..ef834da601 100644 --- a/Documentation/user/macros.itexi +++ b/Documentation/user/macros.itexi @@ -131,3 +131,15 @@ internals document, @internalsref{\NAME\} @internalsref{\NAME\} @end macro @end ifnottex + +@macro refbugs +@strong{BUGS} +@end macro + +@macro seealso +@strong{SEE ALSO} +@end macro + +@macro syntax +@strong{SYNTAX} +@end macro diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 63a03e43c7..cbd41ea92b 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -3,18 +3,14 @@ @c A menu is needed before every deeper *section nesting of @node's; run @c M-x texinfo-all-menus-update @c to automagically fill in these menus before saving changes - +@c @c FIXME: singular vs. plural: Beams/Beam -@macro refbugs -@strong{BUGS} -@end macro -@c .{Reference Manual} @node Reference Manual @chapter Reference Manual @@ -31,7 +27,6 @@ make an input file, how to create sheet music from that input file, etc). New users are encouraged to study the tutorial before reading this manual. - @menu * Note entry:: * Easier music entry:: @@ -56,7 +51,7 @@ this manual. @end menu @c FIXME: Note entry vs Music entry at top level menu is confusing. -@c . {Note entry} + @node Note entry @section Note entry @cindex Note entry @@ -80,7 +75,7 @@ for the sake of brevity and simplicity we will generally omit * Easy Notation note heads :: @end menu -@c . {Notes} + @node Notes @subsection Notes @@ -90,7 +85,7 @@ A note is printed by specifying its pitch and then its duration. cis'4 d'8 e'16 c'16 @end lilypond -@c . {Pitches} + @node Pitches @subsection Pitches @@ -183,7 +178,7 @@ question mark `@code{?}' after the pitch. The automatic production of accidentals can be tuned in many ways. For more information, refer to @ref{Accidentals}. -@c . {Rests} + @node Rests @subsection Rests @cindex Rests @@ -207,7 +202,7 @@ a'4\rest d'4\rest @end lilypond -@c . {Skips} + @c FIXME: naming. @node Skips @subsection Skips @@ -240,7 +235,7 @@ produce any output, not even transparent output. -@c . {Durations} + @node Durations @subsection Durations @@ -254,7 +249,7 @@ and dots: durations are entered as their reciprocal values. For example, a quarter note is entered using a @code{4} (since it is a 1/4 note), while a half note is entered using a @code{2} (since it is a 1/2 note). For notes longer than a whole you must use identifiers. -@c FIXME: what's an identifier? I do not think it's been introduced yet. +@c FIXME: what is an identifier? I do not think it's been introduced yet. @c and if it has, I obviously skipped that part. - Graham @example @@ -339,16 +334,6 @@ When a tie is applied to a chord, all note heads (whose pitches match) are connected. If you try to tie together chords that have no common pitches, no ties will be created. -[TODO: seealso] - -If you want less ties created for a chord, you can set -@code{Voice.sparseTies} to true. In this case, a single tie is used -for every tied chord. -@lilypond[fragment,verbatim,center] - \property Voice.sparseTies = ##t - <> ~ <> -@end lilypond - In its meaning a tie is just a way of extending a note duration, similar to the augmentation dot: the following example are two ways of notating exactly the same concept. @@ -356,21 +341,30 @@ exactly the same concept. @lilypond[fragment, singleline,quote] \time 3/4 c'2. c'2 ~ c'4 @end lilypond -If you need to tie notes over bars, it may be easier to use -@ref{Automatic note splitting}. +If you need to tie notes over bars, it may be easier to use automatic +note splitting (See @ref{Automatic note splitting}). + -See also @seeinternals{Tie}. +@seealso +@seeinternals{Tie}, @ref{Automatic note splitting}. If you want less +ties created for a chord, see @inputfileref{input/test/,tie-sparse.ly}. @refbugs -At present, the tie is represented as a separate event, temporally -located in between the notes. Tying only a subset of the note heads -of a chord is not supported in a simple way. It can be achieved by -moving the tie-engraver into the Thread context and turning on and off -ties per Thread. +Tieing only a subset of the note heads of a pair of chords is not +supported in a simple way. It can be achieved by moving the +tie-engraver into the @internalsref{Thread} context and turning on and +off ties per @internalsref{Thread}. + +Switching staves when a tie is active, will produce a horizontal tie +on the first note. + + +Formatting of ties is a difficult subject. LilyPond often does not +give optimal results. + -Switching staves when a tie is active will not work. @node Automatic note splitting @subsection Automatic note splitting @@ -451,7 +445,7 @@ See also @seeinternals{TupletBracket}. @refbugs Nested tuplets are not formatted automatically. In this case, outer -tuplet brackets should be moved automatically. +tuplet brackets should be moved manually. @node Easy Notation note heads @subsection Easy Notation note heads @@ -459,9 +453,8 @@ tuplet brackets should be moved automatically. @cindex easy notation @cindex Hal Leonard -An entirely different type of note head is the "easyplay" note head: a -note head that includes a note name. It is used in some publications by -Hal-Leonard Inc. music publishers. +The "easyplay" note head includes a note name inside the head. It is +used in music aimed at beginners. @lilypond[singleline,verbatim,26pt] \score { @@ -473,9 +466,9 @@ Hal-Leonard Inc. music publishers. The @code{EasyNotation} identifier overrides a @internalsref{Score} context. You probably will want to print it with magnification or a large font size to make it more readable. To print with -magnification, you must create a dvi (with @file{ly2dvi}) and then -enlarge it with something like @file{dvips -x 2000 file.dvi}. See -@file{man dvips} for details. To print with a larger font, see +magnification, you must create a DVI file (with @file{ly2dvi}) and +then enlarge it with something like @file{dvips -x 2000 file.dvi}. +See @file{man dvips} for details. To print with a larger font, see @ref{Font Size}. @@ -498,62 +491,14 @@ produce the correct result. * Skipping corrected music:: @end menu -When entering music with LilyPond, it is easy to introduce errors. This -section deals with tricks and features that help you enter music, and -find and correct mistakes. - -@node Graphical interfaces -@subsection Graphical interfaces - -@cindex GUI -@cindex graphical interface -@cindex sequencer -@cindex RoseGarden -@cindex Denemo -@cindex NoteEdit -@cindex MIDI - -One way to avoid entering notes using the keyboard is to use a -graphical user interface. The following programs are known to have -a lilypond export option: - -@itemize @bullet -@item -Denemo was once intended as -a LilyPond graphical user interface. It run on Gnome/GTK. - -@quotation -@uref{http://denemo.sourceforge.net/} -@end quotation - -@item - Noteedit, a graphical score editor that runs under KDE/Qt. -@quotation -@uref{http://rnvs.informatik.tu-chemnitz.de/~jan/noteedit/noteedit.html,} -@end quotation - -@item -RoseGarden was once the inspiration for naming LilyPond. Nowadays it -has been rewritten from scratch and supports LilyPond export as of -version 0.1.6. - -@quotation -@uref{http://rosegarden.sf.net/} -@end quotation -@end itemize +When entering music with LilyPond, it is easy to introduce +errors. This section deals with tricks and features that help you +enter music, and find and correct mistakes. It is also possible to +use external programs to enter or edit music. Refer to the website for +more information. -Another option is to enter the music using your favorite -sequencer/notation editor, and then export it as MIDI or MusicXML. -You can then import it in lilypond by using either midi2ly or -@cindex midi2ly -xml2ly. midi2ly is described in @ref{Invoking midi2ly}. @code{xml2ly} -@cindex xml2ly -is a tool to convert from the MusicXML music representation format -(@uref{http://www.musicxml.org}) to LilyPond format. @code{xml2ly} is -described at @uref{http://www.nongnu.org/xml2ly/}. -@c . {Relative} @node Relative octaves @subsection Relative octaves @cindex Relative @@ -619,7 +564,6 @@ want to use relative within transposed music, you must place an additional @code{\relative} inside the @code{\transpose}. -@c . {Bar check} @node Bar check @subsection Bar check @cindex Bar check @@ -635,7 +579,7 @@ help you find errors in the input. Depending on the value of @code{barCheckSynchronize}, the beginning of the measure will be relocated, so this can also be used to shorten measures. -A bar check is entered using the bar symbol, @code{|}: +A bar check is entered using the bar symbol, `@code{|}'. @example \time 3/4 c2 e4 | g2. @end example @@ -644,144 +588,12 @@ A bar check is entered using the bar symbol, @code{|}: @cindex skipTypesetting -Failed bar checks are most often caused by entering incorrect +Failed bar checks are caused by entering incorrect durations. Incorrect durations often completely garble up the score, -especially if it is polyphonic, so you should start correcting the score -by scanning for failed bar checks and incorrect durations. To speed up -this process, you can use @code{skipTypesetting} (See @ref{Skipping -corrected music})). - -@c . {Point and click} -@node Point and click -@subsection Point and click -@cindex poind and click - -Point and click lets you find notes in the input by clicking on them in -the Xdvi window. This makes it very easy to find input that causes some -error in the sheet music. - -To use it, you need the following software -@itemize @bullet -@item A dvi viewer that supports src specials. -@itemize @bullet -@item Xdvi, version 22.36 or newer. Available from -@uref{ftp://ftp.math.berkeley.edu/pub/Software/TeX/xdvi.tar.gz,ftp.math.berkeley.edu}. - - Most @TeX{} distributions ship with xdvik, which is always - a few versions behind the official Xdvi. To find out which xdvi you - are running, try @code{xdvi -version} or @code{xdvi.bin -version}. -@item KDVI. A dvi viewer for KDE. You need KDVI from KDE 3.0 or -newer. Enable option @emph{Inverse search} in the menu @emph{Settings}. - -@cindex Xdvi -@cindex KDVI -@cindex KDE - - - -@end itemize -@item An editor with a client/server interface (or a lightweight GUI -editor). - -@cindex editor - -@itemize @bullet -@item Emacs. Emacs is an extensible text-editor. It is available from -@uref{http://www.gnu.org/software/emacs/}. You need version 21 to use -column location. - -@c move this elsewhere? - -LilyPond also comes with support files for emacs: lilypond-mode for -emacs provides indentation, autocompletion, syntax coloring, handy -compile short-cuts and reading Info documents of lilypond inside emacs. -If lilypond-mode is not installed on your platform, -then refer to the installation instructions for more information. - -@cindex emacs -@cindex emacs mode -@cindex lilypond-mode for emacs -@cindex syntax coloring - -@item XEmacs. Xemacs is very similar to emacs. - -@cindex XEmacs - -@item NEdit. NEdit runs under Windows, and Unix. - It is available from @uref{http://www.nedit.org}. - -@cindex NEdit - -@item GVim. GVim is a GUI variant of VIM, the popular VI -clone. It is available from @uref{http://www.vim.org}. - -@cindex GVim -@cindex Vim - -@end itemize -@end itemize - - -Xdvi must be configured to find the @TeX{} fonts and music -fonts. Refer to the Xdvi documentation for more information. - -To use point-and-click, add one of these lines to the top of your .ly -file. -@example -#(ly:set-point-and-click 'line) -@end example -@cindex line-location - -When viewing, Control-Mousebutton 1 will take you to the originating -spot in the @file{.ly} file. Control-Mousebutton 2 will show all -clickable boxes. - -If you correct large files with point-and-click, be sure to start -correcting at the end of the file. When you start at the top, and -insert one line, all following locations will be off by a line. - -@cindex Emacs -For using point-and-click with emacs, add the following -In your emacs startup file (usually @file{~/.emacs}), -@example -(server-start) -@end example - -Make sure that the environment variable @var{XEDITOR} is set to -@example -emacsclient --no-wait +%l %f -@end example -@cindex @var{XEDITOR} -If you use xemacs instead of emacs, you use @code{(gnuserve-start)} in -your @file{.emacs}, and set @code{XEDITOR} to @code{gnuclient -q +%l %f} - -For using Vim, set @code{XEDITOR} to @code{gvim --remote +%l %f}, or -use this argument with xdvi's @code{-editor} option. - -@cindex NEdit -For using NEdit, set @code{XEDITOR} to @code{nc -noask +%l %f}, or -use this argument with xdvi's @code{-editor} option. - -If can also make your editor jump to the exact location of the note -you clicked. This is only supported on Emacs and VIM. Users of Emacs version -20 must apply the patch @file{emacsclient.patch}. Users of version 21 -must apply @file{server.el.patch} (version 21.2 and earlier). At the -top of the @code{ly} file, replace the @code{set-point-and-click} line -with the following line, -@example -#(ly:set-point-and-click 'line-column) -@end example -@cindex line-colomn-location -and set @code{XEDITOR} to @code{emacsclient --no-wait +%l:%c %f}. Vim -users can set @var{XEDITOR} to @code{gvim --remote +:%l:norm%c| %f}. - - - -@refbugs - -When you convert the @TeX{} file to PostScript using @code{dvips}, it -will complain about not finding @code{src:X:Y} files. These complaints -are harmless, and can be ignored. +especially if it is polyphonic, so you should start correcting the +score by scanning for failed bar checks and incorrect durations. To +speed up this process, you can use @code{skipTypesetting}, described +in the next section. @node Skipping corrected music @subsection Skipping corrected music @@ -823,35 +635,41 @@ such as keys, clefs and time signatures. @node Staff symbol @subsection Staff symbol - @cindex adjusting staff symbol @cindex StaffSymbol, using \property @cindex staff lines, setting number of +Staff is a the general name for Notes, dynamic signs, etc. are grouped +with a set of horizontal lines, into a staff (plural `staves'). In our +system, these lines are drawn using a separate graphical object called +staff symbol. -The lines of the staff symbol are formed by the -@internalsref{StaffSymbol} object. This object is created at the moment -that their context is created. You can not change the appearance of -the staff symbol by using @code{\override} or @code{\set}. At the -moment that @code{\property Staff} is interpreted, a Staff context is -made, and the StaffSymbol is created before any @code{\override} is +This object is created whenever a @internalsref{Staff} context is +created. You can not change the appearance of the staff symbol by +using @code{\override} or @code{\set}. At the moment that +@code{\property Staff} is interpreted, a Staff context is made, and +the @internalsref{StaffSymbol} is created before any @code{\override} is effective. You can deal with this either overriding properties in a @code{\translator} definition, or by using @code{\outputproperty}. - @refbugs -If you end a staff half way a piece, the staff symbol may not end +If you end a staff halfway a piece, the staff symbol may not end exactly on the barline. -@c . {Key} @node Key signature @subsection Key signature @cindex Key @cindex @code{\key} +The key signature indicates the scale in which a piece is played. It +is denoted by a set of alterations (flats or sharps) at the start of +the staff. + +@syntax + Setting or changing the key signature is done with the @code{\key} command. @example @@ -875,20 +693,27 @@ The standard mode names @code{\ionian}, @code{\locrian}, @code{\aeolian}, @code{\mixolydian}, @code{\lydian}, @code{\phrygian}, and @code{\dorian} are also defined. -This command sets the context property @code{Staff.keySignature}. -Non-standard key signatures can be specified by setting this property -directly. +@seealso + +This command sets the context property +@internalsref{Staff}.@code{keySignature}. Non-standard key signatures +can be specified by setting this property directly. The printed signature is a @internalsref{KeySignature} object, typically created in @internalsref{Staff} context. @cindex @code{keySignature} -@c . {Clef} + @node Clef @subsection Clef @cindex @code{\clef} +The clef indicates which lines of the staff correspond to which +pitches. + +@syntax + The clef can be set or changed with the @code{\clef} command: @lilypond[fragment,verbatim] \key f\major c''2 \clef alto g'2 @@ -929,38 +754,40 @@ name. For example, \clef "G_8" @end example -The object for this symbol is @internalsref{Clef}. - - This command is equivalent to setting @code{clefGlyph}, @code{clefPosition} (which controls the Y position of the clef), -@code{centralCPosition} and @code{clefOctavation}. A clef is created +@code{centralCPosition} and @code{clefOctavation}. A clef is printed when any of these properties are changed. +@seealso + +The object for this symbol is @internalsref{Clef}. + + + -@c . {Time signature} @node Time signature @subsection Time signature @cindex Time signature @cindex meter @cindex @code{\time} +Time signature indicates the metrum of a piece: a regular pattern of +strong and weak beats. It is denoted by a fraction at the start of the +staff. + +@syntax + The time signature is set or changed by the @code{\time} command. @lilypond[fragment,verbatim] \time 2/4 c'2 \time 3/4 c'2. @end lilypond -The actual symbol that's printed can be customized with the @code{style} +The actual symbol that is printed can be customized with the @code{style} property. Setting it to @code{#'()} uses fraction style for 4/4 and 2/2 time. - -The object for this symbol is @internalsref{TimeSignature}. There are -many more options for its layout. They are selected through the -@code{style} object property. See @inputfileref{input/test,time.ly} for more -examples. - This command sets the property @code{timeSignatureFraction}, @code{beatLength} and @code{measureLength} in the @code{Timing} context, which is normally aliased to @internalsref{Score}. The property @@ -980,7 +807,7 @@ measure is subdivided in 2, 2, 2 and 3. This is passed to @lilypond[verbatim] \score { \notes \relative c'' { #(set-time-signature 9 8 '(2 2 2 3)) - g8 g d d g g a8-[-( bes g-]-) | + g8-[ g-] d-[ d-] g-[ g-] a8-[-( bes g-]-) | #(set-time-signature 5 8 '(3 2)) a4. g4 } @@ -991,7 +818,18 @@ measure is subdivided in 2, 2, 2 and 3. This is passed to }}} @end lilypond -@c . {Partial} +@seealso + +The object for this symbol is @internalsref{TimeSignature}. There are +many more options for its layout. See +@inputfileref{input/test,time.ly} for more examples. + +@refbugs + +Automatic beaming does not use measure grouping specified with +@code{set-time-signature}. + + @subsection Partial @cindex Partial @cindex anacrusis @@ -1004,7 +842,7 @@ measure is subdivided in 2, 2, 2 and 3. This is passed to Partial measures, for example in upbeats, are entered using the @code{\partial} command: @lilypond[fragment,verbatim] -\partial 4* 5/16 c'16 c4 f16 a'2. ~ a'8. a'16 | g'1 +\partial 16*5 c'16 c4 f16 a'2. ~ a'8. a'16 | g'1 @end lilypond The syntax for this command is @@ -1019,27 +857,14 @@ This is internally translated into The property @code{measurePosition} contains a rational number indicating how much of the measure has passed at this point. - @node Unmetered music @subsection Unmetered music Bar lines and bar numbers are calculated automatically. For unmetered -music (e.g. cadenzas), this is not desirable. The commands -@code{\cadenzaOn} and @code{\cadenzaOff} can be used to switch off the -timing information: - -@lilypond[fragment,relative,singleline,verbatim] -c'2. -\cadenzaOn -c2 -\cadenzaOff -c4 c4 c4 -@end lilypond - -The property @code{Score.timing} can be used to switch off this -automatic timing +music (e.g. cadenzas), this is not desirable. By setting +@code{Score.timing} to false, this automatic timing can be switched +off. -@c . {Bar lines} @node Bar lines @subsection Bar lines @cindex Bar lines @@ -1048,9 +873,16 @@ automatic timing @cindex measure lines @cindex repeat bars + +Bar lines delimit measures, but are also used to indicate +repeats. Line breaks may only happen on barlines. + +@syntax + Bar lines are inserted automatically, but if you need a special type of barline, you can force one using the @code{\bar} command: -@lilypond[fragment,verbatim] c4 \bar "|:" c4 +@lilypond[relative=1,fragment,verbatim] + c4 \bar "|:" c4 @end lilypond The following bar types are available @@ -1066,9 +898,6 @@ c4 \bar "|." @end lilypond -You are encouraged to use @code{\repeat} for repetitions. See -@ref{Repeats}. - In scores with many staves, the barlines are automatically placed at top level, and they are connected between different staves of a @internalsref{StaffGroup}: @@ -1081,8 +910,6 @@ top level, and they are connected between different staves of a \context Staff = pedal { \clef bass c2 c2 } > @end lilypond -The objects that are created at @internalsref{Staff} level. The name is -@internalsref{BarLine}. The command @code{\bar @var{bartype}} is a short cut for doing @code{\property Score.whichBar = @var{bartype}} @@ -1095,37 +922,44 @@ a measure it is set to @code{defaultBarType}. The contents of @code{\bar }. These settings take precedence over the automatic @code{whichBar} settings. - -@cindex Bar_line_engraver @cindex whichBar @cindex repeatCommands @cindex defaultBarType +@seealso + +You are encouraged to use @code{\repeat} for repetitions. See +@ref{Repeats}. + +The bar line objects that are created at @internalsref{Staff} are +called @internalsref{BarLine}, the bar lines that span staffs are +@internalsref{SpanBar}s. + -@c . {Polyphony} @node Polyphony @section Polyphony @cindex polyphony -The easiest way to enter such fragments with more than one voice on a -staff is to split chords using the separator @code{\\}. You can use -it for small, short-lived voices (make a chord of voices) or for -single chords: +The easiest way to enter fragments with more than one voice on a staff +is to split chords using the separator @code{\\}. You can use it for +small, short-lived voices (make a chord of voices) or for single +chords: @lilypond[verbatim,fragment] \context Voice = VA \relative c'' { - c4 < { f d e } \\ { b c2 } > c4 < g' \\ b, \\ f \\ d > + c4 < { f d e } \\ { b c2 } > c4 < g' \\ b, \\ f' \\ d' > } @end lilypond The separator causes @internalsref{Voice} contexts to be instantiated, -bearing the names @code{"1"}, @code{"2"}, etc. +bearing the names @code{"1"}, @code{"2"}, etc. In each of these +contexts, vertical direction of slurs, stems, etc. are set +appropriately. -Sometimes, it is necessary to instantiate these contexts by hand: For -Instantiate a separate Voice context for each part, and use -@code{\voiceOne}, up to @code{\voiceFour} to assign a stem directions -and horizontal shift for each part. +This can also be done by instantiating @internalsref{Voice} contexts +by hand, and using @code{\voiceOne}, up to @code{\voiceFour} to assign +a stem directions and horizontal shift for each part. @c @lilypond[singleline, verbatim] @@ -1135,38 +969,15 @@ and horizontal shift for each part. \context Voice = VC { \voiceTwo fis4~ fis4 f ~ f } > @end lilypond -The identifiers @code{\voiceOne} to @code{\voiceFour} set directions -ties, slurs and stems, and set shift directions. - -If you want more than four voices, you can also manually set -horizontal shifts and stem directions, as is shown in the following example: -@lilypond[fragment, verbatim] - \context Staff \notes\relative c''< - \context Voice=one { - \shiftOff \stemUp e4 - } - \context Voice=two { - \shiftOn \stemUp cis - } - \context Voice=three { - \shiftOnn \stemUp ais - } - \context Voice=four { - \shiftOnnn \stemUp fis - } - > -@end lilypond - - Normally, note heads with a different number of dots are not merged, but if you set the object property @code{merge-differently-dotted}, they are: @lilypond[verbatim,fragment,singleline] -\context Voice < { - g'8 g'8 +\relative c' \context Voice < { + g8 g8 \property Staff.NoteCollision \override #'merge-differently-dotted = ##t - g'8 g'8 - } \\ { [g'8. f16] [g'8. f'16] } + g8 g8 + } \\ { [g8. f16] [g8. f16] } > @end lilypond @@ -1186,7 +997,16 @@ LilyPond also vertically shifts rests that are opposite of a stem. \context Voice < c''4 \\ r4 > @end lilypond -See also @internalsref{NoteCollision} and @internalsref{RestCollision} +@seealso + +The objects responsible for resolving collisions are +@internalsref{NoteCollision} and @internalsref{RestCollision}. See +also example files @inputfileref{input/regression/,collision-dots.ly}, +@inputfileref{input/regression/,collision-head-chords.ly}, +@inputfileref{input/regression/,collision-heads.ly}, +@inputfileref{input/regression/,collision-mesh.ly}, and +@inputfileref{input/regression/,collisions.ly}. + @refbugs @@ -1207,22 +1027,21 @@ the metrum. They are inserted automatically in most cases. If you are not satisfied with the automatic beaming, you can enter the beams explicitly. If you have beaming patterns that differ from the -defaults, you can also set the patterns for automatic beamer. +defaults, you can also set your own. See also @internalsref{Beam}. -@c . {Manual beams} + @cindex Automatic beams @subsection Manual beams @cindex beams, manual @cindex @code{]} @cindex @code{[} -In some cases it may be necessary to override LilyPond's automatic -beaming algorithm. For example, the auto beamer will not beam over -rests or bar lines, If you want that, specify the begin and end point -manually using a @code{[} before the first beamed note and a @code{]} -after the last note: +In some cases it may be necessary to override the automatic beaming +algorithm. For example, the auto beamer will not beam over rests or +bar lines, If you want that, specify the begin and end point manually +using @code{[} and @code{]}. @lilypond[fragment,relative,verbatim] \context Staff { @@ -1253,54 +1072,38 @@ same effect as twiddling with @code{stemLeftBeamCount} and @code{stemRightBeamCount}, but it take less typing. -@example -c16-[ c c c c c c c-] -\property Voice.subdivideBeams = ##t -c16-[ c c c c c c c-] -c32-[ c c c c c c c c c c c c c c c-] -\property Score.beatLength = #(ly:make-moment 1 8) -c32-[ c c c c c c c c c c c c c c c-] -@end example -@lilypond[noindent] -\score { - \notes \relative c' { +@lilypond[relative=1,verbatim,noindent] c16-[ c c c c c c c-] \property Voice.subdivideBeams = ##t c16-[ c c c c c c c-] c32-[ c c c c c c c c c c c c c c c-] \property Score.beatLength = #(ly:make-moment 1 8) c32-[ c c c c c c c c c c c c c c c-] - } -} @end lilypond @cindex subdivideBeams -Kneed beams are inserted automatically, when a large gap between two -adjacent beamed notes is detected. This behavior can be tuned through -the object property @code{auto-knee-gap}. +Kneed beams are inserted automatically, when a large gap is detected +between the note heads. This behavior can be tuned through the object +property @code{auto-knee-gap}. @cindex beams, kneed @cindex kneed beams @cindex auto-knee-gap -@c TODO -> why this ref? Document? -@cindex @code{neutral-direction} @refbugs @cindex hara kiri -Auto knee beams can not be used together with hara kiri staves. +Automatically kneed beams can not be used together with Hara Kiri +staves. [TODO from bugs] The Automatic beamer does not put @strong{unfinished} beams on the last notes of a score. -Formatting of ties is a difficult subject. LilyPond often does not -give optimal results. - @menu * Setting automatic beam behavior :: @end menu @@ -1323,7 +1126,7 @@ Some beams should be horizontal. These are so-called concave beams. [TODO: some pictures.] @end ignore -@c . {Automatic beams} + @node Setting automatic beam behavior @subsection Setting automatic beam behavior @@ -1333,6 +1136,8 @@ Some beams should be horizontal. These are so-called concave beams. @cindex automatic beams, tuning @cindex tuning automatic beaming +[TODO: use \applycontext] + In normal time signatures, automatic beams can start on any note but can only end in a few positions within the measure: beams can end on a beat, or at durations specified by the properties in @@ -1420,9 +1225,12 @@ automatic beaming in irregular meters such as @code{5/8}. @node Accidentals @section Accidentals @cindex Accidentals + This section describes how to change the way that LilyPond automatically inserts accidentals before the running notes. +[TODO: identifier vs. macro] + @menu * Using the predefined accidental macros:: * Defining your own accidental typesettings:: @@ -1493,28 +1301,28 @@ The macros are: Apart from that the rule is similar to @code{\defaultAccidentals}. - Warning: This leads to some weird and often unwanted results - because accidentals from one voice DO NOT get cancelled in other + This leads to some weird and often unwanted results + because accidentals from one voice do not get cancelled in other voices: @lilypond[singleline,relative,fragment,verbatim,quote] \context Staff < \voiceAccidentals - \context Voice=va { \voiceOne es g } - \context Voice=vb { \voiceTwo c, e } - > -@end lilypond - Hence you should only use @code{\voiceAccidentals} - if the voices are to be read solely by - individual musicians. if the staff should be readable also - by one musician/conductor then you should use - @code{\modernVoiceAccidentals} or @code{\modernVoiceCautionaries} - instead. + < + { es g } \\ + { c, e } + > > +@end lilypond + Hence you should only use @code{\voiceAccidentals} if the voices +are to be read solely by individual musicians. If the staff is to be +used by one musician (e.g., a conductor) then you use +@code{\modernVoiceAccidentals} or @code{\modernVoiceCautionaries} +instead. @item \modernAccidentals @cindex @code{\modernAccidentals} - This rule should correspond to the common practice in the 20th + This rule corresponds to the common practice in the 20th century. - The rule is a bit more complex than @code{\defaultAccidentals}: + The rule is more complex than @code{\defaultAccidentals}. You get all the same accidentals, but temporary accidentals also get cancelled in other octaves. Further more, in the same octave, they also get cancelled in the following measure: @@ -1534,22 +1342,21 @@ The macros are: cis' c'' cis'2 | c'' c' @end lilypond -@item \modernVoiceAccidentals @cindex @code{\modernVoiceAccidentals} - Multivoice accidentals to be read both by musicians playing one voice - and musicians playing all voices. - - Accidentals are typeset for each voice, but they ARE cancelled - across voices in the same @internalsref{Staff}. +@item \modernVoiceAccidentals +is used for multivoice accidentals to be read both by musicians +playing one voice and musicians playing all voices. Accidentals are +typeset for each voice, but they @emph{are} cancelled across voices in +the same @internalsref{Staff}. -@item \modernVoiceCautionaries @cindex @code{\modernVoiceCautionaries} - The same as @code{\modernVoiceAccidentals}, but with the - extra accidentals (the ones not typeset by - @code{\voiceAccidentals}) typeset as cautionaries. - Notice that even though all accidentals typeset by - @code{\defaultAccidentals} ARE typeset by this macro then some - of them are typeset as cautionaries. +@item \modernVoiceCautionaries +is the same as +@code{\modernVoiceAccidentals}, but with the extra accidentals (the +ones not typeset by @code{\voiceAccidentals}) typeset as cautionaries. +Even though all accidentals typeset by @code{\defaultAccidentals} +@emph{are} typeset by this macro then some of them are typeset as +cautionaries. @item \pianoAccidentals @cindex @code{\pianoAccidentals} @@ -1591,33 +1398,31 @@ This section must be considered gurus-only, and hence it must be sufficient with a short description of the system and a reference to the internal documentation. -The idea of the algorithm is to try several different rules and then -use the rule that gives the highest number of accidentals. -Each rule cosists of -@table @asis -@item Context: - In which context is the rule applied. I.e. if context is - @internalsref{Score} then all staves share accidentals, and if - context is @internalsref{Staff} then all voices in the same - staff share accidentals, but staves do not - like normally. -@item Octavation: +The algorithm tries several different rules, and uses the rule +that gives the highest number of accidentals. Each rule consists of +@table @var +@item context: + In which context is the rule applied. For example, if +@var{context} is @internalsref{Score} then all staves share +accidentals, and if @var{context} is @internalsref{Staff} then all +voices in the same staff share accidentals, but staves do not. +@item octavation: Whether the accidental changes all octaves or only the current octave. -@item Lazyness: +@item lazyness: Over how many barlines the accidental lasts. - If lazyness is @code{-1} then the accidental is forget - immidiately, and if lazyness is @code{#t} then the accidental + If @var{lazyness} is @code{-1} then the accidental is forget + immediately, and if @var{lazyness} is @code{#t} then the accidental lasts forever. + +[TODO: should use +infinity for this case?] + @end table -As described in the internal documentation of -@internalsref{Accidental_engraver}, the properties @code{autoAccidentals} and -@code{autoCautionaries} contain lists of rule descriptions. Notice -that the contexts must be listed from in to out - that is -@internalsref{Thread} before @internalsref{Voice}, -@internalsref{Voice} before @internalsref{Staff}, etc. -see the macros in @file{ly/property-init.ly} for examples of how the -properties are set. +@seealso + +@internalsref{Accidental_engraver}, + @refbugs @@ -1626,12 +1431,11 @@ sequential mode. This means that in a chord the accidentals are typeset as if the notes in the chord happened one at a time - in the order in which they appear in the input file. -Of course this is only a problem when you have simultainous notes -which accidentals should depend on each other. -Notice that the problem only occurs when using non-default accidentals -- as the default accidentals only depend on other accidentals on the -same staff and same pitch and hence cannot depend on other -simultainous notes. +This is only a problem when there are simultaneous notes whose +accidentals depend on each other. The problem only occurs when using +non-default accidentals. In the default scheme, accidentals only +depend on other accidentals with the same pitch on the same staff, so +no conflicts possible. This example shows two examples of the same music giving different accidentals depending on the order in which the notes occur in the @@ -1639,16 +1443,17 @@ input file: @lilypond[singleline,fragment,verbatim] \property Staff.autoAccidentals = #'( Staff (any-octave . 0) ) -cis'4 <> r2 | cis'4 <> r2 | <> r | <> r | +cis'4 <> r2 | cis'4 <> r2 +| <> r | <> r | @end lilypond -The only solution is to manually insert the problematic -accidentals using @code{!} and @code{?}. +This problem can be solved by manually inserting @code{!} and @code{?} +for the problematic notes. @node Expressive marks @section Expressive marks -@c . {Slurs} + @menu * Slurs :: * Phrasing slurs:: @@ -1675,7 +1480,7 @@ Slurs avoid crossing stems, and are generally attached to note heads. However, in some situations with beams, slurs may be attached to stem ends. If you want to override this layout you can do this through the object property @code{attachment} of @internalsref{Slur} in -@internalsref{Voice} context It's value is a pair of symbols, specifying +@internalsref{Voice} context. Its value is a pair of symbols, specifying the attachment type of the left and right end points. @lilypond[fragment,relative,verbatim] @@ -1787,7 +1592,7 @@ d4 The default value for the @code{text} property is @code{scripts-rcomma}. -@c . {Tempo} + @node Tempo @subsection Tempo @cindex Tempo @@ -1865,7 +1670,7 @@ To use this, add the @internalsref{Horizontal_bracket_engraver} to }}} @end lilypond -@c . {Ornaments} + @node Ornaments @section Ornaments @cindex Ornaments @@ -1877,7 +1682,7 @@ To use this, add the @internalsref{Horizontal_bracket_engraver} to * Dynamics:: @end menu -@c . {Articulation} + @node Articulations @subsection Articulations @cindex Articulations @@ -2021,7 +1826,7 @@ ornaments to individual note heads. Some hacks exist, though. See @inputfileref{input/test,script-horizontal.ly}. -@c . {Text scripts} + @node Text scripts @subsection Text scripts @cindex Text scripts @@ -2051,7 +1856,7 @@ Text scripts are created in form of @internalsref{TextScript} objects, in special symbols in text scripts. -@c . {Grace notes} + @node Grace notes @subsection Grace notes @@ -2206,7 +2011,7 @@ manually. See also @seeinternals{Glissando}. -@c . {Dynamics} + @node Dynamics @subsection Dynamics @cindex Dynamics @@ -2305,7 +2110,7 @@ identifiers to set the vertical direction are \dynamicUp and @cindex @code{\dynamicDown} @cindex @code{\dynamicUp} -@c . {Repeats} + @node Repeats @section Repeats @@ -2845,7 +2650,7 @@ bring some other way of typesetting drums, and probably there will be made no great efforts in keeping things downwards compatible. -@c . {Piano music} + @node Piano music @section Piano music @@ -2881,7 +2686,7 @@ included with the distribution as @inputfileref{input/test,stem-cross-staff.ly}. -@c . {Automatic staff changes} + @node Automatic staff changes @subsection Automatic staff changes @cindex Automatic staff changes @@ -2924,7 +2729,7 @@ current voice from its current staff to the Staff called @var{staffname}. Typically @var{staffname} is @code{"up"} or @code{"down"}. -@c . {Pedals} + @node Pedals @subsection Pedals @cindex Pedals @@ -3333,7 +3138,7 @@ the standard staff. @end example @c @end lilypond -@c . {Chords} + @node Chords @section Chords @cindex Chords @@ -3369,7 +3174,7 @@ print them as name. * Printing named chords:: @end menu -@c . {Chords mode} + @node Chords mode @subsection Chords mode @cindex Chords mode @@ -3495,7 +3300,7 @@ and subtractions, so articulation scripts can not be entered. -@c . {Printing named chords} + @node Printing named chords @subsection Printing named chords @@ -3521,7 +3326,7 @@ scheme = \notes { You can make the chord changes stand out by setting @code{ChordNames.chordChanges} to true. This will only display chord -names when there's a change in the chords scheme and at the start of a +names when there is a change in the chords scheme and at the start of a new line. @lilypond[verbatim] @@ -3635,7 +3440,7 @@ as in the individual parts. This section explains how to tackle common problems in orchestral music. -@c . {Transpose} + @menu * Rehearsal marks:: * Bar numbers:: @@ -3647,7 +3452,7 @@ problems in orchestral music. * Sound output for transposing instruments:: @end menu -@c . {Rehearsal marks} + @node Rehearsal marks @subsection Rehearsal marks @cindex Rehearsal marks @@ -3851,7 +3656,7 @@ If you want to use both @code{\transpose} and @code{\relative}, then you must use @code{\transpose} first. @code{\relative} will have no effect music that appears inside a @code{\transpose}. -@c . {Multi measure rests} + @node Multi measure rests @subsection Multi measure rests @cindex Multi measure rests @@ -4313,7 +4118,7 @@ historic editions (other than those of Petrucci)''. Petrucci used C clefs with differently balanced left-side vertical beams, depending on which staffline it was printed. -@c . {Custodes} + @node Custodes @subsection Custodes @@ -4716,7 +4521,7 @@ Internally, the code produces markup texts internally. You can use any of the markup text properties to override formatting. For example, the vertical spacing of the figures may be set with @code{baseline-skip}. -@c . {Contemporary notation} + @node Contemporary notation @section Contemporary notation @@ -4855,7 +4660,7 @@ frequently used in contemporary music notation: See @ref{Articulations} for general instructions how to apply scripts such as fermatas to a @code{\notes@{@}} block. -@c . {Tuning output} + @node Tuning output @section Tuning output @@ -4916,7 +4721,7 @@ c'4 \property Voice.Stem \override #'thickness = #4.0 c'4 \property Voice.Stem \revert #'thickness c'4 @end lilypond -You should balance @code{\override} and @code{\revert}. If that's too +You should balance @code{\override} and @code{\revert}. If that is too much work, you can use the @code{\set} shorthand. It performs a revert followed by an override. The following example gives exactly the same result as the previous one. @@ -5303,7 +5108,7 @@ A \fontsize #2 @{ B C @} D This will enlarge the B and the C by two steps. @item \translate #(cons @var{x} @var{y}) @cindex \translate -This translates an object. It's first argument is a cons of numbers +This translates an object. Its first argument is a cons of numbers @example A \translate #(cons 2 -3) @{ B C @} D @end example @@ -5549,7 +5354,7 @@ must be overriden from the @code{\paper} block, e.g. @refbugs Spacing is determined on a score wide basis. If you have a score that -changes its character (measured in durations) half way during the +changes its character (measured in durations) halfway during the score, the part containing the longer durations will be spaced too widely. @@ -5570,7 +5375,7 @@ kneed stems. @end lilypond -@c . {Font size} + @node Font Size @subsection Font size @cindex font size, setting @@ -5598,7 +5403,7 @@ The font definitions are generated using a Scheme function. For more details, see the file @file{scm/font.scm}. -@c . {Line break} + @node Line breaking @subsection Line breaking @@ -5702,7 +5507,7 @@ Lilypond and @code{ly2dvi}) -@c . {Sound} + @node Sound @section Sound @cindex Sound @@ -5732,7 +5537,7 @@ Both loudness controls are combined to produce the final MIDI volume. * MIDI instrument names:: @end menu -@c . {MIDI block} + @node MIDI block @subsection MIDI block @cindex MIDI block diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index 2a60f210b0..d87a719db7 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -25,7 +25,6 @@ * Fine tuning a piece:: * An orchestral score:: Conductor's score and individual parts * Integrating text and music:: Integrating text and music -* End of tutorial:: The end @end menu Operating lilypond is done through text files: To print a piece of diff --git a/input/regression/+.ly b/input/regression/+.ly index 21f6b881c7..1ebf3230d1 100644 --- a/input/regression/+.ly +++ b/input/regression/+.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" %% +.ly: Be the first .ly file for lys-to-tely.py. %% Better to make lys-to-tely.py include "introduction.texi" or %% other .texi documents too? diff --git a/input/regression/abe.ly b/input/regression/abe.ly index dbd888c1e4..0ae1240545 100644 --- a/input/regression/abe.ly +++ b/input/regression/abe.ly @@ -1,7 +1,7 @@ \header { texidoc="Automatic beamer behaves nicely." } -\version "1.7.6" +\version "1.7.16" \include "paper16.ly" \paper { linewidth = 390.000000 \pt } diff --git a/input/regression/accidental-cautionary.ly b/input/regression/accidental-cautionary.ly index d2c16195d1..41eb930c48 100644 --- a/input/regression/accidental-cautionary.ly +++ b/input/regression/accidental-cautionary.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Cautionary accidentals are indicated using either diff --git a/input/regression/accidental-double.ly b/input/regression/accidental-double.ly index 56de4ed450..41ca70cff7 100644 --- a/input/regression/accidental-double.ly +++ b/input/regression/accidental-double.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "If two forced accidentals happen at the same time, only one sharp sign is printed." diff --git a/input/regression/accidental-ledger.ly b/input/regression/accidental-ledger.ly index 9c7dc6faf9..a23fdcd36b 100644 --- a/input/regression/accidental-ledger.ly +++ b/input/regression/accidental-ledger.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Ledger lines are shortened when there are accidentals" @@ -8,6 +8,6 @@ { cis'4 cis'! cis' cis' } - \paper { linewidth = -1. } + \paper { raggedright = ##t} } %% new-chords-done %% \ No newline at end of file diff --git a/input/regression/accidental-octave.ly b/input/regression/accidental-octave.ly index 041442e2b7..3edb8b009d 100644 --- a/input/regression/accidental-octave.ly +++ b/input/regression/accidental-octave.ly @@ -1,5 +1,5 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc=" diff --git a/input/regression/accidental-placement.ly b/input/regression/accidental-placement.ly index 19919746b9..a48220d4d4 100644 --- a/input/regression/accidental-placement.ly +++ b/input/regression/accidental-placement.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc ="Accidentals are placed as closely as possible. Accidentals in corresponding octaves are aligned. @@ -24,6 +24,6 @@ flats in a sixth shoudl be staggered. " <> <> } -\paper { linewidth = -1. } +\paper { raggedright = ##t} } %% new-chords-done %% \ No newline at end of file diff --git a/input/regression/accidental-single-double.ly b/input/regression/accidental-single-double.ly index afb8da3b89..ef37c21fb2 100644 --- a/input/regression/accidental-single-double.ly +++ b/input/regression/accidental-single-double.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" A sharp sign after a double sharp sign, as well as a flat sign diff --git a/input/regression/accidental-unbroken-tie-spacing.ly b/input/regression/accidental-unbroken-tie-spacing.ly index 609582595a..0455f14736 100644 --- a/input/regression/accidental-unbroken-tie-spacing.ly +++ b/input/regression/accidental-unbroken-tie-spacing.ly @@ -3,7 +3,7 @@ texidoc = "Tied accidentaled notes (which cause reminder accidentals) don't wrea the spacing when unbroken." } -\version "1.7.6" +\version "1.7.16" \include "deutsch.ly" rechts = \notes \relative c' { @@ -23,7 +23,7 @@ Rechts = \context Staff \notes { \rechts \paper { - linewidth = -3.3 \cm + raggedright = ##t } } %% new-chords-done %% \ No newline at end of file diff --git a/input/regression/accidental-voice.ly b/input/regression/accidental-voice.ly index 315207e998..1f0e2e78f4 100644 --- a/input/regression/accidental-voice.ly +++ b/input/regression/accidental-voice.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/accidental.ly b/input/regression/accidental.ly index 94d9f3784e..7f4c8ba3cd 100644 --- a/input/regression/accidental.ly +++ b/input/regression/accidental.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/accidentals.ly b/input/regression/accidentals.ly index 0920b82908..1329f4b2be 100644 --- a/input/regression/accidentals.ly +++ b/input/regression/accidentals.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/ambitus.ly b/input/regression/ambitus.ly index 775ed18fc1..1fd50ff06f 100644 --- a/input/regression/ambitus.ly +++ b/input/regression/ambitus.ly @@ -2,7 +2,7 @@ texidoc = "Ambituses indicate pitch ranges for voices." } -\version "1.7.6" +\version "1.7.16" upper = \notes \relative c { \clef "treble" diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly index 851621aa0e..80541e533d 100644 --- a/input/regression/arpeggio-collision.ly +++ b/input/regression/arpeggio-collision.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "arpeggio stays clear of accidentals and flipped note heads. @@ -40,7 +40,7 @@ hairyChord = \context Staff \notes\relative c' < \hairyChord } \paper { - linewidth = -1. + raggedright = ##t \translator{ \StaffContext connectArpeggios = ##t diff --git a/input/regression/arpeggio.ly b/input/regression/arpeggio.ly index 5be9da372c..4ee72bc65a 100644 --- a/input/regression/arpeggio.ly +++ b/input/regression/arpeggio.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" Arpeggios are supported, both cross-staff and broken single staff. diff --git a/input/regression/auto-beam-bar.ly b/input/regression/auto-beam-bar.ly index 9f51a0299a..f2d0b90c15 100644 --- a/input/regression/auto-beam-bar.ly +++ b/input/regression/auto-beam-bar.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" @@ -17,7 +17,7 @@ a16 cis d a bes g fis4 g8 a16 g a bes c d % ees8 d c } \paper{ - linewidth=-1. + raggedright = ##t } } %% new-chords-done %% \ No newline at end of file diff --git a/input/regression/auto-beam-triplet.ly b/input/regression/auto-beam-triplet.ly index 6e500421a3..2b0a5dedbb 100644 --- a/input/regression/auto-beam-triplet.ly +++ b/input/regression/auto-beam-triplet.ly @@ -3,7 +3,7 @@ texidoc = "Automatic beaming is also done on tuplets." } -\version "1.7.6" +\version "1.7.16" \score{ \notes\relative c''{ diff --git a/input/regression/auto-beam-tuplets.ly b/input/regression/auto-beam-tuplets.ly index c42ae1ad04..cf074c330f 100644 --- a/input/regression/auto-beam-tuplets.ly +++ b/input/regression/auto-beam-tuplets.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Tuplet-spanner should not put (visible) brackets on diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly index dc1346bc31..7c185c3c14 100644 --- a/input/regression/auto-change.ly +++ b/input/regression/auto-change.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { diff --git a/input/regression/bar-number.ly b/input/regression/bar-number.ly index 4b18f7ab2c..7945891cf8 100644 --- a/input/regression/bar-number.ly +++ b/input/regression/bar-number.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { @@ -16,7 +16,7 @@ start counting after the anacrusis." c1 c } \paper { - linewidth = -1. \mm + raggedright = ##t \translator { \ScoreContext BarNumber \override #'break-visibility = #all-visible diff --git a/input/regression/bar-scripts.ly b/input/regression/bar-scripts.ly index 191091614b..ac73d0f47d 100644 --- a/input/regression/bar-scripts.ly +++ b/input/regression/bar-scripts.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/beam-auto-knee.ly b/input/regression/beam-auto-knee.ly index 8dfc4ac6a6..d0c987dfe0 100644 --- a/input/regression/beam-auto-knee.ly +++ b/input/regression/beam-auto-knee.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc="Automatic kneeing. A knee is made when a horizontal beam fits in a gap between note heads that is larger than a predefined diff --git a/input/regression/beam-center-slope.ly b/input/regression/beam-center-slope.ly index 52540d368c..f79517b846 100644 --- a/input/regression/beam-center-slope.ly +++ b/input/regression/beam-center-slope.ly @@ -1,5 +1,5 @@ -\version "1.7.7" +\version "1.7.16" \header{ texidoc="Simple beams on middle staffline be allowed to be diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly index a1c38cdcb6..f51de22ca6 100644 --- a/input/regression/beam-concave.ly +++ b/input/regression/beam-concave.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc = "Concave beams should be horizontal. informally spoken, @@ -74,7 +74,7 @@ beams this way." [\stemUp bes8 \stemDown d'8 bes8] } \paper{ - linewidth = -1.0 + raggedright = ##t } } diff --git a/input/regression/beam-cross-staff-auto-knee.ly b/input/regression/beam-cross-staff-auto-knee.ly index da33980107..e51a51110a 100644 --- a/input/regression/beam-cross-staff-auto-knee.ly +++ b/input/regression/beam-cross-staff-auto-knee.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ @@ -20,7 +20,7 @@ with explicit staff switches)." } > \paper{ - linewidth = -1.0 + raggedright = ##t } } %% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-cross-staff-slope.ly b/input/regression/beam-cross-staff-slope.ly index 4ec3479265..b9c0e40724 100644 --- a/input/regression/beam-cross-staff-slope.ly +++ b/input/regression/beam-cross-staff-slope.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Cross staff (kneed) beams don't cause extreme slopes" @@ -28,7 +28,7 @@ don't cause extreme slopes" \context Staff = down { \time 3/8 \clef bass s4.*3 } > - \paper { linewidth = -1. } + \paper { raggedright = ##t} } %% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-cross-staff.ly b/input/regression/beam-cross-staff.ly index 75d77cfbf4..a1f95cae3b 100644 --- a/input/regression/beam-cross-staff.ly +++ b/input/regression/beam-cross-staff.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" Beams can be typeset over fixed distance aligned staves, beam diff --git a/input/regression/beam-default-lengths.ly b/input/regression/beam-default-lengths.ly index a769b08a29..ad60d495b4 100644 --- a/input/regression/beam-default-lengths.ly +++ b/input/regression/beam-default-lengths.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc="Beamed stems have standard lengths if possible." @@ -13,5 +13,5 @@ f4 [f8 f] [f16 f] [f32 f] [f64 f] [f128 f] } - \paper{ linewidth = -1.0 } + \paper{ raggedright = ##t} } %% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly index b31642528b..c714ed5764 100644 --- a/input/regression/beam-extreme.ly +++ b/input/regression/beam-extreme.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" Beams should behave reasonably well, even under extreme circumstances. @@ -42,7 +42,7 @@ extreme = \notes\relative c'' { } \paper{ % raggedright = ##t - linewidth = -1 + raggedright = ##t } } %% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-french.ly b/input/regression/beam-french.ly index 0d2d9ec8a1..2b8822293f 100644 --- a/input/regression/beam-french.ly +++ b/input/regression/beam-french.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "French style beaming. In french beaming, the stems do not go to the outer beams." diff --git a/input/regression/beam-funky-beamlet.ly b/input/regression/beam-funky-beamlet.ly index 22a4d004d3..c01dcd662b 100644 --- a/input/regression/beam-funky-beamlet.ly +++ b/input/regression/beam-funky-beamlet.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc=" Funky kneed beams with beamlets also work. The beamlets @@ -15,7 +15,7 @@ should be pointing to the note head. c16 c,,8 c16 } - \paper { linewidth = -1 } + \paper { raggedright = ##t} } %% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-funky.ly b/input/regression/beam-funky.ly index 6821d080e8..ec00e413b8 100644 --- a/input/regression/beam-funky.ly +++ b/input/regression/beam-funky.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Knee beaming. (funky)" } @@ -27,7 +27,7 @@ g''' g,,,] } } } -\paper { linewidth = -1. } +\paper { raggedright = ##t} } %% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-length.ly b/input/regression/beam-length.ly index 590cf8fb85..5e3176303d 100644 --- a/input/regression/beam-length.ly +++ b/input/regression/beam-length.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/beam-manual.ly b/input/regression/beam-manual.ly index 5529228c10..e9fde0dc30 100644 --- a/input/regression/beam-manual.ly +++ b/input/regression/beam-manual.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { @@ -18,7 +18,7 @@ } } \paper{ - linewidth = -1 + raggedright = ##t } } %% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-multiple-cross-staff.ly b/input/regression/beam-multiple-cross-staff.ly index 4c085cfd78..a2780b253c 100644 --- a/input/regression/beam-multiple-cross-staff.ly +++ b/input/regression/beam-multiple-cross-staff.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Kneed beams (often happens with cross-staff beams) diff --git a/input/regression/beam-over-barline.ly b/input/regression/beam-over-barline.ly index 4bc4ae287b..a72c851622 100644 --- a/input/regression/beam-over-barline.ly +++ b/input/regression/beam-over-barline.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "explicit beams may cross barlines. " } diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly index a5d21beacf..4a62509b86 100644 --- a/input/regression/beam-position.ly +++ b/input/regression/beam-position.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" Beams should always reach the middle staff line. The second beam @@ -22,7 +22,7 @@ Override with @code{noStemExtend}. } \paper { - linewidth=-1.0 + raggedright = ##t } \midi { } } diff --git a/input/regression/beam-postfix-notation.ly b/input/regression/beam-postfix-notation.ly index db83418ad4..b22f9e7ae2 100644 --- a/input/regression/beam-postfix-notation.ly +++ b/input/regression/beam-postfix-notation.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Beams and ties may be entered in postfix notation, separating the diff --git a/input/regression/beam-quarter.ly b/input/regression/beam-quarter.ly index ebe7f88b9c..f385ced735 100644 --- a/input/regression/beam-quarter.ly +++ b/input/regression/beam-quarter.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc= "Quarter notes may be beamed: the beam is halted momentarily." @@ -7,6 +7,6 @@ \score {\notes \relative c'' { [c8 c4 c8] % should warn here! } -\paper { linewidth = -1.0 } +\paper { raggedright = ##t} } %% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-rest.ly b/input/regression/beam-rest.ly index d56c49f943..29fdf09e1c 100644 --- a/input/regression/beam-rest.ly +++ b/input/regression/beam-rest.ly @@ -2,11 +2,11 @@ texidoc = "The number of beams doesn't change on a rest." } -\version "1.7.7" +\version "1.7.16" \score { \notes \relative c, { \clef bass [e8 r16 f d'8 e16 e16] [c8 c16 r16 bes8 r16 c16-] | } -\paper { linewidth = -1.0 } +\paper { raggedright = ##t} } diff --git a/input/regression/beam-shortened-lengths.ly b/input/regression/beam-shortened-lengths.ly index 7b8d81f44d..8006f0e5a2 100644 --- a/input/regression/beam-shortened-lengths.ly +++ b/input/regression/beam-shortened-lengths.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc="Beams in unnatural direction, have shortened stems, but do not look too short." @@ -13,6 +13,6 @@ \stemUp f'4 [f8 f] [f16 f] [f32 f] [f64 f] [f128 f] } - \paper{ linewidth = -1.0 } + \paper{ raggedright = ##t} } %% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beamed-chord.ly b/input/regression/beamed-chord.ly index db5e2fd520..0b3823c958 100644 --- a/input/regression/beamed-chord.ly +++ b/input/regression/beamed-chord.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc = "Hairy case for beam, chord, and automatic knees." diff --git a/input/regression/beaming-ternary-metrum.ly b/input/regression/beaming-ternary-metrum.ly index f15fcfaa22..e1ae4b2e23 100644 --- a/input/regression/beaming-ternary-metrum.ly +++ b/input/regression/beaming-ternary-metrum.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "automatic beaming also works in ternary time sigs." } @@ -8,6 +8,6 @@ texidoc = "automatic beaming also works in ternary time sigs." \time 6/8 [c8. c16 c16 c16] } -\paper { linewidth = -1. } +\paper { raggedright = ##t} } %% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beaming.ly b/input/regression/beaming.ly index 95398a0a14..fdbb92e04b 100644 --- a/input/regression/beaming.ly +++ b/input/regression/beaming.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/beams.ly b/input/regression/beams.ly index 0c0e62aca2..79ab0970ed 100644 --- a/input/regression/beams.ly +++ b/input/regression/beams.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "beams (simple)" } diff --git a/input/regression/between-systems.ly b/input/regression/between-systems.ly index ca88483c53..4732030699 100644 --- a/input/regression/between-systems.ly +++ b/input/regression/between-systems.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/break.ly b/input/regression/break.ly index ab2f120cbf..9f0f4e17dd 100644 --- a/input/regression/break.ly +++ b/input/regression/break.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly index c065e027b7..e0c80a6717 100644 --- a/input/regression/breathing-sign.ly +++ b/input/regression/breathing-sign.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" Breathing signs, also used for phrasing, do normally not influence diff --git a/input/regression/chord-changes.ly b/input/regression/chord-changes.ly index aeb1ccec24..8fd8c82df0 100644 --- a/input/regression/chord-changes.ly +++ b/input/regression/chord-changes.ly @@ -1,4 +1,4 @@ -\version "1.7.10" +\version "1.7.16" \header{ texidoc="property chordChanges: only display chord names when diff --git a/input/regression/chord-scripts.ly b/input/regression/chord-scripts.ly index dee2434e92..4af532f714 100644 --- a/input/regression/chord-scripts.ly +++ b/input/regression/chord-scripts.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Scripts can also be attached to chord elements." diff --git a/input/regression/chord-tremolo.ly b/input/regression/chord-tremolo.ly index 1d02ba4852..b6fb165e28 100644 --- a/input/regression/chord-tremolo.ly +++ b/input/regression/chord-tremolo.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/clefs.ly b/input/regression/clefs.ly index 8611a48157..37aeb30ac6 100644 --- a/input/regression/clefs.ly +++ b/input/regression/clefs.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/cluster.ly b/input/regression/cluster.ly index 43d0ed2129..cb3dda671d 100644 --- a/input/regression/cluster.ly +++ b/input/regression/cluster.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Clusters are a device to denote that a complete range of notes is to be played." diff --git a/input/regression/collision-2.ly b/input/regression/collision-2.ly index 722f00b1b6..7fd0ee574e 100644 --- a/input/regression/collision-2.ly +++ b/input/regression/collision-2.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Collisions for single head notes. " } diff --git a/input/regression/collision-dots.ly b/input/regression/collision-dots.ly index c11f65122b..11e89dc4e3 100644 --- a/input/regression/collision-dots.ly +++ b/input/regression/collision-dots.ly @@ -1,10 +1,11 @@ + \header { texidoc = "collision resolution tries to put notes with dots on the right side." } -\version "1.7.6" +\version "1.7.16" \score{ \context Staff \notes < @@ -21,4 +22,4 @@ } -%% new-chords-done %% \ No newline at end of file +%% new-chords-done %% diff --git a/input/regression/collision-head-chords.ly b/input/regression/collision-head-chords.ly index e226524580..57be7c9327 100644 --- a/input/regression/collision-head-chords.ly +++ b/input/regression/collision-head-chords.ly @@ -1,4 +1,4 @@ -\version "1.7.14" +\version "1.7.16" \header { texidoc = "Note heads in collisions should be merged if they have the same positions in the extreme note heads. @@ -12,7 +12,7 @@ they have the same positions in the extreme note heads. c4 < { c4 d4 <>8 <> <> } \\ { c4 c <>8 <> <>8 } > } -\paper {linewidth = -1.0 } +\paper {raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly index 9a281587e6..a4f21338d8 100644 --- a/input/regression/collision-heads.ly +++ b/input/regression/collision-heads.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = diff --git a/input/regression/collision-mesh.ly b/input/regression/collision-mesh.ly index 5d2d358268..3d19aadbf7 100644 --- a/input/regression/collision-mesh.ly +++ b/input/regression/collision-mesh.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Oppositely stemmed chords, meshing into each other, are resolved." diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly index 89e2ec131d..4be6236a20 100644 --- a/input/regression/collisions.ly +++ b/input/regression/collisions.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" Normal collisions. We have support for polyphony, where the @@ -30,49 +30,28 @@ twovoicechords = \context Staff \notes < threevoice = \context Staff \notes < - \context Voice=i { \stemUp g4 f e f g a g2 } - \context Voice=ii { \stemUp \shiftOn - e4 e e e e e e e } - \context Voice=iii { \stemDown c4 d e d c d es } + { g4 f e f g a g2 } \\ + { c4 d e d c d es } \\ + { e4 e e e e e e e } > -hairyChord = \context Staff \notes\relative c' < - \context Voice=one { -\shiftOff - \stemUp - e4 - } - - \context Voice=two { - \stemUp - \shiftOn - \property Voice.NoteColumn \override #'horizontal-shift = #1 - cis - } - - \context Voice=three { \shiftOnn - \stemUp - ais - } - - \context Voice=four { - \stemDown - \shiftOn - - fis - } -> +hairyChord = \context Staff \notes \relative c'' + < e \\ + fis, \\ + cis' \\ + \\ + ais + i> \score{ - \notes \transpose c c' { + \notes { \transpose c c' { \twovoice \twovoicechords - - \threevoice + \threevoice } \hairyChord } % \midi { \tempo 4:80 } } -%% new-chords-done %% \ No newline at end of file +%% new-chords-done %% diff --git a/input/regression/completion-heads-polyphony.ly b/input/regression/completion-heads-polyphony.ly index 1f4e2e82a6..ef5022e7c8 100644 --- a/input/regression/completion-heads-polyphony.ly +++ b/input/regression/completion-heads-polyphony.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Completion heads are broken across bar lines. This was diff --git a/input/regression/completion-heads.ly b/input/regression/completion-heads.ly index d00431a26b..15c6569460 100644 --- a/input/regression/completion-heads.ly +++ b/input/regression/completion-heads.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/custos.ly b/input/regression/custos.ly index fd9a2f9bac..9edcb0ed72 100644 --- a/input/regression/custos.ly +++ b/input/regression/custos.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "custodes in various styles." } diff --git a/input/regression/dot-flag-collision.ly b/input/regression/dot-flag-collision.ly index 0f9fd31615..7b3e16b63c 100644 --- a/input/regression/dot-flag-collision.ly +++ b/input/regression/dot-flag-collision.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Dots move to the right when a collision with the (up)flag happens" } @@ -12,7 +12,7 @@ g''16. a,4. a8 a8. a16. c,16. g16. } - \paper { linewidth = -1. } + \paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/dots.ly b/input/regression/dots.ly index f0c5bc9e67..838bc8471f 100644 --- a/input/regression/dots.ly +++ b/input/regression/dots.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" Noteheads can have dots, and rests can too. Augmentation dots should diff --git a/input/regression/drums.ly b/input/regression/drums.ly index d1bced2b65..8458635c78 100644 --- a/input/regression/drums.ly +++ b/input/regression/drums.ly @@ -8,7 +8,7 @@ texidoc = "Drum notation, although kludgy, should work. Though, << chord >> does \include "drumpitch-init.ly" -\version "1.7.9" +\version "1.7.16" drh = \notes { cymc4.^"crash" hhc16^"h.h." hh \repeat "unfold" 5 {hhc8 hho hhc8 hh16 hh} hhc4 r4 r2 } drl = \notes {\repeat "unfold" 3 {bd4 sn8 bd bd4 < bd ss > } bd8 tommh tommh bd toml toml bd tomfh16 tomfh } diff --git a/input/regression/dynamics-broken-hairpin.ly b/input/regression/dynamics-broken-hairpin.ly index 03dee28621..ad17ab2397 100644 --- a/input/regression/dynamics-broken-hairpin.ly +++ b/input/regression/dynamics-broken-hairpin.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc = "Broken crescendi should look be open on one side." } diff --git a/input/regression/dynamics-glyphs.ly b/input/regression/dynamics-glyphs.ly index 8811e35851..6be24a54d0 100644 --- a/input/regression/dynamics-glyphs.ly +++ b/input/regression/dynamics-glyphs.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header {texidoc = "Dynamic letters are kerned, and their weight matches that of the hairpin signs. The dynamic scripts should be diff --git a/input/regression/dynamics-line.ly b/input/regression/dynamics-line.ly index 1904b0a96f..46a34ef3cc 100644 --- a/input/regression/dynamics-line.ly +++ b/input/regression/dynamics-line.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" Dynamics appear below or above the staff. If multiple dynamics are linked with (de)crescendi, they should be on the same diff --git a/input/regression/dynamics-unbound-hairpin.ly b/input/regression/dynamics-unbound-hairpin.ly index 7445933c36..cc53f1317d 100644 --- a/input/regression/dynamics-unbound-hairpin.ly +++ b/input/regression/dynamics-unbound-hairpin.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Crescendi may start off-notes. In that case, they should not collapse into flat lines." @@ -8,6 +8,6 @@ texidoc = "Crescendi may start off-notes. In that case, they should not collaps < f''1 { s4 s4 \< \! s4 \> \! s4 } > }} -\paper { linewidth = -1. } +\paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/easy-notation.ly b/input/regression/easy-notation.ly index fc69c3df2e..c61b4cd437 100644 --- a/input/regression/easy-notation.ly +++ b/input/regression/easy-notation.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = " Ez-notation prints names in note heads. @@ -11,7 +11,7 @@ You also get ledger lines, of course." \score { \notes { c'2 e'4 f' | g'1 b8 } \paper { \translator { \EasyNotation } - linewidth = -1. + raggedright = ##t } } %% new-chords-done %% diff --git a/input/regression/figured-bass.ly b/input/regression/figured-bass.ly index 9f454db3c2..b60cad14ff 100644 --- a/input/regression/figured-bass.ly +++ b/input/regression/figured-bass.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Test figured bass. diff --git a/input/regression/finger-chords.ly b/input/regression/finger-chords.ly index 4df28235fa..1c1f372264 100644 --- a/input/regression/finger-chords.ly +++ b/input/regression/finger-chords.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "With the new chord syntax it's possible to associate diff --git a/input/regression/fingering.ly b/input/regression/fingering.ly index 8469229e78..41020b0a31 100644 --- a/input/regression/fingering.ly +++ b/input/regression/fingering.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Automatic fingering tries to put fingering instructions diff --git a/input/regression/font-magnification.ly b/input/regression/font-magnification.ly index cfc7a0e88d..f9f17cd173 100644 --- a/input/regression/font-magnification.ly +++ b/input/regression/font-magnification.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "The magnification can be set for any font. Note that this doesn't change variable symbols such as beams or slurs. " } diff --git a/input/regression/generic-output-property.ly b/input/regression/generic-output-property.ly index 48967cef53..c4c9cc5f30 100644 --- a/input/regression/generic-output-property.ly +++ b/input/regression/generic-output-property.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" @@ -23,7 +23,7 @@ setting the @code{extra-offset} of a grob. e } \paper{ - linewidth=-1.0 + raggedright = ##t } } %% new-chords-done %% diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly index 868da0d200..11db72efb7 100644 --- a/input/regression/glissando.ly +++ b/input/regression/glissando.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ diff --git a/input/regression/grace-auto-beam.ly b/input/regression/grace-auto-beam.ly index c3cc594d9f..7b6e5b4f3c 100644 --- a/input/regression/grace-auto-beam.ly +++ b/input/regression/grace-auto-beam.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "The autobeamer is not confused by grace notes." diff --git a/input/regression/grace-bar-line.ly b/input/regression/grace-bar-line.ly index c7d12778cb..9abe8a6ad3 100644 --- a/input/regression/grace-bar-line.ly +++ b/input/regression/grace-bar-line.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Bar line should come before the grace note." } @@ -9,6 +9,6 @@ texidoc = "Bar line should come before the grace note." \score {\notes \relative c' \context Staff { f1 \grace { [a'16 f] } g1 } - \paper { linewidth = -1. } + \paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/grace-bar-number.ly b/input/regression/grace-bar-number.ly index eab693bc6d..ec2fbdb0e6 100644 --- a/input/regression/grace-bar-number.ly +++ b/input/regression/grace-bar-number.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Grace notes do tricky things with timing. If a measure diff --git a/input/regression/grace-beam.ly b/input/regression/grace-beam.ly index 7605845a2e..e941d5f7f5 100644 --- a/input/regression/grace-beam.ly +++ b/input/regression/grace-beam.ly @@ -5,6 +5,6 @@ Unbeamed grace notes are not put into normal beams. " } -\version "1.7.6" +\version "1.7.16" \score { \notes\relative c'' { c4 [d8 \grace { [e32 d c d] } e8] [e e \grace { f16 } e8 e] }} %% new-chords-done %% diff --git a/input/regression/grace-dynamic.ly b/input/regression/grace-dynamic.ly index 1995a9edba..e2e88e18bb 100644 --- a/input/regression/grace-dynamic.ly +++ b/input/regression/grace-dynamic.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ % ? % niet zo onschuldig! je hebt graces gefixt in 1.5, zie maar eens 1.3.150 diff --git a/input/regression/grace-nest.ly b/input/regression/grace-nest.ly index 6d0ccb7827..ca19091fbf 100644 --- a/input/regression/grace-nest.ly +++ b/input/regression/grace-nest.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "grace code should not be confused by nested sequential musics, containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example." diff --git a/input/regression/grace-nest1.ly b/input/regression/grace-nest1.ly index 6d0ccb7827..ca19091fbf 100644 --- a/input/regression/grace-nest1.ly +++ b/input/regression/grace-nest1.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "grace code should not be confused by nested sequential musics, containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example." diff --git a/input/regression/grace-nest2.ly b/input/regression/grace-nest2.ly index 4b38a503a2..e7ff9eb087 100644 --- a/input/regression/grace-nest2.ly +++ b/input/regression/grace-nest2.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "grace code should not be confused by nested sequential musics, containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example." diff --git a/input/regression/grace-nest3.ly b/input/regression/grace-nest3.ly index 4f28c0cc08..0b8c826a7c 100644 --- a/input/regression/grace-nest3.ly +++ b/input/regression/grace-nest3.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \score { \notes \relative c'' { f1 diff --git a/input/regression/grace-nest4.ly b/input/regression/grace-nest4.ly index a5d1cc6a97..71b9983f6a 100644 --- a/input/regression/grace-nest4.ly +++ b/input/regression/grace-nest4.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Another combination of grace note nesting." } diff --git a/input/regression/grace-nest5.ly b/input/regression/grace-nest5.ly index 5811c82bb1..98758eb983 100644 --- a/input/regression/grace-nest5.ly +++ b/input/regression/grace-nest5.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \score { \notes { diff --git a/input/regression/grace-part-combine.ly b/input/regression/grace-part-combine.ly index e7f9153e22..2262cf58ae 100644 --- a/input/regression/grace-part-combine.ly +++ b/input/regression/grace-part-combine.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "partcombiner and grace notes can go together" } diff --git a/input/regression/grace-staff-length.ly b/input/regression/grace-staff-length.ly index 5cae4ede66..e1981cabb4 100644 --- a/input/regression/grace-staff-length.ly +++ b/input/regression/grace-staff-length.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc = "Stripped version of trip.ly. Staffs should be of correct length." } diff --git a/input/regression/grace-start.ly b/input/regression/grace-start.ly index cc4b3672ef..ea1261ab5d 100644 --- a/input/regression/grace-start.ly +++ b/input/regression/grace-start.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Pieces may begin with grace notes." } @@ -8,6 +8,6 @@ texidoc = "Pieces may begin with grace notes." \grace { [a16 bes] } c1 \bar "||" % test if | and || are synced. } - \paper { linewidth = -1. } + \paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/grace-stems.ly b/input/regression/grace-stems.ly index 36a88f5ea2..3dff2e7477 100644 --- a/input/regression/grace-stems.ly +++ b/input/regression/grace-stems.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc = "startGraceMusic should no-stem-extend to true; the two grace beams should be the same here. @@ -18,7 +18,7 @@ the two grace beams should be the same here. } \paper { - linewidth=-1.0 + raggedright = ##t } \midi { } } diff --git a/input/regression/grace-sync.ly b/input/regression/grace-sync.ly index f47e56642e..b94f383d34 100644 --- a/input/regression/grace-sync.ly +++ b/input/regression/grace-sync.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "grace notes in different voices/staves are synchronized." } @@ -12,6 +12,6 @@ ) c4 c4 } \context Staff = SC { c2 c4 c4 \bar "|." } > - \paper { linewidth = -1. } + \paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/grace-unfold-repeat.ly b/input/regression/grace-unfold-repeat.ly index 41fdced98e..b9571681c3 100644 --- a/input/regression/grace-unfold-repeat.ly +++ b/input/regression/grace-unfold-repeat.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Grace notes and unfolded repeats. Line breaks may happen before grace notes. diff --git a/input/regression/grace-volta-repeat.ly b/input/regression/grace-volta-repeat.ly index 82e881224e..46c2e3a3e2 100644 --- a/input/regression/grace-volta-repeat.ly +++ b/input/regression/grace-volta-repeat.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { @@ -15,7 +15,7 @@ } } - \paper { linewidth = -1. } + \paper { raggedright = ##t} } diff --git a/input/regression/grace.ly b/input/regression/grace.ly index 66d0250cfd..188e15a33c 100644 --- a/input/regression/grace.ly +++ b/input/regression/grace.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" @@ -29,7 +29,7 @@ not set. Main note scripts don't end up on the grace note. %%\grace { \property Grace.graceAlignPosition = \right c16} c4 c4 \grace { c16 } c4 } -\paper {linewidth = -1.} +\paper {raggedright = ##t} \midi{ } } %% new-chords-done %% diff --git a/input/regression/hairpin-ending.ly b/input/regression/hairpin-ending.ly index d8b523e354..091402af5e 100644 --- a/input/regression/hairpin-ending.ly +++ b/input/regression/hairpin-ending.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { @@ -11,6 +11,6 @@ into them." \score { \notes \relative c'' { c4 \> c4 \! c4 c4_\ff \> c4 \! c4 -\p } -\paper { linewidth = -1.} +\paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/hara-kiri-pianostaff.ly b/input/regression/hara-kiri-pianostaff.ly index 8ac6ec9052..1f99c1a8a4 100644 --- a/input/regression/hara-kiri-pianostaff.ly +++ b/input/regression/hara-kiri-pianostaff.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Hara kiri should not upset fixed distance alignment like in pianostaff. In this example the middle staff is harakiried." } diff --git a/input/regression/hara-kiri-short.ly b/input/regression/hara-kiri-short.ly index e58a16045b..0d77904f54 100644 --- a/input/regression/hara-kiri-short.ly +++ b/input/regression/hara-kiri-short.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" Hara kiri staves kill themselves if they are empty. This example really diff --git a/input/regression/instrument-name-markup.ly b/input/regression/instrument-name-markup.ly index c367b7f5fd..2ddfbe72b4 100644 --- a/input/regression/instrument-name-markup.ly +++ b/input/regression/instrument-name-markup.ly @@ -7,7 +7,7 @@ including alterations. " } -\version "1.7.6" +\version "1.7.16" textFlat = \markup {\smaller \musicglyph #"accidentals--1"} diff --git a/input/regression/instrument-name.ly b/input/regression/instrument-name.ly index 6f0f6f0bc3..54fa6e669f 100644 --- a/input/regression/instrument-name.ly +++ b/input/regression/instrument-name.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" Staff margins are also markings attached to barlines. They should be @@ -19,7 +19,7 @@ be on normal staves, but also on compound staves, like the PianoStaff \context Staff = bass { \property Staff.instrument = "Left " \clef bass c4 }> \paper { -linewidth=-1.0 +raggedright = ##t }} %% new-chords-done %% diff --git a/input/regression/key-signature-scordatura.ly b/input/regression/key-signature-scordatura.ly index 985cfdd871..22f743f7a6 100644 --- a/input/regression/key-signature-scordatura.ly +++ b/input/regression/key-signature-scordatura.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Key signatures can be set per pitch individually. This can be done bby setting @code{Staff.keySignature} diff --git a/input/regression/keys.ly b/input/regression/keys.ly index 9c194981b6..3f002cb828 100644 --- a/input/regression/keys.ly +++ b/input/regression/keys.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" Key signatures appear on key changes. They may also diff --git a/input/regression/lyric-align.ly b/input/regression/lyric-align.ly index b8c159a106..4edb50998c 100644 --- a/input/regression/lyric-align.ly +++ b/input/regression/lyric-align.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc="Lyric alignment @@ -9,7 +9,7 @@ " } -%\paper { linewidth = -1. } +%\paper { raggedright = ##t} \score { < \context Voice = "v" \notes \relative c'' { \property Staff.automaticMelismata = ##t diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly index 97cf3e962e..9fde847c34 100644 --- a/input/regression/lyric-combine-polyphonic.ly +++ b/input/regression/lyric-combine-polyphonic.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc ="polyphonic rhythms and rests don't disturb @@ -36,6 +36,6 @@ texidoc ="polyphonic rhythms and rests don't disturb } > } - \paper { linewidth=-1.0 } + \paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly index f2617c03a7..949f1d59e2 100644 --- a/input/regression/lyric-combine.ly +++ b/input/regression/lyric-combine.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc= "Lyrics can be set to a melody automatically. Excess lyrics will be diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly index d7f1b2ed34..b02fddad11 100644 --- a/input/regression/lyric-phrasing.ly +++ b/input/regression/lyric-phrasing.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc="Lyric phrasing @@ -21,7 +21,7 @@ are left-aligned, in this case the third x." } -\paper { linewidth = -1. } +\paper { raggedright = ##t} \score { \addlyrics \context Voice = "v" \notes \relative c'' { diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly index 7e2cbc52e4..8363e775e5 100644 --- a/input/regression/lyrics-bar.ly +++ b/input/regression/lyrics-bar.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" @@ -24,7 +24,7 @@ lyrics don't collide with barlines. \notes \context Staff = SB { b1 b1 } > \paper { - linewidth = -1.0\cm + raggedright = ##t \translator { \LyricsContext \accepts "LyricsVoiceWithBars" diff --git a/input/regression/lyrics-extender.ly b/input/regression/lyrics-extender.ly index 39cb18b903..267cb66d5a 100644 --- a/input/regression/lyrics-extender.ly +++ b/input/regression/lyrics-extender.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc = diff --git a/input/regression/lyrics-multi-stanza.ly b/input/regression/lyrics-multi-stanza.ly index aca5712137..1bac3a47a6 100644 --- a/input/regression/lyrics-multi-stanza.ly +++ b/input/regression/lyrics-multi-stanza.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Lyrics syllables are aligned according to @@ -18,7 +18,7 @@ texidoc = "Lyrics syllables are aligned according to \property LyricsVoice . stanza = "Ernie" Ooooo, ch\'e -- ri, je t'aime. } > - \paper { linewidth = -1.0} + \paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/markup-stack.ly b/input/regression/markup-stack.ly index 6fd4342c3c..e64b9fecf1 100644 --- a/input/regression/markup-stack.ly +++ b/input/regression/markup-stack.ly @@ -1,6 +1,6 @@ -\version "1.7.6" +\version "1.7.16" \header {texidoc="Stacking of markup scripts."} -\paper { linewidth=-1. } +\paper { raggedright = ##t} \score { \notes { c''^\markup { "a" \column << "1" \bold "2" "3" >> } } } %% new-chords-done %% diff --git a/input/regression/measure-grouping.ly b/input/regression/measure-grouping.ly index 4ced5bc728..c754b62949 100644 --- a/input/regression/measure-grouping.ly +++ b/input/regression/measure-grouping.ly @@ -7,7 +7,7 @@ of Steve Martland's Dance Works. " } -\version "1.7.6" +\version "1.7.16" %% TODO: should have 2/4 + 5/8 time sig style. @@ -24,7 +24,7 @@ of Steve Martland's Dance Works. " g8 a4 g a-> } \paper { - linewidth = -1.0 + raggedright = ##t \translator { \StaffContext \consists "Measure_grouping_engraver" } diff --git a/input/regression/mensural.ly b/input/regression/mensural.ly index d4e01fd342..0309c96887 100644 --- a/input/regression/mensural.ly +++ b/input/regression/mensural.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "There is limited support for mensural notation: note head diff --git a/input/regression/merge-differently-dotted.ly b/input/regression/merge-differently-dotted.ly index 0488531156..033324c847 100644 --- a/input/regression/merge-differently-dotted.ly +++ b/input/regression/merge-differently-dotted.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "If NoteCollision has merge-differently-dotted set, note diff --git a/input/regression/mm-rests2.ly b/input/regression/mm-rests2.ly index 156ffa79c2..d0ecd3c945 100644 --- a/input/regression/mm-rests2.ly +++ b/input/regression/mm-rests2.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/molecule-hacking.ly b/input/regression/molecule-hacking.ly index ec80a695aa..8ac8f88585 100644 --- a/input/regression/molecule-hacking.ly +++ b/input/regression/molecule-hacking.ly @@ -1,4 +1,4 @@ -\version "1.7.13" +\version "1.7.16" \header { texidoc=" You can write molecule callbacks in Scheme, thus providing custom glyphs for notation elements. A simple example is @@ -71,7 +71,7 @@ GROB. The dimensions of the molecule is not affected. } - \paper { linewidth = -1. } + \paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/multi-measure-rest-center.ly b/input/regression/multi-measure-rest-center.ly index dfe310a6f4..cdbad211fa 100644 --- a/input/regression/multi-measure-rest-center.ly +++ b/input/regression/multi-measure-rest-center.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "The multimeasure rest is centered exactly between bar lines." @@ -14,7 +14,7 @@ c'1 R1*20 c'1 } - \paper { linewidth = -1.0 } + \paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly index 57ef79a54b..711c4777f9 100644 --- a/input/regression/multi-measure-rest.ly +++ b/input/regression/multi-measure-rest.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" @@ -31,7 +31,7 @@ are used then a different symbol is used. \ScoreContext skipBars = ##t } - linewidth = -1. + raggedright = ##t } } %% new-chords-done %% diff --git a/input/regression/music-map.ly b/input/regression/music-map.ly index ab7a2e5986..9e5eb80075 100644 --- a/input/regression/music-map.ly +++ b/input/regression/music-map.ly @@ -10,7 +10,7 @@ dynamics are left over. These are put onto the 2nd measure." } -\version "1.7.8" +\version "1.7.16" #(define (notes-to-skip m) "Convert all stuff with duration (notes, lyrics, bass figures, etc.) to skips. diff --git a/input/regression/new-markup-syntax.ly b/input/regression/new-markup-syntax.ly index 8045888fe2..36b8846da3 100644 --- a/input/regression/new-markup-syntax.ly +++ b/input/regression/new-markup-syntax.ly @@ -2,7 +2,7 @@ texidoc = "New markup syntax." } -\version "1.7.8" +\version "1.7.16" \score { diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly index d66be3b061..01aac5f372 100644 --- a/input/regression/non-empty-text.ly +++ b/input/regression/non-empty-text.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/note-group-bracket.ly b/input/regression/note-group-bracket.ly index 0cb06ecaf0..21f63b340e 100644 --- a/input/regression/note-group-bracket.ly +++ b/input/regression/note-group-bracket.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { @@ -31,7 +31,7 @@ brackets for analysis start and end. \translator { \StaffContext \consists "Horizontal_bracket_engraver" } - linewidth = -1.0 + raggedright = ##t } } %% new-chords-done %% diff --git a/input/regression/note-head-chord.ly b/input/regression/note-head-chord.ly index 23dcfe5a3d..447b83f720 100644 --- a/input/regression/note-head-chord.ly +++ b/input/regression/note-head-chord.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Note heads are flipped on the stem to prevent collisions. diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly index 9cac587cb2..12cbed9146 100644 --- a/input/regression/note-head-style.ly +++ b/input/regression/note-head-style.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" Note head shapes are settable. The stem endings should be adjusted diff --git a/input/regression/note-line.ly b/input/regression/note-line.ly index e9c7e0e388..f9f416e6df 100644 --- a/input/regression/note-line.ly +++ b/input/regression/note-line.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Note head lines (eg glissando) diff --git a/input/regression/number-staff-lines.ly b/input/regression/number-staff-lines.ly index 50e481ab66..c27b0da349 100644 --- a/input/regression/number-staff-lines.ly +++ b/input/regression/number-staff-lines.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" The number of stafflines of a staff can be set. Ledger diff --git a/input/regression/pc-mmrest.ly b/input/regression/pc-mmrest.ly index 54335a8ff5..b7d1657724 100644 --- a/input/regression/pc-mmrest.ly +++ b/input/regression/pc-mmrest.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc="Multi measure rests of second voice should not disappear." } diff --git a/input/regression/pc-switch-slur.ly b/input/regression/pc-switch-slur.ly index 7c923788e8..9c74821221 100644 --- a/input/regression/pc-switch-slur.ly +++ b/input/regression/pc-switch-slur.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc="The partcombiner should not combine two small slurs into a big one." } diff --git a/input/regression/pedal.ly b/input/regression/pedal.ly index a87371f20a..fbb181981a 100644 --- a/input/regression/pedal.ly +++ b/input/regression/pedal.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc = "Piano pedal symbols merge stop and start. The strings are configurable. Text style, bracket style, and a mixture of both are supported. diff --git a/input/regression/percent-repeat.ly b/input/regression/percent-repeat.ly index 3d501c2a59..9aef0fa780 100644 --- a/input/regression/percent-repeat.ly +++ b/input/regression/percent-repeat.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Measure and beat repeats are supported." } diff --git a/input/regression/phrasing-slur.ly b/input/regression/phrasing-slur.ly index 6cac3e72fb..d546d5b03c 100644 --- a/input/regression/phrasing-slur.ly +++ b/input/regression/phrasing-slur.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc="Slurs play well with phrasing slur." @@ -9,7 +9,7 @@ texidoc="Slurs play well with phrasing slur." \time 6/4 c\((d)e f(e)\)d } \paper { - linewidth = -1. + raggedright = ##t } } %% new-chords-done %% diff --git a/input/regression/prefatory-empty-spacing.ly b/input/regression/prefatory-empty-spacing.ly index bacb8eace7..d3c22ca6c4 100644 --- a/input/regression/prefatory-empty-spacing.ly +++ b/input/regression/prefatory-empty-spacing.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { diff --git a/input/regression/prefatory-spacing-matter.ly b/input/regression/prefatory-spacing-matter.ly index 6ee0402de2..b0e4ee7cb1 100644 --- a/input/regression/prefatory-spacing-matter.ly +++ b/input/regression/prefatory-spacing-matter.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "prefatory spacing @@ -12,6 +12,6 @@ TODO: show all common combinations to check for spacing anomalies. \key cis \major cis4 cis4 cis4 cis4 \clef bass cis4 cis4 cis4 } -\paper { linewidth = -1. } +\paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/property-once.ly b/input/regression/property-once.ly index cda6bdaf46..ae71659a15 100644 --- a/input/regression/property-once.ly +++ b/input/regression/property-once.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Once properties take effect during a single time step only." } diff --git a/input/regression/rehearsal-mark.ly b/input/regression/rehearsal-mark.ly index 226200564f..2018104ace 100644 --- a/input/regression/rehearsal-mark.ly +++ b/input/regression/rehearsal-mark.ly @@ -3,7 +3,7 @@ can be incremented automatically or manually. "} -\version "1.7.12" +\version "1.7.16" global = \notes { diff --git a/input/regression/repeat-fold.ly b/input/regression/repeat-fold.ly index e9d10c3f57..a83a46a594 100644 --- a/input/regression/repeat-fold.ly +++ b/input/regression/repeat-fold.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/repeat-line-break.ly b/input/regression/repeat-line-break.ly index 1d639b7eda..a972a1f3b7 100644 --- a/input/regression/repeat-line-break.ly +++ b/input/regression/repeat-line-break.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/repeat-unfold-all.ly b/input/regression/repeat-unfold-all.ly index 7d4b68f063..adcee0ba7e 100644 --- a/input/regression/repeat-unfold-all.ly +++ b/input/regression/repeat-unfold-all.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Repeats may be unfolded through the Scheme function @code{unfold-repeats}." @@ -13,6 +13,6 @@ nots = \notes\relative c' { \nots \apply #unfold-repeats \nots } -\paper {linewidth=-1.} +\paper {raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/repeat-unfold.ly b/input/regression/repeat-unfold.ly index fea2e1f71d..79590d4077 100644 --- a/input/regression/repeat-unfold.ly +++ b/input/regression/repeat-unfold.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/repeat-volta-skip-alternatives.ly b/input/regression/repeat-volta-skip-alternatives.ly index abac54ae92..2619ed483c 100644 --- a/input/regression/repeat-volta-skip-alternatives.ly +++ b/input/regression/repeat-volta-skip-alternatives.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \score { \notes \context Voice { \repeat volta 3 c1 diff --git a/input/regression/repeat-volta.ly b/input/regression/repeat-volta.ly index 099500c0eb..1abde0e948 100644 --- a/input/regression/repeat-volta.ly +++ b/input/regression/repeat-volta.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/rest-collision-default.ly b/input/regression/rest-collision-default.ly index 54f942d776..5fc62b8d81 100644 --- a/input/regression/rest-collision-default.ly +++ b/input/regression/rest-collision-default.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly index 2fe623238d..c2628739c4 100644 --- a/input/regression/rest-collision.ly +++ b/input/regression/rest-collision.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" Rests should not collide with beams, stems and noteheads. Rests may diff --git a/input/regression/rest-ledger.ly b/input/regression/rest-ledger.ly index 26ffc92774..b5257fec9e 100644 --- a/input/regression/rest-ledger.ly +++ b/input/regression/rest-ledger.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "whole and half rests moving outside the staff should get ledger lines" diff --git a/input/regression/rest-pitch.ly b/input/regression/rest-pitch.ly index 6219411ab9..03200aa8f1 100644 --- a/input/regression/rest-pitch.ly +++ b/input/regression/rest-pitch.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Rests can have pitches--these will be affected by diff --git a/input/regression/rest.ly b/input/regression/rest.ly index d8e8a121b0..96ce365056 100644 --- a/input/regression/rest.ly +++ b/input/regression/rest.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/rhythmic-staff.ly b/input/regression/rhythmic-staff.ly index 9ed51f97b5..940d201b20 100644 --- a/input/regression/rhythmic-staff.ly +++ b/input/regression/rhythmic-staff.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { diff --git a/input/regression/script-collision.ly b/input/regression/script-collision.ly index 7e122136a9..fda8fc2fbb 100644 --- a/input/regression/script-collision.ly +++ b/input/regression/script-collision.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { @@ -13,6 +13,6 @@ < \context Voice = VA { \voiceOne c4^^ } \context Voice = VB { \voiceTwo d4_^} > } -\paper { linewidth = -1. } +\paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/script-stack-order.ly b/input/regression/script-stack-order.ly index 745cd86b79..e839fe8f29 100644 --- a/input/regression/script-stack-order.ly +++ b/input/regression/script-stack-order.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Scripts can be stacked. The order is determined by a priority field, but when objects have the same priority, the input @@ -7,6 +7,6 @@ order determines the order. Objects specified first are closest to the note. } \score{ \notes { c4^"inner up"^"outer up"_"inner down"_"outer down" } - \paper { linewidth = -1. } + \paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/script-stacked.ly b/input/regression/script-stacked.ly index f1e879ac73..0712320752 100644 --- a/input/regression/script-stacked.ly +++ b/input/regression/script-stacked.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Scripts may be stacked." diff --git a/input/regression/slur-attachment.ly b/input/regression/slur-attachment.ly index 474954f6c3..c9445a5337 100644 --- a/input/regression/slur-attachment.ly +++ b/input/regression/slur-attachment.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/slur-broken-trend.ly b/input/regression/slur-broken-trend.ly index 1b3d9954da..13549abc25 100644 --- a/input/regression/slur-broken-trend.ly +++ b/input/regression/slur-broken-trend.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/slur-cross-staff.ly b/input/regression/slur-cross-staff.ly index 92299bbd14..fdc5f31ce6 100644 --- a/input/regression/slur-cross-staff.ly +++ b/input/regression/slur-cross-staff.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" The same goes for slurs. They behave decently when broken across diff --git a/input/regression/slur-dots.ly b/input/regression/slur-dots.ly index d2c480c7df..e0cab70667 100644 --- a/input/regression/slur-dots.ly +++ b/input/regression/slur-dots.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc="Slurs should not get confused by augmentation dots. We use a lot of dots here, to make problems more visible." @@ -8,7 +8,7 @@ of dots here, to make problems more visible." c4.............()c } \paper { - linewidth = -1. + raggedright = ##t } } %% new-chords-done %% diff --git a/input/regression/slur-nice.ly b/input/regression/slur-nice.ly index 9585e94ea6..214a78a854 100644 --- a/input/regression/slur-nice.ly +++ b/input/regression/slur-nice.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" Slurs should look nice and symmetric. The curvature may increase diff --git a/input/regression/slur-rest.ly b/input/regression/slur-rest.ly index b044e9e9fa..cfa3222617 100644 --- a/input/regression/slur-rest.ly +++ b/input/regression/slur-rest.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc ="Slurs may be placed over rest. The slur will avoid colliding with @@ -14,6 +14,6 @@ the rest } -\paper { linewidth = -1. } +\paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/slur-staccato.ly b/input/regression/slur-staccato.ly index 26d46ac2c1..cede628cee 100644 --- a/input/regression/slur-staccato.ly +++ b/input/regression/slur-staccato.ly @@ -1,9 +1,9 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc="Manual hack for slur and staccato." } -\paper { linewidth = -1.0 } +\paper { raggedright = ##t} \score { \context Staff \notes\relative c'' { diff --git a/input/regression/slur-stem-broken.ly b/input/regression/slur-stem-broken.ly index b3587ac5cc..3c185c21e1 100644 --- a/input/regression/slur-stem-broken.ly +++ b/input/regression/slur-stem-broken.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc="Trend of broken slur with user-overridden stem attachment should also follow the same vertical direction it would have had in unbroken state." diff --git a/input/regression/slur-symmetry-1.ly b/input/regression/slur-symmetry-1.ly index 3d77859ac0..e279d09bb2 100644 --- a/input/regression/slur-symmetry-1.ly +++ b/input/regression/slur-symmetry-1.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \score{ \notes\relative c''< @@ -11,7 +11,7 @@ } > \paper{ - linewidth=-1. + raggedright = ##t } } %% new-chords-done %% diff --git a/input/regression/slur-symmetry.ly b/input/regression/slur-symmetry.ly index 1b3d8ce635..60d5dd9f43 100644 --- a/input/regression/slur-symmetry.ly +++ b/input/regression/slur-symmetry.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \score{ \notes\relative c'< @@ -11,7 +11,7 @@ } > \paper{ - linewidth=-1. + raggedright = ##t } } %% new-chords-done %% diff --git a/input/regression/spacing-accidental-staffs.ly b/input/regression/spacing-accidental-staffs.ly index 4e85d191a5..f4eea83cad 100644 --- a/input/regression/spacing-accidental-staffs.ly +++ b/input/regression/spacing-accidental-staffs.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Accidentals in different staffs don't effect the @@ -14,7 +14,7 @@ spacing of the quarter notes here." } { \key d \major cis4 cis4 cis4 cis!4 } > - \paper { linewidth = -1. } + \paper { raggedright = ##t} } diff --git a/input/regression/spacing-accidental.ly b/input/regression/spacing-accidental.ly index 565875e91f..2746eb1d68 100644 --- a/input/regression/spacing-accidental.ly +++ b/input/regression/spacing-accidental.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Accidentals sticking out to the left @@ -10,7 +10,7 @@ of a note will take a little more space, but only if the spacing is tight." c2 c2 cis2 cis2 | c8 c8 cis8 cis8 cis c c c] } -\paper { linewidth = -1. } +\paper { raggedright = ##t} } diff --git a/input/regression/spacing-bar-stem.ly b/input/regression/spacing-bar-stem.ly index 7f0a4a1cad..90f247a2af 100644 --- a/input/regression/spacing-bar-stem.ly +++ b/input/regression/spacing-bar-stem.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Downstem notes following a barline are printed with some extra space. This is an optical correction similar @@ -20,6 +20,6 @@ su = \property Voice.Stem \set #'direction = #1 \sd c4 \su c4 \sd f c,4 c'4 cis4 \stemUp c4 } -\paper { linewidth = -1. } +\paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/spacing-clef-first-note.ly b/input/regression/spacing-clef-first-note.ly index 4421e1ea9b..657700f5fc 100644 --- a/input/regression/spacing-clef-first-note.ly +++ b/input/regression/spacing-clef-first-note.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "clef changes at the start of a line get much more space @@ -16,7 +16,7 @@ than clef changes halfway the line." c4 c4 c4 }> } - \paper { linewidth = -1. + \paper { raggedright = ##t \translator { \StaffContext TimeSignature = \turnOff } diff --git a/input/regression/spacing-end-of-line.ly b/input/regression/spacing-end-of-line.ly index 3f9b689dd0..79cbda5eb5 100644 --- a/input/regression/spacing-end-of-line.ly +++ b/input/regression/spacing-end-of-line.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc ="Broken matter at the end of line does not upset the diff --git a/input/regression/spacing-ended-voice.ly b/input/regression/spacing-ended-voice.ly index e65a86837b..17d661db8a 100644 --- a/input/regression/spacing-ended-voice.ly +++ b/input/regression/spacing-ended-voice.ly @@ -1,27 +1,21 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = " - A voicelet (a very short voice to get polyphonic chords correct) should not confuse the spacing engine." - } +} \score { -\notes { \context Staff { +\notes { \context Staff \relative c' { c4 < - \context Voice = I \relative c'' { \stemUp r4 dis4 } - \context Voice = III \relative c'' { \stemUp \shiftOn r4 bis \shiftOff} - \context Voice = IV \relative c'' { - \stemDown - \shiftOn s4 gis } - \context Voice = II \relative c' { \stemDown - % idem - - r4 fis } + { r4 dis'4 } \\ + { r4 fis,4 } \\ + { r bis } \\ + { s gis } > c4 }} -\paper { linewidth = -1. } + \paper { raggedright = ##t } } %% new-chords-done %% diff --git a/input/regression/spacing-folded-clef.ly b/input/regression/spacing-folded-clef.ly index 17e6bf2ebd..1dec1f4784 100644 --- a/input/regression/spacing-folded-clef.ly +++ b/input/regression/spacing-folded-clef.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "A clef can be folded below notes in a different staff, if this doesn't disrupt the flow of the notes." @@ -9,6 +9,6 @@ this doesn't disrupt the flow of the notes." \context Staff = SB { \clef bass c,2 \clef treble c'2 } > - \paper { linewidth = -1. } + \paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/spacing-folded-clef2.ly b/input/regression/spacing-folded-clef2.ly index 7091b8f8e6..5575707f15 100644 --- a/input/regression/spacing-folded-clef2.ly +++ b/input/regression/spacing-folded-clef2.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "A clef can be folded below notes in a different staff, if @@ -11,7 +11,7 @@ show where columns are in the score." \context Staff = SB { \clef bass c,2 \clef treble c'2 } > - \paper { linewidth = -1. + \paper { raggedright = ##t \translator { \ScoreContext NonMusicalPaperColumn \override #'molecule-callback = #Paper_column::brew_molecule diff --git a/input/regression/spacing-grace-duration.ly b/input/regression/spacing-grace-duration.ly index b52c587487..32458dbd78 100644 --- a/input/regression/spacing-grace-duration.ly +++ b/input/regression/spacing-grace-duration.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Spacing uses the duration of the notes, but disregards @@ -17,6 +17,6 @@ } - \paper { linewidth = -1. } + \paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/spacing-grace.ly b/input/regression/spacing-grace.ly index 055cd4d289..763141b39e 100644 --- a/input/regression/spacing-grace.ly +++ b/input/regression/spacing-grace.ly @@ -1,11 +1,11 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Grace note spacing. Should be tuned? " } \score { \notes \context Voice \relative c'' { \grace { [c16 d] } c4 } - \paper { linewidth =-1. } + \paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/spacing-knee.ly b/input/regression/spacing-knee.ly index d4e72a45df..c40d98b097 100644 --- a/input/regression/spacing-knee.ly +++ b/input/regression/spacing-knee.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "For knees, the spacing correction is such that the stems are put at regular distances. @@ -9,7 +9,7 @@ stems are put at regular distances. [g''8 g g'' g''] } -\paper { linewidth = -1. } +\paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/spacing-loose.ly b/input/regression/spacing-loose.ly index 10ce9c95c3..b9ee2d4aa0 100644 --- a/input/regression/spacing-loose.ly +++ b/input/regression/spacing-loose.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/spacing-natural.ly b/input/regression/spacing-natural.ly index e5a0dffe8e..0a6a7b7145 100644 --- a/input/regression/spacing-natural.ly +++ b/input/regression/spacing-natural.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" @@ -8,7 +8,7 @@ Natural: \score { \notes { \time 2/2 c'2 c'2 \time 2/2 } - \paper { linewidth = -1.0 \cm + \paper { raggedright = ##t indent = 0.0 } } diff --git a/input/regression/spacing-note-flags.ly b/input/regression/spacing-note-flags.ly index 66229cec94..bcefefb8ff 100644 --- a/input/regression/spacing-note-flags.ly +++ b/input/regression/spacing-note-flags.ly @@ -12,9 +12,9 @@ texidoc = "The flags of 8th notes take some space, but not } \paper { %stafflinethickness = 0.0 -linewidth = -1 +raggedright = ##t } } -\version "1.7.6" +\version "1.7.16" %% new-chords-done %% diff --git a/input/regression/spacing-rest.ly b/input/regression/spacing-rest.ly index 7f29a1384c..427f58b4a1 100644 --- a/input/regression/spacing-rest.ly +++ b/input/regression/spacing-rest.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Rests get a little less space, since they are narrower. However, the feta quarter rest is relatively wide, causing this effect to be @@ -11,7 +11,7 @@ very small. } \paper { %stafflinethickness = 0.0 -linewidth = -1 +raggedright = ##t } } %% new-chords-done %% diff --git a/input/regression/spacing-short-notes.ly b/input/regression/spacing-short-notes.ly index c0bc104d1b..01efb85626 100644 --- a/input/regression/spacing-short-notes.ly +++ b/input/regression/spacing-short-notes.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Notes that are shorter than the common shortest note, Get a @@ -19,6 +19,6 @@ eighth note. " } - \paper { linewidth = -1. } + \paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/spacing-stem-bar.ly b/input/regression/spacing-stem-bar.ly index 581594b926..33fe55a76d 100644 --- a/input/regression/spacing-stem-bar.ly +++ b/input/regression/spacing-stem-bar.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Upstem notes before a barline are printed with some extra @@ -23,6 +23,6 @@ a a a c c c e e e } -\paper { linewidth = -1. } +\paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/spacing-stem-direction.ly b/input/regression/spacing-stem-direction.ly index f19c05f7ad..42e99268f0 100644 --- a/input/regression/spacing-stem-direction.ly +++ b/input/regression/spacing-stem-direction.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ @@ -18,7 +18,7 @@ much to correct." } \paper { - linewidth=-1.0 + raggedright = ##t } } %% new-chords-done %% diff --git a/input/regression/spacing-stem-same-direction.ly b/input/regression/spacing-stem-same-direction.ly index 9578a975a5..2e60aabec5 100644 --- a/input/regression/spacing-stem-same-direction.ly +++ b/input/regression/spacing-stem-same-direction.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "For juxtaposed chords with the same direction, a slight optical correction is used. It is constant, and only works if @@ -10,6 +10,6 @@ two chords have no common head-positions range." \time 12/4 [f8 e f e] [f d f d] [f c f c] [f b, f' b,] [f' a, f' a,] } -\paper { linewidth = -1. } +\paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/spacing-tight.ly b/input/regression/spacing-tight.ly index 1dc387b451..c3229386e2 100644 --- a/input/regression/spacing-tight.ly +++ b/input/regression/spacing-tight.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/spacing-to-grace.ly b/input/regression/spacing-to-grace.ly index 0cba8c8296..7c51f1a903 100644 --- a/input/regression/spacing-to-grace.ly +++ b/input/regression/spacing-to-grace.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc ="space from a normal note /barline to a grace note is @@ -16,6 +16,6 @@ } } - \paper { linewidth = -1.0 } + \paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/spacing-very-tight.ly b/input/regression/spacing-very-tight.ly index 8e574d31f9..3d4207d1dd 100644 --- a/input/regression/spacing-very-tight.ly +++ b/input/regression/spacing-very-tight.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = " When tightly spaced, hinterfleisch -> 0. diff --git a/input/regression/span-bar.ly b/input/regression/span-bar.ly index caecac6a91..a28b97d7f5 100644 --- a/input/regression/span-bar.ly +++ b/input/regression/span-bar.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Span bars draw only in between staff bar lines, so setting those to transparent shows bar lines between systems only. " diff --git a/input/regression/staccato-pos.ly b/input/regression/staccato-pos.ly index 6541246754..fa08501323 100644 --- a/input/regression/staccato-pos.ly +++ b/input/regression/staccato-pos.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" @@ -11,7 +11,7 @@ not be on staff lines. e'4-. f-. d-. c-. b-. } \paper { - linewidth=-1.0 + raggedright = ##t } } %% new-chords-done %% diff --git a/input/regression/staff-tweak.ly b/input/regression/staff-tweak.ly index d09efde5b5..8ef671e52d 100644 --- a/input/regression/staff-tweak.ly +++ b/input/regression/staff-tweak.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "The staff is a grob, and may be adjusted as well: this one shows a staff with 6 thick line, and a slightly large staffspace. @@ -14,7 +14,7 @@ Beams remain correctly quantized. c'4 g'4 b'8 b'8 b'8 b'8 } -\paper { linewidth = -1. +\paper { raggedright = ##t } diff --git a/input/regression/stanza-number.ly b/input/regression/stanza-number.ly index a0e8b1cfe6..42f94d1691 100644 --- a/input/regression/stanza-number.ly +++ b/input/regression/stanza-number.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Stanza numbers may differ for the first and following systems." } diff --git a/input/regression/stem-direction-down.ly b/input/regression/stem-direction-down.ly index 80cfb61ea6..cace3da5e9 100644 --- a/input/regression/stem-direction-down.ly +++ b/input/regression/stem-direction-down.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ diff --git a/input/regression/stem-direction.ly b/input/regression/stem-direction.ly index 45f0278253..b2a2d86d8a 100644 --- a/input/regression/stem-direction.ly +++ b/input/regression/stem-direction.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" @@ -19,7 +19,7 @@ notes, and up for low notes. } \paper { - linewidth=-1.0 + raggedright = ##t } \midi { } } diff --git a/input/regression/stem-spacing.ly b/input/regression/stem-spacing.ly index b90894cc16..b34686ff2f 100644 --- a/input/regression/stem-spacing.ly +++ b/input/regression/stem-spacing.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" @@ -15,7 +15,7 @@ effects. In this example, space for opposite pointed stems is adjuste } \paper { - linewidth=-1.0 + raggedright = ##t } } @@ -26,7 +26,7 @@ effects. In this example, space for opposite pointed stems is adjuste } \paper { - linewidth=-1.0 + raggedright = ##t \translator { \ScoreContext SpacingSpanner \override #'stem-spacing-correction = #0.0 } } diff --git a/input/regression/stem-tremolo.ly b/input/regression/stem-tremolo.ly index 1540960c8f..74d032e21e 100644 --- a/input/regression/stem-tremolo.ly +++ b/input/regression/stem-tremolo.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" Stem tremolos or rolls are tremolo signs that look like beam segments diff --git a/input/regression/system-extents.ly b/input/regression/system-extents.ly index 0754a3d0ac..73f81acbd9 100644 --- a/input/regression/system-extents.ly +++ b/input/regression/system-extents.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "LilyPond correctly determines the size of every diff --git a/input/regression/system-start-bracket.ly b/input/regression/system-start-bracket.ly index 3b6e4a4598..3c67a9e32a 100644 --- a/input/regression/system-start-bracket.ly +++ b/input/regression/system-start-bracket.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = " @@ -15,5 +15,5 @@ The piano brace should be shifted horizontally if it is enclosed in a bracket. e >>4 > - }\paper {linewidth = -1. }} + }\paper {raggedright = ##t}} %% new-chords-done %% diff --git a/input/regression/text-spanner.ly b/input/regression/text-spanner.ly index dffca67bf2..f3afaf96d5 100644 --- a/input/regression/text-spanner.ly +++ b/input/regression/text-spanner.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" % text spanners should not repeat start text when broken diff --git a/input/regression/tie-accidental.ly b/input/regression/tie-accidental.ly index a384188b30..399c0d9f64 100644 --- a/input/regression/tie-accidental.ly +++ b/input/regression/tie-accidental.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/tie-break-accidental.ly b/input/regression/tie-break-accidental.ly index 177e07e084..d920ca4e77 100644 --- a/input/regression/tie-break-accidental.ly +++ b/input/regression/tie-break-accidental.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "First and second bes (tied across line break) diff --git a/input/regression/tie-busy-grobs.ly b/input/regression/tie-busy-grobs.ly index 98444f166b..05b94a4c2e 100644 --- a/input/regression/tie-busy-grobs.ly +++ b/input/regression/tie-busy-grobs.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Tie engraver uses @code{busyGrobs} to keep track of diff --git a/input/regression/tie-chord-partial.ly b/input/regression/tie-chord-partial.ly index cf2df4639a..a6dbe77aeb 100644 --- a/input/regression/tie-chord-partial.ly +++ b/input/regression/tie-chord-partial.ly @@ -5,7 +5,7 @@ putting the Tie engraver at Thread level, and redirecting untied notes to a different thread." } -\version "1.7.13" +\version "1.7.16" \score { diff --git a/input/regression/tie-chord.ly b/input/regression/tie-chord.ly index 43a7630f89..8d08a4db87 100644 --- a/input/regression/tie-chord.ly +++ b/input/regression/tie-chord.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" When tieing chords, the outer slurs point outwards, the inner slurs diff --git a/input/regression/tie-dots.ly b/input/regression/tie-dots.ly index d8c11a86f8..22714de1e1 100644 --- a/input/regression/tie-dots.ly +++ b/input/regression/tie-dots.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Ties should not collide with dots." } diff --git a/input/regression/tie-grace.ly b/input/regression/tie-grace.ly index 11054e105e..ce7dc9235e 100644 --- a/input/regression/tie-grace.ly +++ b/input/regression/tie-grace.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Tieing a grace to the to a following grace or main note works." } diff --git a/input/regression/tie.ly b/input/regression/tie.ly index 93fa2e38ec..fa64db45b2 100644 --- a/input/regression/tie.ly +++ b/input/regression/tie.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/triplets.ly b/input/regression/triplets.ly index d0ac4b562a..c422e22c2c 100644 --- a/input/regression/triplets.ly +++ b/input/regression/triplets.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc="Simple beams. This broke somewhere < 1.3.110 diff --git a/input/regression/tup.ly b/input/regression/tup.ly index 1d8551b019..5485887a21 100644 --- a/input/regression/tup.ly +++ b/input/regression/tup.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header{ texidoc=" diff --git a/input/regression/tuplet-beam.ly b/input/regression/tuplet-beam.ly index a970aedf8a..297c767b11 100644 --- a/input/regression/tuplet-beam.ly +++ b/input/regression/tuplet-beam.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "In combination with a beam, the bracket of the tuplet diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly index afed1d3db3..0aede61efa 100644 --- a/input/regression/tuplet-nest.ly +++ b/input/regression/tuplet-nest.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc="Manual hack for nested tuplets, move outer tuplet up." } @@ -28,6 +28,6 @@ } } } - \paper { linewidth = -1. } + \paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/regression/tuplet-properties.ly b/input/regression/tuplet-properties.ly index 913592839a..fe4a5779b9 100644 --- a/input/regression/tuplet-properties.ly +++ b/input/regression/tuplet-properties.ly @@ -5,7 +5,7 @@ NB should have no bracket, B should have bracket. } -\version "1.7.6" +\version "1.7.16" \score { diff --git a/input/regression/tuplet-staffline-collision.ly b/input/regression/tuplet-staffline-collision.ly index 9a94c5099e..fab085a0f0 100644 --- a/input/regression/tuplet-staffline-collision.ly +++ b/input/regression/tuplet-staffline-collision.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc = "Horizontal tuplet brackets are shifted vertically diff --git a/input/regression/volta-broken-left-edge.ly b/input/regression/volta-broken-left-edge.ly index 2351f432b6..adfa0ebf39 100644 --- a/input/regression/volta-broken-left-edge.ly +++ b/input/regression/volta-broken-left-edge.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.16" \header { texidoc ="Broken volta spanners behave correctly at left edge in all cases." diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index ed2e099dda..9459d91887 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -1144,6 +1144,12 @@ if 1: conversions.append (((1,7,13), conv, "ly:XX-molecule-YY -> ly:molecule-XX-YY")) +if 1: + def conv(str): + str = re.sub (r"linewidth *= *-[0-9.]+ *(\\mm|\\cm|\\in|\\pt)?", 'raggedright = ##t', str ) + return str + + conversions.append (((1,7,16), conv, "linewidth = -1 -> raggedright = ##t")) ################################ -- 2.39.2