From: hanwen <hanwen>
Date: Sun, 26 Jun 2005 22:46:56 +0000 (+0000)
Subject: * Documentation/user/examples.itely (Module): 2.4.0 -> 2.6.0
X-Git-Tag: release/2.7.2~110
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5f9f300a9bfff2f933136e2dbe704c4b66c6f6ac;p=lilypond.git

* 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 14f71b58dd..cfabe01c68 100644
--- 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 1071b46fe5..8dda883571 100644
--- 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 fa26421a36..4b9682f371 100644
--- 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 f4a0339902..7c62ceddde 100644
--- 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 09e7944721..a67de05741 100644
--- 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 44577744cd..2fea8930ef 100644
--- 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 3fe50d91a5..0d4faec693 100644
--- 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 00af0f7194..26ad78c99f 100644
--- 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 14d9b95c4d..8ef2b4624a 100644
--- 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 01306b6fcc..d38c21d170 100644
--- 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 cc97edac18..955d137f48 100644
--- 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 f3fd0d37a4..9fe6d9a365 100644
--- 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 3a9f478edc..6b0d8e7bc8 100644
--- 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 a332525cf9..ce7e5d37b5 100644
--- 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 aa1f1b07e9..cdc9aa1531 100644
--- 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 38ed94d1a0..8db429adb3 100644
--- 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 219de62fc2..d2dfccb7d2 100644
--- 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 cf88badbe1..d5286cda31 100644
--- 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 0b9432c7b2..1afc4a235a 100644
--- 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 d96b9c553d..62d8e76dae 100644
--- 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 41c0f232bd..66f569f5ba 100644
--- 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 c764fdc5fd..76d771c27f 100644
--- 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 0b5a6e4122..29bb85bbb6 100644
--- 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 26b123d960..f6d2c2dbd4 100644
--- 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 7106387c52..783895d984 100644
--- 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 1da264b147..410563313e 100644
--- 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 0008dfc672..bb5b25f3b7 100644
--- 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 60c3b480b0..6fcfa12113 100644
--- 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 3104f7b6b0..76cdf12d52 100644
--- 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 5540f7a218..466a349070 100644
--- 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 533ec75711..c6c517c91f 100644
--- 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 2dffeea3b1..9591fd96d7 100644
--- 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 341e85d06b..088161fc2d 100644
--- 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 8a61a8eafe..585532aa4c 100644
--- 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 fdb902979a..11d8d3ea5d 100644
--- 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 59bd73bcd4..d93e6ea041 100644
--- 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 edd29d0216..6ee16df6ca 100644
--- 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 bc4379c45f..6eebcb11f3 100644
--- 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 835aaed41a..640eab58c2 100644
--- 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 d7f355ff37..29d9c0d3a8 100644
--- 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 b1920f6a8b..bd4b6dcaa4 100644
--- 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 6a68fe1d79..4d5f3a2749 100644
--- 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 6beaa4363b..775d039c01 100644
--- 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 8fbb3f31c6..e5064c5583 100644
--- 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 b038e1a0d7..7eb825da10 100644
--- 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 f4a497a8e4..bd14b805fa 100644
--- 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 2c5d184a36..dd8050814d 100644
--- 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 07089d6cb4..c54f071212 100644
--- 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 3b78f1cc08..50d7cb2c52 100644
--- 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 9e03a1ac5c..5cbd25a279 100644
--- 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 e5062be39c..e151da304c 100644
--- 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 dfdff8d15c..034f120165 100644
--- 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 058d0e1166..d20b040d9a 100644
--- 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 4544c29c4d..3ed084550f 100644
--- 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 3c816cf01b..7de434428a 100644
--- 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 18969e3013..c291893ec0 100644
--- 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 024464c588..8b6f4b1a7b 100644
--- 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 1cc4e71747..aa5776f3e1 100644
--- 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 0c83bf2f09..356fee7701 100644
--- 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 1c05f5bb3d..f15597cd2b 100644
--- 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 88e3d2e8cb..0701d6df95 100644
--- 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 6c0bf5ad24..57f7fca117 100644
--- 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 c447c9a25d..24b1b55061 100644
--- 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 7273323665..1f2547aacc 100644
--- 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 05e6072945..3c40265812 100644
--- 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 4184b7a564..70de21e9b1 100644
--- 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 99741033a0..2c6db58059 100644
--- 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 d08a98a42b..47f06bd859 100644
--- 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 c8e9660d83..a3ad74c574 100644
--- 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 c7582cc054..583cf4da65 100644
--- 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 b0ba5d3bbe..81b43fa1e4 100644
--- 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 471ecb621a..d7f47e7236 100644
--- 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 5e82e10c18..ed428c8ce0 100644
--- 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 3b93ef4ea5..5a1a4cff89 100644
--- 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 9113fdf82b..3f516d92ec 100644
--- 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 ed776622f0..f70ad73502 100644
--- 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 63aebc30ba..bc14e87054 100644
--- 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 043b2f3355..a5a4a30b33 100644
--- 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 9cb4f7c5ad..4222278bea 100644
--- 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 fd31edb902..d1924e9fb3 100644
--- 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 053157f1bb..3075eecfd4 100644
--- 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 3d15a66283..7cb4a6b65b 100644
--- 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 9426bcd75d..b3fa4cd25d 100644
--- 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 6f3ef1456f..00535b076e 100644
--- 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 a12ede9779..0b444e3fe1 100644
--- 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 74fe6337b7..bfd2ed54f0 100644
--- 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 5e869391db..c608a35d04 100644
--- 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 8f0add5494..cbcc9de4ec 100644
--- 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 b28b609101..6640823353 100644
--- 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 09a50d6093..97eed63428 100644
--- 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 61bd630b33..d0eb0cc2bf 100644
--- 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 cfa0832e3a..51534e5225 100644
--- 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 6528edbcc5..a1994968bd 100644
--- 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 2449a61112..c164d8fcbf 100644
--- 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 092d09ede2..c217236570 100644
--- 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 3c68d1d3dc..51f6314fa3 100644
--- 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 0fbefca8d3..218693bc02 100644
--- 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 7c17c9f2fc..78a9a75d93 100644
--- 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 ec8efa67cc..633ea32f7f 100644
--- 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 ce0d8fd480..056d1cc8de 100644
--- 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 a372c3cb40..c478734766 100644
--- 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 8be67dbb5d..dbcdd63805 100644
--- 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 f3832e8a1b..f3552a30a2 100644
--- 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 6f53e9c545..32d0d57320 100644
--- 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 32c1226224..cc7e831b13 100644
--- 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 65eccd07bb..f92705de82 100644
--- 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 a38c7c26c9..494935c3be 100644
--- 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 32164c0615..111efde1e5 100644
--- 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 23b4892cd2..d07c8633e2 100644
--- 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 9b244490d7..da970be7fd 100644
--- 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')