* Documentation/user/examples.itely (Module): 2.4.0 -> 2.6.0

* python/convertrules.py (do_conversion): don't print program_name
from within a module

* python/convertrules.py (conv): add 2.6.0 dummy rule.

diff --git a/ChangeLog b/ChangeLog
index 14f71b58ddb24f49a658555e1a3ff30d1e67b9e7..cfabe01c683b0bdfb2deb432c84f9d61d011abfe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-06-27  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * Documentation/user/examples.itely (Module): 2.4.0 -> 2.6.0
+
+       * input/*.ly (Module): 2.4 -> 2.6 grand convert-ly s/r. 
+
+       * python/convertrules.py (do_conversion): don't print program_name
+       from within a module
+
        * configure.in (reloc_b): bump fontforge requirement to 20050624.
 
        * python/convertrules.py (conv): add 2.6.0 dummy rule.

diff --git a/Documentation/user/examples.itely b/Documentation/user/examples.itely
index 1071b46fe5e52e5bf0b4463c9360fc3ee24ada40..8dda883571dac7268755120c1adf6f344243a909 100644 (file)
--- a/Documentation/user/examples.itely
+++ b/Documentation/user/examples.itely
@@ -28,7 +28,7 @@ instrument or a melodic fragment.  Cut and paste this into a file,
 add notes, and you're finished!
 
 @lilypond[quote,verbatim,raggedright]
-\version "2.4.0"
+\version "2.6.0"
 melody = \relative c' {
    \clef treble
    \key c \major
@@ -53,7 +53,7 @@ automatic beaming, you'll have to change or comment out the relevant
 line.
 
 @lilypond[quote,verbatim,raggedright]
-\version "2.4.0"
+\version "2.6.0"
 melody = \relative c' {
    \clef treble
    \key c \major
@@ -84,7 +84,7 @@ text = \lyricmode {
 Want to prepare a lead sheet with a melody and chords?  Look no further!
 
 @lilypond[quote,verbatim,raggedright]
-\version "2.4.0"
+\version "2.6.0"
 melody = \relative c' {
    \clef treble
    \key c \major
@@ -117,7 +117,7 @@ harmonies = \chordmode {
 This template allows you to prepare a song with melody, words, and chords.
 
 @lilypond[quote,verbatim,raggedright]
-\version "2.4.0"
+\version "2.6.0"
 melody = \relative c' {
    \clef treble
    \key c \major
@@ -158,7 +158,7 @@ harmonies = \chordmode {
 Here is a simple piano staff.
 
 @lilypond[quote,verbatim,raggedright]
-\version "2.4.0"
+\version "2.6.0"
 upper = \relative c'' {
    \clef treble
    \key c \major
@@ -192,7 +192,7 @@ Here is a typical song format: one staff with the melody and lyrics, with
 piano accompaniment underneath.
 
 @lilypond[quote,verbatim,raggedright]
-\version "2.4.0"
+\version "2.6.0"
 melody = \relative c'' {
    \clef treble
    \key c \major
@@ -248,7 +248,7 @@ Instead of having a full staff for the melody and lyrics, you can place
 the lyrics between the piano staff (and omit the separate melody staff).
 
 @lilypond[quote,verbatim,raggedright]
-\version "2.4.0"
+\version "2.6.0"
 upper = \relative c'' {
    \clef treble
    \key c \major
@@ -296,7 +296,7 @@ since the template is right here, you don't have to do the
 tweaking yourself.
 
 @lilypond[quote,verbatim,raggedright]
-\version "2.4.0"
+\version "2.6.0"
 upper = \relative c'' {
   \clef treble
   \key c \major
@@ -393,7 +393,7 @@ This template demonstrates a string quartet.  It also uses a @code{\global}
 section for time and key signatures.
 
 @lilypond[quote,verbatim,raggedright]
-\version "2.4.0"
+\version "2.6.0"
 
 global= {
   \time 4/4
@@ -453,7 +453,7 @@ contains all the music definitions.  The other files -- @code{score.ly},
 
 @verbatim
 %%%%% piece.ly
-\version "2.4.0"
+\version "2.6.0"
 
 global= {
   \time 4/4
@@ -499,7 +499,7 @@ music = {
 
 
 %%%%% score.ly
-\version "2.4.0"
+\version "2.6.0"
 \include "piece.ly"
 #(set-global-staff-size 14)
 \score {
@@ -510,7 +510,7 @@ music = {
 
 
 %%%%% vn1.ly
-\version "2.4.0"
+\version "2.6.0"
 \include "piece.ly"
 \score { 
   \keepWithTag #'vn1 \music
@@ -519,7 +519,7 @@ music = {
 
 
 %%%%% vn2.ly
-\version "2.4.0"
+\version "2.6.0"
 \include "piece.ly"
 \score { 
   \keepWithTag #'vn2 \music
@@ -528,7 +528,7 @@ music = {
 
 
 %%%%% vla.ly
-\version "2.4.0"
+\version "2.6.0"
 \include "piece.ly"
 \score { 
   \keepWithTag #'vla \music
@@ -537,7 +537,7 @@ music = {
 
 
 %%%%% vlc.ly
-\version "2.4.0"
+\version "2.6.0"
 \include "piece.ly"
 \score { 
   \keepWithTag #'vlc \music
@@ -557,7 +557,7 @@ parts.  For example, the time signature and key signatures are almost
 always the same for all parts.
 
 @lilypond[quote,verbatim,raggedright]
-\version "2.4.0"
+\version "2.6.0"
 global = {
    \key c \major
    \time 4/4
@@ -636,7 +636,7 @@ to the vocal notes (say, tenorMusic), then the changes will also
 apply to the piano reduction.
 
 @lilypond[quote,verbatim,raggedright]
-\version "2.4.0"
+\version "2.6.0"
 global = {
    \key c \major
    \time 4/4
@@ -738,7 +738,7 @@ notes.  As a compromise, bar lines are often printed between the
 staves rather than on the staves.
 
 @lilypond[quote,verbatim,linewidth=11.0\cm]
-\version "2.4.0"
+\version "2.6.0"
 
 global = {
   \set Score.skipBars = ##t
@@ -976,7 +976,7 @@ is within a @code{\transpose} section.
 @c The `linewidth' argument is for the \header.
 
 @lilypond[quote,verbatim,raggedright,linewidth]
-\version "2.4.0"
+\version "2.6.0"
 \header {
   title = "Song"
   subtitle = "(tune)"
@@ -1242,7 +1242,7 @@ violin concerto as TchaikovskyPI, whereas perhaps you wish to print
 
 @ The `linewidth' is for \header.
 @lilypond[quote,verbatim,raggedright,linewidth]
-\version "2.4.0"
+\version "2.6.0"
 \header {
   dedication = "dedication"
   title = "Title"

diff --git a/Documentation/user/putting.itely b/Documentation/user/putting.itely
index fa26421a363b99e8f667213900a657678ecd8b56..4b9682f37188c62c3bcf30dd145bacb5fb84f3fc 100644 (file)
--- a/Documentation/user/putting.itely
+++ b/Documentation/user/putting.itely
@@ -72,7 +72,7 @@ cello.  In this case, we would start with ``Notes and lyrics'' (for the
 soprano part).
 
 @example
-\version "2.4.0"
+\version "2.6.0"
 melody = \relative c' @{
   \clef treble
   \key c \major
@@ -101,7 +101,7 @@ text = \lyricmode @{
 Now we want to add a cello part.  Let's look at the ``Notes only'' example:
 
 @example
-\version "2.4.0"
+\version "2.6.0"
 melody = \relative c' @{
   \clef treble
   \key c \major
@@ -137,7 +137,7 @@ normally use bass clef.  We'll also give the cello some different
 notes.
 
 @example
-\version "2.4.0"
+\version "2.6.0"
 sopranoMusic = \relative c' @{
   \clef treble
   \key c \major
@@ -207,7 +207,7 @@ This looks a bit messy; the indentation is messed up now.  That is
 easily fixed.  Here's the complete soprano and cello template.
 
 @lilypond[quote,verbatim,raggedright]
-\version "2.4.0"
+\version "2.6.0"
 sopranoMusic = \relative c' {
   \clef treble
   \key c \major

diff --git a/input/example-2.ly b/input/example-2.ly
index f4a03399020cf610f1de383253e2d546f4d27861..7c62ceddde600aa4e3b693e234d20189b0b45a9d 100644 (file)
--- a/input/example-2.ly
+++ b/input/example-2.ly
@@ -17,5 +17,5 @@ also included in the user-manual.
 %}
 
 %% Optional version number
-\version "2.4.0"
+\version "2.6.0"
 

diff --git a/input/example-3.ly b/input/example-3.ly
index 09e7944721ebec4cab3fa9066f7e4b42f30a21be..a67de057415b64fd32d9a536a729e5e831ca6152 100644 (file)
--- a/input/example-3.ly
+++ b/input/example-3.ly
@@ -33,4 +33,4 @@ also included in the user-manual.
 %}
 
 %% Optional version number
-\version "2.4.0"
+\version "2.6.0"

diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly
index 44577744cde528b00a097900d3e5fa01d06abebe..2fea8930ef7efde2d483b8193167cfeef251b99a 100644 (file)
--- a/input/mutopia/F.Schubert/morgenlied.ly
+++ b/input/mutopia/F.Schubert/morgenlied.ly
@@ -27,7 +27,7 @@ been lowered
 
 }
 
-\version "2.5.13"
+\version "2.6.0"
 manuscriptBreak = { \break }
 
 

diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly
index 3fe50d91a55b6c4e42cfcb569f5b7bc848d7eab0..0d4faec693f981ae5c84bc4c11d4cd5db1b83f14 100644 (file)
--- a/input/mutopia/F.Schubert/standchen.ly
+++ b/input/mutopia/F.Schubert/standchen.ly
@@ -40,7 +40,7 @@ instrument = "Piano"
  footer = "Mutopia-2001/04/27-xx"
 } 
 
-\version "2.5.13"
+\version "2.5.18"
 
 dynamicUp = \override DynamicLineSpanner  #'direction = #1
 dynamicRevert = \revert DynamicLineSpanner #'direction
@@ -402,13 +402,17 @@ vocals = \context Voice = "leise"  {
 trebleStaff = \context Staff = "treble"<< 
         \set Staff.midiInstrument = "acoustic grand"
        \global
-       {\clef treble
-       \override autoBeamSettings  #'(begin * * * *) = #(ly:make-moment 0 1)
-       \trebleIntro 
-       \trebleVerseOne 
-       \trebleEentje
-       \trebleVerseOne 
-       \trebleThrough }
+       {
+         \clef treble
+         #(override-auto-beam-setting
+           '(begin * * * *) @var{a} @var{b}
+           (ly:make-moment 0 1))
+         \trebleIntro 
+         \trebleVerseOne 
+         \trebleEentje
+         \trebleVerseOne 
+         \trebleThrough
+       }
 >>
 
 bassStaff = \context Staff = "bass"<<

diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly
index 00af0f7194d4b2bcc5de62e888945855357e8874..26ad78c99f38178c2dfecdc4a415f55eaa36b860 100644 (file)
--- a/input/mutopia/R.Schumann/romanze-op28-2.ly
+++ b/input/mutopia/R.Schumann/romanze-op28-2.ly
@@ -4,7 +4,7 @@
 
 #(set-global-staff-size 16)
 
-\version "2.5.13"
+\version "2.6.0"
 
 \header {
   title = "Romanzen"

diff --git a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
index 14d9b95c4db4698b5472a888ac2b7637576426b4..8ef2b4624aa8f21ef473b90126c706a3025d098e 100644 (file)
--- a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
@@ -41,7 +41,7 @@ virtuoso that taught in Geneva.
 
 %}
 
-\version "2.5.13"
+\version "2.6.0"
 
 \include "mozart-hrn3-defs.ily"
 \include "mozart-hrn3-allegro.ily"

diff --git a/input/no-notation/bar-check.ly b/input/no-notation/bar-check.ly
index 01306b6fcc81a8d6b62beb8a114f1c1d68026951..d38c21d1706533e1aff24fb220b1af84fb41d8ea 100644 (file)
--- a/input/no-notation/bar-check.ly
+++ b/input/no-notation/bar-check.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 \header {
 

diff --git a/input/no-notation/beam-warn.ly b/input/no-notation/beam-warn.ly
index cc97edac1850f27ea2976ba35d026e09c8623bcd..955d137f489bbf61623f04a7cf5eedb41066486e 100644 (file)
--- a/input/no-notation/beam-warn.ly
+++ b/input/no-notation/beam-warn.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 \header        {
 

diff --git a/input/no-notation/denneboom.ly b/input/no-notation/denneboom.ly
index f3fd0d37a4b95b86a73fd8f8619ba5b813e00e0e..9fe6d9a365dbc87f733c1424ed642850e099d38d 100644 (file)
--- a/input/no-notation/denneboom.ly
+++ b/input/no-notation/denneboom.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 \header{
 filename =      "denneboom.ly"
 enteredby =     "jcn"

diff --git a/input/no-notation/die-staff.ly b/input/no-notation/die-staff.ly
index 3a9f478edc854fc0da77228973411846920b4a32..6b0d8e7bc8c405c68f7eab0c16bdfb3d52afb7f2 100644 (file)
--- a/input/no-notation/die-staff.ly
+++ b/input/no-notation/die-staff.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 \header  {
 texidoc = "a staff should really die, if no one's referencing it."

diff --git a/input/no-notation/dos-guile.ly b/input/no-notation/dos-guile.ly
index a332525cf94302f8b5ab777393ab162ff2946383..ce7e5d37b5352c809980013d626766b69222f5c1 100644 (file)
--- a/input/no-notation/dos-guile.ly
+++ b/input/no-notation/dos-guile.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 \header{
     

diff --git a/input/no-notation/dos-ps.ly b/input/no-notation/dos-ps.ly
index aa1f1b07e98121d0c335dfef76eb59c9f6a5e265..cdc9aa1531724729e497fc6f2d24702121fe23d1 100644 (file)
--- a/input/no-notation/dos-ps.ly
+++ b/input/no-notation/dos-ps.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 \header{
 

diff --git a/input/no-notation/dos-tex.ly b/input/no-notation/dos-tex.ly
index 38ed94d1a0de75bcdb2a057c6ca76c02175e22f7..8db429adb3c4d5ee510ecfc4da102cae60324582 100644 (file)
--- a/input/no-notation/dos-tex.ly
+++ b/input/no-notation/dos-tex.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 \header{
     

diff --git a/input/no-notation/dynamic-absolute-volume.ly b/input/no-notation/dynamic-absolute-volume.ly
index 219de62fc25ee260c456395c08b4d9676ecb3f40..d2dfccb7d2ee737fd2338032ffc96aae39547b1d 100644 (file)
--- a/input/no-notation/dynamic-absolute-volume.ly
+++ b/input/no-notation/dynamic-absolute-volume.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 \header {
     texidoc = "@cindex Dynamic Absolute Volume
 Absolute dynamics have an effect on MIDI files.

diff --git a/input/no-notation/embedded-scm.ly b/input/no-notation/embedded-scm.ly
index cf88badbe17a4947d534cb58b5f8068fa5de0fc8..d5286cda31091e8c943e81f75971330e8c9d1dce 100644 (file)
--- a/input/no-notation/embedded-scm.ly
+++ b/input/no-notation/embedded-scm.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 \header {
     
     texidoc = "@cindex Embedded scm

diff --git a/input/no-notation/midi-grace.ly b/input/no-notation/midi-grace.ly
index 0b9432c7b2b180e7b6396004fb341d0527e0a69b..1afc4a235a5a7cf6490e32316234bb373351fd05 100644 (file)
--- a/input/no-notation/midi-grace.ly
+++ b/input/no-notation/midi-grace.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "2.4.0"
+\version "2.6.0"
 \header{ texidoc = "Tests MIDI output with grace notes. " }
 
 \score { 

diff --git a/input/no-notation/midi-lyric-barcheck.ly b/input/no-notation/midi-lyric-barcheck.ly
index d96b9c553d126711664773a2c59bfc271dfb0f82..62d8e76dae058a23f62467d89bde8cfb1b64ecba 100644 (file)
--- a/input/no-notation/midi-lyric-barcheck.ly
+++ b/input/no-notation/midi-lyric-barcheck.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 \header {
 
     texidoc = "Lyrics in MIDI are aligned to ties and beams:

diff --git a/input/no-notation/midi-scales.ly b/input/no-notation/midi-scales.ly
index 41c0f232bd7f90cef417e399efbc2b9bda759bf5..66f569f5bafcd5e9dbe81722a081b1588da97b29 100644 (file)
--- a/input/no-notation/midi-scales.ly
+++ b/input/no-notation/midi-scales.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 % candidate for regression.  -gp
 \header {
   texidoc="Converting LilyPond input to MIDI and then again back with

diff --git a/input/no-notation/midi-transposing.ly b/input/no-notation/midi-transposing.ly
index c764fdc5fd2579fc70eba79813261a34f69f3977..76d771c27fc975d13693f3eda95c6a2861f7e8ff 100644 (file)
--- a/input/no-notation/midi-transposing.ly
+++ b/input/no-notation/midi-transposing.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "2.4.0"
+\version "2.6.0"
 
 \header { texidoc = "@cindex Transposing
 The transposing property leaves output invariant, but has effect on MIDI. "

diff --git a/input/no-notation/midi-tuplets.ly b/input/no-notation/midi-tuplets.ly
index 0b5a6e41220d72029e31894f5a8d4a87d7612817..29bb85bbb60f2e0eee0190f9fb2f7d1615d1ac28 100644 (file)
--- a/input/no-notation/midi-tuplets.ly
+++ b/input/no-notation/midi-tuplets.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "2.4.0"
+\version "2.6.0"
 \header {
 texidoc = "
 

diff --git a/input/no-notation/midi-volume-equaliser.ly b/input/no-notation/midi-volume-equaliser.ly
index 26b123d960f7a66ca5f26cf00b76f83f01831b4d..f6d2c2dbd40e984ea0a99ed74b1fee6ceca6da88 100644 (file)
--- a/input/no-notation/midi-volume-equaliser.ly
+++ b/input/no-notation/midi-volume-equaliser.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "2.4.0"
+\version "2.6.0"
 \header {
 texidoc = "@cindex Midi Volume Equaliser
 The full orchestra plays a notes, where groups stop one after

diff --git a/input/no-notation/parse.ly b/input/no-notation/parse.ly
index 7106387c52516dac28894cbdcfd68c1cc1948b6a..783895d984510c3516834d8ab42893289053e59a 100644 (file)
--- a/input/no-notation/parse.ly
+++ b/input/no-notation/parse.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 % Test parser error
 

diff --git a/input/no-notation/parse2.ly b/input/no-notation/parse2.ly
index 1da264b1471155f6f3df99b03323b4afa7c09b25..410563313e53666d984c00dfcd93d9e2387cc318 100644 (file)
--- a/input/no-notation/parse2.ly
+++ b/input/no-notation/parse2.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 % Test parser error
 

diff --git a/input/no-notation/parse3.ly b/input/no-notation/parse3.ly
index 0008dfc67281d067b9997697908a3802c65bf347..bb5b25f3b7223ab340cda6a71e71e5ffc3a12443 100644 (file)
--- a/input/no-notation/parse3.ly
+++ b/input/no-notation/parse3.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 % Test parser error
 

diff --git a/input/no-notation/parse4.ly b/input/no-notation/parse4.ly
index 60c3b480b0dc43bd1a04f21086f86396726a2ad8..6fcfa12113fd256b19c2ea1cb8848529547b7601 100644 (file)
--- a/input/no-notation/parse4.ly
+++ b/input/no-notation/parse4.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 % Test parser error
 

diff --git a/input/no-notation/parse5.ly b/input/no-notation/parse5.ly
index 3104f7b6b08a140739dd241c07cf07e8c5ce35bb..76cdf12d52406b3aa44cac393384dc6d006a8464 100644 (file)
--- a/input/no-notation/parse5.ly
+++ b/input/no-notation/parse5.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 %If you specify two different key sigs at one point, a
 %warning is printed.
 

diff --git a/input/no-notation/recording.ly b/input/no-notation/recording.ly
index 5540f7a218726ec2f9fca174c1b948e63a04eb01..466a349070f72ea489c7279425dd02507eaac2be 100644 (file)
--- a/input/no-notation/recording.ly
+++ b/input/no-notation/recording.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 \header {
 
 texidoc = "The @code{Recording_group_engraver} will record events

diff --git a/input/no-notation/safe-guile.ly b/input/no-notation/safe-guile.ly
index 533ec7571104438399b1906fca288e96766651cf..c6c517c91fc5acde07cf5f2b13ef3b9902606875 100644 (file)
--- a/input/no-notation/safe-guile.ly
+++ b/input/no-notation/safe-guile.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 \header{
     

diff --git a/input/no-notation/safe-include.ly b/input/no-notation/safe-include.ly
index 2dffeea3b19cd3073700ecdfd4f29b5e553fc33e..9591fd96d7a62d2ee6763981840f9a7937b2d471 100644 (file)
--- a/input/no-notation/safe-include.ly
+++ b/input/no-notation/safe-include.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 \header{
     

diff --git a/input/no-notation/safe-ps.ly b/input/no-notation/safe-ps.ly
index 341e85d06b57cd8c6dc5a2efb6c393a8153e679c..088161fc2d1df50a54a81495873609b9923eadc5 100644 (file)
--- a/input/no-notation/safe-ps.ly
+++ b/input/no-notation/safe-ps.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 \header{
     texidoc = "This should not survive lilypond --safe-mode

diff --git a/input/no-notation/safe-tex.ly b/input/no-notation/safe-tex.ly
index 8a61a8eafed36bcfe2c70f5642af52502471071c..585532aa4cd28ca3f6fcd29c64e1318e63c90891 100644 (file)
--- a/input/no-notation/safe-tex.ly
+++ b/input/no-notation/safe-tex.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 \header{
     

diff --git a/input/no-notation/textcresc.ly b/input/no-notation/textcresc.ly
index fdb902979a2ec7bcd9713b177e3b7ad9071bed61..11d8d3ea5dcb2e853c6fddb181c8a451e1542e6c 100644 (file)
--- a/input/no-notation/textcresc.ly
+++ b/input/no-notation/textcresc.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 \header{
 texidoc="crashes lily"
 }

diff --git a/input/no-notation/to-xml.ly b/input/no-notation/to-xml.ly
index 59bd73bcd45f2839c07cebd06fa3d234d3597c3e..d93e6ea04100e5e3387cc2c6c7348d5070385ac4 100644 (file)
--- a/input/no-notation/to-xml.ly
+++ b/input/no-notation/to-xml.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 fooBar =  { << c''4 \\ g'4 >> }
 

diff --git a/input/screech-boink.ly b/input/screech-boink.ly
index edd29d02162dfd071cfe4660055bf8ccfcb9fedc..6ee16df6caaa4e0cc2ba603fe26b168d69afa345 100644 (file)
--- a/input/screech-boink.ly
+++ b/input/screech-boink.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 \header {
     title = "Screech and boink"
     subtitle = "Random complex notation"

diff --git a/input/simple-song.ly b/input/simple-song.ly
index bc4379c45f2038af27940aebc955d39d15b1c8f1..6eebcb11f351a53a9a4ec62f76192db7018a9bf0 100644 (file)
--- a/input/simple-song.ly
+++ b/input/simple-song.ly
@@ -13,5 +13,5 @@
 >>
 
 %% Optional helper for automatic updating by convert-ly.  May be omitted.
-\version "2.5.13"
+\version "2.6.0"
     

diff --git a/input/simple.ly b/input/simple.ly
index 835aaed41a872c588a5cbe2e9f0cdd12cd60d22d..640eab58c2099221c9c0037e8b857173131300e5 100644 (file)
--- a/input/simple.ly
+++ b/input/simple.ly
@@ -4,4 +4,4 @@
 }
 
 %% Optional helper for automatic updating by convert-ly.  May be omitted.
-\version "2.4.0"
+\version "2.6.0"

diff --git a/input/test/+.ly b/input/test/+.ly
index d7f355ff37494d781c93a36cb5bde87871800631..29d9c0d3a815da82959222a1cb8e076e2d6ec282 100644 (file)
--- a/input/test/+.ly
+++ b/input/test/+.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 %% +.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/add-staccato.ly b/input/test/add-staccato.ly
index b1920f6a8b41fbdb44b4df98938a36a7010985e7..bd4b6dcaa4410881330c0819f7f953200061728d 100644 (file)
--- a/input/test/add-staccato.ly
+++ b/input/test/add-staccato.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 
 \header {
 

diff --git a/input/test/add-text-script.ly b/input/test/add-text-script.ly
index 6a68fe1d79164e9b15fe8303320d8d9ffef5d903..4d5f3a274942344f99304d623c37de4a78f2abb8 100644 (file)
--- a/input/test/add-text-script.ly
+++ b/input/test/add-text-script.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 \header {
 texidoc= "@cindex make-music Fingering

diff --git a/input/test/ambitus-mixed.ly b/input/test/ambitus-mixed.ly
index 6beaa4363ba23b1f7a25b563f89e990d4cf5d6d8..775d039c01b80df6d87259573b5d5a8c43079c44 100644 (file)
--- a/input/test/ambitus-mixed.ly
+++ b/input/test/ambitus-mixed.ly
@@ -6,7 +6,7 @@ ambitus must be moved manually to prevent collisions."
 
 }
 
-\version "2.4.0"
+\version "2.6.0"
 
 \layout {
     raggedright = ##t

diff --git a/input/test/ancient-accidentals.ly b/input/test/ancient-accidentals.ly
index 8fbb3f31c6af9f3e4dbf6b16a52d5d6fd4112a8d..e5064c558336d71eadfdf2ee131cc03452c0213e 100644 (file)
--- a/input/test/ancient-accidentals.ly
+++ b/input/test/ancient-accidentals.ly
@@ -6,7 +6,7 @@ are collected here.
 "
 }
 
-\version "2.4.0"
+\version "2.6.0"
 
 \relative c'' {
       \time 5/4

diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly
index b038e1a0d7cf8a5414f2e22033a3ddca54b31a09..7eb825da10078f43b8727a0dee6c6c5c6518e277 100644 (file)
--- a/input/test/ancient-font.ly
+++ b/input/test/ancient-font.ly
@@ -1,4 +1,4 @@
-\version "2.5.2"
+\version "2.6.0"
 % TODO: split ancient-font into seperate files; possibly in
 % different locations.
 \header {

diff --git a/input/test/ancient-time.ly b/input/test/ancient-time.ly
index f4a497a8e4c86b8cde8f452fcf6aec28cc5c78c8..bd14b805fac7eaea93530ffdfdb3c06d6a321026 100644 (file)
--- a/input/test/ancient-time.ly
+++ b/input/test/ancient-time.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 % TODO: move stuff from ancient-font into here?  See comment
 % for ancient-font.ly
 \header {

diff --git a/input/test/bar-always.ly b/input/test/bar-always.ly
index 2c5d184a361f7f906b6f32ce18f6a7f67b7f43d2..dd8050814d3432767fc97d3cf2a5c086dcb20945 100644 (file)
--- a/input/test/bar-always.ly
+++ b/input/test/bar-always.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 \header {
 
     texidoc = "@cindex Bars Always

diff --git a/input/test/bar-lines-lyric-only.ly b/input/test/bar-lines-lyric-only.ly
index 07089d6cb453cf85bc837664a8364e844bdfa8f9..c54f0712125734240f671ec95a5c8362b7791611 100644 (file)
--- a/input/test/bar-lines-lyric-only.ly
+++ b/input/test/bar-lines-lyric-only.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 \header { texidoc = "@cindex Bar line lyric only
 You can move @code{Bar_engraver} and @code{Span_bar_engraver} to 
 a different engraving context, if you want, for example, bar lines 

diff --git a/input/test/bar-lines.ly b/input/test/bar-lines.ly
index 3b78f1cc08fe22c3fcbfafed45a92b900958ca63..50d7cb2c528d6f1db08c61983f9cdc2aa3efdb22 100644 (file)
--- a/input/test/bar-lines.ly
+++ b/input/test/bar-lines.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 
 \header {
     

diff --git a/input/test/bar-number-every-five-reset.ly b/input/test/bar-number-every-five-reset.ly
index 9e03a1ac5c3f236bafec5898794ecd5408d0d4dc..5cbd25a27972ec9b89df6cd19199bf0300e4f802 100644 (file)
--- a/input/test/bar-number-every-five-reset.ly
+++ b/input/test/bar-number-every-five-reset.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 \header {
     texidoc = "@cindex Bar Number Every Fifth Reset

diff --git a/input/test/bar-number-regular-interval.ly b/input/test/bar-number-regular-interval.ly
index e5062be39cc30bb1b8f42f9d60f6463a0e95d477..e151da304c1c48965cce9fcf1e4762d73c6ebd1c 100644 (file)
--- a/input/test/bar-number-regular-interval.ly
+++ b/input/test/bar-number-regular-interval.ly
@@ -5,7 +5,7 @@ Bar numbers can be printed at regular intervals, inside a box or a circle.
 
 " }
 
-\version "2.4.0"
+\version "2.6.0"
 
 \relative c'{
    \override Score.BarNumber  #'break-visibility = #end-of-line-invisible

diff --git a/input/test/bar-number-show-all.ly b/input/test/bar-number-show-all.ly
index dfdff8d15c91b2734da0f140e15b3dc055bc7338..034f12016536c7692aa8e2e47f59074c61d0b45d 100644 (file)
--- a/input/test/bar-number-show-all.ly
+++ b/input/test/bar-number-show-all.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 \header{
     texidoc="@cindex Bar Number Show All
 By default, bar numbers are printed only in the first measure.  This 

diff --git a/input/test/beam-alternate.ly b/input/test/beam-alternate.ly
index 058d0e1166d9ffd36b9c9358bd44d090e95e16af..d20b040d9a2fae1778d9c799c51f233b63263ed4 100644 (file)
--- a/input/test/beam-alternate.ly
+++ b/input/test/beam-alternate.ly
@@ -8,7 +8,7 @@
 
 }
 
-\version "2.4.0"
+\version "2.6.0"
 
 wipeNote = {
     \once \override NoteHead #'transparent = ##t

diff --git a/input/test/beam-auto-4-8.ly b/input/test/beam-auto-4-8.ly
index 4544c29c4d0cd78aaa4da5937c3136cb3b584a99..3ed084550fc2cc97d3e5a54f65c35bfe00cc6580 100644 (file)
--- a/input/test/beam-auto-4-8.ly
+++ b/input/test/beam-auto-4-8.ly
@@ -1,5 +1,5 @@
 
-%% \version "2.5.21"
+%% \version "2.6.0"
 
 %% keep for now, although merging into beam-auto-override is a possibility.
 \header {

diff --git a/input/test/beam-auto-override.ly b/input/test/beam-auto-override.ly
index 3c816cf01beda2da28572e9aeb694199880dc66c..7de434428a7c71562b29f52653c0ec601660df60 100644 (file)
--- a/input/test/beam-auto-override.ly
+++ b/input/test/beam-auto-override.ly
@@ -1,6 +1,6 @@
 
 %% ugh
-%% \version "2.5.21"
+%% \version "2.6.0"
 
 \header {
 

diff --git a/input/test/beam-control.ly b/input/test/beam-control.ly
index 18969e301356d74cabfd90b0a368ac3f8f66665d..c291893ec088a28baf320122c625c2bcfbe85a44 100644 (file)
--- a/input/test/beam-control.ly
+++ b/input/test/beam-control.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 \header{
     texidoc="@cindex Beam Position Control
 

diff --git a/input/test/beam-count.ly b/input/test/beam-count.ly
index 024464c5881006fcf408a9ae179ef05e49b1be22..8b6f4b1a7b2a577507c46c45e7fefe238af70847 100644 (file)
--- a/input/test/beam-count.ly
+++ b/input/test/beam-count.ly
@@ -1,5 +1,5 @@
 
-%%\version "2.5.21"
+%%\version "2.6.0"
 \header{
        texidoc="@cindex Beam Count
 

diff --git a/input/test/boxed-stencil.ly b/input/test/boxed-stencil.ly
index 1cc4e71747782f84d342e49e8d396ec031cad296..aa5776f3e1529d75a26ec66b0c4577bedb1bed54 100644 (file)
--- a/input/test/boxed-stencil.ly
+++ b/input/test/boxed-stencil.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 \header {
   texidoc = "@cindex Boxed Stencil
 

diff --git a/input/test/caps.ly b/input/test/caps.ly
index 0c83bf2f09aa42f7254c9a6dd6ec6489496d2d97..356fee7701d06b2616e8fb0302623d657e935911 100644 (file)
--- a/input/test/caps.ly
+++ b/input/test/caps.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 \header {
 texidoc = "@cindex Capital Letters
 The font can be changed to small caps.

diff --git a/input/test/chord-names-jazz.ly b/input/test/chord-names-jazz.ly
index 1c05f5bb3df0b5aa83f581de89932f087718a6d1..f15597cd2b8f2c44b95d7014540898edf4578883 100644 (file)
--- a/input/test/chord-names-jazz.ly
+++ b/input/test/chord-names-jazz.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 \header {
 
 texidoc = " Chord names are generated from a list pitches.  The

diff --git a/input/test/chord-names-languages.ly b/input/test/chord-names-languages.ly
index 88e3d2e8cb59fd8b6345d453988d89770f191e0f..0701d6df95c70734f250b0194e6d8ee751c62e73 100644 (file)
--- a/input/test/chord-names-languages.ly
+++ b/input/test/chord-names-languages.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 \header  {
     texidoc = "@cindex Chord Names German
 The english naming of chords (default) can be changed to german 

diff --git a/input/test/circle.ly b/input/test/circle.ly
index 6c0bf5ad2430576128c3b69eeffbbff3a9011f60..57f7fca117e7c2e8385c10e26ed0d541901bb3bc 100644 (file)
--- a/input/test/circle.ly
+++ b/input/test/circle.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 \header {
 texidoc = "@cindex Circle
 

diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index c447c9a25dc88facbb73112dd78d9870fe9afcd6..24b1b55061b11b65eabf8f6afd0c9871c3ccb191 100644 (file)
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -1,5 +1,5 @@
 
-\version "2.5.13"
+\version "2.6.0"
 
 
 % Ugh, we need to override some LaTeX titling stuff

diff --git a/input/test/divisiones.ly b/input/test/divisiones.ly
index 72733236654f662c2f02538e159ca7944c2973e8..1f2547aacc3c4406423f029e31ae9316b9121940 100644 (file)
--- a/input/test/divisiones.ly
+++ b/input/test/divisiones.ly
@@ -9,7 +9,7 @@ Choices are @code{divisioMinima}, @code{divisioMaior},
 
 " }
 
-\version "2.4.0"
+\version "2.6.0"
 
 \include "gregorian-init.ly"
 

diff --git a/input/test/dynamic-extra.ly b/input/test/dynamic-extra.ly
index 05e60729455b3d581d46071dee5c22b38225733c..3c40265812391e2c239b8fcee1b1c725fb8c1973 100644 (file)
--- a/input/test/dynamic-extra.ly
+++ b/input/test/dynamic-extra.ly
@@ -1,5 +1,5 @@
 
-\version "2.5.13"
+\version "2.6.0"
 % probably should be merged into refman.
 \header{
     texidoc = "@cindex Dynamic Piu Forte

diff --git a/input/test/embedded-postscript.ly b/input/test/embedded-postscript.ly
index 4184b7a564d5ddb76a59eb85401c5620073d6a5b..70de21e9b102ef7c509faa87a743e4850d7858c1 100644 (file)
--- a/input/test/embedded-postscript.ly
+++ b/input/test/embedded-postscript.ly
@@ -1,5 +1,5 @@
 
-\version "2.5.17"
+\version "2.6.0"
 
 
 \header {

diff --git a/input/test/engraver-contexts.ly b/input/test/engraver-contexts.ly
index 99741033a0336e1b05de20a0776dbec26900639f..2c6db58059db06341e3c9decbc78146a17872f77 100644 (file)
--- a/input/test/engraver-contexts.ly
+++ b/input/test/engraver-contexts.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 \header {
     
 texidoc ="In polyphonic notation, many voices can share a staff: In

diff --git a/input/test/engraver-one-by-one.ly b/input/test/engraver-one-by-one.ly
index d08a98a42b3996af34fe86371ea334e68b1b9c25..47f06bd8591dff165858cf462ab21596bc3d5f00 100644 (file)
--- a/input/test/engraver-one-by-one.ly
+++ b/input/test/engraver-one-by-one.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 \header {
     
 texidoc = "The notation problem, creating a certain symbol,

diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly
index c8e9660d83ebda124d954ba76424880699a59619..a3ad74c57400c0f054c6b51b702150a40cf6d329 100644 (file)
--- a/input/test/extra-staff.ly
+++ b/input/test/extra-staff.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 
 % definitely wil be renamed to something.
 %{

diff --git a/input/test/fret-diagram.ly b/input/test/fret-diagram.ly
index c7582cc0546eb5d29faa3a49db6413619dfe8186..583cf4da657642535d4d154b95849f029ef208c2 100644 (file)
--- a/input/test/fret-diagram.ly
+++ b/input/test/fret-diagram.ly
@@ -3,7 +3,7 @@
   texidoc = "Frets are supported as markup commands."
 }
 
-\version "2.4.0"
+\version "2.6.0"
 
 \score {
     <<

diff --git a/input/test/gregorian-scripts.ly b/input/test/gregorian-scripts.ly
index b0ba5d3bbea8db845cf8da899d31ce83dbf1d2f8..81b43fa1e4ea91cb11c7ee37b226ee07e6faa91a 100644 (file)
--- a/input/test/gregorian-scripts.ly
+++ b/input/test/gregorian-scripts.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 \header {
     texidoc  = "@cindex Gregorian Scripts
 

diff --git a/input/test/header-ifelse.ly b/input/test/header-ifelse.ly
index 471ecb621a720fc3a660d4b7269f77be1521a9d0..d7f47e723612361b8e752555a1c9173ef8cdc805 100644 (file)
--- a/input/test/header-ifelse.ly
+++ b/input/test/header-ifelse.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 
 #(if (not (defined? 'pieceTagLine))

diff --git a/input/test/hymn.ly b/input/test/hymn.ly
index 5e82e10c181abab66d4af043a1240f83b76c0a32..ed428c8ce02f0adf99599217d431c88cb6af1242 100644 (file)
--- a/input/test/hymn.ly
+++ b/input/test/hymn.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 
 \header { texidoc = "
 

diff --git a/input/test/instrument-name-grandstaff.ly b/input/test/instrument-name-grandstaff.ly
index 3b93ef4ea542258edb15a5bb7ef5a50565ccb758..5a1a4cff896fb876c29152c125f4c63a0fa59cba 100644 (file)
--- a/input/test/instrument-name-grandstaff.ly
+++ b/input/test/instrument-name-grandstaff.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 \header { texidoc = "@cindex Instrument Name Grandstaff
 You can have a name for the whole @code{GrandStaff} in addition to 
 individual @code{Staff}s. " }

diff --git a/input/test/ligature-vaticana.ly b/input/test/ligature-vaticana.ly
index 9113fdf82bb70042a20636a287a4997372f7f3b1..3f516d92ec2c5e9f67599a4485da867ae378bb0d 100644 (file)
--- a/input/test/ligature-vaticana.ly
+++ b/input/test/ligature-vaticana.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 \header { texidoc      = "@cindex Ancient Vaticana
 Vaticana ligature uses four staff lines, special clef, and

diff --git a/input/test/lilypond-testpage.ly b/input/test/lilypond-testpage.ly
index ed776622f0e6367cb24920c8fa6e4bdb7f6c8269..f70ad7350219031d20543f7b86d6dfc092c1cb9d 100644 (file)
--- a/input/test/lilypond-testpage.ly
+++ b/input/test/lilypond-testpage.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 % MERGE with title.ly -gp
 
 %{

diff --git a/input/test/mensural-ligatures.ly b/input/test/mensural-ligatures.ly
index 63aebc30baabecd4c8c5aedd04b919440e1c1967..bc14e87054555226e651b446faaf59b1c95c56fb 100644 (file)
--- a/input/test/mensural-ligatures.ly
+++ b/input/test/mensural-ligatures.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 % TODO:
 % check with ancient- stuff.  rename, merge, something.  -gp
 

diff --git a/input/test/mensural-note-heads.ly b/input/test/mensural-note-heads.ly
index 043b2f33559c03c370c88b22ecfbdf6780282e3b..a5a4a30b33b0d5a6d3b209f59fb740833c37939e 100644 (file)
--- a/input/test/mensural-note-heads.ly
+++ b/input/test/mensural-note-heads.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 
 \header {
     texidoc ="@cindex Ancient Mensural Note Heads

diff --git a/input/test/move-specific-text.ly b/input/test/move-specific-text.ly
index 9cb4f7c5ad2669081bd4394cb68c018857f9e2f0..4222278bea2093e01148dfb542830a975966deef 100644 (file)
--- a/input/test/move-specific-text.ly
+++ b/input/test/move-specific-text.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 % possible rename to scheme- or something like that.  -gp
 \header { texidoc = "@cindex Scheme Move Text
 Objects, like text, can be moved around by using some Scheme code.

diff --git a/input/test/music-box.ly b/input/test/music-box.ly
index fd31edb90276264f33494fcb2cc971374057b8a8..d1924e9fb3a04f045602a8b030ff9634fc5d4aad 100644 (file)
--- a/input/test/music-box.ly
+++ b/input/test/music-box.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 \include "deutsch.ly"
 % possible rename to scheme- something.  -gp
 % TODO: ask if it needs to have so many empty bars in the middle.  -gp
@@ -11,7 +11,7 @@ using Scheme functions to avoid typing work. " }
   (let* ((es (ly:music-property music 'elements))
          (n  (ly:music-property music 'name)))
    (if (not (equal? n 'SequentialMusic))
-     (ly:warn "transform needs SequentialMusic, got ~a" n)
+     (ly:warning "transform needs SequentialMusic, got ~a" n)
      (begin
       (let recurse ((elts es))
        (if (not (equal? elts '()))
@@ -53,7 +53,7 @@ using Scheme functions to avoid typing work. " }
 
 
 
-\version "2.4.0"
+\version "2.6.0"
 
 pat =  \transpose c c' \repeat unfold 2 {
   << { \context Staff = "up" {r8 e16 f g e f g } }

diff --git a/input/test/music-creation.ly b/input/test/music-creation.ly
index 053157f1bb40d65aab9cf5c6db9307feabe21018..3075eecfd43b688a903a6e3bde4ada6061fc51f8 100644 (file)
--- a/input/test/music-creation.ly
+++ b/input/test/music-creation.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 % possible rename to scheme- something.  -gp
 \header { texidoc = "@cindex Scheme Music Creation

diff --git a/input/test/no-bar-lines.ly b/input/test/no-bar-lines.ly
index 3d15a6628376a7051044ed124fcd7acc57645af1..7cb4a6b65b05dde67346c68617e3b523ee1f4f68 100644 (file)
--- a/input/test/no-bar-lines.ly
+++ b/input/test/no-bar-lines.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 % possible rename to bar-lines-foo.  -gp
 
 \header{ texidoc = "@cindex Bar Lines Remove

diff --git a/input/test/no-key-at-end-of-line.ly b/input/test/no-key-at-end-of-line.ly
index 9426bcd75d309c9513e5003805d8fef33d09527a..b3fa4cd25d30d42344a9a99c50e333bddc858cc2 100644 (file)
--- a/input/test/no-key-at-end-of-line.ly
+++ b/input/test/no-key-at-end-of-line.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 \header {
 
     texidoc = "@cindex Key Signature End of Line

diff --git a/input/test/ossia.ly b/input/test/ossia.ly
index 6f3ef1456f4a3af261c984ffa702de7358e6c267..00535b076e756711b7a0e93139cba1e38300e0f0 100644 (file)
--- a/input/test/ossia.ly
+++ b/input/test/ossia.ly
@@ -2,7 +2,7 @@
 \header { texidoc = "Ossia fragments can be done with starting and
 stopping staves. " }
 
-\version "2.5.23"
+\version "2.6.0"
 \paper { raggedright = ##t }
 
 <<

diff --git a/input/test/partial-blank.ly b/input/test/partial-blank.ly
index a12ede977997ec17258019ecead153836408ba97..0b444e3fe1e62d1203cf04f39c1982e5f2925fd4 100644 (file)
--- a/input/test/partial-blank.ly
+++ b/input/test/partial-blank.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 % check with invisible-notes or blank-notes.  possible rename. -gp
 \header{ texidoc = "@cindex Partial Blank
 When entering partially typeset music (i.e. for students to be 

diff --git a/input/test/piano-staff-distance.ly b/input/test/piano-staff-distance.ly
index 74fe6337b728c89e1e25e262d143e8ef6bb7a872..bfd2ed54f0ae47629ac04f49fe6ae3071349d119 100644 (file)
--- a/input/test/piano-staff-distance.ly
+++ b/input/test/piano-staff-distance.ly
@@ -8,7 +8,7 @@ Currently, this is for testing purposes.  "
 
 }
 
-\version "2.4.0"
+\version "2.6.0"
 
 #(define ((futz-alignment-callback distance count) grob axis)
 

diff --git a/input/test/preset-extent.ly b/input/test/preset-extent.ly
index 5e869391dbc8c5e744267f10149168db7589e3a5..c608a35d045ff9fe82bfd0b8737ccc78ac56b449 100644 (file)
--- a/input/test/preset-extent.ly
+++ b/input/test/preset-extent.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 \header { texidoc = "
 
 @cindex Preset Extent

diff --git a/input/test/rests.ly b/input/test/rests.ly
index 8f0add54944ecae22587136a190e7294206145f2..cbcc9de4ec64a358b2b1cbefa2ca7c3b1c6b1643 100644 (file)
--- a/input/test/rests.ly
+++ b/input/test/rests.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 \header {
     texidoc = "@cindex Rests
 

diff --git a/input/test/reverse-music.ly b/input/test/reverse-music.ly
index b28b609101baff7d26b09da1d4d7cde330c3e82e..6640823353ab1cbe422cf368b13ca4d948ab41d1 100644 (file)
--- a/input/test/reverse-music.ly
+++ b/input/test/reverse-music.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 % possible rename to scheme-something.
 \header { texidoc="@cindex Scheme Reverse Music
 Symmetric, or palindromical music can be produced, first, by printing

diff --git a/input/test/script-abbreviations.ly b/input/test/script-abbreviations.ly
index 09a50d60930e9c153614a56c3b4983876a802c8f..97eed6342817135dac402a3b84e9989521f06c01 100644 (file)
--- a/input/test/script-abbreviations.ly
+++ b/input/test/script-abbreviations.ly
@@ -1,7 +1,7 @@
 
 % this chart is used in the manual too.
 
-\version "2.4.0"
+\version "2.6.0"
 \header { texidoc = "@cindex Script Abbreviations
 
 Some articulations may be entered using an abbreviation.

diff --git a/input/test/script-chart.ly b/input/test/script-chart.ly
index 61bd630b33be86c8d0fd419124526ce8dcf5d02d..d0eb0cc2bf36b8fb72268186259684d014f7f0e9 100644 (file)
--- a/input/test/script-chart.ly
+++ b/input/test/script-chart.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 % this chart is used in the manual too.
 

diff --git a/input/test/slur-manual.ly b/input/test/slur-manual.ly
index cfa0832e3a8bbd1f54cfa3eb4b6f5c963c25bc23..51534e522545a74b1ffc13bc17ddd8519825fc7d 100644 (file)
--- a/input/test/slur-manual.ly
+++ b/input/test/slur-manual.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 \header {
 
 

diff --git a/input/test/slur-minimum-length.ly b/input/test/slur-minimum-length.ly
index 6528edbcc54b421348d9149c418c1745763fe634..a1994968bd8bc47415b8dfe8cbd7374d0381ccb7 100644 (file)
--- a/input/test/slur-minimum-length.ly
+++ b/input/test/slur-minimum-length.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 
 \header { texidoc = "@cindex Slur Minimum Length
 By setting the minimum length of a slur, notes are more separated. " 

diff --git a/input/test/smart-transpose.ly b/input/test/smart-transpose.ly
index 2449a61112cf4c96d2923432c6d1160d1390e8e3..c164d8fcbf09083e8a88067811a7d3f2193c3bc5 100644 (file)
--- a/input/test/smart-transpose.ly
+++ b/input/test/smart-transpose.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 
 \header {
 texidoc="@cindex Smart Transpose

diff --git a/input/test/spacing-optical.ly b/input/test/spacing-optical.ly
index 092d09ede2ff235236834ffbdb21a909814aa681..c21723657029700879e9f08dc5928e1388c24637 100644 (file)
--- a/input/test/spacing-optical.ly
+++ b/input/test/spacing-optical.ly
@@ -4,7 +4,7 @@ texidoc  = "Stem directions and head positions are taken into account for spacin
 
 }
 
-\version "2.5.19"
+\version "2.6.0"
 
 \paper {
   raggedright = ##t

diff --git a/input/test/staff-bracket.ly b/input/test/staff-bracket.ly
index 3c68d1d3dc0f580d018570f507a87d63b789f8dd..51f6314fa369c6b2af2d7b16c330ce38f2d228c3 100644 (file)
--- a/input/test/staff-bracket.ly
+++ b/input/test/staff-bracket.ly
@@ -1,4 +1,4 @@
-\version "2.4.0" 
+\version "2.6.0" 
 
 \header{ texidoc="@cindex Nested Staff Groups
 Staffs can be nested in various combinations. Here, @code{StaffGroup}

diff --git a/input/test/staff-container.ly b/input/test/staff-container.ly
index 0fbefca8d3b4135260d92dc62181ec9879a3e64e..218693bc02ce337fa8f95962faed8d2f36c2fd56 100644 (file)
--- a/input/test/staff-container.ly
+++ b/input/test/staff-container.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 \header {
 

diff --git a/input/test/staff-lines.ly b/input/test/staff-lines.ly
index 7c17c9f2fcf277f3f437da18518741cd94c118e3..78a9a75d935d77e672c4b460d4684cc41b13375d 100644 (file)
--- a/input/test/staff-lines.ly
+++ b/input/test/staff-lines.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 
 \header {
 

diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly
index ec8efa67ccf3a902235507744c668951a7930df0..633ea32f7f29d0865c98bef891ec6eb1579b4296 100644 (file)
--- a/input/test/staff-size.ly
+++ b/input/test/staff-size.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 \header { texidoc = "@cindex Staff Size
 

diff --git a/input/test/stem-extend.ly b/input/test/stem-extend.ly
index ce0d8fd480e5d6907126066166ebdfcc0c6e7612..056d1cc8deaf9076af7bc52385cf34ec38a25961 100644 (file)
--- a/input/test/stem-extend.ly
+++ b/input/test/stem-extend.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 \header { texidoc = "@cindex Stem Extend
 Extending stems to the center line may be prevented using @code{no-stem-extend}.

diff --git a/input/test/tablature-hammer.ly b/input/test/tablature-hammer.ly
index a372c3cb40df2c911fb458779cfbebcf9b57c297..c478734766fa7b4f027ce9842d53b9c75997d9bd 100644 (file)
--- a/input/test/tablature-hammer.ly
+++ b/input/test/tablature-hammer.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 \header {texidoc = "@cindex Tablature hammer
 A hammer in tablature can be faked with slurs. "
 } 

diff --git a/input/test/temporary-stave.ly b/input/test/temporary-stave.ly
index 8be67dbb5ddccef592164e70104d540fb36d317c..dbcdd63805df5ca54f3a9c36ff480eecde39e19b 100644 (file)
--- a/input/test/temporary-stave.ly
+++ b/input/test/temporary-stave.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 
 \header {
 

diff --git a/input/test/text-rotate.ly b/input/test/text-rotate.ly
index f3832e8a1b747567fc8970750ba68d92ed3df24c..f3552a30a2b2b03c36b1a232d1ea2e62e33a0da6 100644 (file)
--- a/input/test/text-rotate.ly
+++ b/input/test/text-rotate.ly
@@ -16,7 +16,7 @@ output for printing of the source of this example (commenting one line).
 
     }
 
-\version "2.4.0"
+\version "2.6.0"
 
 \score {
 \new Staff  \relative c'' {

diff --git a/input/test/text-spanner.ly b/input/test/text-spanner.ly
index 6f53e9c545eccfec5052a8d035535ed7360c43ad..32d0d573203a10c0aed33d380b5c05613e733909 100644 (file)
--- a/input/test/text-spanner.ly
+++ b/input/test/text-spanner.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.6.0"
 
 \header { texidoc = "@cindex text spanner
 Text spanners can be used in the similar manner than markings for pedals

diff --git a/input/test/unfold-all-repeats.ly b/input/test/unfold-all-repeats.ly
index 32c1226224fcfa605e9e03d9b066e0fe9a604055..cc7e831b13703b37ac70e81faf10995d11f3c354 100644 (file)
--- a/input/test/unfold-all-repeats.ly
+++ b/input/test/unfold-all-repeats.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 \header { 
 texidoc = "Applying the standard function @code{unfold-repeats} unfolds 

diff --git a/input/test/version-output.ly b/input/test/version-output.ly
index 65eccd07bb5e99215150a19d52734bdc2ebe1e3f..f92705de82af261daf6fc404ef47f1f79fdd28df 100644 (file)
--- a/input/test/version-output.ly
+++ b/input/test/version-output.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 
 \header {
 

diff --git a/input/test/vertical-extent.ly b/input/test/vertical-extent.ly
index a38c7c26c9a372ae1945dd565ab91ab2190febd4..494935c3be73fdf19871ec27bbdc8531a8799e1d 100644 (file)
--- a/input/test/vertical-extent.ly
+++ b/input/test/vertical-extent.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.6.0"
 % TODO: huh?  what's this file about?  -gp
 
 \header { texidoc = "

diff --git a/input/test/volta-chord-names.ly b/input/test/volta-chord-names.ly
index 32164c0615558add5ca7d9f7b028edf3dcd12cb0..111efde1e5dbd2b2f9ba6c9ce689d582e803ccab 100644 (file)
--- a/input/test/volta-chord-names.ly
+++ b/input/test/volta-chord-names.ly
@@ -3,7 +3,7 @@
 the @code{voltaOnThisStaff} property to true for the @code{ChordNames} context and to false for the topmost ordinary @code{Staff} context."
 }
 
-\version "2.4.0"
+\version "2.6.0"
 \score { <<
   \new ChordNames \with {
     voltaOnThisStaff = ##t

diff --git a/input/wilhelmus.ly b/input/wilhelmus.ly
index 23b4892cd252a34f64537e4f16d812f9ca771a95..d07c8633e262a903ce78a5cf6fe6df36b2ecd6db 100644 (file)
--- a/input/wilhelmus.ly
+++ b/input/wilhelmus.ly
@@ -1,4 +1,4 @@
-\version "2.5.2"
+\version "2.6.0"
 
 \header {
   texidoc = "Wilhelmus van Nassouwe"

diff --git a/python/convertrules.py b/python/convertrules.py
index 9b244490d70b33cbaf06ab541ddbd9f9f727929f..da970be7fd3cd1590f8ae46e3419018e36447c2a 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2554,8 +2554,7 @@ string."""
                        last_conversion = x[0]
 
        except FatalConversionError:
-               error_file.write (_ ("%s: error while converting") \
-                                 % program_name)
+               error_file.write (_ ("error while converting")) 
                error_file.write ('\n')
                error_file.write (_ ("Aborting"))
                error_file.write ('\n')