diff options
174 files changed, 218 insertions, 34 deletions
@@ -1,6 +1,14 @@ 2002-08-11 Jan Nieuwenhuizen <janneke@gnu.org> - * input: some fixes. + * lily/stem.cc (get_default_stem_end_position): use beam_count - 1 + as index; this fixes too short forced stem directions. + (calc_stem_info): various minute bugfixes. + + * lily/gourlay-breaking.cc (combine_demerits): set uniform + tightness constraint back to one. This fixes Baerenreiter + sarabande layout. + + * input: some fixes. Add \version to all files. * lily/stem.cc (calc_stem_info): Use get_direction_beam_count. diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index ef530ca8e4..9c66868d85 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -624,12 +624,12 @@ To use it, you need the following software @itemize @bullet @item A dvi viewer that supports src specials. @itemize @bullet -@item Plain Xdvi, version 22.36 or newer. Available from +@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}. - Note that most @TeX{} distributions ship with xdvik, which is a - different and less well maintained program. To find out which xdvi you - are running, try @code{xdvi --version} or @code{xdvi.bin --version}. + Note that 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. Enablle the menu Settings -> Inverse search. @end itemize @@ -641,7 +641,7 @@ column location. @item XEmacs. Xemacs is very similar to emacs. @item NEdit. NEdit runs under Windows, and Unix. It is available from @uref{http://www.nedit.org}. -@item GVim. GVim is a lightweight GUI variant of VIM, the popular VI +@item GVim. GVim is a GUI variant of VIM, the popular VI clone. It is available from @uref{http://www.vim.org}. @end itemize @end itemize @@ -680,7 +680,7 @@ emacsclient --no-wait +%l %f 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 +%l %f}, or use this +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 diff --git a/input/GNUmakefile b/input/GNUmakefile index f2b0a2bb16..6931442c2b 100644 --- a/input/GNUmakefile +++ b/input/GNUmakefile @@ -1,6 +1,6 @@ depth = .. -SUBDIRS=bugs test regression tutorial no-notation ascii-art template mutopia +SUBDIRS=test regression tutorial no-notation ascii-art template mutopia # nereides is tweaked a lot, can't do (read webpage) examples=trip star-spangled-banner paddy twinkle font20 diff --git a/input/SondagMorgen/SondagMorgen.ly b/input/SondagMorgen/SondagMorgen.ly index f7e095b9f3..3e59a8c8dc 100644 --- a/input/SondagMorgen/SondagMorgen.ly +++ b/input/SondagMorgen/SondagMorgen.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "paper13.ly" mu = {} diff --git a/input/SondagMorgen/SondagMorgenFolded.ly b/input/SondagMorgen/SondagMorgenFolded.ly index fb14766d4b..13dc5c91ee 100644 --- a/input/SondagMorgen/SondagMorgenFolded.ly +++ b/input/SondagMorgen/SondagMorgenFolded.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "SondagMorgenIntro.ly" \include "SondagMorgenVers.ly" \include "SondagMorgenVersVolta1.ly" diff --git a/input/SondagMorgen/SondagMorgenIntro.ly b/input/SondagMorgen/SondagMorgenIntro.ly index 16c5bfa164..51ee1f1430 100644 --- a/input/SondagMorgen/SondagMorgenIntro.ly +++ b/input/SondagMorgen/SondagMorgenIntro.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "deutsch.ly" marks = \lyrics { diff --git a/input/SondagMorgen/SondagMorgenLyrics.ly b/input/SondagMorgen/SondagMorgenLyrics.ly index 462bc3c6fd..1185994d41 100644 --- a/input/SondagMorgen/SondagMorgenLyrics.ly +++ b/input/SondagMorgen/SondagMorgenLyrics.ly @@ -1,3 +1,4 @@ +\version "1.5.68" lyr = \lyrics { \context LyricsVoice = va { Nu er det søn -- dag, diff --git a/input/SondagMorgen/SondagMorgenNotes.ly b/input/SondagMorgen/SondagMorgenNotes.ly index 5599c1b288..2dccd0e512 100644 --- a/input/SondagMorgen/SondagMorgenNotes.ly +++ b/input/SondagMorgen/SondagMorgenNotes.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "deutsch.ly" marks = \lyrics { diff --git a/input/SondagMorgen/SondagMorgenOmkvaed.ly b/input/SondagMorgen/SondagMorgenOmkvaed.ly index 099f34876a..cf9b0970bf 100644 --- a/input/SondagMorgen/SondagMorgenOmkvaed.ly +++ b/input/SondagMorgen/SondagMorgenOmkvaed.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "deutsch.ly" marks = \lyrics { diff --git a/input/SondagMorgen/SondagMorgenOmkvaedVolta1.ly b/input/SondagMorgen/SondagMorgenOmkvaedVolta1.ly index 28807265df..ba2ebd3ca1 100644 --- a/input/SondagMorgen/SondagMorgenOmkvaedVolta1.ly +++ b/input/SondagMorgen/SondagMorgenOmkvaedVolta1.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "deutsch.ly" marks = \lyrics { diff --git a/input/SondagMorgen/SondagMorgenOmkvaedVolta2.ly b/input/SondagMorgen/SondagMorgenOmkvaedVolta2.ly index 41c232e222..f266c95887 100644 --- a/input/SondagMorgen/SondagMorgenOmkvaedVolta2.ly +++ b/input/SondagMorgen/SondagMorgenOmkvaedVolta2.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "deutsch.ly" marks = \lyrics { diff --git a/input/SondagMorgen/SondagMorgenOmkvaedVolta3.ly b/input/SondagMorgen/SondagMorgenOmkvaedVolta3.ly index 293c069ac3..b19d9f362d 100644 --- a/input/SondagMorgen/SondagMorgenOmkvaedVolta3.ly +++ b/input/SondagMorgen/SondagMorgenOmkvaedVolta3.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "deutsch.ly" marks = \lyrics { diff --git a/input/SondagMorgen/SondagMorgenOutro.ly b/input/SondagMorgen/SondagMorgenOutro.ly index 1e80d677b7..cbd718bcd8 100644 --- a/input/SondagMorgen/SondagMorgenOutro.ly +++ b/input/SondagMorgen/SondagMorgenOutro.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "deutsch.ly" marks = \lyrics { diff --git a/input/SondagMorgen/SondagMorgenUnfolded.ly b/input/SondagMorgen/SondagMorgenUnfolded.ly index 2aabc4d7c2..0369802262 100644 --- a/input/SondagMorgen/SondagMorgenUnfolded.ly +++ b/input/SondagMorgen/SondagMorgenUnfolded.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "SondagMorgenIntro.ly" \include "SondagMorgenVers.ly" \include "SondagMorgenVersVolta1.ly" diff --git a/input/SondagMorgen/SondagMorgenVers.ly b/input/SondagMorgen/SondagMorgenVers.ly index 47d10abb5e..7438a03bda 100644 --- a/input/SondagMorgen/SondagMorgenVers.ly +++ b/input/SondagMorgen/SondagMorgenVers.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "deutsch.ly" marks = \lyrics { diff --git a/input/SondagMorgen/SondagMorgenVersVolta1.ly b/input/SondagMorgen/SondagMorgenVersVolta1.ly index 97e63c8a31..f24d27e25a 100644 --- a/input/SondagMorgen/SondagMorgenVersVolta1.ly +++ b/input/SondagMorgen/SondagMorgenVersVolta1.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "deutsch.ly" marks = \lyrics { diff --git a/input/SondagMorgen/SondagMorgenVersVolta2.ly b/input/SondagMorgen/SondagMorgenVersVolta2.ly index 967d97de03..897e37c4d6 100644 --- a/input/SondagMorgen/SondagMorgenVersVolta2.ly +++ b/input/SondagMorgen/SondagMorgenVersVolta2.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "deutsch.ly" marks = \lyrics { diff --git a/input/bugs/+.ly b/input/bugs/+.ly index acbabf4c1e..6e3df1e52d 100644 --- a/input/bugs/+.ly +++ b/input/bugs/+.ly @@ -1,3 +1,4 @@ +\version "1.5.68" %% +.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/example-1.ly b/input/example-1.ly index cd62668b8b..9d699c4e85 100644 --- a/input/example-1.ly +++ b/input/example-1.ly @@ -1,3 +1,4 @@ +\version "1.5.68" % A simple scale in LilyPond % % Type: diff --git a/input/example-2.ly b/input/example-2.ly index da40b648ef..b41258dfb7 100644 --- a/input/example-2.ly +++ b/input/example-2.ly @@ -1,3 +1,4 @@ +\version "1.5.68" % Some beamed and slurred notes of different taste in LilyPond % % Type: diff --git a/input/no-notation/bar-check.ly b/input/no-notation/bar-check.ly index c8a706a201..3eb4bf2bf8 100644 --- a/input/no-notation/bar-check.ly +++ b/input/no-notation/bar-check.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { diff --git a/input/no-notation/beam-warn.ly b/input/no-notation/beam-warn.ly index 02c86dab7f..f07c27197e 100644 --- a/input/no-notation/beam-warn.ly +++ b/input/no-notation/beam-warn.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { diff --git a/input/no-notation/parse.ly b/input/no-notation/parse.ly index 1c165825ac..c90e82d135 100644 --- a/input/no-notation/parse.ly +++ b/input/no-notation/parse.ly @@ -1,3 +1,4 @@ +\version "1.5.68" % Test parser error diff --git a/input/no-notation/parse2.ly b/input/no-notation/parse2.ly index 8339c274dc..6595800188 100644 --- a/input/no-notation/parse2.ly +++ b/input/no-notation/parse2.ly @@ -1,3 +1,4 @@ +\version "1.5.68" % Test parser error diff --git a/input/no-notation/parse3.ly b/input/no-notation/parse3.ly index b167ae49a7..9f559ecff5 100644 --- a/input/no-notation/parse3.ly +++ b/input/no-notation/parse3.ly @@ -1,3 +1,4 @@ +\version "1.5.68" % Test parser error diff --git a/input/no-notation/parse4.ly b/input/no-notation/parse4.ly index ecb5abd6cb..874a9dc8c9 100644 --- a/input/no-notation/parse4.ly +++ b/input/no-notation/parse4.ly @@ -1,3 +1,4 @@ +\version "1.5.68" % Test parser error diff --git a/input/regression/+.ly b/input/regression/+.ly index 29cd1dc7cd..b950653462 100644 --- a/input/regression/+.ly +++ b/input/regression/+.ly @@ -1,3 +1,4 @@ +\version "1.5.68" %% +.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/accidental-cautionary.ly b/input/regression/accidental-cautionary.ly index 71f6e03214..38feb90c57 100644 --- a/input/regression/accidental-cautionary.ly +++ b/input/regression/accidental-cautionary.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Cautionary accidentals are indicated using either diff --git a/input/regression/accidental-double.ly b/input/regression/accidental-double.ly index eb37a7c289..a428ae8393 100644 --- a/input/regression/accidental-double.ly +++ b/input/regression/accidental-double.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \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 f035e33bcd..9128d022f5 100644 --- a/input/regression/accidental-ledger.ly +++ b/input/regression/accidental-ledger.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Ledger lines are shortened when there are accidentals" diff --git a/input/regression/accidental-placement.ly b/input/regression/accidental-placement.ly index ce86f02981..76619e83ce 100644 --- a/input/regression/accidental-placement.ly +++ b/input/regression/accidental-placement.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc ="Accidentals are placed as closely as possible. Accidentals in corresponding octaves are aligned. diff --git a/input/regression/beam-center-slope.ly b/input/regression/beam-center-slope.ly index c8536f79d3..a472c9d794 100644 --- a/input/regression/beam-center-slope.ly +++ b/input/regression/beam-center-slope.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header{ texidoc="Simple beams on middle line should be allowed to have a slope." } diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly index ca6d42c0c6..899e9f19cd 100644 --- a/input/regression/beam-concave.ly +++ b/input/regression/beam-concave.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header{ texidoc = "Concave beams should be horizontal. informally spoken, diff --git a/input/regression/beam-cross-staff-slope.ly b/input/regression/beam-cross-staff-slope.ly index abfc7a3ac8..bb558a3afb 100644 --- a/input/regression/beam-cross-staff-slope.ly +++ b/input/regression/beam-cross-staff-slope.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Cross staff (kneed) beams don't cause extreme slopes" diff --git a/input/regression/beam-french.ly b/input/regression/beam-french.ly index a953925323..e12a30958a 100644 --- a/input/regression/beam-french.ly +++ b/input/regression/beam-french.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \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 111833309e..b1cf401aab 100644 --- a/input/regression/beam-funky-beamlet.ly +++ b/input/regression/beam-funky-beamlet.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc=" Funky kneed beams with beamlets also work. The beamlets diff --git a/input/regression/beam-funky.ly b/input/regression/beam-funky.ly index 67601e418e..e2b2f5be12 100644 --- a/input/regression/beam-funky.ly +++ b/input/regression/beam-funky.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Knee beaming. (funky)" } diff --git a/input/regression/beam-manual.ly b/input/regression/beam-manual.ly index 5aa6ed6e82..c8c8ca2468 100644 --- a/input/regression/beam-manual.ly +++ b/input/regression/beam-manual.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { diff --git a/input/regression/beam-multiple-cross-staff.ly b/input/regression/beam-multiple-cross-staff.ly index a627df8d32..ac33facd96 100644 --- a/input/regression/beam-multiple-cross-staff.ly +++ b/input/regression/beam-multiple-cross-staff.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \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 6f57cff901..e9db66d2e9 100644 --- a/input/regression/beam-over-barline.ly +++ b/input/regression/beam-over-barline.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "explicit beams may cross barlines. " } diff --git a/input/regression/beam-quarter.ly b/input/regression/beam-quarter.ly index 1608e62cfb..5f5873f3e2 100644 --- a/input/regression/beam-quarter.ly +++ b/input/regression/beam-quarter.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc= "Quarter notes may be beamed: the beam is halted momentarily." diff --git a/input/regression/beaming-ternary-metrum.ly b/input/regression/beaming-ternary-metrum.ly index 1e29f66379..f4aa21fa84 100644 --- a/input/regression/beaming-ternary-metrum.ly +++ b/input/regression/beaming-ternary-metrum.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "automatic beaming also works in ternary time sigs." } diff --git a/input/regression/beams.ly b/input/regression/beams.ly index 634c0eca19..8bf90d6b7e 100644 --- a/input/regression/beams.ly +++ b/input/regression/beams.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "beams (simple)" } diff --git a/input/regression/collision-2.ly b/input/regression/collision-2.ly index f2edf9595d..41a55978f0 100644 --- a/input/regression/collision-2.ly +++ b/input/regression/collision-2.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \score { \notes diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly index 7726cac131..38097fe74d 100644 --- a/input/regression/collision-heads.ly +++ b/input/regression/collision-heads.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = diff --git a/input/regression/collision-mesh.ly b/input/regression/collision-mesh.ly index 571183ebc5..01db6616b4 100644 --- a/input/regression/collision-mesh.ly +++ b/input/regression/collision-mesh.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Oppositely stemmed chords, meshing into each other, are resolved." diff --git a/input/regression/dot-flag-collision.ly b/input/regression/dot-flag-collision.ly index 049d030bf9..90cbf10284 100644 --- a/input/regression/dot-flag-collision.ly +++ b/input/regression/dot-flag-collision.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Dots move to the right when a collision with the (up)flag happens" } diff --git a/input/regression/dynamics-glyphs.ly b/input/regression/dynamics-glyphs.ly index 0616f2ecc7..e9beeffa5b 100644 --- a/input/regression/dynamics-glyphs.ly +++ b/input/regression/dynamics-glyphs.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \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/figured-bass.ly b/input/regression/figured-bass.ly index 8ac5ed2fbf..ef06d37196 100644 --- a/input/regression/figured-bass.ly +++ b/input/regression/figured-bass.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Test figured bass. diff --git a/input/regression/fingering.ly b/input/regression/fingering.ly index 15c2933584..db5d5fa386 100644 --- a/input/regression/fingering.ly +++ b/input/regression/fingering.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Automatic fingering tries to put fingering instructions diff --git a/input/regression/font-magnification.ly b/input/regression/font-magnification.ly index d379b9e7cf..3a4d5e282f 100644 --- a/input/regression/font-magnification.ly +++ b/input/regression/font-magnification.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \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/grace-auto-beam.ly b/input/regression/grace-auto-beam.ly index 53deb7e5bc..aad5caf353 100644 --- a/input/regression/grace-auto-beam.ly +++ b/input/regression/grace-auto-beam.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "The autobeamer is not confusde by grace notes." diff --git a/input/regression/grace-bar-line.ly b/input/regression/grace-bar-line.ly index 176da92aa9..9a9bcca698 100644 --- a/input/regression/grace-bar-line.ly +++ b/input/regression/grace-bar-line.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Bar line should come before the grace note." } diff --git a/input/regression/grace-bar-number.ly b/input/regression/grace-bar-number.ly index 7368e1eb9f..c7343f5cf6 100644 --- a/input/regression/grace-bar-number.ly +++ b/input/regression/grace-bar-number.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Grace notes do tricky things with timing. If a measure diff --git a/input/regression/grace-nest.ly b/input/regression/grace-nest.ly index 71ca4b43e3..c28c4260c4 100644 --- a/input/regression/grace-nest.ly +++ b/input/regression/grace-nest.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \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 71ca4b43e3..c28c4260c4 100644 --- a/input/regression/grace-nest1.ly +++ b/input/regression/grace-nest1.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \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 fbd4c8989e..5e1ff47285 100644 --- a/input/regression/grace-nest2.ly +++ b/input/regression/grace-nest2.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \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 2b6116cf55..68a2663e04 100644 --- a/input/regression/grace-nest3.ly +++ b/input/regression/grace-nest3.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \score { \notes \relative c'' { f1 diff --git a/input/regression/grace-nest4.ly b/input/regression/grace-nest4.ly index 416983ba1c..c64aea483d 100644 --- a/input/regression/grace-nest4.ly +++ b/input/regression/grace-nest4.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Another combination of grace note nesting." } diff --git a/input/regression/grace-nest5.ly b/input/regression/grace-nest5.ly index 36e0290d14..8b4a46a67a 100644 --- a/input/regression/grace-nest5.ly +++ b/input/regression/grace-nest5.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \score { \notes { diff --git a/input/regression/grace-part-combine.ly b/input/regression/grace-part-combine.ly index bec2319790..978a2929bb 100644 --- a/input/regression/grace-part-combine.ly +++ b/input/regression/grace-part-combine.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "partcombiner and grace notes can go together" } diff --git a/input/regression/grace-start.ly b/input/regression/grace-start.ly index 5c0c5dff67..d6babb10b5 100644 --- a/input/regression/grace-start.ly +++ b/input/regression/grace-start.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Pieces may begin with grace notes." } diff --git a/input/regression/grace-sync.ly b/input/regression/grace-sync.ly index 8e44e82570..4487e93002 100644 --- a/input/regression/grace-sync.ly +++ b/input/regression/grace-sync.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "grace notes in different voices/staves are synchronized." } diff --git a/input/regression/grace-unfold-repeat.ly b/input/regression/grace-unfold-repeat.ly index 9b580ceb31..afe449af81 100644 --- a/input/regression/grace-unfold-repeat.ly +++ b/input/regression/grace-unfold-repeat.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \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 8143a3a0ca..6149cee71b 100644 --- a/input/regression/grace-volta-repeat.ly +++ b/input/regression/grace-volta-repeat.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { diff --git a/input/regression/hara-kiri-pianostaff.ly b/input/regression/hara-kiri-pianostaff.ly index 786e49f9d8..dde1af1a4e 100644 --- a/input/regression/hara-kiri-pianostaff.ly +++ b/input/regression/hara-kiri-pianostaff.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \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/lyrics-extender.ly b/input/regression/lyrics-extender.ly index 42966ad69e..21b99d4f21 100644 --- a/input/regression/lyrics-extender.ly +++ b/input/regression/lyrics-extender.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header{ texidoc = diff --git a/input/regression/lyrics-multi-stanza.ly b/input/regression/lyrics-multi-stanza.ly index 1af9baed14..186d553aa4 100644 --- a/input/regression/lyrics-multi-stanza.ly +++ b/input/regression/lyrics-multi-stanza.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Lyrics syllables are aligned according to diff --git a/input/regression/merge-differently-dotted.ly b/input/regression/merge-differently-dotted.ly index 32380cc1e1..78764b4d41 100644 --- a/input/regression/merge-differently-dotted.ly +++ b/input/regression/merge-differently-dotted.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "If NoteCollision has merge-differently-dotted set, note diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly index 1392a639a5..88c806bec4 100644 --- a/input/regression/multi-measure-rest.ly +++ b/input/regression/multi-measure-rest.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header{ texidoc=" diff --git a/input/regression/note-head-chord.ly b/input/regression/note-head-chord.ly index bfdd455cbd..91c496cde8 100644 --- a/input/regression/note-head-chord.ly +++ b/input/regression/note-head-chord.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Note heads are flipped on the stem to prevent collisions. diff --git a/input/regression/prefatory-spacing-matter.ly b/input/regression/prefatory-spacing-matter.ly index 630a450389..1536d0134e 100644 --- a/input/regression/prefatory-spacing-matter.ly +++ b/input/regression/prefatory-spacing-matter.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "prefatory spacing diff --git a/input/regression/repeat-unfold-all.ly b/input/regression/repeat-unfold-all.ly index 1aa96159ed..23428c15e5 100644 --- a/input/regression/repeat-unfold-all.ly +++ b/input/regression/repeat-unfold-all.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Repeats may be unfolded through the Scheme function @code{unfold-repeats}." diff --git a/input/regression/rest-collision-default.ly b/input/regression/rest-collision-default.ly index 0dd3ba2683..f47677da76 100644 --- a/input/regression/rest-collision-default.ly +++ b/input/regression/rest-collision-default.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { diff --git a/input/regression/rest-pitch.ly b/input/regression/rest-pitch.ly index 5880a5246d..c22f535ad4 100644 --- a/input/regression/rest-pitch.ly +++ b/input/regression/rest-pitch.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Rests can have pitches--these will be affected by diff --git a/input/regression/rhythmic-staff.ly b/input/regression/rhythmic-staff.ly index 55b7b64eb7..1719dca0f1 100644 --- a/input/regression/rhythmic-staff.ly +++ b/input/regression/rhythmic-staff.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { diff --git a/input/regression/script-collision.ly b/input/regression/script-collision.ly index 78645f915c..8149ba0d8f 100644 --- a/input/regression/script-collision.ly +++ b/input/regression/script-collision.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { diff --git a/input/regression/script-stack-order.ly b/input/regression/script-stack-order.ly index 4cb875b88a..c399119d5c 100644 --- a/input/regression/script-stack-order.ly +++ b/input/regression/script-stack-order.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Scripts can be stacked. The order is determined by a priority field, but when objects have the same priority, the input diff --git a/input/regression/script-stacked.ly b/input/regression/script-stacked.ly index 0f487101b6..aabf7a0236 100644 --- a/input/regression/script-stacked.ly +++ b/input/regression/script-stacked.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Scripts may b4e stacked." diff --git a/input/regression/slur-rest.ly b/input/regression/slur-rest.ly index e8477fb365..2667f97cde 100644 --- a/input/regression/slur-rest.ly +++ b/input/regression/slur-rest.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc ="Slurs may be placed over rest. The slur will avoid colliding with diff --git a/input/regression/slur-staccato.ly b/input/regression/slur-staccato.ly index 53c31a4f37..27e9ac5eb8 100644 --- a/input/regression/slur-staccato.ly +++ b/input/regression/slur-staccato.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc="Manual hack for slur and staccato." } diff --git a/input/regression/slur-stem-broken.ly b/input/regression/slur-stem-broken.ly index 3c7800da51..6e0f80b21f 100644 --- a/input/regression/slur-stem-broken.ly +++ b/input/regression/slur-stem-broken.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \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/spacing-accidental-staffs.ly b/input/regression/spacing-accidental-staffs.ly index 848579c9a2..2cf35d9d56 100644 --- a/input/regression/spacing-accidental-staffs.ly +++ b/input/regression/spacing-accidental-staffs.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Accidentals in different staffs don't effect the diff --git a/input/regression/spacing-accidental.ly b/input/regression/spacing-accidental.ly index 5afe8286af..1313b19d85 100644 --- a/input/regression/spacing-accidental.ly +++ b/input/regression/spacing-accidental.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Accidentals sticking out to the left diff --git a/input/regression/spacing-bar-stem.ly b/input/regression/spacing-bar-stem.ly index 946628b167..4c11348773 100644 --- a/input/regression/spacing-bar-stem.ly +++ b/input/regression/spacing-bar-stem.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Downstem notes following a barline are printed with some extra space. This is an optical correction similar diff --git a/input/regression/spacing-clef-first-note.ly b/input/regression/spacing-clef-first-note.ly index c0d9258ddc..8835cb6288 100644 --- a/input/regression/spacing-clef-first-note.ly +++ b/input/regression/spacing-clef-first-note.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "clef changes at the start of a line get much more space diff --git a/input/regression/spacing-ended-voice.ly b/input/regression/spacing-ended-voice.ly index 27063e00d3..54dd548133 100644 --- a/input/regression/spacing-ended-voice.ly +++ b/input/regression/spacing-ended-voice.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = " A voicelet (a very short voice to get polyphonic chords correct) diff --git a/input/regression/spacing-folded-clef.ly b/input/regression/spacing-folded-clef.ly index 287d634d0c..0364f8a95b 100644 --- a/input/regression/spacing-folded-clef.ly +++ b/input/regression/spacing-folded-clef.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "A clef can be folded below notes in a different staff, if this doesn't disrupt the flow of the notes." diff --git a/input/regression/spacing-folded-clef2.ly b/input/regression/spacing-folded-clef2.ly index 95ce23f023..efaca2bedd 100644 --- a/input/regression/spacing-folded-clef2.ly +++ b/input/regression/spacing-folded-clef2.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "A clef can be folded below notes in a different staff, if diff --git a/input/regression/spacing-grace-duration.ly b/input/regression/spacing-grace-duration.ly index 358124edaf..68f76dcf60 100644 --- a/input/regression/spacing-grace-duration.ly +++ b/input/regression/spacing-grace-duration.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Spacing uses the duration of the notes, but disregards diff --git a/input/regression/spacing-grace.ly b/input/regression/spacing-grace.ly index 3b4b32bfa7..e86f1b5be9 100644 --- a/input/regression/spacing-grace.ly +++ b/input/regression/spacing-grace.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Grace note spacing. Should be tuned? " } diff --git a/input/regression/spacing-individual-tuning.ly b/input/regression/spacing-individual-tuning.ly index 1845bfc0d3..524f72bd4e 100644 --- a/input/regression/spacing-individual-tuning.ly +++ b/input/regression/spacing-individual-tuning.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = " diff --git a/input/regression/spacing-knee.ly b/input/regression/spacing-knee.ly index 3b51d5fc82..04a726aeb4 100644 --- a/input/regression/spacing-knee.ly +++ b/input/regression/spacing-knee.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "For knees, the spacing correction is such that the stems are put at regular distances. diff --git a/input/regression/spacing-rest.ly b/input/regression/spacing-rest.ly index a5aee6cbee..70acf2990d 100644 --- a/input/regression/spacing-rest.ly +++ b/input/regression/spacing-rest.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \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 diff --git a/input/regression/spacing-short-notes.ly b/input/regression/spacing-short-notes.ly index 1abde19301..4e625cedfe 100644 --- a/input/regression/spacing-short-notes.ly +++ b/input/regression/spacing-short-notes.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Notes that are shorter than the common shortest note, Get a diff --git a/input/regression/spacing-stem-bar.ly b/input/regression/spacing-stem-bar.ly index 2c93e2f37a..2659f1d828 100644 --- a/input/regression/spacing-stem-bar.ly +++ b/input/regression/spacing-stem-bar.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Upstem notes before a barline are printed with some extra diff --git a/input/regression/spacing-stem-same-direction.ly b/input/regression/spacing-stem-same-direction.ly index 62e7216e39..8328b9d1d0 100644 --- a/input/regression/spacing-stem-same-direction.ly +++ b/input/regression/spacing-stem-same-direction.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "For juxtaposed chords with the same direction, a slight optical correction is used. It is constant, and only works if diff --git a/input/regression/span-bar.ly b/input/regression/span-bar.ly index 9bebddd626..85f23d4baf 100644 --- a/input/regression/span-bar.ly +++ b/input/regression/span-bar.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \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/staff-tweak.ly b/input/regression/staff-tweak.ly index 18db69d0e1..7bf7b42ebc 100644 --- a/input/regression/staff-tweak.ly +++ b/input/regression/staff-tweak.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \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. diff --git a/input/regression/stanza-number.ly b/input/regression/stanza-number.ly index 55991ad5a2..cdfd660b5b 100644 --- a/input/regression/stanza-number.ly +++ b/input/regression/stanza-number.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Stanza numbers may differ for the first and following systems." } diff --git a/input/regression/system-extents.ly b/input/regression/system-extents.ly index 3d6ec4a3d1..a72e3b2ca3 100644 --- a/input/regression/system-extents.ly +++ b/input/regression/system-extents.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \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 7b6e7bd47a..1e16713abf 100644 --- a/input/regression/system-start-bracket.ly +++ b/input/regression/system-start-bracket.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = " diff --git a/input/regression/tie-busy-grobs.ly b/input/regression/tie-busy-grobs.ly index 719d196f2c..c40bf9dd66 100644 --- a/input/regression/tie-busy-grobs.ly +++ b/input/regression/tie-busy-grobs.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Tie engraver uses @code{busyGrobs} to keep track of diff --git a/input/regression/tie-grace.ly b/input/regression/tie-grace.ly index 66309e8636..2c6d6ebf77 100644 --- a/input/regression/tie-grace.ly +++ b/input/regression/tie-grace.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Tieing a grace to the to a following grace or main note works." } diff --git a/input/regression/tuplet-beam.ly b/input/regression/tuplet-beam.ly index 51b0889de5..dca7229114 100644 --- a/input/regression/tuplet-beam.ly +++ b/input/regression/tuplet-beam.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \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 d59418ea07..dad954c4fa 100644 --- a/input/regression/tuplet-nest.ly +++ b/input/regression/tuplet-nest.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc="Manual hack for nested tuplets, move outer tuplet up." } diff --git a/input/regression/tuplet-staffline-collision.ly b/input/regression/tuplet-staffline-collision.ly index 18399df528..a64f7cbb9f 100644 --- a/input/regression/tuplet-staffline-collision.ly +++ b/input/regression/tuplet-staffline-collision.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Horizontal tuplet brackets are shifted vertically diff --git a/input/sondag-morgen/sondag-morgen-folded.ly b/input/sondag-morgen/sondag-morgen-folded.ly index 51503f9f33..7d2b9303dd 100644 --- a/input/sondag-morgen/sondag-morgen-folded.ly +++ b/input/sondag-morgen/sondag-morgen-folded.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "sondag-morgen-intro.ly" \include "sondag-morgen-vers.ly" \include "sondag-morgen-vers-volta1.ly" diff --git a/input/sondag-morgen/sondag-morgen-intro.ly b/input/sondag-morgen/sondag-morgen-intro.ly index 16c5bfa164..51ee1f1430 100644 --- a/input/sondag-morgen/sondag-morgen-intro.ly +++ b/input/sondag-morgen/sondag-morgen-intro.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "deutsch.ly" marks = \lyrics { diff --git a/input/sondag-morgen/sondag-morgen-lyrics.ly b/input/sondag-morgen/sondag-morgen-lyrics.ly index 462bc3c6fd..1185994d41 100644 --- a/input/sondag-morgen/sondag-morgen-lyrics.ly +++ b/input/sondag-morgen/sondag-morgen-lyrics.ly @@ -1,3 +1,4 @@ +\version "1.5.68" lyr = \lyrics { \context LyricsVoice = va { Nu er det søn -- dag, diff --git a/input/sondag-morgen/sondag-morgen-notes.ly b/input/sondag-morgen/sondag-morgen-notes.ly index 5599c1b288..2dccd0e512 100644 --- a/input/sondag-morgen/sondag-morgen-notes.ly +++ b/input/sondag-morgen/sondag-morgen-notes.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "deutsch.ly" marks = \lyrics { diff --git a/input/sondag-morgen/sondag-morgen-omkvaed-volta1.ly b/input/sondag-morgen/sondag-morgen-omkvaed-volta1.ly index 28807265df..ba2ebd3ca1 100644 --- a/input/sondag-morgen/sondag-morgen-omkvaed-volta1.ly +++ b/input/sondag-morgen/sondag-morgen-omkvaed-volta1.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "deutsch.ly" marks = \lyrics { diff --git a/input/sondag-morgen/sondag-morgen-omkvaed-volta2.ly b/input/sondag-morgen/sondag-morgen-omkvaed-volta2.ly index 41c232e222..f266c95887 100644 --- a/input/sondag-morgen/sondag-morgen-omkvaed-volta2.ly +++ b/input/sondag-morgen/sondag-morgen-omkvaed-volta2.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "deutsch.ly" marks = \lyrics { diff --git a/input/sondag-morgen/sondag-morgen-omkvaed-volta3.ly b/input/sondag-morgen/sondag-morgen-omkvaed-volta3.ly index 293c069ac3..b19d9f362d 100644 --- a/input/sondag-morgen/sondag-morgen-omkvaed-volta3.ly +++ b/input/sondag-morgen/sondag-morgen-omkvaed-volta3.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "deutsch.ly" marks = \lyrics { diff --git a/input/sondag-morgen/sondag-morgen-omkvaed.ly b/input/sondag-morgen/sondag-morgen-omkvaed.ly index 099f34876a..cf9b0970bf 100644 --- a/input/sondag-morgen/sondag-morgen-omkvaed.ly +++ b/input/sondag-morgen/sondag-morgen-omkvaed.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "deutsch.ly" marks = \lyrics { diff --git a/input/sondag-morgen/sondag-morgen-outro.ly b/input/sondag-morgen/sondag-morgen-outro.ly index 1e80d677b7..cbd718bcd8 100644 --- a/input/sondag-morgen/sondag-morgen-outro.ly +++ b/input/sondag-morgen/sondag-morgen-outro.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "deutsch.ly" marks = \lyrics { diff --git a/input/sondag-morgen/sondag-morgen-unfolded.ly b/input/sondag-morgen/sondag-morgen-unfolded.ly index 823ef39aff..c4bedc5dd8 100644 --- a/input/sondag-morgen/sondag-morgen-unfolded.ly +++ b/input/sondag-morgen/sondag-morgen-unfolded.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "sondag-morgen-intro.ly" \include "sondag-morgen-vers.ly" \include "sondag-morgen-vers-volta1.ly" diff --git a/input/sondag-morgen/sondag-morgen-vers-volta1.ly b/input/sondag-morgen/sondag-morgen-vers-volta1.ly index 97e63c8a31..f24d27e25a 100644 --- a/input/sondag-morgen/sondag-morgen-vers-volta1.ly +++ b/input/sondag-morgen/sondag-morgen-vers-volta1.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "deutsch.ly" marks = \lyrics { diff --git a/input/sondag-morgen/sondag-morgen-vers-volta2.ly b/input/sondag-morgen/sondag-morgen-vers-volta2.ly index 967d97de03..897e37c4d6 100644 --- a/input/sondag-morgen/sondag-morgen-vers-volta2.ly +++ b/input/sondag-morgen/sondag-morgen-vers-volta2.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "deutsch.ly" marks = \lyrics { diff --git a/input/sondag-morgen/sondag-morgen-vers.ly b/input/sondag-morgen/sondag-morgen-vers.ly index 47d10abb5e..7438a03bda 100644 --- a/input/sondag-morgen/sondag-morgen-vers.ly +++ b/input/sondag-morgen/sondag-morgen-vers.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "deutsch.ly" marks = \lyrics { diff --git a/input/sondag-morgen/sondag-morgen.ly b/input/sondag-morgen/sondag-morgen.ly index da2fd24f5c..ed1f2285c5 100644 --- a/input/sondag-morgen/sondag-morgen.ly +++ b/input/sondag-morgen/sondag-morgen.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "paper13.ly" mu = {} diff --git a/input/template/header.ly b/input/template/header.ly index aea4b0b2b5..f13a878204 100644 --- a/input/template/header.ly +++ b/input/template/header.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { dedication = "dedication" title = "Title" diff --git a/input/template/satb.ly b/input/template/satb.ly index 49b1bad896..ad333b07da 100644 --- a/input/template/satb.ly +++ b/input/template/satb.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = " diff --git a/input/test/+.ly b/input/test/+.ly index d42b34fd7d..fb399d66c6 100644 --- a/input/test/+.ly +++ b/input/test/+.ly @@ -1,3 +1,4 @@ +\version "1.5.68" %% +.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/test/Cc-chords.ly b/input/test/Cc-chords.ly index 2879a55422..870ab9720e 100644 --- a/input/test/Cc-chords.ly +++ b/input/test/Cc-chords.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc="Jazz chord names, but with lower case names for minor chords" } diff --git a/input/test/add-staccato.ly b/input/test/add-staccato.ly index bbf30f6fef..3f772c75f2 100644 --- a/input/test/add-staccato.ly +++ b/input/test/add-staccato.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc= "Using make-music, you can add various stuff to notes. Here @@ -8,13 +9,13 @@ one would not use scm constructs. See separate-staccato.ly first." #(define (make-script x) (let ((m (ly-make-music "Articulation_req"))) - (ly-set-mus-property! m 'articulation-type x) - (ly-set-mus-property! m 'script x) + (ly-set-mus-property!! m 'articulation-type x) + (ly-set-mus-property!! m 'script x) m)) #(define (add-script m x) (if (equal? (ly-music-name m) "Request_chord") - (ly-set-mus-property! m 'elements + (ly-set-mus-property!! m 'elements (cons (make-script x) (ly-get-mus-property m 'elements))) diff --git a/input/test/barline-lyric-only.ly b/input/test/barline-lyric-only.ly index 0ad5f5bc24..d9440f50c7 100644 --- a/input/test/barline-lyric-only.ly +++ b/input/test/barline-lyric-only.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "You can move around Bar_engraver and diff --git a/input/test/beam-second.ly b/input/test/beam-second.ly index d2bb26787e..a805d57581 100644 --- a/input/test/beam-second.ly +++ b/input/test/beam-second.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header{ texidoc="" } diff --git a/input/test/blank-notes.ly b/input/test/blank-notes.ly index 6558c33905..15dc614d0e 100644 --- a/input/test/blank-notes.ly +++ b/input/test/blank-notes.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { diff --git a/input/test/blank.ly b/input/test/blank.ly index b13f630e51..71d4ffc9dd 100644 --- a/input/test/blank.ly +++ b/input/test/blank.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc="Blank music paper with clefs" } diff --git a/input/test/broken-spanner-adjustment.ly b/input/test/broken-spanner-adjustment.ly index cd9f206a86..8bac2d9f7a 100644 --- a/input/test/broken-spanner-adjustment.ly +++ b/input/test/broken-spanner-adjustment.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Broken spanners can be adjusted individually, but @@ -16,7 +17,7 @@ this requires complicated scheme code. ;; if you're using this for other grob-types. (if (and (>= (length b) 2) (eq? (car (last-pair b)) grob)) - (ly-set-grob-property! grob 'extra-offset '(4 . -2)) + (ly-set-grob-property!! grob 'extra-offset '(4 . -2)) ) )) diff --git a/input/test/chord-markup.ly b/input/test/chord-markup.ly index 4519d16759..037fcd70a1 100644 --- a/input/test/chord-markup.ly +++ b/input/test/chord-markup.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header{ texidoc = "chord/markup test" } diff --git a/input/test/chord-taxonomy.ly b/input/test/chord-taxonomy.ly index 575195434c..f629d015f1 100644 --- a/input/test/chord-taxonomy.ly +++ b/input/test/chord-taxonomy.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { title="Chord Taxonomy of LilyPond -- jazz" } diff --git a/input/test/count-systems.ly b/input/test/count-systems.ly index 1717ee753e..84ad063602 100644 --- a/input/test/count-systems.ly +++ b/input/test/count-systems.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header{ texidoc="Display the number of systems, or the system number of a diff --git a/input/test/ct-jazz.ly b/input/test/ct-jazz.ly index f4c7771b67..dec88717cf 100644 --- a/input/test/ct-jazz.ly +++ b/input/test/ct-jazz.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { title="Chord Taxomony of LilyPond -- jazz" subtitle="Amy's chord tests" diff --git a/input/test/cue-notes.ly b/input/test/cue-notes.ly index d5d03f600a..55b18b1854 100644 --- a/input/test/cue-notes.ly +++ b/input/test/cue-notes.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Cue notes should be set in smaller type. Cue clefs are diff --git a/input/test/duration-check.ly b/input/test/duration-check.ly index 902a1310e6..62a44d3eab 100644 --- a/input/test/duration-check.ly +++ b/input/test/duration-check.ly @@ -1,3 +1,4 @@ +\version "1.5.68" #(define (duration-check music) "Check all rest durations in MUSIC" diff --git a/input/test/figured-bass.ly b/input/test/figured-bass.ly index e8859ad9ce..4ae770346f 100644 --- a/input/test/figured-bass.ly +++ b/input/test/figured-bass.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Test figured bass. diff --git a/input/test/knee-sym.ly b/input/test/knee-sym.ly index 155a317f85..0cee88fbb6 100644 --- a/input/test/knee-sym.ly +++ b/input/test/knee-sym.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \score{ \notes\relative c'{ [a8 b'' a,, b''] diff --git a/input/test/midi-scales.ly b/input/test/midi-scales.ly index 1383129387..3e9bd86803 100644 --- a/input/test/midi-scales.ly +++ b/input/test/midi-scales.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc="MIDI and midi2ly test file. Diff between this and midi2ly.py (experimental, 1.5.17) should be minimal" } diff --git a/input/test/move-accidentals.ly b/input/test/move-accidentals.ly index ee2133bed2..85482ba5cd 100644 --- a/input/test/move-accidentals.ly +++ b/input/test/move-accidentals.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc= "Positions of accidentals may be manually set. This diff --git a/input/test/octave-duplicate.ly b/input/test/octave-duplicate.ly index eaf17c4d0d..fbd3cbb815 100644 --- a/input/test/octave-duplicate.ly +++ b/input/test/octave-duplicate.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc="Octave duplicate parts of music" } diff --git a/input/test/preset-extent.ly b/input/test/preset-extent.ly index a9cef82fa6..c1e3c7359a 100644 --- a/input/test/preset-extent.ly +++ b/input/test/preset-extent.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Grob extents may be hard coded using grob diff --git a/input/test/rhythm-excercise.ly b/input/test/rhythm-excercise.ly index a15f5ee979..6283da123a 100644 --- a/input/test/rhythm-excercise.ly +++ b/input/test/rhythm-excercise.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = " a way to generate rhythm exercises with lilypond diff --git a/input/test/script-priority.ly b/input/test/script-priority.ly index c7cbd8befd..7921e38eb2 100644 --- a/input/test/script-priority.ly +++ b/input/test/script-priority.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "Relative placements of different script types can be controlled by overriding script-priority." diff --git a/input/test/separate-staccato.ly b/input/test/separate-staccato.ly index 5fc2f6ef15..40617448ca 100644 --- a/input/test/separate-staccato.ly +++ b/input/test/separate-staccato.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc="You can enter notes and articulations separately, and merge diff --git a/input/test/sketch.ly b/input/test/sketch.ly index ffe66521e5..cbcd39489a 100644 --- a/input/test/sketch.ly +++ b/input/test/sketch.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc="sketch output supported features" } diff --git a/input/test/spacing-regular.ly b/input/test/spacing-regular.ly index 903ced28f1..c2c1ecb05b 100644 --- a/input/test/spacing-regular.ly +++ b/input/test/spacing-regular.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "regularSpacingDelta is an experimental feature that diff --git a/input/test/super-sub.ly b/input/test/super-sub.ly index 3e8f8ff3c2..3a8208095f 100644 --- a/input/test/super-sub.ly +++ b/input/test/super-sub.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc="Test super/sub, raise and overstrike." } diff --git a/input/test/trills.ly b/input/test/trills.ly index 50edfd174d..f00f0ce032 100644 --- a/input/test/trills.ly +++ b/input/test/trills.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc="Document trills, pralls and turns" title="Marques des agr\\'ements et leur signification" diff --git a/input/test/unfold-all-repeats.ly b/input/test/unfold-all-repeats.ly index 006fcc144a..520a33c0b8 100644 --- a/input/test/unfold-all-repeats.ly +++ b/input/test/unfold-all-repeats.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \header { texidoc = "The standard function unfold-repeats will recursively unfold diff --git a/input/test/voicify-chords.ly b/input/test/voicify-chords.ly index f472e04f7c..86283a2262 100644 --- a/input/test/voicify-chords.ly +++ b/input/test/voicify-chords.ly @@ -1,3 +1,4 @@ +\version "1.5.68" #(define (voicify-list lst number) "Make a list of Musics. @@ -23,7 +24,7 @@ (let* ((es (ly-get-mus-property ch 'elements))) - (ly-set-mus-property! ch 'elements + (ly-set-mus-property!! ch 'elements (voicify-list (split-list es music-separator?) 0)) ch )) @@ -46,9 +47,9 @@ (voicify-chord m) (begin (if (pair? es) - (ly-set-mus-property! m 'elements (map voicify-music es))) + (ly-set-mus-property!! m 'elements (map voicify-music es))) (if (music? e) - (ly-set-mus-property! m 'element (voicify-music e))) + (ly-set-mus-property!! m 'element (voicify-music e))) m) diff --git a/input/tutorial/brahms-original.ly b/input/tutorial/brahms-original.ly index eb16f6c8e8..d2619e99bc 100644 --- a/input/tutorial/brahms-original.ly +++ b/input/tutorial/brahms-original.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \score { \notes\context PianoStaff < \context Staff = up diff --git a/input/tutorial/brahms-tweaked.ly b/input/tutorial/brahms-tweaked.ly index f25b3299f1..56e0c1a411 100644 --- a/input/tutorial/brahms-tweaked.ly +++ b/input/tutorial/brahms-tweaked.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \score { \notes\context PianoStaff < \context Staff = up diff --git a/input/tutorial/galuppi.ly b/input/tutorial/galuppi.ly index 1c6343a288..6d9eb97d24 100644 --- a/input/tutorial/galuppi.ly +++ b/input/tutorial/galuppi.ly @@ -1,3 +1,4 @@ +\version "1.5.68" soprano = \notes \relative c'' { diff --git a/input/tutorial/minuet.ly b/input/tutorial/minuet.ly index 6fba5af310..157a5c8c5c 100644 --- a/input/tutorial/minuet.ly +++ b/input/tutorial/minuet.ly @@ -1,3 +1,4 @@ +\version "1.5.68" % lines preceded by a percent sign are comments. \include "paper16.ly" diff --git a/input/tutorial/os-flute-2.ly b/input/tutorial/os-flute-2.ly index 11cf5fb309..fe890a021f 100644 --- a/input/tutorial/os-flute-2.ly +++ b/input/tutorial/os-flute-2.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "os-music.ly" \include "paper16.ly" diff --git a/input/tutorial/os-music.ly b/input/tutorial/os-music.ly index b275b2c681..ed5759374d 100644 --- a/input/tutorial/os-music.ly +++ b/input/tutorial/os-music.ly @@ -1,3 +1,4 @@ +\version "1.5.68" % include file for tutorial \header { diff --git a/input/tutorial/sammartini.ly b/input/tutorial/sammartini.ly index 2d5e755733..8030c59d35 100644 --- a/input/tutorial/sammartini.ly +++ b/input/tutorial/sammartini.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \include "paper16.ly" diff --git a/input/tutorial/singing-saw.ly b/input/tutorial/singing-saw.ly index 6bfc261f49..0277abfaf5 100644 --- a/input/tutorial/singing-saw.ly +++ b/input/tutorial/singing-saw.ly @@ -1,3 +1,4 @@ +\version "1.5.68" accompMotif = \notes \relative c { diff --git a/input/tutorial/solar.ly b/input/tutorial/solar.ly index edc1d82fb5..fd88ec2140 100644 --- a/input/tutorial/solar.ly +++ b/input/tutorial/solar.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \score { \notes { diff --git a/input/tutorial/test.ly b/input/tutorial/test.ly index c9acd9f7e3..86a167e185 100644 --- a/input/tutorial/test.ly +++ b/input/tutorial/test.ly @@ -1,3 +1,4 @@ +\version "1.5.68" \score { \notes { c'4 e'4 g'4 } } diff --git a/lily/beam.cc b/lily/beam.cc index 8c06658d4a..0ecb3bfa22 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -745,15 +745,14 @@ Beam::set_stem_shorten (Grob *me) int beam_count = get_beam_count (me); - SCM shorten = me->get_grob_property ("beamed-stem-shorten"); - if (shorten == SCM_EOL) + SCM shorten_list = me->get_grob_property ("beamed-stem-shorten"); + if (shorten_list == SCM_EOL) return; - int sz = scm_ilength (shorten); - Real staff_space = Staff_symbol_referencer::staff_space (me); - SCM shorten_elt = scm_list_ref (shorten, - scm_int2num (beam_count <? (sz - 1))); + + SCM shorten_elt = + robust_list_ref (beam_count -1, shorten_list); Real shorten_f = gh_scm2double (shorten_elt) * staff_space; /* your similar cute comment here */ diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc index c16e044049..3120b65c68 100644 --- a/lily/gourlay-breaking.cc +++ b/lily/gourlay-breaking.cc @@ -44,8 +44,24 @@ struct Break_node { line_ = 0; demerits_ = 0; } + + void print () const + { + printf ("prev break %d, line %d, demerits %f\n", + prev_break_, line_, demerits_); + } }; +void +print_break_nodes (Array<Break_node> const & arr) +{ + for (int i =0; i < arr.size (); i++) + { + printf ( "node %d: ", i); + arr[i].print (); + } +} + /** This algorithms is adapted from the OSU Tech report on breaking lines. @@ -153,7 +169,6 @@ Gourlay_breaking::do_solve () const if (breaks.size () % HAPPY_DOTS_I) progress_indication (String ("[") + to_string (breaks.size()) + "]"); - progress_indication ("\n"); Array<int> final_breaks; @@ -213,18 +228,13 @@ Gourlay_breaking::combine_demerits (Column_x_positions const &prev, break_penalties += gh_scm2double (pen); } } - -#if 1 /* Q: do want globally non-cramped lines, or locally equally cramped lines. */ - Real demerit = abs (this_one.force_) + 0.1 *abs (prev.force_ - this_one.force_) + Real demerit = abs (this_one.force_) + abs (prev.force_ - this_one.force_) + break_penalties; -#else - Real demerit = abs (this_one.force_) + break_penalties; -#endif - if (!this_one.satisfies_constraints_b_) + if (!this_one.satisfies_constraints_b_) { /* If it doesn't satisfy constraints, we make this one diff --git a/lily/stem.cc b/lily/stem.cc index 2ed0f4fb78..47300d7a82 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -815,11 +815,11 @@ Stem::calc_stem_info (Grob*me) SCM grace_prop = me->get_grob_property ("grace"); bool grace_b = to_boolean (grace_prop); - SCM bml = robust_list_ref ( beam_count , + SCM bml = robust_list_ref ( beam_count - 1, me->get_grob_property ("beamed-minimum-lengths")); Real minimum_length = gh_scm2double(bml)*staff_space; - SCM bl = robust_list_ref ( beam_count , + SCM bl = robust_list_ref ( beam_count - 1, me->get_grob_property ("beamed-lengths")); Real stem_length = gh_scm2double(bl) * staff_space; @@ -828,7 +828,7 @@ Stem::calc_stem_info (Grob*me) stem goes to center of beam, hence 0.5 */ Real beam_lengthen = beam_translation* (beam_count - 1) - + ((beam_count > 0) ? thick : 0) - 0.5 * thick; + + 0.5 * thick; Real shortest_y = note_start + minimum_length + beam_lengthen; Real ideal_y = stem_length + note_start + beam_lengthen; diff --git a/ly/generate-interface-doc-init.ly b/ly/generate-interface-doc-init.ly index a50eeaf3d0..048127d6d3 100644 --- a/ly/generate-interface-doc-init.ly +++ b/ly/generate-interface-doc-init.ly @@ -1,3 +1,4 @@ +\version "1.5.68" % % Running LilyPond on this file generates the short interface doc diff --git a/ly/grace-init.ly b/ly/grace-init.ly index 96f3d4073e..ade097e0bf 100644 --- a/ly/grace-init.ly +++ b/ly/grace-init.ly @@ -1,3 +1,4 @@ +\version "1.5.68" startGraceMusic = { \property Voice.Stem \override #'direction = #1 diff --git a/ly/paper11.ly b/ly/paper11.ly index 313d25a0e4..84e85cd4e2 100644 --- a/ly/paper11.ly +++ b/ly/paper11.ly @@ -1,2 +1,3 @@ +\version "1.5.68" \include "paper11-init.ly" diff --git a/ly/paper13.ly b/ly/paper13.ly index 7ecec51bbb..c1d872f08d 100644 --- a/ly/paper13.ly +++ b/ly/paper13.ly @@ -1,2 +1,3 @@ +\version "1.5.68" \include "paper13-init.ly" diff --git a/ly/paper16.ly b/ly/paper16.ly index 2621cae3e6..36c108ae5b 100644 --- a/ly/paper16.ly +++ b/ly/paper16.ly @@ -1,2 +1,3 @@ +\version "1.5.68" \include "paper16-init.ly" diff --git a/ly/paper20.ly b/ly/paper20.ly index 4511cff2ad..586a49bdcc 100644 --- a/ly/paper20.ly +++ b/ly/paper20.ly @@ -1,2 +1,3 @@ +\version "1.5.68" \include "paper20-init.ly" diff --git a/ly/paper23.ly b/ly/paper23.ly index 61dfc7fc1b..f36cddf07c 100644 --- a/ly/paper23.ly +++ b/ly/paper23.ly @@ -1,2 +1,3 @@ +\version "1.5.68" \include "paper23-init.ly" diff --git a/ly/paper26.ly b/ly/paper26.ly index c874b34f25..1099206bfc 100644 --- a/ly/paper26.ly +++ b/ly/paper26.ly @@ -1,2 +1,3 @@ +\version "1.5.68" \include "paper26-init.ly" diff --git a/scm/grob-description.scm b/scm/grob-description.scm index 4425102e63..afd86a0ab9 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -822,10 +822,10 @@ (before-line-breaking-callback . ,Stem::before_line_breaking) (molecule-callback . ,Stem::brew_molecule) (thickness . 1.3) - (beamed-lengths . (0.0 2.5 2.0 1.5)) + (beamed-lengths . (2.5 2.0 1.5)) ;; - (beamed-minimum-lengths . (0.0 1.5 1.25 1.0)) + (beamed-minimum-lengths . (1.5 1.25 1.0)) ;; Stems in unnatural (forced) direction should be shortened, ;; according to [Roush & Gourlay]. Their suggestion to knock off |