From 9c31b0d42a407a412a324a6586cfb0437de4bfd8 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 1 Apr 2004 10:26:19 +0000
Subject: [PATCH] (conv): add 2.2.0 rule.

---
 ChangeLog                                     | 10 ++++
 input/example-1.ly                            |  2 +-
 input/example-2.ly                            |  2 +-
 input/example-3.ly                            |  2 +-
 input/les-nereides.ly                         |  2 +-
 input/mutopia-header.ly                       |  2 +-
 .../E.Satie/petite-ouverture-a-danser.ly      |  2 +-
 input/mutopia/F.Schubert/morgenlied.ly        |  2 +-
 input/mutopia/F.Schubert/standchen.ly         |  2 +-
 .../J.S.Bach/baerenreiter-sarabande.ly        |  2 +-
 input/mutopia/J.S.Bach/bwv940.ly              |  2 +-
 input/mutopia/J.S.Bach/wtk1-fugue2.ly         |  2 +-
 input/mutopia/R.Schumann/romanze-op28-2.ly    |  2 +-
 input/mutopia/W.A.Mozart/mozart-hrn-3.ly      |  2 +-
 .../mutopia/W.A.Mozart/mozart-hrn3-allegro.ly |  2 +-
 input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly  |  2 +-
 .../mutopia/W.A.Mozart/mozart-hrn3-romanze.ly |  2 +-
 input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly |  2 +-
 input/no-notation/bar-check.ly                |  2 +-
 input/no-notation/beam-warn.ly                |  2 +-
 input/no-notation/denneboom.ly                |  2 +-
 input/no-notation/die-staff.ly                |  2 +-
 input/no-notation/dos-guile.ly                |  2 +-
 input/no-notation/dos-ps.ly                   |  2 +-
 input/no-notation/dos-tex.ly                  |  2 +-
 input/no-notation/midi-grace.ly               |  2 +-
 input/no-notation/midi-lyric-barcheck.ly      |  2 +-
 input/no-notation/midi-transposing.ly         |  2 +-
 input/no-notation/midi-tuplets.ly             |  2 +-
 input/no-notation/midi-volume-equaliser.ly    |  2 +-
 input/no-notation/parse.ly                    |  2 +-
 input/no-notation/parse2.ly                   |  2 +-
 input/no-notation/parse3.ly                   |  2 +-
 input/no-notation/parse4.ly                   |  2 +-
 input/no-notation/parse5.ly                   |  2 +-
 input/no-notation/recording.ly                |  2 +-
 input/no-notation/safe-guile.ly               |  2 +-
 input/no-notation/safe-include.ly             |  2 +-
 input/no-notation/safe-ps.ly                  |  2 +-
 input/no-notation/safe-tex.ly                 |  2 +-
 input/no-notation/textcresc.ly                |  2 +-
 input/puer-fragment.ly                        |  2 +-
 input/regression/+.ly                         |  2 +-
 input/regression/accidental-cautionary.ly     |  2 +-
 input/regression/accidental-double.ly         |  2 +-
 input/regression/accidental-ledger.ly         |  2 +-
 input/regression/accidental-octave.ly         |  2 +-
 input/regression/accidental-placement.ly      |  2 +-
 input/regression/accidental-quarter.ly        |  2 +-
 input/regression/accidental-single-double.ly  |  2 +-
 input/regression/accidental-tie.ly            |  2 +-
 .../accidental-unbroken-tie-spacing.ly        |  2 +-
 input/regression/accidental-voice.ly          |  2 +-
 input/regression/accidental.ly                |  2 +-
 input/regression/accidentals.ly               |  2 +-
 input/regression/allfontstyle.lyinc           |  4 +-
 input/regression/ambitus.ly                   |  2 +-
 input/regression/apply-context.ly             |  2 +-
 input/regression/apply-output.ly              |  2 +-
 input/regression/arpeggio-bracket.ly          |  2 +-
 input/regression/arpeggio-collision.ly        |  2 +-
 input/regression/arpeggio.ly                  |  2 +-
 input/regression/auto-beam-bar.ly             |  2 +-
 input/regression/auto-beam-no-beam.ly         |  2 +-
 input/regression/auto-beam-triplet.ly         |  2 +-
 input/regression/auto-beam-tuplets.ly         |  2 +-
 input/regression/auto-beam.ly                 |  2 +-
 input/regression/auto-change.ly               |  2 +-
 input/regression/balloon.ly                   |  2 +-
 input/regression/bar-number.ly                |  2 +-
 input/regression/bar-scripts.ly               |  2 +-
 input/regression/beam-auto-knee.ly            |  2 +-
 input/regression/beam-break.ly                |  2 +-
 input/regression/beam-center-slope.ly         |  2 +-
 input/regression/beam-concave.ly              |  2 +-
 .../regression/beam-cross-staff-auto-knee.ly  |  2 +-
 input/regression/beam-cross-staff-slope.ly    |  2 +-
 input/regression/beam-cross-staff.ly          |  2 +-
 input/regression/beam-damp.ly                 |  2 +-
 input/regression/beam-default-lengths.ly      |  2 +-
 input/regression/beam-extreme.ly              |  2 +-
 input/regression/beam-french.ly               |  2 +-
 input/regression/beam-funky-beamlet.ly        |  2 +-
 input/regression/beam-funky.ly                |  2 +-
 input/regression/beam-knee-symmetry.ly        |  2 +-
 input/regression/beam-length.ly               |  2 +-
 input/regression/beam-manual-beaming.ly       |  2 +-
 input/regression/beam-multiple-cross-staff.ly |  2 +-
 input/regression/beam-over-barline.ly         |  2 +-
 input/regression/beam-position.ly             |  2 +-
 input/regression/beam-postfix-notation.ly     |  2 +-
 input/regression/beam-quanting-32nd.ly        |  2 +-
 input/regression/beam-quanting-horizontal.ly  |  2 +-
 input/regression/beam-quarter.ly              |  2 +-
 input/regression/beam-rest.ly                 |  2 +-
 input/regression/beam-second.ly               |  2 +-
 input/regression/beam-shortened-lengths.ly    |  2 +-
 input/regression/beamed-chord.ly              |  2 +-
 input/regression/beaming-ternary-metrum.ly    |  2 +-
 input/regression/beaming.ly                   |  2 +-
 input/regression/beams.ly                     |  2 +-
 input/regression/between-systems.ly           |  2 +-
 input/regression/break.ly                     |  2 +-
 input/regression/breathing-sign-ancient.ly    |  2 +-
 input/regression/breathing-sign.ly            |  2 +-
 input/regression/chord-changes.ly             |  2 +-
 input/regression/chord-name-entry-11.ly       |  2 +-
 input/regression/chord-name-entry.ly          |  2 +-
 input/regression/chord-name-exceptions.ly     |  2 +-
 input/regression/chord-name-major7.ly         |  2 +-
 input/regression/chord-names-bass.ly          |  2 +-
 input/regression/chord-scripts.ly             |  2 +-
 input/regression/chord-tremolo-short.ly       |  2 +-
 input/regression/chord-tremolo.ly             |  2 +-
 input/regression/chords-funky-ignatzek.ly     |  2 +-
 input/regression/clef-oct.ly                  |  2 +-
 input/regression/clefs.ly                     |  2 +-
 input/regression/cluster-cross-staff.ly       |  2 +-
 input/regression/cluster.ly                   |  2 +-
 input/regression/collision-2.ly               |  2 +-
 input/regression/collision-dots-invert.ly     |  2 +-
 input/regression/collision-dots-move.ly       |  2 +-
 input/regression/collision-dots.ly            |  2 +-
 input/regression/collision-head-chords.ly     |  2 +-
 input/regression/collision-heads.ly           |  2 +-
 .../collision-merge-differently-dotted.ly     |  2 +-
 input/regression/collision-merge-dots.ly      |  2 +-
 input/regression/collision-mesh.ly            |  2 +-
 input/regression/collisions.ly                |  2 +-
 .../regression/completion-heads-polyphony.ly  |  2 +-
 input/regression/completion-heads.ly          |  2 +-
 input/regression/custos.ly                    |  2 +-
 input/regression/dot-flag-collision.ly        |  2 +-
 input/regression/dots.ly                      |  2 +-
 input/regression/drums.ly                     |  2 +-
 input/regression/dynamics-broken-hairpin.ly   |  2 +-
 input/regression/dynamics-glyphs.ly           |  2 +-
 input/regression/dynamics-line.ly             |  2 +-
 input/regression/dynamics-unbound-hairpin.ly  |  2 +-
 input/regression/easy-notation.ly             |  2 +-
 input/regression/figured-bass.ly              |  2 +-
 input/regression/finger-chords.ly             |  2 +-
 input/regression/fingering.ly                 |  2 +-
 input/regression/follow-voice-break.ly        |  2 +-
 input/regression/font-magnification.ly        |  2 +-
 input/regression/font-name.ly                 |  2 +-
 input/regression/generic-output-property.ly   |  2 +-
 input/regression/glissando.ly                 |  2 +-
 input/regression/grace-auto-beam.ly           |  2 +-
 input/regression/grace-bar-line.ly            |  2 +-
 input/regression/grace-bar-number.ly          |  2 +-
 input/regression/grace-beam.ly                |  2 +-
 input/regression/grace-end.ly                 |  2 +-
 input/regression/grace-nest.ly                |  2 +-
 input/regression/grace-nest1.ly               |  2 +-
 input/regression/grace-nest2.ly               |  2 +-
 input/regression/grace-nest3.ly               |  2 +-
 input/regression/grace-nest4.ly               |  2 +-
 input/regression/grace-nest5.ly               |  2 +-
 input/regression/grace-part-combine.ly        |  2 +-
 input/regression/grace-staff-length.ly        |  2 +-
 input/regression/grace-start.ly               |  2 +-
 input/regression/grace-stems.ly               |  2 +-
 input/regression/grace-sync.ly                |  2 +-
 input/regression/grace-types.ly               |  2 +-
 input/regression/grace-unfold-repeat.ly       |  2 +-
 input/regression/grace-volta-repeat-2.ly      |  2 +-
 input/regression/grace-volta-repeat.ly        |  2 +-
 input/regression/grace.ly                     |  2 +-
 input/regression/hairpin-dashed.ly            |  2 +-
 input/regression/hairpin-ending.ly            |  2 +-
 input/regression/hara-kiri-pianostaff.ly      |  2 +-
 input/regression/instrument-name-markup.ly    |  2 +-
 input/regression/instrument-name-partial.ly   |  2 +-
 input/regression/instrument-name.ly           |  2 +-
 input/regression/key-clefs.ly                 |  2 +-
 input/regression/key-signature-scordatura.ly  |  2 +-
 input/regression/keys.ly                      |  2 +-
 input/regression/lyric-combine-new.ly         |  2 +-
 input/regression/lyric-combine-polyphonic.ly  |  2 +-
 input/regression/lyric-combine.ly             |  2 +-
 input/regression/lyric-extender-broken.ly     |  2 +-
 input/regression/lyric-extender.ly            |  2 +-
 input/regression/lyric-hyphen-break.ly        |  2 +-
 input/regression/lyric-hyphen.ly              |  2 +-
 input/regression/lyric-phrasing.ly            |  2 +-
 input/regression/lyrics-bar.ly                |  2 +-
 input/regression/lyrics-melisma-beam.ly       |  2 +-
 input/regression/markup-note.ly               |  2 +-
 input/regression/markup-stack.ly              |  2 +-
 input/regression/markup-user.ly               |  2 +-
 input/regression/measure-grouping.ly          |  2 +-
 input/regression/mensural.ly                  |  2 +-
 input/regression/metronome-marking.ly         |  2 +-
 input/regression/mm-rests2.ly                 |  2 +-
 input/regression/molecule-hacking.ly          |  2 +-
 input/regression/multi-measure-rest-center.ly |  2 +-
 input/regression/multi-measure-rest-grace.ly  |  2 +-
 .../multi-measure-rest-instr-name.ly          |  2 +-
 .../multi-measure-rest-multi-staff-center.ly  |  2 +-
 .../regression/multi-measure-rest-spacing.ly  |  2 +-
 input/regression/multi-measure-rest-text.ly   |  2 +-
 input/regression/multi-measure-rest.ly        |  2 +-
 input/regression/new-markup-scheme.ly         |  2 +-
 input/regression/new-markup-syntax.ly         |  2 +-
 input/regression/non-empty-text.ly            |  2 +-
 input/regression/note-group-bracket.ly        |  2 +-
 input/regression/note-head-chord.ly           |  2 +-
 input/regression/note-head-harmonic.ly        |  2 +-
 input/regression/note-head-style.ly           |  2 +-
 input/regression/note-line.ly                 |  2 +-
 input/regression/number-staff-lines.ly        |  2 +-
 input/regression/ottava-broken.ly             |  2 +-
 input/regression/ottava.ly                    |  2 +-
 input/regression/part-combine-a2.ly           |  2 +-
 input/regression/part-combine-global.ly       |  2 +-
 input/regression/part-combine-solo-global.ly  |  2 +-
 input/regression/part-combine-solo.ly         |  2 +-
 input/regression/part-combine-text.ly         |  2 +-
 input/regression/part-combine.ly              |  2 +-
 input/regression/pedal-bracket.ly             |  2 +-
 input/regression/pedal-end.ly                 |  2 +-
 input/regression/pedal-ped.ly                 |  2 +-
 input/regression/phrasing-slur.ly             |  2 +-
 input/regression/prefatory-empty-spacing.ly   |  2 +-
 input/regression/prefatory-spacing-matter.ly  |  2 +-
 input/regression/property-grace-polyphony.ly  |  2 +-
 input/regression/property-once.ly             |  2 +-
 input/regression/quote-transposition.ly       |  2 +-
 input/regression/quote.ly                     |  2 +-
 input/regression/rehearsal-mark-letter.ly     |  2 +-
 input/regression/rehearsal-mark-number.ly     |  2 +-
 input/regression/repeat-fold.ly               |  2 +-
 input/regression/repeat-line-break.ly         |  2 +-
 input/regression/repeat-percent-skipbars.ly   |  2 +-
 input/regression/repeat-percent.ly            |  2 +-
 input/regression/repeat-slash.ly              |  2 +-
 input/regression/repeat-unfold-all.ly         |  2 +-
 input/regression/repeat-unfold.ly             |  2 +-
 .../repeat-volta-skip-alternatives.ly         |  2 +-
 input/regression/repeat-volta.ly              |  2 +-
 input/regression/rest-collision-beam.ly       |  2 +-
 input/regression/rest-collision.ly            |  2 +-
 input/regression/rest-ledger.ly               |  2 +-
 input/regression/rest-pitch.ly                |  2 +-
 input/regression/rest-polyphonic.ly           |  2 +-
 input/regression/rest.ly                      |  2 +-
 input/regression/rhythmic-staff.ly            |  2 +-
 input/regression/script-collision.ly          |  2 +-
 input/regression/script-stack-order.ly        |  2 +-
 input/regression/script-stacked.ly            |  2 +-
 input/regression/size11.ly                    |  2 +-
 input/regression/size13.ly                    |  2 +-
 input/regression/size16.ly                    |  2 +-
 input/regression/size20.ly                    |  2 +-
 input/regression/size23.ly                    |  2 +-
 input/regression/size26.ly                    |  2 +-
 input/regression/slur-area.ly                 |  2 +-
 input/regression/slur-attachment.ly           |  2 +-
 input/regression/slur-broken-trend.ly         |  2 +-
 input/regression/slur-cross-staff.ly          |  2 +-
 input/regression/slur-dots.ly                 |  2 +-
 input/regression/slur-nice.ly                 |  2 +-
 input/regression/slur-rest.ly                 |  2 +-
 input/regression/slur-staccato.ly             |  2 +-
 input/regression/slur-stem-broken.ly          |  2 +-
 input/regression/slur-symmetry-1.ly           |  2 +-
 input/regression/slur-symmetry.ly             |  2 +-
 input/regression/spacing-accidental-staffs.ly |  2 +-
 .../regression/spacing-accidental-stretch.ly  |  2 +-
 input/regression/spacing-accidental.ly        |  2 +-
 input/regression/spacing-bar-stem.ly          |  2 +-
 input/regression/spacing-clef-first-note.ly   |  2 +-
 input/regression/spacing-end-of-line.ly       |  2 +-
 input/regression/spacing-ended-voice.ly       |  2 +-
 input/regression/spacing-folded-clef.ly       |  2 +-
 input/regression/spacing-folded-clef2.ly      |  2 +-
 input/regression/spacing-grace-duration.ly    |  2 +-
 input/regression/spacing-grace.ly             |  2 +-
 input/regression/spacing-knee.ly              |  2 +-
 input/regression/spacing-multi-tuplet.ly      |  2 +-
 input/regression/spacing-note-flags.ly        |  2 +-
 input/regression/spacing-ragged-last.ly       |  2 +-
 input/regression/spacing-rest.ly              |  2 +-
 input/regression/spacing-short-notes.ly       |  2 +-
 input/regression/spacing-stem-bar.ly          |  2 +-
 input/regression/spacing-stem-direction.ly    |  2 +-
 .../regression/spacing-stem-same-direction.ly |  2 +-
 input/regression/spacing-to-grace.ly          |  2 +-
 input/regression/spacing-very-tight.ly        |  2 +-
 input/regression/span-bar.ly                  |  2 +-
 input/regression/staccato-pos.ly              |  2 +-
 input/regression/staff-halfway.ly             |  2 +-
 input/regression/staff-mixed-size.ly          |  2 +-
 input/regression/staff-tweak.ly               |  2 +-
 input/regression/stanza-number.ly             |  2 +-
 input/regression/stem-direction.ly            |  2 +-
 input/regression/stem-shorten.ly              |  2 +-
 input/regression/stem-spacing.ly              |  2 +-
 input/regression/stem-tremolo.ly              |  2 +-
 input/regression/system-extents.ly            |  2 +-
 input/regression/system-start-bracket.ly      |  2 +-
 input/regression/tablature-string-tunings.ly  |  2 +-
 input/regression/tablature.ly                 |  2 +-
 input/regression/tag-filter.ly                |  2 +-
 input/regression/text-spanner.ly              |  2 +-
 input/regression/tie-busy-grobs.ly            |  2 +-
 input/regression/tie-chord.ly                 |  2 +-
 input/regression/tie-dots.ly                  |  2 +-
 input/regression/tie-grace.ly                 |  2 +-
 input/regression/tie.ly                       |  2 +-
 input/regression/tuplet-beam.ly               |  2 +-
 input/regression/tuplet-gap.ly                |  2 +-
 input/regression/tuplet-nest.ly               |  2 +-
 input/regression/tuplet-properties.ly         |  2 +-
 input/regression/tuplet-rest.ly               |  2 +-
 input/regression/tuplet-slope.ly              |  2 +-
 .../regression/tuplet-staffline-collision.ly  |  2 +-
 input/regression/tuplets.ly                   |  2 +-
 input/regression/voice-follower.ly            |  2 +-
 input/regression/volta-broken-left-edge.ly    |  2 +-
 input/regression/volta-multi-staff.ly         |  2 +-
 input/screech-boink.ly                        |  2 +-
 input/template/gregorian-transcription.ly     |  2 +-
 input/template/header.ly                      |  2 +-
 input/template/jazz-combo.ly                  |  2 +-
 input/template/melody-chords.ly               |  2 +-
 input/template/melody-lyrics-chords.ly        |  2 +-
 input/template/melody-lyrics.ly               |  2 +-
 input/template/melody.ly                      |  2 +-
 input/template/piano-4-voices.ly              |  2 +-
 input/template/piano-dynamics.ly              |  2 +-
 input/template/piano-lyrics.ly                |  2 +-
 input/template/piano-melody-lyrics.ly         |  2 +-
 input/template/piano.ly                       |  2 +-
 input/template/satb.ly                        |  2 +-
 input/test/+.ly                               |  2 +-
 input/test/add-staccato.ly                    |  2 +-
 input/test/add-text-script.ly                 |  2 +-
 input/test/ambitus-mixed.ly                   |  2 +-
 input/test/ancient-accidentals.ly             |  2 +-
 input/test/ancient-font.ly                    |  2 +-
 input/test/ancient-time.ly                    |  2 +-
 input/test/bagpipe.ly                         |  2 +-
 input/test/bar-always.ly                      |  2 +-
 input/test/bar-lines-lyric-only.ly            |  2 +-
 input/test/bar-lines.ly                       |  2 +-
 input/test/bar-number-every-five-reset.ly     |  2 +-
 input/test/bar-number-regular-interval.ly     |  2 +-
 input/test/bar-number-show-all.ly             |  2 +-
 input/test/beam-alternate.ly                  |  2 +-
 input/test/beam-auto-4-8.ly                   |  2 +-
 input/test/beam-auto-override.ly              |  2 +-
 input/test/beam-auto.ly                       |  2 +-
 input/test/beam-control.ly                    |  2 +-
 input/test/beam-count.ly                      |  2 +-
 input/test/beam-dir-functions.ly              |  2 +-
 input/test/beam-isknee.ly                     |  2 +-
 input/test/beam-neutral-direction.ly          |  2 +-
 input/test/beam-rest.ly                       |  2 +-
 input/test/blank-notes.ly                     |  2 +-
 input/test/blank-paper-tab.ly                 |  2 +-
 input/test/blank-paper.ly                     |  2 +-
 input/test/boxed-molecule.ly                  |  2 +-
 input/test/caps.ly                            |  2 +-
 input/test/cautionaries.ly                    |  2 +-
 input/test/chord-names-german.ly              |  2 +-
 input/test/chord-names-jazz.ly                |  2 +-
 input/test/chord-names-no-inversions.ly       |  2 +-
 input/test/chords-without-melody.ly           |  2 +-
 input/test/clef-8-syntax.ly                   |  2 +-
 input/test/clef-end-of-line.ly                |  2 +-
 input/test/clef-manual-control.ly             |  2 +-
 input/test/coriolan-margin.ly                 |  2 +-
 input/test/count-systems.ly                   |  2 +-
 input/test/crescendi.ly                       |  2 +-
 input/test/cue-notes.ly                       |  2 +-
 input/test/divisiones.ly                      |  2 +-
 input/test/drarn-slurs.ly                     |  2 +-
 input/test/drarn.ly                           |  2 +-
 input/test/dynamic-absolute-volume.ly         |  2 +-
 input/test/dynamic-extra.ly                   |  2 +-
 input/test/embedded-postscript.ly             |  2 +-
 input/test/embedded-scm.ly                    |  2 +-
 input/test/embedded-tex.ly                    |  2 +-
 input/test/engraver-contexts.ly               |  2 +-
 input/test/engraver-example.lyinc             |  2 +-
 input/test/engraver-one-by-one.ly             |  2 +-
 input/test/extra-staff.ly                     |  2 +-
 input/test/figured-bass-alternate.ly          |  2 +-
 input/test/fill-a4.ly                         |  2 +-
 input/test/follow-voice.ly                    |  2 +-
 input/test/force-hshift.ly                    |  2 +-
 input/test/gourlay.ly                         |  2 +-
 input/test/gregorian-scripts.ly               |  2 +-
 input/test/harmonic.ly                        |  2 +-
 input/test/header-ifelse.ly                   |  2 +-
 input/test/hshift.ly                          |  2 +-
 input/test/hymn.ly                            |  2 +-
 input/test/improv.ly                          |  2 +-
 input/test/incipit.ly                         |  2 +-
 input/test/instrument-name-grandstaff.ly      |  2 +-
 input/test/ligature-vaticana.ly               |  2 +-
 input/test/lilypond-testpage.ly               |  2 +-
 input/test/lyric-hyphen-retain.ly             |  2 +-
 input/test/lyrics-skip-notes.ly               |  2 +-
 input/test/mensural-ligatures.ly              |  2 +-
 input/test/mensural-note-heads.ly             |  2 +-
 input/test/midi-scales.ly                     |  2 +-
 input/test/move-accidentals.ly                |  2 +-
 input/test/move-specific-text.ly              |  2 +-
 input/test/music-box.ly                       |  4 +-
 input/test/music-creation.ly                  |  2 +-
 input/test/no-bar-lines.ly                    |  2 +-
 input/test/no-staff.ly                        |  2 +-
 input/test/ossia.ly                           |  2 +-
 input/test/page-breaks.ly                     |  4 +-
 input/test/part-combine.ly                    |  2 +-
 input/test/partial-blank.ly                   |  2 +-
 input/test/phrasing-slur-height.ly            |  2 +-
 input/test/piano-staff-distance.ly            |  2 +-
 input/test/polymetric-differing-notes.ly      |  2 +-
 input/test/polymetric.ly                      |  2 +-
 input/test/preset-extent.ly                   |  2 +-
 input/test/repeat-manual.ly                   |  2 +-
 input/test/repeat-shorter-bracket.ly          |  2 +-
 input/test/repeat.ly                          |  2 +-
 input/test/rest-dot-positions.ly              |  2 +-
 input/test/rests.ly                           |  2 +-
 input/test/reverse-music.ly                   |  2 +-
 input/test/rhythm-excercise.ly                |  2 +-
 input/test/scales-greek.ly                    |  2 +-
 input/test/scheme-interactions.ly             |  2 +-
 input/test/script-abbreviations.ly            |  2 +-
 input/test/script-chart.ly                    |  2 +-
 input/test/script-priority.ly                 |  2 +-
 input/test/script-stack.ly                    |  2 +-
 input/test/separate-staccato.ly               |  2 +-
 input/test/slur-attachment-override.ly        |  2 +-
 input/test/slur-beautiful.ly                  |  2 +-
 input/test/slur-dash.ly                       |  2 +-
 input/test/slur-manual.ly                     |  2 +-
 input/test/slur-minimum-length.ly             |  2 +-
 input/test/slur-ugly.ly                       |  2 +-
 input/test/smart-transpose.ly                 |  2 +-
 input/test/spacing-2.ly                       |  2 +-
 input/test/spanner-after-break-tweak.ly       |  2 +-
 input/test/staff-bracket.ly                   |  2 +-
 input/test/staff-container.ly                 |  2 +-
 input/test/staff-lines.ly                     |  2 +-
 input/test/staff-size.ly                      |  2 +-
 input/test/staff-space.ly                     |  2 +-
 input/test/stem-cross-staff.ly                |  2 +-
 input/test/stem-extend.ly                     |  2 +-
 input/test/stem-length.ly                     |  2 +-
 input/test/tablature-hammer.ly                |  2 +-
 input/test/tablature.ly                       |  2 +-
 input/test/temporary-stave.ly                 |  2 +-
 input/test/text-rotate.ly                     |  2 +-
 input/test/text-spanner.ly                    |  2 +-
 input/test/textscript.ly                      |  2 +-
 input/test/tie-cross-voice.ly                 |  2 +-
 input/test/time-signature-double.ly           |  2 +-
 input/test/time.ly                            |  2 +-
 input/test/timing.ly                          |  2 +-
 input/test/title-markup.ly                    |  2 +-
 input/test/title.ly                           |  2 +-
 input/test/to-xml.ly                          |  2 +-
 input/test/transposition.ly                   |  2 +-
 input/test/trill.ly                           |  2 +-
 input/test/trills.ly                          |  2 +-
 input/test/unfold-all-repeats.ly              |  2 +-
 input/test/version-output.ly                  |  2 +-
 input/test/vertical-extent.ly                 |  2 +-
 input/tutorial/brahms-original.ly             |  2 +-
 input/tutorial/brahms-tweaked.ly              |  2 +-
 input/twinkle-pop.ly                          |  2 +-
 input/wilhelmus.ly                            |  2 +-
 lily/accidental-placement.cc                  | 10 ++--
 lily/change-iterator.cc                       | 16 +++--
 lily/cluster.cc                               |  2 +-
 lily/context.cc                               |  6 +-
 lily/include/context.hh                       |  2 +-
 lily/lyric-engraver.cc                        |  4 +-
 lily/parse-scm.cc                             |  3 +-
 lily/parser.yy                                | 58 +++++++++++--------
 ly/a3-init.ly                                 |  2 +-
 ly/a4-init.ly                                 |  2 +-
 ly/accordion-defs-init.ly                     |  2 +-
 ly/book-init-init.ly                          |  2 +-
 ly/catalan.ly                                 |  2 +-
 ly/center-init.ly                             |  2 +-
 ly/chord-modifiers-init.ly                    |  2 +-
 ly/declarations-init.ly                       |  2 +-
 ly/deutsch.ly                                 |  2 +-
 ly/drumpitch-init.ly                          |  2 +-
 ly/dynamic-scripts-init.ly                    |  2 +-
 ly/english.ly                                 |  2 +-
 ly/engraver-init.ly                           |  2 +-
 ly/espanol.ly                                 |  2 +-
 ly/generate-documentation.ly                  |  2 +-
 ly/generate-interface-doc-init.ly             |  2 +-
 ly/grace-init.ly                              |  2 +-
 ly/gregorian-init.ly                          |  2 +-
 ly/init.ly                                    |  2 +-
 ly/italiano.ly                                |  2 +-
 ly/legal-init.ly                              |  2 +-
 ly/letter-init.ly                             |  2 +-
 ly/midi-init.ly                               |  2 +-
 ly/nederlands.ly                              |  2 +-
 ly/norsk.ly                                   |  2 +-
 ly/params-init.ly                             |  2 +-
 ly/part-paper-init.ly                         |  2 +-
 ly/performer-init.ly                          |  6 +-
 ly/property-init.ly                           |  2 +-
 ly/scale-definitions-init.ly                  |  2 +-
 ly/script-init.ly                             |  2 +-
 ly/spanners-init.ly                           |  2 +-
 ly/suomi.ly                                   |  2 +-
 ly/svenska.ly                                 |  2 +-
 ly/tabloid-init.ly                            |  2 +-
 scripts/convert-ly.py                         |  8 +++
 522 files changed, 595 insertions(+), 558 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 00178da948..f57c343f32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-01  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+	* VERSION (PACKAGE_NAME): release 2.2.0
+
+	* scripts/convert-ly.py (conv): add 2.2.0 rule.
+
 2004-04-01  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* lily/cluster.cc (height): Fix warning.
@@ -8,6 +14,10 @@
 
 2004-04-01  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* lily/change-iterator.cc (process): search at multiple context
+	levels. This fixes 
+
+	
 	* scm/part-combiner.scm (analyse-spanner-states): use split-index,
 	not voice-state index for tie state. This fixes a partcombine
 	problem with ties.
diff --git a/input/example-1.ly b/input/example-1.ly
index 3e84a09de9..4be16cfa22 100644
--- a/input/example-1.ly
+++ b/input/example-1.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 
 % A simple scale in LilyPond
 %
diff --git a/input/example-2.ly b/input/example-2.ly
index 4f394bcb64..2819902ad5 100644
--- a/input/example-2.ly
+++ b/input/example-2.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 % Some beamed and slurred notes of different taste in LilyPond
 %
 % Type:
diff --git a/input/example-3.ly b/input/example-3.ly
index d85a2ef5d1..4e3a924d5a 100644
--- a/input/example-3.ly
+++ b/input/example-3.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "2.1.28"
+\version "2.1.36"
 
 one = \notes\relative c{
 	c'' d e f
diff --git a/input/les-nereides.ly b/input/les-nereides.ly
index 93702ec3fa..1b86a31d30 100644
--- a/input/les-nereides.ly
+++ b/input/les-nereides.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "2.1.29"
+\version "2.1.36"
 
 \header {
     composer = "ARTHUR GRAY"
diff --git a/input/mutopia-header.ly b/input/mutopia-header.ly
index 80724680f7..a7e1d7312a 100644
--- a/input/mutopia-header.ly
+++ b/input/mutopia-header.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 \header {
   title =	"Title"
   subtitle =	"Subtitle"
diff --git a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
index 26a5955909..632a225ea2 100644
--- a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
+++ b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
@@ -7,7 +7,7 @@
   copyright = "Public Domain"
 }
 
-\version "2.1.29"
+\version "2.1.36"
 
 \include "nederlands.ly"
 
diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly
index 086eeeaf01..271fb6b872 100644
--- a/input/mutopia/F.Schubert/morgenlied.ly
+++ b/input/mutopia/F.Schubert/morgenlied.ly
@@ -27,7 +27,7 @@ been lowered
 
 }
 
-\version "2.1.29"
+\version "2.1.36"
 manuscriptBreak = { \break }
 
 
diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly
index 3762e487b1..b05ba29d24 100644
--- a/input/mutopia/F.Schubert/standchen.ly
+++ b/input/mutopia/F.Schubert/standchen.ly
@@ -42,7 +42,7 @@ instrument = "Piano"
  footer = "Mutopia-2001/04/27-xx"
 } 
 
-\version "2.1.29"
+\version "2.1.36"
 
 dynamicUp = \override DynamicLineSpanner  #'direction = #1
 dynamicRevert = \revert DynamicLineSpanner #'direction
diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
index 08a53867c7..6ba03c60ad 100644
--- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
+++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
@@ -1,4 +1,4 @@
-\version "2.1.29"
+\version "2.1.36"
 
 % #(ly:set-point-and-click 'line-column)
 
diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly
index 40587b59e4..20b592fbd3 100644
--- a/input/mutopia/J.S.Bach/bwv940.ly
+++ b/input/mutopia/J.S.Bach/bwv940.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "2.1.29"
+\version "2.1.36"
 
 %{
  Header for Petites Preludes.
diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly
index c98b4dc7b6..c73120a0f2 100644
--- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly
+++ b/input/mutopia/J.S.Bach/wtk1-fugue2.ly
@@ -36,7 +36,7 @@
 %}
 
 
-\version "2.1.29"
+\version "2.1.36"
 
 
 
diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly
index 69d79029ec..b9299d78d7 100644
--- a/input/mutopia/R.Schumann/romanze-op28-2.ly
+++ b/input/mutopia/R.Schumann/romanze-op28-2.ly
@@ -4,7 +4,7 @@
 \include "deutsch.ly"
 
 #(set-global-staff-size 16)
-\version "2.1.29"
+\version "2.1.36"
 
 \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 5091326ac3..6ff2b2472d 100644
--- a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
@@ -44,7 +44,7 @@ virtuoso that taught in Geneva.
 
 %}
 
-\version "2.1.28"
+\version "2.1.36"
 
 \include "mozart-hrn3-defs.ly"
 \include "mozart-hrn3-allegro.ly"
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly
index 6317f5bff7..bab8b18469 100644
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "2.1.28"
+\version "2.1.36"
 \include  "mozart-hrn3-defs.ly"
 
 allegro =
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly
index c8710e95ab..b652f55a2a 100644
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly
@@ -4,7 +4,7 @@ longgrace = \override Stem  #'stroke-style = #'()
 endlonggrace = \revert Stem #'stroke-style
 ritenuto = \markup { \italic  "rit." }
 
-\version "2.1.29"
+\version "2.1.36"
   
 cresc = \notes {
     #(ly:export (make-event-chord (list (make-span-event 'CrescendoEvent START)))) 
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly
index ab01380ac0..917aaf4bca 100644
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly
@@ -1,6 +1,6 @@
 #(ly:set-option 'old-relative)
 
-\version "2.1.28"
+\version "2.1.36"
 \include  "mozart-hrn3-defs.ly"
 
 romanze = \notes \relative c' {
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly
index 1b5be8b0c1..7e6f6ce853 100644
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "2.1.28"
+\version "2.1.36"
 
 % \include "mozart-hrn3-defs.ly"
 
diff --git a/input/no-notation/bar-check.ly b/input/no-notation/bar-check.ly
index cb6dca74eb..bcf3d5f543 100644
--- a/input/no-notation/bar-check.ly
+++ b/input/no-notation/bar-check.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 
 \header {
 
diff --git a/input/no-notation/beam-warn.ly b/input/no-notation/beam-warn.ly
index 3167773d10..efdc3efad6 100644
--- a/input/no-notation/beam-warn.ly
+++ b/input/no-notation/beam-warn.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 
 \header	{
 
diff --git a/input/no-notation/denneboom.ly b/input/no-notation/denneboom.ly
index be15701738..9a9c9cc02d 100644
--- a/input/no-notation/denneboom.ly
+++ b/input/no-notation/denneboom.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 \header{
 filename = 	 "denneboom.ly"
 enteredby = 	 "jcn"
diff --git a/input/no-notation/die-staff.ly b/input/no-notation/die-staff.ly
index 3f6d5b4a0a..52b03ade92 100644
--- a/input/no-notation/die-staff.ly
+++ b/input/no-notation/die-staff.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 
 \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 a2bb9fbd9e..0a7f62426a 100644
--- a/input/no-notation/dos-guile.ly
+++ b/input/no-notation/dos-guile.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 
 \header{
     
diff --git a/input/no-notation/dos-ps.ly b/input/no-notation/dos-ps.ly
index 27f6e3de44..3577f56f45 100644
--- a/input/no-notation/dos-ps.ly
+++ b/input/no-notation/dos-ps.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 
 \header{
 
diff --git a/input/no-notation/dos-tex.ly b/input/no-notation/dos-tex.ly
index 8c9689d790..b4ae38ac34 100644
--- a/input/no-notation/dos-tex.ly
+++ b/input/no-notation/dos-tex.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 
 \header{
     
diff --git a/input/no-notation/midi-grace.ly b/input/no-notation/midi-grace.ly
index d17f73a162..761b562825 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.1.28"
+\version "2.1.36"
 \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 c581549901..843df22123 100644
--- a/input/no-notation/midi-lyric-barcheck.ly
+++ b/input/no-notation/midi-lyric-barcheck.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 \header {
 
     texidoc = "Lyrics in MIDI are aligned to ties and beams:
diff --git a/input/no-notation/midi-transposing.ly b/input/no-notation/midi-transposing.ly
index 983ce0074f..6817134009 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.1.28"
+\version "2.1.36"
 
 \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 5083bb005c..b17805ef42 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.1.28"
+\version "2.1.36"
 \header {
 texidoc = "
 
diff --git a/input/no-notation/midi-volume-equaliser.ly b/input/no-notation/midi-volume-equaliser.ly
index 46e9e3c041..9abea55b5e 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.1.29"
+\version "2.1.36"
 \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 194af12f83..8c8e56cefd 100644
--- a/input/no-notation/parse.ly
+++ b/input/no-notation/parse.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 
 % Test parser error
 
diff --git a/input/no-notation/parse2.ly b/input/no-notation/parse2.ly
index 6092d7649f..1e2cc459c8 100644
--- a/input/no-notation/parse2.ly
+++ b/input/no-notation/parse2.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 
 % Test parser error
 
diff --git a/input/no-notation/parse3.ly b/input/no-notation/parse3.ly
index 2f5a243b5c..b0334560d0 100644
--- a/input/no-notation/parse3.ly
+++ b/input/no-notation/parse3.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 
 % Test parser error
 
diff --git a/input/no-notation/parse4.ly b/input/no-notation/parse4.ly
index ef5ba4bde9..cc99f2a236 100644
--- a/input/no-notation/parse4.ly
+++ b/input/no-notation/parse4.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 
 % Test parser error
 
diff --git a/input/no-notation/parse5.ly b/input/no-notation/parse5.ly
index fa8075033d..6ddac7a000 100644
--- a/input/no-notation/parse5.ly
+++ b/input/no-notation/parse5.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 %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 425c5973fd..d4309f1670 100644
--- a/input/no-notation/recording.ly
+++ b/input/no-notation/recording.ly
@@ -1,4 +1,4 @@
-\version "2.1.29"
+\version "2.1.36"
 \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 edab8bcce1..fdf561c236 100644
--- a/input/no-notation/safe-guile.ly
+++ b/input/no-notation/safe-guile.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 
 \header{
     
diff --git a/input/no-notation/safe-include.ly b/input/no-notation/safe-include.ly
index 5b51ef3168..10cfb8a2e9 100644
--- a/input/no-notation/safe-include.ly
+++ b/input/no-notation/safe-include.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 
 \header{
     
diff --git a/input/no-notation/safe-ps.ly b/input/no-notation/safe-ps.ly
index 0f84bb35b5..93f18d3e94 100644
--- a/input/no-notation/safe-ps.ly
+++ b/input/no-notation/safe-ps.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 
 \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 7506f4ede3..88489d18f6 100644
--- a/input/no-notation/safe-tex.ly
+++ b/input/no-notation/safe-tex.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 
 \header{
     
diff --git a/input/no-notation/textcresc.ly b/input/no-notation/textcresc.ly
index 5584bfed2e..2edda54399 100644
--- a/input/no-notation/textcresc.ly
+++ b/input/no-notation/textcresc.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 \header{
 texidoc="crashes lily"
 }
diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly
index 9b730473da..50080c53c6 100644
--- a/input/puer-fragment.ly
+++ b/input/puer-fragment.ly
@@ -1,4 +1,4 @@
-\version "2.1.29"
+\version "2.1.36"
 \header {
     title	= "Puer natus est nobis (excerptum)"
     subtitle	= "Antiphona ad introitum VII"
diff --git a/input/regression/+.ly b/input/regression/+.ly
index 20cb98e97e..b2edf1f166 100644
--- a/input/regression/+.ly
+++ b/input/regression/+.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 %% +.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 df5bc614cf..b34c07b35c 100644
--- a/input/regression/accidental-cautionary.ly
+++ b/input/regression/accidental-cautionary.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
 texidoc = "Cautionary accidentals are indicated using either
diff --git a/input/regression/accidental-double.ly b/input/regression/accidental-double.ly
index 028be8c6fe..ea628a9d53 100644
--- a/input/regression/accidental-double.ly
+++ b/input/regression/accidental-double.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \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 afb6603f29..050d293930 100644
--- a/input/regression/accidental-ledger.ly
+++ b/input/regression/accidental-ledger.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 
diff --git a/input/regression/accidental-octave.ly b/input/regression/accidental-octave.ly
index b15a3e44e6..e97ba69b66 100644
--- a/input/regression/accidental-octave.ly
+++ b/input/regression/accidental-octave.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 texidoc="
diff --git a/input/regression/accidental-placement.ly b/input/regression/accidental-placement.ly
index 229d37685d..06651c0c9a 100644
--- a/input/regression/accidental-placement.ly
+++ b/input/regression/accidental-placement.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 
diff --git a/input/regression/accidental-quarter.ly b/input/regression/accidental-quarter.ly
index f4249dea4a..3d62800ec5 100644
--- a/input/regression/accidental-quarter.ly
+++ b/input/regression/accidental-quarter.ly
@@ -3,7 +3,7 @@
     texidoc = "Quarter tone notation is supported, including
     threequarters flat."
     }
-\version "2.1.30"
+\version "2.1.36"
 
 \score {
     \notes \relative c'' {
diff --git a/input/regression/accidental-single-double.ly b/input/regression/accidental-single-double.ly
index d7c9ba8252..368435a59b 100644
--- a/input/regression/accidental-single-double.ly
+++ b/input/regression/accidental-single-double.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
 texidoc="
 A sharp sign after a double sharp sign, as well as a flat sign
diff --git a/input/regression/accidental-tie.ly b/input/regression/accidental-tie.ly
index 429567c400..a113d19dec 100644
--- a/input/regression/accidental-tie.ly
+++ b/input/regression/accidental-tie.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 
diff --git a/input/regression/accidental-unbroken-tie-spacing.ly b/input/regression/accidental-unbroken-tie-spacing.ly
index 4c4908e95f..be81847bfc 100644
--- a/input/regression/accidental-unbroken-tie-spacing.ly
+++ b/input/regression/accidental-unbroken-tie-spacing.ly
@@ -4,7 +4,7 @@ texidoc = "Tied accidentaled notes (which cause reminder accidentals) do not
 wreak havoc in the spacing when unbroken."
 }
 
-\version "2.1.30"
+\version "2.1.36"
 
 rechts = \notes \relative c' {
   \clef treble
diff --git a/input/regression/accidental-voice.ly b/input/regression/accidental-voice.ly
index 1a8f1d4948..242b596b60 100644
--- a/input/regression/accidental-voice.ly
+++ b/input/regression/accidental-voice.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/accidental.ly b/input/regression/accidental.ly
index 0e910a5571..38ed03cd5b 100644
--- a/input/regression/accidental.ly
+++ b/input/regression/accidental.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/accidentals.ly b/input/regression/accidentals.ly
index 0de5043290..228eb6d1a9 100644
--- a/input/regression/accidentals.ly
+++ b/input/regression/accidentals.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/allfontstyle.lyinc b/input/regression/allfontstyle.lyinc
index ac670d1aca..39e84e1ee1 100644
--- a/input/regression/allfontstyle.lyinc
+++ b/input/regression/allfontstyle.lyinc
@@ -1,4 +1,4 @@
-\version "1.9.4"
+\version "2.2.0"
 
 \header{
 texidoc="
@@ -18,6 +18,6 @@ Different text styles are used for various purposes.
 			 f4\ff^""^\markup  { \large "Largo" } \mark "B" g 
 	}
 	\paper { raggedright = ##t
-	% \translator {\BarNumberingStaffContext} }
+	% \context {\BarNumberingStaffContext} }
 	}
 }
diff --git a/input/regression/ambitus.ly b/input/regression/ambitus.ly
index 9a1bb058f8..fc965afec6 100644
--- a/input/regression/ambitus.ly
+++ b/input/regression/ambitus.ly
@@ -52,7 +52,7 @@ paper block:
 
 
  %}
-\version "2.1.33"
+\version "2.1.36"
 
 upper = \notes \relative c {
 	\clef "treble"
diff --git a/input/regression/apply-context.ly b/input/regression/apply-context.ly
index 2f40588d00..a9e61b8d27 100644
--- a/input/regression/apply-context.ly
+++ b/input/regression/apply-context.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 
 \header {
diff --git a/input/regression/apply-output.ly b/input/regression/apply-output.ly
index 0b65d64d9e..29f6cfd30b 100644
--- a/input/regression/apply-output.ly
+++ b/input/regression/apply-output.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30" 
+\version "2.1.36" 
 \header {
 
 texidoc = "The @code{\applyoutput} expression is the most flexible way to
diff --git a/input/regression/arpeggio-bracket.ly b/input/regression/arpeggio-bracket.ly
index 7d6ef842f7..7261880a3b 100644
--- a/input/regression/arpeggio-bracket.ly
+++ b/input/regression/arpeggio-bracket.ly
@@ -1,6 +1,6 @@
 
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
 texidoc="
 A square bracket on the left indicates that the player should not
diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly
index 0d1355dd57..d7063e184c 100644
--- a/input/regression/arpeggio-collision.ly
+++ b/input/regression/arpeggio-collision.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header  {
 texidoc = "Arpeggio stays clear of accidentals and flipped note heads."
diff --git a/input/regression/arpeggio.ly b/input/regression/arpeggio.ly
index f214a6497f..2fe90d67ba 100644
--- a/input/regression/arpeggio.ly
+++ b/input/regression/arpeggio.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
 texidoc="
 Arpeggios are supported, both cross-staff and broken single staff.
diff --git a/input/regression/auto-beam-bar.ly b/input/regression/auto-beam-bar.ly
index a21476acfa..7b25d9aca8 100644
--- a/input/regression/auto-beam-bar.ly
+++ b/input/regression/auto-beam-bar.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="No auto beams will be put over (manual) repeat bars."
diff --git a/input/regression/auto-beam-no-beam.ly b/input/regression/auto-beam-no-beam.ly
index adfff3e281..9ce4334408 100644
--- a/input/regression/auto-beam-no-beam.ly
+++ b/input/regression/auto-beam-no-beam.ly
@@ -5,7 +5,7 @@
 
 
     }
-\version "2.1.30"
+\version "2.1.36"
 
 \score {
     \notes { c8 c-\noBeam c c }
diff --git a/input/regression/auto-beam-triplet.ly b/input/regression/auto-beam-triplet.ly
index 0f43966c0b..08069723f7 100644
--- a/input/regression/auto-beam-triplet.ly
+++ b/input/regression/auto-beam-triplet.ly
@@ -4,7 +4,7 @@
 texidoc = "Automatic beaming is also done on tuplets."
 }
 
-\version "2.1.30"
+\version "2.1.36"
 
 \score{
 	\notes\relative c''{
diff --git a/input/regression/auto-beam-tuplets.ly b/input/regression/auto-beam-tuplets.ly
index f8cdc6dcbc..b06e72b07b 100644
--- a/input/regression/auto-beam-tuplets.ly
+++ b/input/regression/auto-beam-tuplets.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 texidoc = "Tuplet-spanner should not put (visible) brackets on
diff --git a/input/regression/auto-beam.ly b/input/regression/auto-beam.ly
index f6ca2018b9..836fe509e6 100644
--- a/input/regression/auto-beam.ly
+++ b/input/regression/auto-beam.ly
@@ -6,7 +6,7 @@ beam."
 
 }
 
-\version "2.1.30"
+\version "2.1.36"
 
 
 
diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly
index 55ceabbbd2..f59331bff5 100644
--- a/input/regression/auto-change.ly
+++ b/input/regression/auto-change.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 
diff --git a/input/regression/balloon.ly b/input/regression/balloon.ly
index 4ae21910aa..159b30eef6 100644
--- a/input/regression/balloon.ly
+++ b/input/regression/balloon.ly
@@ -3,7 +3,7 @@
     texidoc = "With balloon texts, objects in the output can be marked,
 with lines and explanatory text added."
     }
-\version "2.1.30"
+\version "2.1.36"
 
 \score  {
  \notes {
diff --git a/input/regression/bar-number.ly b/input/regression/bar-number.ly
index af9fc9c378..34ed808750 100644
--- a/input/regression/bar-number.ly
+++ b/input/regression/bar-number.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 
diff --git a/input/regression/bar-scripts.ly b/input/regression/bar-scripts.ly
index 0f416b761f..6b95969746 100644
--- a/input/regression/bar-scripts.ly
+++ b/input/regression/bar-scripts.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header{
 texidoc="
 
diff --git a/input/regression/beam-auto-knee.ly b/input/regression/beam-auto-knee.ly
index 8011410392..3839966f9a 100644
--- a/input/regression/beam-auto-knee.ly
+++ b/input/regression/beam-auto-knee.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{ texidoc="A knee is made automatically when a horizontal
 beam fits in a gap between note heads that is larger than a predefined
diff --git a/input/regression/beam-break.ly b/input/regression/beam-break.ly
index 89f118fe0a..2dbd985c5b 100644
--- a/input/regression/beam-break.ly
+++ b/input/regression/beam-break.ly
@@ -4,7 +4,7 @@
 "
 
 }
-\version "2.1.30"
+\version "2.1.36"
 \paper { raggedright= ##t }
 
 \score { \notes \relative c''  {
diff --git a/input/regression/beam-center-slope.ly b/input/regression/beam-center-slope.ly
index b21813e9cc..5f42476b8c 100644
--- a/input/regression/beam-center-slope.ly
+++ b/input/regression/beam-center-slope.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
 
     texidoc="Simple beams on middle staffline are allowed to be
diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly
index ca5fabaecd..275ff85661 100644
--- a/input/regression/beam-concave.ly
+++ b/input/regression/beam-concave.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
 
 texidoc = "Concave beams should be horizontal. Informally spoken,
diff --git a/input/regression/beam-cross-staff-auto-knee.ly b/input/regression/beam-cross-staff-auto-knee.ly
index 648ae16bdc..d2886ee233 100644
--- a/input/regression/beam-cross-staff-auto-knee.ly
+++ b/input/regression/beam-cross-staff-auto-knee.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 
diff --git a/input/regression/beam-cross-staff-slope.ly b/input/regression/beam-cross-staff-slope.ly
index 9617b0e882..af2ab220bb 100644
--- a/input/regression/beam-cross-staff-slope.ly
+++ b/input/regression/beam-cross-staff-slope.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc = "Cross staff  (kneed) beams do not cause extreme slopes."
 }
diff --git a/input/regression/beam-cross-staff.ly b/input/regression/beam-cross-staff.ly
index 5fcb936d2d..6df40ac1fb 100644
--- a/input/regression/beam-cross-staff.ly
+++ b/input/regression/beam-cross-staff.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
 texidoc="
 Beams can be typeset over fixed distance aligned staves, beam
diff --git a/input/regression/beam-damp.ly b/input/regression/beam-damp.ly
index b0a5b6a735..90983b4da1 100644
--- a/input/regression/beam-damp.ly
+++ b/input/regression/beam-damp.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header { texidoc = "@cindex Beam Damp
 Beams are less steep than the notes they encompass. " }
 
diff --git a/input/regression/beam-default-lengths.ly b/input/regression/beam-default-lengths.ly
index 46c1861aa3..d0d1d490dd 100644
--- a/input/regression/beam-default-lengths.ly
+++ b/input/regression/beam-default-lengths.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
     texidoc="Beamed stems have standard lengths if possible. Quantization is switched off in this example."
diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly
index d25f5e2ec6..f8514eb374 100644
--- a/input/regression/beam-extreme.ly
+++ b/input/regression/beam-extreme.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
 texidoc="
 Beams should behave reasonably well, even under extreme circumstances.
diff --git a/input/regression/beam-french.ly b/input/regression/beam-french.ly
index 73c78cd0b4..77dd0b413f 100644
--- a/input/regression/beam-french.ly
+++ b/input/regression/beam-french.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 
diff --git a/input/regression/beam-funky-beamlet.ly b/input/regression/beam-funky-beamlet.ly
index 72ea4a98f1..5f095193fb 100644
--- a/input/regression/beam-funky-beamlet.ly
+++ b/input/regression/beam-funky-beamlet.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \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 a4a3c8d16c..4d31523d73 100644
--- a/input/regression/beam-funky.ly
+++ b/input/regression/beam-funky.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
     
     texidoc = "In complex configurations of knee beaming, according to
diff --git a/input/regression/beam-knee-symmetry.ly b/input/regression/beam-knee-symmetry.ly
index ae6747d3b9..46137bf42a 100644
--- a/input/regression/beam-knee-symmetry.ly
+++ b/input/regression/beam-knee-symmetry.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
     texidoc = "Point-symmetric beams should receive the same
diff --git a/input/regression/beam-length.ly b/input/regression/beam-length.ly
index 966db47865..3e9a66a16e 100644
--- a/input/regression/beam-length.ly
+++ b/input/regression/beam-length.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/beam-manual-beaming.ly b/input/regression/beam-manual-beaming.ly
index 9831890ac1..204452c895 100644
--- a/input/regression/beam-manual-beaming.ly
+++ b/input/regression/beam-manual-beaming.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 
 \header {
diff --git a/input/regression/beam-multiple-cross-staff.ly b/input/regression/beam-multiple-cross-staff.ly
index fc2bf33c52..c098db41f5 100644
--- a/input/regression/beam-multiple-cross-staff.ly
+++ b/input/regression/beam-multiple-cross-staff.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \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 99c3f82e84..b45835fe9c 100644
--- a/input/regression/beam-over-barline.ly
+++ b/input/regression/beam-over-barline.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 texidoc = "Explicit beams may cross barlines. "
 }
diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly
index 1215a416d5..17ba3bb1f7 100644
--- a/input/regression/beam-position.ly
+++ b/input/regression/beam-position.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
 
 texidoc=" Beams on ledgered notes should always reach the middle staff
diff --git a/input/regression/beam-postfix-notation.ly b/input/regression/beam-postfix-notation.ly
index b9f53c8df6..94f7d559cb 100644
--- a/input/regression/beam-postfix-notation.ly
+++ b/input/regression/beam-postfix-notation.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
 texidoc = "Beams and ties may be entered in postfix notation, separating the
diff --git a/input/regression/beam-quanting-32nd.ly b/input/regression/beam-quanting-32nd.ly
index fb09912e44..9bfef05824 100644
--- a/input/regression/beam-quanting-32nd.ly
+++ b/input/regression/beam-quanting-32nd.ly
@@ -8,7 +8,7 @@ texidoc = "Stem lengths take precedence over beam quants: `forbidden'
 
 }
 
-\version "2.1.30"
+\version "2.1.36"
 
 \score {
     \notes \relative c''{ 
diff --git a/input/regression/beam-quanting-horizontal.ly b/input/regression/beam-quanting-horizontal.ly
index 00c5f9937a..d71c81e106 100644
--- a/input/regression/beam-quanting-horizontal.ly
+++ b/input/regression/beam-quanting-horizontal.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 
diff --git a/input/regression/beam-quarter.ly b/input/regression/beam-quarter.ly
index 4298c52a3e..3c9524961d 100644
--- a/input/regression/beam-quarter.ly
+++ b/input/regression/beam-quarter.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header
 {
     texidoc= "Quarter notes may be beamed: the beam is halted momentarily."
diff --git a/input/regression/beam-rest.ly b/input/regression/beam-rest.ly
index 3b332991d8..b0a358b6b7 100644
--- a/input/regression/beam-rest.ly
+++ b/input/regression/beam-rest.ly
@@ -3,7 +3,7 @@
  texidoc = "The number of beams does not change on a rest."
 }
 
-\version "2.1.30"
+\version "2.1.36"
 
 \score { \notes \relative c, {
   \clef bass	 
diff --git a/input/regression/beam-second.ly b/input/regression/beam-second.ly
index c6e12a5327..699155b265 100644
--- a/input/regression/beam-second.ly
+++ b/input/regression/beam-second.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
   texidoc="
 Engraving second intervals is tricky.  We used to have problems with seconds 
diff --git a/input/regression/beam-shortened-lengths.ly b/input/regression/beam-shortened-lengths.ly
index f1b27a17d0..57a2100f78 100644
--- a/input/regression/beam-shortened-lengths.ly
+++ b/input/regression/beam-shortened-lengths.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
     texidoc="Beams in unnatural direction, have shortened stems, but do not look too short."
diff --git a/input/regression/beamed-chord.ly b/input/regression/beamed-chord.ly
index 97ff53c319..01fd6cc5e0 100644
--- a/input/regression/beamed-chord.ly
+++ b/input/regression/beamed-chord.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc = "Hairy case for beam, chord, and automatic knees."
diff --git a/input/regression/beaming-ternary-metrum.ly b/input/regression/beaming-ternary-metrum.ly
index 49b386fa05..d817a3d91a 100644
--- a/input/regression/beaming-ternary-metrum.ly
+++ b/input/regression/beaming-ternary-metrum.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 texidoc = "Automatic beaming works also in ternary time sigs."
 }
diff --git a/input/regression/beaming.ly b/input/regression/beaming.ly
index 63035c556f..498bb27be8 100644
--- a/input/regression/beaming.ly
+++ b/input/regression/beaming.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/beams.ly b/input/regression/beams.ly
index 5ca77d9252..2103915654 100644
--- a/input/regression/beams.ly
+++ b/input/regression/beams.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc = "Beaming can be also given explicitly."
 }
diff --git a/input/regression/between-systems.ly b/input/regression/between-systems.ly
index d34ce3f6e4..1f49e1cdb1 100644
--- a/input/regression/between-systems.ly
+++ b/input/regression/between-systems.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/break.ly b/input/regression/break.ly
index ac1090ca25..a9334273fe 100644
--- a/input/regression/break.ly
+++ b/input/regression/break.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/breathing-sign-ancient.ly b/input/regression/breathing-sign-ancient.ly
index 6987bd00d9..3f74f05d22 100644
--- a/input/regression/breathing-sign-ancient.ly
+++ b/input/regression/breathing-sign-ancient.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly
index 139514afce..21df0be415 100644
--- a/input/regression/breathing-sign.ly
+++ b/input/regression/breathing-sign.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "2.1.30"
+\version "2.1.36"
 \header{
 texidoc="
 Breathing signs are available in different tastes: commas (default),
diff --git a/input/regression/chord-changes.ly b/input/regression/chord-changes.ly
index 8af0e7e01f..19e39f5ba4 100644
--- a/input/regression/chord-changes.ly
+++ b/input/regression/chord-changes.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="Property chordChanges: display chord names only when
diff --git a/input/regression/chord-name-entry-11.ly b/input/regression/chord-name-entry-11.ly
index 705ea2ce36..6727f8e1a8 100644
--- a/input/regression/chord-name-entry-11.ly
+++ b/input/regression/chord-name-entry-11.ly
@@ -1,4 +1,4 @@
-\version "2.1.30" 
+\version "2.1.36" 
 
 \header {
 
diff --git a/input/regression/chord-name-entry.ly b/input/regression/chord-name-entry.ly
index fb22a3790a..feaee359f2 100644
--- a/input/regression/chord-name-entry.ly
+++ b/input/regression/chord-name-entry.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 
 \header {
diff --git a/input/regression/chord-name-exceptions.ly b/input/regression/chord-name-exceptions.ly
index 2b7d6d897f..d5ffa6b6b7 100644
--- a/input/regression/chord-name-exceptions.ly
+++ b/input/regression/chord-name-exceptions.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header { texidoc = "The property @code{chordNameExceptions} can used
     to store a list of special notations for specific chords.
 
diff --git a/input/regression/chord-name-major7.ly b/input/regression/chord-name-major7.ly
index a70eb53d53..c4488606f0 100644
--- a/input/regression/chord-name-major7.ly
+++ b/input/regression/chord-name-major7.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc = "The layout of the major 7 can be tuned with
 @code{majorSevenSymbol}."
diff --git a/input/regression/chord-names-bass.ly b/input/regression/chord-names-bass.ly
index 3bd37626ea..780ee04fba 100644
--- a/input/regression/chord-names-bass.ly
+++ b/input/regression/chord-names-bass.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 
diff --git a/input/regression/chord-scripts.ly b/input/regression/chord-scripts.ly
index 2d2b3e2722..9ec7db4ccd 100644
--- a/input/regression/chord-scripts.ly
+++ b/input/regression/chord-scripts.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
 texidoc = "Scripts can also be attached to chord elements."
diff --git a/input/regression/chord-tremolo-short.ly b/input/regression/chord-tremolo-short.ly
index 184c1ac3a3..fb076cc567 100644
--- a/input/regression/chord-tremolo-short.ly
+++ b/input/regression/chord-tremolo-short.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
   texidoc = "
   Tremolo repeats can be constructed for short tremolos (total duration smaller than 1/4) too. Only some of the beams are connected to the stems. 
diff --git a/input/regression/chord-tremolo.ly b/input/regression/chord-tremolo.ly
index bd4a798897..5620f2d5fc 100644
--- a/input/regression/chord-tremolo.ly
+++ b/input/regression/chord-tremolo.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/chords-funky-ignatzek.ly b/input/regression/chords-funky-ignatzek.ly
index b5b6634f3e..89de880f6c 100644
--- a/input/regression/chords-funky-ignatzek.ly
+++ b/input/regression/chords-funky-ignatzek.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 
 \header {
diff --git a/input/regression/clef-oct.ly b/input/regression/clef-oct.ly
index 031d28c057..cfa9c9bd8f 100644
--- a/input/regression/clef-oct.ly
+++ b/input/regression/clef-oct.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30" \header {
+\version "2.1.36" \header {
 
     texidoc = "Octavation signs may be added to clefs.  These
 octavation signs may be placed below or above (meaning an octave
diff --git a/input/regression/clefs.ly b/input/regression/clefs.ly
index 0d61ca0ac3..c3a07f8bbd 100644
--- a/input/regression/clefs.ly
+++ b/input/regression/clefs.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 
diff --git a/input/regression/cluster-cross-staff.ly b/input/regression/cluster-cross-staff.ly
index f21bf39331..2937b66b49 100644
--- a/input/regression/cluster-cross-staff.ly
+++ b/input/regression/cluster-cross-staff.ly
@@ -4,7 +4,7 @@
 
 }
 
-\version "2.1.34"
+\version "2.1.36"
 
 \score {
 \notes    \new PianoStaff <<
diff --git a/input/regression/cluster.ly b/input/regression/cluster.ly
index b8b4b2afac..1cc288c96c 100644
--- a/input/regression/cluster.ly
+++ b/input/regression/cluster.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc = "Clusters are a device to denote that a complete range of
 notes is to be played."
diff --git a/input/regression/collision-2.ly b/input/regression/collision-2.ly
index 1540066440..0e894e836f 100644
--- a/input/regression/collision-2.ly
+++ b/input/regression/collision-2.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 texidoc = "Single head notes may collide. "
 }
diff --git a/input/regression/collision-dots-invert.ly b/input/regression/collision-dots-invert.ly
index 97efa57fe9..f441d27fe1 100644
--- a/input/regression/collision-dots-invert.ly
+++ b/input/regression/collision-dots-invert.ly
@@ -4,7 +4,7 @@
     dots: notes with dots should go to the right, if there could be
     confusion to which notes the dots belong."
 }
-\version "2.1.30"
+\version "2.1.36"
 \score { 
   \notes \relative c'' { 
     << <a c>2\\ { <b d>4 <b d>4 }   >>
diff --git a/input/regression/collision-dots-move.ly b/input/regression/collision-dots-move.ly
index c4c8b28946..c8819075a4 100644
--- a/input/regression/collision-dots-move.ly
+++ b/input/regression/collision-dots-move.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
     
     texidoc = "If collision resolution finds dotted note head must
diff --git a/input/regression/collision-dots.ly b/input/regression/collision-dots.ly
index b05bfe8654..2cfe4fdabe 100644
--- a/input/regression/collision-dots.ly
+++ b/input/regression/collision-dots.ly
@@ -5,7 +5,7 @@
   on the right side."
 }
 
-\version "2.1.30"
+\version "2.1.36"
 \paper { raggedright= ##t }
 
 % todo: b2 (up) + b8 down looks strange compared to c2up + b8. (down)
diff --git a/input/regression/collision-head-chords.ly b/input/regression/collision-head-chords.ly
index a08860ca77..b7031b46c0 100644
--- a/input/regression/collision-head-chords.ly
+++ b/input/regression/collision-head-chords.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 texidoc = "Note heads in collisions should be merged if
 they have the same positions in the extreme note heads.  
diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly
index d4550ca69e..b542b690c3 100644
--- a/input/regression/collision-heads.ly
+++ b/input/regression/collision-heads.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc =
 
diff --git a/input/regression/collision-merge-differently-dotted.ly b/input/regression/collision-merge-differently-dotted.ly
index d248bb1c53..24fb34be5d 100644
--- a/input/regression/collision-merge-differently-dotted.ly
+++ b/input/regression/collision-merge-differently-dotted.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
     
     texidoc = "If NoteCollision has merge-differently-dotted = ##t note
diff --git a/input/regression/collision-merge-dots.ly b/input/regression/collision-merge-dots.ly
index ccea2c915a..0a4cda9dff 100644
--- a/input/regression/collision-merge-dots.ly
+++ b/input/regression/collision-merge-dots.ly
@@ -2,7 +2,7 @@
 
     texidoc = "When merging heads, the dots are merged too."
     }
-\version "2.1.30"
+\version "2.1.36"
 
 \score {
 \notes {
diff --git a/input/regression/collision-mesh.ly b/input/regression/collision-mesh.ly
index 397fef7861..2f77561768 100644
--- a/input/regression/collision-mesh.ly
+++ b/input/regression/collision-mesh.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 texidoc = "Oppositely stemmed chords,  meshing into each other,
 are resolved."
diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly
index 60c205a640..4f936f99bc 100644
--- a/input/regression/collisions.ly
+++ b/input/regression/collisions.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "2.1.30"
+\version "2.1.36"
 \header{
 texidoc="
 In addition to normal collision rules, there is support for polyphony, 
diff --git a/input/regression/completion-heads-polyphony.ly b/input/regression/completion-heads-polyphony.ly
index 9432c52b65..8f300b288d 100644
--- a/input/regression/completion-heads-polyphony.ly
+++ b/input/regression/completion-heads-polyphony.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
     texidoc = "Completion heads are broken across bar lines. This was
diff --git a/input/regression/completion-heads.ly b/input/regression/completion-heads.ly
index 5e90962206..9370b7f3ce 100644
--- a/input/regression/completion-heads.ly
+++ b/input/regression/completion-heads.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/custos.ly b/input/regression/custos.ly
index 7cf39b6424..e314ba1f2c 100644
--- a/input/regression/custos.ly
+++ b/input/regression/custos.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc = "Custodes may be engraved in various styles."
 }
diff --git a/input/regression/dot-flag-collision.ly b/input/regression/dot-flag-collision.ly
index efe21e8786..d4f82bae4a 100644
--- a/input/regression/dot-flag-collision.ly
+++ b/input/regression/dot-flag-collision.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc = "Dots move to the right when a collision with the (up)flag happens."
 }
diff --git a/input/regression/dots.ly b/input/regression/dots.ly
index 2deccc8f6f..2ea5f53ffe 100644
--- a/input/regression/dots.ly
+++ b/input/regression/dots.ly
@@ -1,4 +1,4 @@
-\version "2.1.30" \header{
+\version "2.1.36" \header{
 
 
     texidoc=" Noteheads can have dots, and rests too.  
diff --git a/input/regression/drums.ly b/input/regression/drums.ly
index 76a3e0cbcd..31dfd7409a 100644
--- a/input/regression/drums.ly
+++ b/input/regression/drums.ly
@@ -7,7 +7,7 @@
 }
 
 
-\version "2.1.30"
+\version "2.1.36"
 
 drh = \drums { cymc4.^"crash" hhc16^"h.h." hh \repeat "unfold" 5 {hhc8 hho hhc8 hh16 hh} hhc4 r4 r2 }
 drl = \drums {\repeat "unfold" 3 {bd4 sn8 bd bd4 << bd ss >> } bd8 tommh tommh bd toml toml bd tomfh16 tomfh }
diff --git a/input/regression/dynamics-broken-hairpin.ly b/input/regression/dynamics-broken-hairpin.ly
index d60bcb2b90..ad1ed477e2 100644
--- a/input/regression/dynamics-broken-hairpin.ly
+++ b/input/regression/dynamics-broken-hairpin.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
 texidoc = "Broken crescendi should be open on one side."
 }
diff --git a/input/regression/dynamics-glyphs.ly b/input/regression/dynamics-glyphs.ly
index 8b81f7842c..eb25b9eaf7 100644
--- a/input/regression/dynamics-glyphs.ly
+++ b/input/regression/dynamics-glyphs.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header {texidoc = "Dynamic letters are kerned, and their weight
 matches that of the hairpin signs.  The dynamic scripts should be
diff --git a/input/regression/dynamics-line.ly b/input/regression/dynamics-line.ly
index ab1c2507a3..ba142d457d 100644
--- a/input/regression/dynamics-line.ly
+++ b/input/regression/dynamics-line.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
 texidoc=" Dynamics appear below or above the staff.  If multiple
 dynamics are linked with (de)crescendi, they should be on the same
diff --git a/input/regression/dynamics-unbound-hairpin.ly b/input/regression/dynamics-unbound-hairpin.ly
index c9412f6649..08d369f29e 100644
--- a/input/regression/dynamics-unbound-hairpin.ly
+++ b/input/regression/dynamics-unbound-hairpin.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 texidoc = "Crescendi may start off-notes, however, they should  not collapse into flat lines."
diff --git a/input/regression/easy-notation.ly b/input/regression/easy-notation.ly
index 35458dff68..4ea58ee9f4 100644
--- a/input/regression/easy-notation.ly
+++ b/input/regression/easy-notation.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
     texidoc = " Easy-notation (or Ez-notation) prints names in note heads.
diff --git a/input/regression/figured-bass.ly b/input/regression/figured-bass.ly
index 050dd872e6..f5cca0c3ff 100644
--- a/input/regression/figured-bass.ly
+++ b/input/regression/figured-bass.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 texidoc = "
 Figured bass is created by the FiguredBass context which eats
diff --git a/input/regression/finger-chords.ly b/input/regression/finger-chords.ly
index c22bf7f303..9e801138de 100644
--- a/input/regression/finger-chords.ly
+++ b/input/regression/finger-chords.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
 texidoc = "With the new chord syntax, it is possible to associate
diff --git a/input/regression/fingering.ly b/input/regression/fingering.ly
index 1fde22d46a..9c5b740757 100644
--- a/input/regression/fingering.ly
+++ b/input/regression/fingering.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
 texidoc = "Automatic fingering tries to put fingering instructions
diff --git a/input/regression/follow-voice-break.ly b/input/regression/follow-voice-break.ly
index f2d7f89df8..ebb7013303 100644
--- a/input/regression/follow-voice-break.ly
+++ b/input/regression/follow-voice-break.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
        texidoc = "
 The line-spanners connects to the Y position of the note  on the next line.
diff --git a/input/regression/font-magnification.ly b/input/regression/font-magnification.ly
index 85c8e4d650..469686b6e3 100644
--- a/input/regression/font-magnification.ly
+++ b/input/regression/font-magnification.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header { texidoc = "The magnification can be set for any font. Note
 that this does not change variable symbols such as beams or slurs. 
 " }
diff --git a/input/regression/font-name.ly b/input/regression/font-name.ly
index 02b057c0ec..a2931ba56e 100644
--- a/input/regression/font-name.ly
+++ b/input/regression/font-name.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 
diff --git a/input/regression/generic-output-property.ly b/input/regression/generic-output-property.ly
index 4a245b52c5..a4f3b40555 100644
--- a/input/regression/generic-output-property.ly
+++ b/input/regression/generic-output-property.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly
index bd40b8f542..dd79ef09dd 100644
--- a/input/regression/glissando.ly
+++ b/input/regression/glissando.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 
diff --git a/input/regression/grace-auto-beam.ly b/input/regression/grace-auto-beam.ly
index 4cc4fdbfd5..019c5500ad 100644
--- a/input/regression/grace-auto-beam.ly
+++ b/input/regression/grace-auto-beam.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header
 {
     texidoc = "The autobeamer is not confused by grace notes."
diff --git a/input/regression/grace-bar-line.ly b/input/regression/grace-bar-line.ly
index a4209b14d1..f4399d8b03 100644
--- a/input/regression/grace-bar-line.ly
+++ b/input/regression/grace-bar-line.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \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 e490edf963..81a02f62ec 100644
--- a/input/regression/grace-bar-number.ly
+++ b/input/regression/grace-bar-number.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
 texidoc = "Grace notes do tricky things with timing. If a measure
diff --git a/input/regression/grace-beam.ly b/input/regression/grace-beam.ly
index 90273bac3e..8bf450363b 100644
--- a/input/regression/grace-beam.ly
+++ b/input/regression/grace-beam.ly
@@ -9,6 +9,6 @@ Unbeamed grace notes are not put into normal beams.
     \paper { raggedright= ##t }
 
 
-\version "2.1.30"
+\version "2.1.36"
 \score { \notes\relative c'' { c4  d8[ \grace {  e32[  d c d] } e8]  e[  e \grace { f16 } e8 e]   }}
 
diff --git a/input/regression/grace-end.ly b/input/regression/grace-end.ly
index 328c73f6a7..80bff4ee64 100644
--- a/input/regression/grace-end.ly
+++ b/input/regression/grace-end.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
     texidoc="@cindex Grace End
diff --git a/input/regression/grace-nest.ly b/input/regression/grace-nest.ly
index 6e34f9c5e1..1ac5863697 100644
--- a/input/regression/grace-nest.ly
+++ b/input/regression/grace-nest.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \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 3917a348ac..1bbe564ceb 100644
--- a/input/regression/grace-nest1.ly
+++ b/input/regression/grace-nest1.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \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 c7971bf220..d5bfab2c78 100644
--- a/input/regression/grace-nest2.ly
+++ b/input/regression/grace-nest2.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \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 cb00ffb074..8d68e4126e 100644
--- a/input/regression/grace-nest3.ly
+++ b/input/regression/grace-nest3.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc = "In nested syntax, graces are still properly handled."
     }
diff --git a/input/regression/grace-nest4.ly b/input/regression/grace-nest4.ly
index 2d8d6b34e3..fcdb095249 100644
--- a/input/regression/grace-nest4.ly
+++ b/input/regression/grace-nest4.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 texidoc = "Also in the nested syntax here, grace notes appear rightly."
 }
diff --git a/input/regression/grace-nest5.ly b/input/regression/grace-nest5.ly
index 429a3dcee1..4905c15ebd 100644
--- a/input/regression/grace-nest5.ly
+++ b/input/regression/grace-nest5.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc = "Graces notes may have the same duration as the main note."
     }
diff --git a/input/regression/grace-part-combine.ly b/input/regression/grace-part-combine.ly
index 52049dc110..1b52641b93 100644
--- a/input/regression/grace-part-combine.ly
+++ b/input/regression/grace-part-combine.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc = "Grace notes may be put in a @code{partcombine}r."
 }
diff --git a/input/regression/grace-staff-length.ly b/input/regression/grace-staff-length.ly
index 071aeb742f..f126aa87c5 100644
--- a/input/regression/grace-staff-length.ly
+++ b/input/regression/grace-staff-length.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header{
 texidoc = "Stripped version of trip.ly.  Staves should be of correct length."
 }
diff --git a/input/regression/grace-start.ly b/input/regression/grace-start.ly
index 4bd7d60f8e..789a67aad8 100644
--- a/input/regression/grace-start.ly
+++ b/input/regression/grace-start.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 texidoc = "Pieces may begin with grace notes."
 }
diff --git a/input/regression/grace-stems.ly b/input/regression/grace-stems.ly
index 73bdc206b7..40096a86d1 100644
--- a/input/regression/grace-stems.ly
+++ b/input/regression/grace-stems.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
 texidoc = "Here @code{startGraceMusic} should set @code{no-stem-extend} to 
 true; the two grace beams should be the same here.
diff --git a/input/regression/grace-sync.ly b/input/regression/grace-sync.ly
index f3e96d440e..448412c431 100644
--- a/input/regression/grace-sync.ly
+++ b/input/regression/grace-sync.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header  {
   texidoc = "Grace notes in different voices/staves are synchronized."
 }
diff --git a/input/regression/grace-types.ly b/input/regression/grace-types.ly
index f2278e7d38..3e612b2243 100644
--- a/input/regression/grace-types.ly
+++ b/input/regression/grace-types.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc = "There are three different kinds of grace types: the base 
 grace switches to smaller type, the appoggiatura inserts also a slur, and the
diff --git a/input/regression/grace-unfold-repeat.ly b/input/regression/grace-unfold-repeat.ly
index c240ec61d2..c5f7e8b949 100644
--- a/input/regression/grace-unfold-repeat.ly
+++ b/input/regression/grace-unfold-repeat.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc = "When grace notes are entered with unfolded repeats,
 line breaks take place before  grace  notes.
diff --git a/input/regression/grace-volta-repeat-2.ly b/input/regression/grace-volta-repeat-2.ly
index 6baa49397a..3829c3be3a 100644
--- a/input/regression/grace-volta-repeat-2.ly
+++ b/input/regression/grace-volta-repeat-2.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 
diff --git a/input/regression/grace-volta-repeat.ly b/input/regression/grace-volta-repeat.ly
index ad4adf7945..709fd62189 100644
--- a/input/regression/grace-volta-repeat.ly
+++ b/input/regression/grace-volta-repeat.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 
diff --git a/input/regression/grace.ly b/input/regression/grace.ly
index e3ccca7e71..fb5436d7e1 100644
--- a/input/regression/grace.ly
+++ b/input/regression/grace.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/hairpin-dashed.ly b/input/regression/hairpin-dashed.ly
index 67932ef608..cbe36921b3 100644
--- a/input/regression/hairpin-dashed.ly
+++ b/input/regression/hairpin-dashed.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 texidoc ="Hairpin crescendi may be dashed. "
diff --git a/input/regression/hairpin-ending.ly b/input/regression/hairpin-ending.ly
index 2fb64a9972..d484fd254f 100644
--- a/input/regression/hairpin-ending.ly
+++ b/input/regression/hairpin-ending.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 
diff --git a/input/regression/hara-kiri-pianostaff.ly b/input/regression/hara-kiri-pianostaff.ly
index 366fad42a6..b5b20532f5 100644
--- a/input/regression/hara-kiri-pianostaff.ly
+++ b/input/regression/hara-kiri-pianostaff.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header { texidoc =
 
diff --git a/input/regression/instrument-name-markup.ly b/input/regression/instrument-name-markup.ly
index 07193b4e51..959d29c060 100644
--- a/input/regression/instrument-name-markup.ly
+++ b/input/regression/instrument-name-markup.ly
@@ -7,7 +7,7 @@ including alterations. "
 }
 
 
-\version "2.1.30"
+\version "2.1.36"
 
 
 textFlat = \markup {\smaller \flat}
diff --git a/input/regression/instrument-name-partial.ly b/input/regression/instrument-name-partial.ly
index 1e9955021d..2fe076c687 100644
--- a/input/regression/instrument-name-partial.ly
+++ b/input/regression/instrument-name-partial.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc = "Instrument names are also printed on  partial starting measures."
 }
diff --git a/input/regression/instrument-name.ly b/input/regression/instrument-name.ly
index 28c568b293..913b380de0 100644
--- a/input/regression/instrument-name.ly
+++ b/input/regression/instrument-name.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header{
 texidoc="
 Staff margins are also markings attached to barlines.  They should be
diff --git a/input/regression/key-clefs.ly b/input/regression/key-clefs.ly
index 4469cbf2e1..51689b4d20 100644
--- a/input/regression/key-clefs.ly
+++ b/input/regression/key-clefs.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header { texidoc = "Each clef have own accidental placing rules. " }
 
 \score { \notes
diff --git a/input/regression/key-signature-scordatura.ly b/input/regression/key-signature-scordatura.ly
index 1ef7cf0347..9fd0633c32 100644
--- a/input/regression/key-signature-scordatura.ly
+++ b/input/regression/key-signature-scordatura.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header { texidoc = "By setting @code{Staff.keySignature} directly,
 key signatures can be set invidually per pitch.
diff --git a/input/regression/keys.ly b/input/regression/keys.ly
index 4541c150d7..07825de22a 100644
--- a/input/regression/keys.ly
+++ b/input/regression/keys.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
 texidoc="
 Key signatures may appear on key changes, even without a barline.  
diff --git a/input/regression/lyric-combine-new.ly b/input/regression/lyric-combine-new.ly
index 087da25eaa..e01db4b25c 100644
--- a/input/regression/lyric-combine-new.ly
+++ b/input/regression/lyric-combine-new.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
     texidoc = "With the @code{\\lyricsto} mechanism, individual lyric
diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly
index 85ad22deae..31f9a4eed4 100644
--- a/input/regression/lyric-combine-polyphonic.ly
+++ b/input/regression/lyric-combine-polyphonic.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
 texidoc ="Polyphonic rhythms and rests do not disturb
diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly
index 67330d94ae..58dd8edfd0 100644
--- a/input/regression/lyric-combine.ly
+++ b/input/regression/lyric-combine.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc= "Lyrics can be set to a melody automatically.  Excess lyrics will be
diff --git a/input/regression/lyric-extender-broken.ly b/input/regression/lyric-extender-broken.ly
index 670e62ab95..03c1a41e71 100644
--- a/input/regression/lyric-extender-broken.ly
+++ b/input/regression/lyric-extender-broken.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header
 {
 
diff --git a/input/regression/lyric-extender.ly b/input/regression/lyric-extender.ly
index 04a087b78e..c3161ebe66 100644
--- a/input/regression/lyric-extender.ly
+++ b/input/regression/lyric-extender.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header { texidoc= "In lyric extenders, a syllable may be extended over several notes. "}
 
diff --git a/input/regression/lyric-hyphen-break.ly b/input/regression/lyric-hyphen-break.ly
index 08772c0e89..ffa7aadd28 100644
--- a/input/regression/lyric-hyphen-break.ly
+++ b/input/regression/lyric-hyphen-break.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 
diff --git a/input/regression/lyric-hyphen.ly b/input/regression/lyric-hyphen.ly
index a72359038a..0ea97222e7 100644
--- a/input/regression/lyric-hyphen.ly
+++ b/input/regression/lyric-hyphen.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc = "In lyrics, hyphens may be used."
 }
diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly
index 382bbeefc9..0d44312880 100644
--- a/input/regression/lyric-phrasing.ly
+++ b/input/regression/lyric-phrasing.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
 texidoc = "
diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly
index cdb9b023f1..1e01ef5b7c 100644
--- a/input/regression/lyrics-bar.ly
+++ b/input/regression/lyrics-bar.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/lyrics-melisma-beam.ly b/input/regression/lyrics-melisma-beam.ly
index 2ce3cb2f48..4bf75a742b 100644
--- a/input/regression/lyrics-melisma-beam.ly
+++ b/input/regression/lyrics-melisma-beam.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header
 {
     texidoc = "Melismata are triggered by manual beams." 
diff --git a/input/regression/markup-note.ly b/input/regression/markup-note.ly
index 64b0afa3e6..949a3562f4 100644
--- a/input/regression/markup-note.ly
+++ b/input/regression/markup-note.ly
@@ -3,7 +3,7 @@
     texidoc = "The note markup function may be used to make metronome
  markings. It works for a variety of flag, dot and duration settings."
 }
-\version "2.1.30"
+\version "2.1.36"
 
 \score { \notes { c4^\markup {
     \note #"1" #1
diff --git a/input/regression/markup-stack.ly b/input/regression/markup-stack.ly
index 1702866f73..a01a489654 100644
--- a/input/regression/markup-stack.ly
+++ b/input/regression/markup-stack.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {texidoc="Markup scripts may be stacked."}
 \paper { raggedright = ##t}
 \score { \notes { c''^\markup { "a" \column < "1" \bold "2"  "3" > } } }
diff --git a/input/regression/markup-user.ly b/input/regression/markup-user.ly
index da75fe54ba..7b98e0d4bd 100644
--- a/input/regression/markup-user.ly
+++ b/input/regression/markup-user.ly
@@ -7,7 +7,7 @@
 
       }
 
-\version "2.1.30" % to be updated
+\version "2.1.36" % to be updated
 
 #(def-markup-command (upcase paper props str) (string?)
   "Upcase the string characters. Syntax: \\upcase #\"string\""
diff --git a/input/regression/measure-grouping.ly b/input/regression/measure-grouping.ly
index e8c6b89274..661b7c085e 100644
--- a/input/regression/measure-grouping.ly
+++ b/input/regression/measure-grouping.ly
@@ -7,7 +7,7 @@ brackets above beats when the beats of a time signature are grouped.  "
 
 }
 
-\version "2.1.30"
+\version "2.1.36"
 
 
 %% TODO: should have 2/4 + 5/8 time sig style.
diff --git a/input/regression/mensural.ly b/input/regression/mensural.ly
index ccae494340..c9f6102786 100644
--- a/input/regression/mensural.ly
+++ b/input/regression/mensural.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
     
 texidoc = "There is limited support for mensural notation: note head
diff --git a/input/regression/metronome-marking.ly b/input/regression/metronome-marking.ly
index 3612cac322..c52b06aeaf 100644
--- a/input/regression/metronome-marking.ly
+++ b/input/regression/metronome-marking.ly
@@ -9,7 +9,7 @@ The marking is left aligned with the time signature, if there is one.
     
     }
 
-\version "2.1.30"
+\version "2.1.36"
 
 \score { \notes \relative c'' {   \tempo \breve = 100 c1 c1 \tempo 8.. = 50 c1 }
 \paper {  raggedright = ##t }
diff --git a/input/regression/mm-rests2.ly b/input/regression/mm-rests2.ly
index b7fef82a38..f4ee45b357 100644
--- a/input/regression/mm-rests2.ly
+++ b/input/regression/mm-rests2.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/molecule-hacking.ly b/input/regression/molecule-hacking.ly
index 78fe502961..862020a7bd 100644
--- a/input/regression/molecule-hacking.ly
+++ b/input/regression/molecule-hacking.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header { texidoc=" You can write stencil callbacks in Scheme, thus
 providing custom glyphs for notation elements.  A simple example is
diff --git a/input/regression/multi-measure-rest-center.ly b/input/regression/multi-measure-rest-center.ly
index 9ebd7acd9f..6ca63ab50b 100644
--- a/input/regression/multi-measure-rest-center.ly
+++ b/input/regression/multi-measure-rest-center.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header
 {
   texidoc = "The multimeasure rest is centered exactly between bar lines."
diff --git a/input/regression/multi-measure-rest-grace.ly b/input/regression/multi-measure-rest-grace.ly
index 0e700a689f..ff92f0910c 100644
--- a/input/regression/multi-measure-rest-grace.ly
+++ b/input/regression/multi-measure-rest-grace.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 
 \header {
diff --git a/input/regression/multi-measure-rest-instr-name.ly b/input/regression/multi-measure-rest-instr-name.ly
index bc0ebc7344..0641f5f174 100644
--- a/input/regression/multi-measure-rest-instr-name.ly
+++ b/input/regression/multi-measure-rest-instr-name.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
     texidoc = "There are both long and short instrument names.
diff --git a/input/regression/multi-measure-rest-multi-staff-center.ly b/input/regression/multi-measure-rest-multi-staff-center.ly
index 198cc68690..bb7a6017a2 100644
--- a/input/regression/multi-measure-rest-multi-staff-center.ly
+++ b/input/regression/multi-measure-rest-multi-staff-center.ly
@@ -2,7 +2,7 @@
 independent on prefatory matter in other staves."
 
 	  }
-\version "2.1.30"
+\version "2.1.36"
 
 \score {
 \notes    << \new Staff  { R1 } 
diff --git a/input/regression/multi-measure-rest-spacing.ly b/input/regression/multi-measure-rest-spacing.ly
index a6f7dd47a7..d7d900fed8 100644
--- a/input/regression/multi-measure-rest-spacing.ly
+++ b/input/regression/multi-measure-rest-spacing.ly
@@ -3,7 +3,7 @@
     texidoc = "By setting texts starting with a multi-measure rest, an 
 extra spacing column is created. This should not cause problems."
     }
-\version "2.1.30"
+\version "2.1.36"
 
 \score {
     <<
diff --git a/input/regression/multi-measure-rest-text.ly b/input/regression/multi-measure-rest-text.ly
index a5564f72eb..2a0c4d12c0 100644
--- a/input/regression/multi-measure-rest-text.ly
+++ b/input/regression/multi-measure-rest-text.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header  {
 
diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly
index f2f48714af..1ddb3650ba 100644
--- a/input/regression/multi-measure-rest.ly
+++ b/input/regression/multi-measure-rest.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header{
 
 texidoc="
diff --git a/input/regression/new-markup-scheme.ly b/input/regression/new-markup-scheme.ly
index b1203d0b0a..54c9d0225e 100644
--- a/input/regression/new-markup-scheme.ly
+++ b/input/regression/new-markup-scheme.ly
@@ -5,7 +5,7 @@
     texts using a similar syntax as @code{\\markup}."
 
     }
-\version "2.1.30"
+\version "2.1.36"
 \score {
     \notes {
         \fatText
diff --git a/input/regression/new-markup-syntax.ly b/input/regression/new-markup-syntax.ly
index b38866168f..c11d0bbdbc 100644
--- a/input/regression/new-markup-syntax.ly
+++ b/input/regression/new-markup-syntax.ly
@@ -2,7 +2,7 @@
 texidoc = "With the new markup syntax, text may be written in various manners."
 }
 
-\version "2.1.30"
+\version "2.1.36"
 
 
 \score {
diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly
index 82c2be9aaf..59baf2fe36 100644
--- a/input/regression/non-empty-text.ly
+++ b/input/regression/non-empty-text.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
     texidoc=" By default, text is set with empty horizontal dimensions.  
diff --git a/input/regression/note-group-bracket.ly b/input/regression/note-group-bracket.ly
index 031f5555cf..74651d9250 100644
--- a/input/regression/note-group-bracket.ly
+++ b/input/regression/note-group-bracket.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 
diff --git a/input/regression/note-head-chord.ly b/input/regression/note-head-chord.ly
index afd5516547..f590c5e019 100644
--- a/input/regression/note-head-chord.ly
+++ b/input/regression/note-head-chord.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
     texidoc = "Note heads are flipped on the stem to prevent collisions.
diff --git a/input/regression/note-head-harmonic.ly b/input/regression/note-head-harmonic.ly
index 073d95c4e7..185cbcae3c 100644
--- a/input/regression/note-head-harmonic.ly
+++ b/input/regression/note-head-harmonic.ly
@@ -6,7 +6,7 @@
   Harmonic heads do not get  dots. If @code{harmonicAccidentals} is unset, they also don't get accidentals."
 }
 
-\version "2.1.30"
+\version "2.1.36"
 
 \score {
  \notes {
diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly
index 9d7e38d972..023ece9ff4 100644
--- a/input/regression/note-head-style.ly
+++ b/input/regression/note-head-style.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header{
 texidoc="
 Note head shapes may be set from several choices.  
diff --git a/input/regression/note-line.ly b/input/regression/note-line.ly
index 19e7667764..ea291cb2ea 100644
--- a/input/regression/note-line.ly
+++ b/input/regression/note-line.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 texidoc = "Note head lines (e.g. glissando)
diff --git a/input/regression/number-staff-lines.ly b/input/regression/number-staff-lines.ly
index 9aea30698e..ce26f36bef 100644
--- a/input/regression/number-staff-lines.ly
+++ b/input/regression/number-staff-lines.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc=" The number of stafflines of a staff can be set.  Ledger
diff --git a/input/regression/ottava-broken.ly b/input/regression/ottava-broken.ly
index 1783cfa344..0411389443 100644
--- a/input/regression/ottava-broken.ly
+++ b/input/regression/ottava-broken.ly
@@ -8,7 +8,7 @@ their horizontal line does not stick out."
 
 
 }
-\version "2.1.30"
+\version "2.1.36"
 
 
 \paper { raggedright = ##t} 
diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly
index a1ca5c3b8b..fb7e578e0b 100644
--- a/input/regression/ottava.ly
+++ b/input/regression/ottava.ly
@@ -10,7 +10,7 @@ string can be tuned with @code{Staff.ottavation}.
 "
 
 }
-\version "2.1.30"
+\version "2.1.36"
 
 % . There must be a minimum distance between the octavation line and the
 %   topmost staff line, taking into account the height of the closing
diff --git a/input/regression/part-combine-a2.ly b/input/regression/part-combine-a2.ly
index 76ebd28145..268a3ff169 100644
--- a/input/regression/part-combine-a2.ly
+++ b/input/regression/part-combine-a2.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc ="The a2 string is printed only on notes (i.e. not on rests),
 and only after chords, solo or polyphony."
diff --git a/input/regression/part-combine-global.ly b/input/regression/part-combine-global.ly
index 02f083a876..84411d270b 100644
--- a/input/regression/part-combine-global.ly
+++ b/input/regression/part-combine-global.ly
@@ -11,7 +11,7 @@ voices.
   
 "
     }
-\version "2.1.30"
+\version "2.1.36"
 
 vone =\notes
 
diff --git a/input/regression/part-combine-solo-global.ly b/input/regression/part-combine-solo-global.ly
index 3762682052..811c35d866 100644
--- a/input/regression/part-combine-solo-global.ly
+++ b/input/regression/part-combine-solo-global.ly
@@ -5,7 +5,7 @@
 
 }
 
-\version "2.1.30"
+\version "2.1.36"
 
 \score {
     \new Staff
diff --git a/input/regression/part-combine-solo.ly b/input/regression/part-combine-solo.ly
index 90994ad3a2..caea66fc94 100644
--- a/input/regression/part-combine-solo.ly
+++ b/input/regression/part-combine-solo.ly
@@ -17,7 +17,7 @@ Solo 1/2 can not be used when a spanner is active, so there is no solo
 vone = \notes \relative a' { d4 r8 d8 d8 r8 d8 r8 d2 ~ d2 ~ d4 }
 vtwo = \notes \relative g' { g4.   g8 r2          g4 r4 r2  g4 } 
 
-\version "2.1.30"
+\version "2.1.36"
 
 \score {
     
diff --git a/input/regression/part-combine-text.ly b/input/regression/part-combine-text.ly
index 169cb58fd5..a944adc71c 100644
--- a/input/regression/part-combine-text.ly
+++ b/input/regression/part-combine-text.ly
@@ -9,7 +9,7 @@ texts accordingly.
     }
 
 
-\version "2.1.30"
+\version "2.1.36"
 
 vone = \notes \relative a' { R1 a2    r4 r a a a a }
 vtwo = \notes \relative a' { R1 f4 f4 f4 f f f a a  }
diff --git a/input/regression/part-combine.ly b/input/regression/part-combine.ly
index 383c2c9158..34fa1a5764 100644
--- a/input/regression/part-combine.ly
+++ b/input/regression/part-combine.ly
@@ -9,7 +9,7 @@
 "
     }
 
-\version "2.1.30"
+\version "2.1.36"
 
 vone = \notes \relative a' { g2 g    g  g4 g f' c c( c) c c  c ~ c
 			     c2. c4   c
diff --git a/input/regression/pedal-bracket.ly b/input/regression/pedal-bracket.ly
index 4f1e5a5d19..dec180fed1 100644
--- a/input/regression/pedal-bracket.ly
+++ b/input/regression/pedal-bracket.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 
diff --git a/input/regression/pedal-end.ly b/input/regression/pedal-end.ly
index 524da8f870..f35ec9a147 100644
--- a/input/regression/pedal-end.ly
+++ b/input/regression/pedal-end.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
     texidoc = "Unterminated piano pedal brackets run to the end of the piece. "
diff --git a/input/regression/pedal-ped.ly b/input/regression/pedal-ped.ly
index ad10921605..351b7fe378 100644
--- a/input/regression/pedal-ped.ly
+++ b/input/regression/pedal-ped.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header
 {
     texidoc = "The standard piano pedals style comes with Ped symbols.
diff --git a/input/regression/phrasing-slur.ly b/input/regression/phrasing-slur.ly
index fa51b6b447..5804778ebf 100644
--- a/input/regression/phrasing-slur.ly
+++ b/input/regression/phrasing-slur.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 texidoc="Ordinary slurs should work well with phrasing slur."
diff --git a/input/regression/prefatory-empty-spacing.ly b/input/regression/prefatory-empty-spacing.ly
index 1f24bf1c7c..94fc280124 100644
--- a/input/regression/prefatory-empty-spacing.ly
+++ b/input/regression/prefatory-empty-spacing.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 
diff --git a/input/regression/prefatory-spacing-matter.ly b/input/regression/prefatory-spacing-matter.ly
index edd6c7d6a2..74dfde52fd 100644
--- a/input/regression/prefatory-spacing-matter.ly
+++ b/input/regression/prefatory-spacing-matter.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
     texidoc = "Distances between prefatory items (e.g. clef, bar,
diff --git a/input/regression/property-grace-polyphony.ly b/input/regression/property-grace-polyphony.ly
index 3e0f87756a..0d6fc35e18 100644
--- a/input/regression/property-grace-polyphony.ly
+++ b/input/regression/property-grace-polyphony.ly
@@ -6,7 +6,7 @@
 
 }
 
-\version "2.1.32"
+\version "2.1.36"
 \score {
   \notes \relative c'' {
       <<
diff --git a/input/regression/property-once.ly b/input/regression/property-once.ly
index b4e437236f..eb859f96dd 100644
--- a/input/regression/property-once.ly
+++ b/input/regression/property-once.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc = "Once properties take effect during a single time step only."
 }
diff --git a/input/regression/quote-transposition.ly b/input/regression/quote-transposition.ly
index 05cfc24a0d..54aba573fb 100644
--- a/input/regression/quote-transposition.ly
+++ b/input/regression/quote-transposition.ly
@@ -6,7 +6,7 @@
 In this example, all instruments play sounding central C, the target is a instrument in F."
 
 }
-\version "2.1.30"
+\version "2.1.36"
 
 
 \addquote clarinet \notes {
diff --git a/input/regression/quote.ly b/input/regression/quote.ly
index d5b8117496..17054c3d64 100644
--- a/input/regression/quote.ly
+++ b/input/regression/quote.ly
@@ -5,7 +5,7 @@
 music may be quoted. " 
 
 }
-\version "2.1.30"
+\version "2.1.36"
 
 \addquote bla \notes\relative c' {
     fis4 g a b }
diff --git a/input/regression/rehearsal-mark-letter.ly b/input/regression/rehearsal-mark-letter.ly
index a0c8cde319..770cc2f63b 100644
--- a/input/regression/rehearsal-mark-letter.ly
+++ b/input/regression/rehearsal-mark-letter.ly
@@ -5,7 +5,7 @@ and after Z, double letters are used.  The mark may be set
 with @code{\mark NUMBER}, or with @code{Score.rehearsalMark}."
       }
 
-\version "2.1.30"
+\version "2.1.36"
 \score {  \notes \relative c'' {
   c1  \mark \default
   c1  \mark #7
diff --git a/input/regression/rehearsal-mark-number.ly b/input/regression/rehearsal-mark-number.ly
index 09a7ccc1a9..4cd91d26fd 100644
--- a/input/regression/rehearsal-mark-number.ly
+++ b/input/regression/rehearsal-mark-number.ly
@@ -5,7 +5,7 @@ By setting @code{markFormatter} we may choose a different style of mark printing
 	  
       }
 
-\version "2.1.30"
+\version "2.1.36"
 \score {
   \notes \relative c''{
     \set Score.markFormatter = #format-mark-numbers 
diff --git a/input/regression/repeat-fold.ly b/input/regression/repeat-fold.ly
index 87fdb1c1ea..20bb4d9a5e 100644
--- a/input/regression/repeat-fold.ly
+++ b/input/regression/repeat-fold.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/repeat-line-break.ly b/input/regression/repeat-line-break.ly
index aa7f991841..b5bc086dc8 100644
--- a/input/regression/repeat-line-break.ly
+++ b/input/regression/repeat-line-break.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/repeat-percent-skipbars.ly b/input/regression/repeat-percent-skipbars.ly
index 6aab3a2b80..746fc96173 100644
--- a/input/regression/repeat-percent-skipbars.ly
+++ b/input/regression/repeat-percent-skipbars.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 
 \header {
diff --git a/input/regression/repeat-percent.ly b/input/regression/repeat-percent.ly
index 8374d0d173..fe68f18276 100644
--- a/input/regression/repeat-percent.ly
+++ b/input/regression/repeat-percent.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 texidoc = "Measure repeats may be nested with beat repeats."
 }
diff --git a/input/regression/repeat-slash.ly b/input/regression/repeat-slash.ly
index 4b9469e037..9530ca04bf 100644
--- a/input/regression/repeat-slash.ly
+++ b/input/regression/repeat-slash.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 texidoc = "Within a bar, beat repeats denote that a music snippet should be
 played again."
diff --git a/input/regression/repeat-unfold-all.ly b/input/regression/repeat-unfold-all.ly
index e184c24ddb..1536cb1b7c 100644
--- a/input/regression/repeat-unfold-all.ly
+++ b/input/regression/repeat-unfold-all.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header { texidoc = "Volta repeats may be unfolded through the Scheme
     function @code{unfold-repeats}."
diff --git a/input/regression/repeat-unfold.ly b/input/regression/repeat-unfold.ly
index a3581168c4..bc1baec853 100644
--- a/input/regression/repeat-unfold.ly
+++ b/input/regression/repeat-unfold.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/repeat-volta-skip-alternatives.ly b/input/regression/repeat-volta-skip-alternatives.ly
index bc0a37676e..f225d68a0c 100644
--- a/input/regression/repeat-volta-skip-alternatives.ly
+++ b/input/regression/repeat-volta-skip-alternatives.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
     texidoc = "When too few alternatives are present, the first
diff --git a/input/regression/repeat-volta.ly b/input/regression/repeat-volta.ly
index 19d7000b7b..d676095ba7 100644
--- a/input/regression/repeat-volta.ly
+++ b/input/regression/repeat-volta.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/rest-collision-beam.ly b/input/regression/rest-collision-beam.ly
index 6b9e675614..6796faefd9 100644
--- a/input/regression/rest-collision-beam.ly
+++ b/input/regression/rest-collision-beam.ly
@@ -2,7 +2,7 @@
     texidoc = "Rests under beams are only moved if necessary."
 }
 
-\version "2.1.30"
+\version "2.1.36"
 
 fig =  \notes \relative c' {
     <a c e>8[ r <c e a> r <e a c> r <a c e>]  r |
diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly
index ea08fb403f..444898ec1c 100644
--- a/input/regression/rest-collision.ly
+++ b/input/regression/rest-collision.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
 texidoc="
 Rests should not collide with beams, stems and noteheads.  Rests may
diff --git a/input/regression/rest-ledger.ly b/input/regression/rest-ledger.ly
index 3c459b035b..23246473ed 100644
--- a/input/regression/rest-ledger.ly
+++ b/input/regression/rest-ledger.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 texidoc = "Whole and half rests moving outside the staff should get
 ledger lines."
diff --git a/input/regression/rest-pitch.ly b/input/regression/rest-pitch.ly
index 4a4ed7d052..6664bb0b63 100644
--- a/input/regression/rest-pitch.ly
+++ b/input/regression/rest-pitch.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
 texidoc = "Rests can have pitches--these will be affected by
diff --git a/input/regression/rest-polyphonic.ly b/input/regression/rest-polyphonic.ly
index b3a95adbf8..395f42d26f 100644
--- a/input/regression/rest-polyphonic.ly
+++ b/input/regression/rest-polyphonic.ly
@@ -7,7 +7,7 @@ even if there is no opposite note or rest. The amount is two
     }
 
 
-\version "2.1.30"
+\version "2.1.36"
 
 \score {
   \new Staff \notes \relative c' {
diff --git a/input/regression/rest.ly b/input/regression/rest.ly
index 9b02be4945..b4c9265e41 100644
--- a/input/regression/rest.ly
+++ b/input/regression/rest.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/rhythmic-staff.ly b/input/regression/rhythmic-staff.ly
index 6113577130..e70e92a4f4 100644
--- a/input/regression/rhythmic-staff.ly
+++ b/input/regression/rhythmic-staff.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header
 {
 
diff --git a/input/regression/script-collision.ly b/input/regression/script-collision.ly
index b8c0aa1b8c..54fb6f003c 100644
--- a/input/regression/script-collision.ly
+++ b/input/regression/script-collision.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 
diff --git a/input/regression/script-stack-order.ly b/input/regression/script-stack-order.ly
index 3709f6ce83..05bd8f6bbc 100644
--- a/input/regression/script-stack-order.ly
+++ b/input/regression/script-stack-order.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \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 79cb4e4485..83e926358d 100644
--- a/input/regression/script-stacked.ly
+++ b/input/regression/script-stacked.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \paper { raggedright= ##t }
 
diff --git a/input/regression/size11.ly b/input/regression/size11.ly
index e62481453b..ec99f048ad 100644
--- a/input/regression/size11.ly
+++ b/input/regression/size11.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/size13.ly b/input/regression/size13.ly
index d7596be3d4..5bf8d90412 100644
--- a/input/regression/size13.ly
+++ b/input/regression/size13.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 foollilypondbook = "
 \score
 "
diff --git a/input/regression/size16.ly b/input/regression/size16.ly
index cf8b24937b..e93ed68215 100644
--- a/input/regression/size16.ly
+++ b/input/regression/size16.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 foollilypondbook = "
 \score
 "
diff --git a/input/regression/size20.ly b/input/regression/size20.ly
index 1df0f4c8b5..e13c682f52 100644
--- a/input/regression/size20.ly
+++ b/input/regression/size20.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 foollilypondbook = "
 \score
 "
diff --git a/input/regression/size23.ly b/input/regression/size23.ly
index 29a87fa6ef..598d444656 100644
--- a/input/regression/size23.ly
+++ b/input/regression/size23.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 foollilypondbook = "
 \score
 "
diff --git a/input/regression/size26.ly b/input/regression/size26.ly
index 76ccf58c3e..cbda62f04d 100644
--- a/input/regression/size26.ly
+++ b/input/regression/size26.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 foollilypondbook = "
 \score
 "
diff --git a/input/regression/slur-area.ly b/input/regression/slur-area.ly
index f19671d8ec..6eff9a8bdb 100644
--- a/input/regression/slur-area.ly
+++ b/input/regression/slur-area.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
     
     texidoc = "The area underneath an (up) slur is minimised to improve the shape. "
diff --git a/input/regression/slur-attachment.ly b/input/regression/slur-attachment.ly
index aada410e41..79e0dd8a5d 100644
--- a/input/regression/slur-attachment.ly
+++ b/input/regression/slur-attachment.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/slur-broken-trend.ly b/input/regression/slur-broken-trend.ly
index 42e2a7bb23..6f6cfff8f9 100644
--- a/input/regression/slur-broken-trend.ly
+++ b/input/regression/slur-broken-trend.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/slur-cross-staff.ly b/input/regression/slur-cross-staff.ly
index 6e6b7e70e1..e9d96e1433 100644
--- a/input/regression/slur-cross-staff.ly
+++ b/input/regression/slur-cross-staff.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
 texidoc="
 Slurs behave decently when broken across a linebreak.
diff --git a/input/regression/slur-dots.ly b/input/regression/slur-dots.ly
index a8a8666fd1..d1ad9bf0ac 100644
--- a/input/regression/slur-dots.ly
+++ b/input/regression/slur-dots.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
 texidoc="Slurs should not get confused by augmentation dots.  With a lot
 of dots, the problems becomes more visible."
diff --git a/input/regression/slur-nice.ly b/input/regression/slur-nice.ly
index 232d96b5ba..b955900795 100644
--- a/input/regression/slur-nice.ly
+++ b/input/regression/slur-nice.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
 texidoc="
 Slurs should look nice and symmetric.  The curvature may increase
diff --git a/input/regression/slur-rest.ly b/input/regression/slur-rest.ly
index 8c31ed8690..20cc83cc83 100644
--- a/input/regression/slur-rest.ly
+++ b/input/regression/slur-rest.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \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 99443ff3cd..e01500b20d 100644
--- a/input/regression/slur-staccato.ly
+++ b/input/regression/slur-staccato.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 texidoc="An extra offset may be added between a slur and staccato(s)."
 }
diff --git a/input/regression/slur-stem-broken.ly b/input/regression/slur-stem-broken.ly
index 59fd966be4..fed657d3c7 100644
--- a/input/regression/slur-stem-broken.ly
+++ b/input/regression/slur-stem-broken.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 texidoc="Trend of broken slur with user-overridden stem attachment should also
 follow the same vertical direction it would have had in unbroken state."
diff --git a/input/regression/slur-symmetry-1.ly b/input/regression/slur-symmetry-1.ly
index 43eb62b762..c9afdce2bf 100644
--- a/input/regression/slur-symmetry-1.ly
+++ b/input/regression/slur-symmetry-1.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header
 {
   texidoc = "Symmetric figures should lead to symmetric slurs."
diff --git a/input/regression/slur-symmetry.ly b/input/regression/slur-symmetry.ly
index f575892f72..4f6615a684 100644
--- a/input/regression/slur-symmetry.ly
+++ b/input/regression/slur-symmetry.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header
 {
     texidoc = "Symmetric figures should lead to symmetric slurs."
diff --git a/input/regression/spacing-accidental-staffs.ly b/input/regression/spacing-accidental-staffs.ly
index b9ff33c441..24fdc59416 100644
--- a/input/regression/spacing-accidental-staffs.ly
+++ b/input/regression/spacing-accidental-staffs.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header { 
 texidoc = "Accidentals in different staves do not affect the
diff --git a/input/regression/spacing-accidental-stretch.ly b/input/regression/spacing-accidental-stretch.ly
index b204287a6c..3a0d2de690 100644
--- a/input/regression/spacing-accidental-stretch.ly
+++ b/input/regression/spacing-accidental-stretch.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
     texidoc = "Accidentals do not influence the amount of stretchable space.
diff --git a/input/regression/spacing-accidental.ly b/input/regression/spacing-accidental.ly
index 60092dc6d3..237e269a8e 100644
--- a/input/regression/spacing-accidental.ly
+++ b/input/regression/spacing-accidental.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \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 ec0e78c257..a58d0e27c0 100644
--- a/input/regression/spacing-bar-stem.ly
+++ b/input/regression/spacing-bar-stem.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \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 86269a2cdc..955e46c224 100644
--- a/input/regression/spacing-clef-first-note.ly
+++ b/input/regression/spacing-clef-first-note.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
     texidoc = "Clef changes at the start of a line get much more space
diff --git a/input/regression/spacing-end-of-line.ly b/input/regression/spacing-end-of-line.ly
index 7f17558768..2b9bffca14 100644
--- a/input/regression/spacing-end-of-line.ly
+++ b/input/regression/spacing-end-of-line.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
     
     texidoc ="Broken engraving of a bar at the end of a line does not upset 
diff --git a/input/regression/spacing-ended-voice.ly b/input/regression/spacing-ended-voice.ly
index e2f5c29cb9..0d760bffe3 100644
--- a/input/regression/spacing-ended-voice.ly
+++ b/input/regression/spacing-ended-voice.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "2.1.30"
+\version "2.1.36"
 \header { texidoc = "
 A voicelet (a very short voice to get polyphonic chords correct)
 should not confuse the spacing engine."
diff --git a/input/regression/spacing-folded-clef.ly b/input/regression/spacing-folded-clef.ly
index 0f1b3484d5..eb1ab14622 100644
--- a/input/regression/spacing-folded-clef.ly
+++ b/input/regression/spacing-folded-clef.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 texidoc = "A clef can be folded below notes in a different staff, if
 this does not disrupt the flow of the notes."
diff --git a/input/regression/spacing-folded-clef2.ly b/input/regression/spacing-folded-clef2.ly
index e0c597e260..bf3556022f 100644
--- a/input/regression/spacing-folded-clef2.ly
+++ b/input/regression/spacing-folded-clef2.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \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 9bca598194..b67f5c1315 100644
--- a/input/regression/spacing-grace-duration.ly
+++ b/input/regression/spacing-grace-duration.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \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 06175e1924..8f073f3757 100644
--- a/input/regression/spacing-grace.ly
+++ b/input/regression/spacing-grace.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
   texidoc = "Grace note spacing. Should it be tuned? "
 }
diff --git a/input/regression/spacing-knee.ly b/input/regression/spacing-knee.ly
index 215b283d9d..44dff0f843 100644
--- a/input/regression/spacing-knee.ly
+++ b/input/regression/spacing-knee.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
     texidoc = "For knees, the spacing correction is such that the
diff --git a/input/regression/spacing-multi-tuplet.ly b/input/regression/spacing-multi-tuplet.ly
index ce1c883ea9..c88f7eacdb 100644
--- a/input/regression/spacing-multi-tuplet.ly
+++ b/input/regression/spacing-multi-tuplet.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header{
 texidoc = "Concurrent tuplets should be equidistant on all staffs.
 
diff --git a/input/regression/spacing-note-flags.ly b/input/regression/spacing-note-flags.ly
index 720e61494a..6215d2294d 100644
--- a/input/regression/spacing-note-flags.ly
+++ b/input/regression/spacing-note-flags.ly
@@ -17,5 +17,5 @@ raggedright = ##t
     }
      }
 
-\version "2.1.30"
+\version "2.1.36"
 
diff --git a/input/regression/spacing-ragged-last.ly b/input/regression/spacing-ragged-last.ly
index 8493e66ae3..a9c01b4a40 100644
--- a/input/regression/spacing-ragged-last.ly
+++ b/input/regression/spacing-ragged-last.ly
@@ -1,4 +1,4 @@
-\version "2.1.34"
+\version "2.1.36"
 
 \header {
 
diff --git a/input/regression/spacing-rest.ly b/input/regression/spacing-rest.ly
index a89a52e955..01f1d5222c 100644
--- a/input/regression/spacing-rest.ly
+++ b/input/regression/spacing-rest.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc = "Rests get a little less space, since they are narrower.
 However, the quarter rest in feta font is relatively wide, causing this 
diff --git a/input/regression/spacing-short-notes.ly b/input/regression/spacing-short-notes.ly
index 8c1b41cb58..bff690fe94 100644
--- a/input/regression/spacing-short-notes.ly
+++ b/input/regression/spacing-short-notes.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \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 78531f4168..96610f2fe2 100644
--- a/input/regression/spacing-stem-bar.ly
+++ b/input/regression/spacing-stem-bar.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
 texidoc = "Upstem notes before a barline are printed with some extra
diff --git a/input/regression/spacing-stem-direction.ly b/input/regression/spacing-stem-direction.ly
index bbd92ec653..0f1050b759 100644
--- a/input/regression/spacing-stem-direction.ly
+++ b/input/regression/spacing-stem-direction.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 
diff --git a/input/regression/spacing-stem-same-direction.ly b/input/regression/spacing-stem-same-direction.ly
index fc7dda3790..b378c94d3c 100644
--- a/input/regression/spacing-stem-same-direction.ly
+++ b/input/regression/spacing-stem-same-direction.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 	texidoc = "For juxtaposed chords with the same direction, a
 slight optical correction is used. It is constant, and works only if
diff --git a/input/regression/spacing-to-grace.ly b/input/regression/spacing-to-grace.ly
index e4df501b23..67152ea91f 100644
--- a/input/regression/spacing-to-grace.ly
+++ b/input/regression/spacing-to-grace.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
     texidoc ="Space from a normal note (or barline) to a grace note is
diff --git a/input/regression/spacing-very-tight.ly b/input/regression/spacing-very-tight.ly
index 3d858fa1de..55120a7298 100644
--- a/input/regression/spacing-very-tight.ly
+++ b/input/regression/spacing-very-tight.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 texidoc = "
  When tightly spaced, the spaces between elements (hinterfleisch?) 
diff --git a/input/regression/span-bar.ly b/input/regression/span-bar.ly
index 7e2072aeb8..e114d4f7ad 100644
--- a/input/regression/span-bar.ly
+++ b/input/regression/span-bar.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
   texidoc = "Span bars are drawn only between staff bar lines. By setting 
 bar lines to transparent, they are shown only between systems.
diff --git a/input/regression/staccato-pos.ly b/input/regression/staccato-pos.ly
index adcc018918..e2df5c6c5c 100644
--- a/input/regression/staccato-pos.ly
+++ b/input/regression/staccato-pos.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 
diff --git a/input/regression/staff-halfway.ly b/input/regression/staff-halfway.ly
index 79c55d944d..bae512e471 100644
--- a/input/regression/staff-halfway.ly
+++ b/input/regression/staff-halfway.ly
@@ -2,7 +2,7 @@
 \header { texidoc = " Staves starting and ending halfway include clefs
     and bar lines.  " }
 
-\version "2.1.33"
+\version "2.1.36"
 
 \score {
     \new StaffGroup \notes \relative c''  <<
diff --git a/input/regression/staff-mixed-size.ly b/input/regression/staff-mixed-size.ly
index 4d7334c8e1..a3cc7afd48 100644
--- a/input/regression/staff-mixed-size.ly
+++ b/input/regression/staff-mixed-size.ly
@@ -7,7 +7,7 @@ large on smaller staves."
 
 }
 
-\version "2.1.30"
+\version "2.1.36"
 
 \score {
   <<
diff --git a/input/regression/staff-tweak.ly b/input/regression/staff-tweak.ly
index dc1c776643..c060a4dbea 100644
--- a/input/regression/staff-tweak.ly
+++ b/input/regression/staff-tweak.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 texidoc = "The staff is a grob (graphical object) which may be adjusted as well, for example, to have 6 thick lines and a slightly large @code{staff-space}.
diff --git a/input/regression/stanza-number.ly b/input/regression/stanza-number.ly
index 0548cf74b5..24c5c52701 100644
--- a/input/regression/stanza-number.ly
+++ b/input/regression/stanza-number.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 texidoc = "Stanza numbers are put left of their lyric. Theyr are aligned in a column."
diff --git a/input/regression/stem-direction.ly b/input/regression/stem-direction.ly
index c9148297d6..391f8188ba 100644
--- a/input/regression/stem-direction.ly
+++ b/input/regression/stem-direction.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/stem-shorten.ly b/input/regression/stem-shorten.ly
index cfa16c8990..f5dbe45716 100644
--- a/input/regression/stem-shorten.ly
+++ b/input/regression/stem-shorten.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
     
diff --git a/input/regression/stem-spacing.ly b/input/regression/stem-spacing.ly
index 0ed9412e61..c3dc9da161 100644
--- a/input/regression/stem-spacing.ly
+++ b/input/regression/stem-spacing.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/stem-tremolo.ly b/input/regression/stem-tremolo.ly
index 27bfd6b364..e732e84931 100644
--- a/input/regression/stem-tremolo.ly
+++ b/input/regression/stem-tremolo.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
 texidoc="
 Stem tremolos or rolls are tremolo signs that look like beam segments
diff --git a/input/regression/system-extents.ly b/input/regression/system-extents.ly
index 842c821b51..03ce8ee7a3 100644
--- a/input/regression/system-extents.ly
+++ b/input/regression/system-extents.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
     texidoc = "The size of every system is correctly determined; this 
diff --git a/input/regression/system-start-bracket.ly b/input/regression/system-start-bracket.ly
index 7a75cadf9d..675d6c6562 100644
--- a/input/regression/system-start-bracket.ly
+++ b/input/regression/system-start-bracket.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc =
 "
diff --git a/input/regression/tablature-string-tunings.ly b/input/regression/tablature-string-tunings.ly
index e674f034bc..f090ee7377 100644
--- a/input/regression/tablature-string-tunings.ly
+++ b/input/regression/tablature-string-tunings.ly
@@ -6,7 +6,7 @@
 
 }
 
-\version "2.1.30"
+\version "2.1.36"
 
 \score  {
     \notes \new TabStaff {
diff --git a/input/regression/tablature.ly b/input/regression/tablature.ly
index 19740c67a5..479c43aa21 100644
--- a/input/regression/tablature.ly
+++ b/input/regression/tablature.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header{ texidoc = "@cindex Tabulature
 A sample tablature, with both normal staff and tab.
diff --git a/input/regression/tag-filter.ly b/input/regression/tag-filter.ly
index d07b1fb203..b9da9fc4f1 100644
--- a/input/regression/tag-filter.ly
+++ b/input/regression/tag-filter.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
 texidoc = "The @code{\\tag} command marks music expressions with a
diff --git a/input/regression/text-spanner.ly b/input/regression/text-spanner.ly
index 75d338f3c7..0b10762390 100644
--- a/input/regression/text-spanner.ly
+++ b/input/regression/text-spanner.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 texidoc= "Text spanners should not repeat start text when broken."
 }
diff --git a/input/regression/tie-busy-grobs.ly b/input/regression/tie-busy-grobs.ly
index 25817da3e4..14f514e3d1 100644
--- a/input/regression/tie-busy-grobs.ly
+++ b/input/regression/tie-busy-grobs.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
 texidoc = "Tie engraver uses @code{busyGrobs} to keep track of
diff --git a/input/regression/tie-chord.ly b/input/regression/tie-chord.ly
index ad0588e1b4..6d44dd0575 100644
--- a/input/regression/tie-chord.ly
+++ b/input/regression/tie-chord.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
 texidoc="
 When tying chords, the outer slurs point outwards, the inner slurs
diff --git a/input/regression/tie-dots.ly b/input/regression/tie-dots.ly
index 7200491b7d..8d4438d1c5 100644
--- a/input/regression/tie-dots.ly
+++ b/input/regression/tie-dots.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 texidoc = "Ties should not collide with dots."
 }
diff --git a/input/regression/tie-grace.ly b/input/regression/tie-grace.ly
index 340f1c3fcb..1c8e193283 100644
--- a/input/regression/tie-grace.ly
+++ b/input/regression/tie-grace.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc = "Tieing a grace to the to a following grace or main note works."
 }
diff --git a/input/regression/tie.ly b/input/regression/tie.ly
index 770c9263fa..e21269e26d 100644
--- a/input/regression/tie.ly
+++ b/input/regression/tie.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="
diff --git a/input/regression/tuplet-beam.ly b/input/regression/tuplet-beam.ly
index 24f9644196..458201b657 100644
--- a/input/regression/tuplet-beam.ly
+++ b/input/regression/tuplet-beam.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
 texidoc = "In combination with a beam, the bracket of the tuplet
diff --git a/input/regression/tuplet-gap.ly b/input/regression/tuplet-gap.ly
index 7b34357a48..a89af2e25e 100644
--- a/input/regression/tuplet-gap.ly
+++ b/input/regression/tuplet-gap.ly
@@ -5,7 +5,7 @@
 
 }
 
-\version "2.1.35"
+\version "2.1.36"
 
 \paper {
    indent = 0.0\mm
diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly
index 30ff63716d..dea964112f 100644
--- a/input/regression/tuplet-nest.ly
+++ b/input/regression/tuplet-nest.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
   texidoc="By a manual hack for nested tuplets, an outer tuplet can be moved up."
 }
diff --git a/input/regression/tuplet-properties.ly b/input/regression/tuplet-properties.ly
index 690734bc40..5887b81e82 100644
--- a/input/regression/tuplet-properties.ly
+++ b/input/regression/tuplet-properties.ly
@@ -6,7 +6,7 @@ for instance, bracketed (B) and non-bracketed (NB).
 }
  
 
-\version "2.1.30"
+\version "2.1.36"
 
 
 \score { 
diff --git a/input/regression/tuplet-rest.ly b/input/regression/tuplet-rest.ly
index 328b0a093a..bafb8686b6 100644
--- a/input/regression/tuplet-rest.ly
+++ b/input/regression/tuplet-rest.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
     texidoc = "Tuplets may contain rests. "
diff --git a/input/regression/tuplet-slope.ly b/input/regression/tuplet-slope.ly
index 8a703fa55c..4acaea0b26 100644
--- a/input/regression/tuplet-slope.ly
+++ b/input/regression/tuplet-slope.ly
@@ -12,7 +12,7 @@ The bracket direction is determined by the dominating stem direction.
 }
 
 
-\version "2.1.30"
+\version "2.1.36"
 
 \score {
     \notes \relative c' {
diff --git a/input/regression/tuplet-staffline-collision.ly b/input/regression/tuplet-staffline-collision.ly
index fdf474f557..2295aa6aff 100644
--- a/input/regression/tuplet-staffline-collision.ly
+++ b/input/regression/tuplet-staffline-collision.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
 texidoc = "Horizontal tuplet brackets are shifted vertically
diff --git a/input/regression/tuplets.ly b/input/regression/tuplets.ly
index b697a0ba08..410905e289 100644
--- a/input/regression/tuplets.ly
+++ b/input/regression/tuplets.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
     
 texidoc="
diff --git a/input/regression/voice-follower.ly b/input/regression/voice-follower.ly
index d88bf989cf..8f0a6b4c0f 100644
--- a/input/regression/voice-follower.ly
+++ b/input/regression/voice-follower.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 
 \header { texidoc= "
diff --git a/input/regression/volta-broken-left-edge.ly b/input/regression/volta-broken-left-edge.ly
index 1d5781c2c0..4a021a031c 100644
--- a/input/regression/volta-broken-left-edge.ly
+++ b/input/regression/volta-broken-left-edge.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 texidoc ="Broken volta spanners behave correctly at their left edge in all cases."
diff --git a/input/regression/volta-multi-staff.ly b/input/regression/volta-multi-staff.ly
index 14468c4d99..abd030d5fc 100644
--- a/input/regression/volta-multi-staff.ly
+++ b/input/regression/volta-multi-staff.ly
@@ -4,7 +4,7 @@
     on more staves in a score."
 
 }
-\version "2.1.30"
+\version "2.1.36"
 
 
 vmus = \notes { \repeat volta 2 c1 \alternative { d e } } 
diff --git a/input/screech-boink.ly b/input/screech-boink.ly
index 207a8245db..3d436aa423 100644
--- a/input/screech-boink.ly
+++ b/input/screech-boink.ly
@@ -1,4 +1,4 @@
-\version "2.1.29"
+\version "2.1.36"
 \header {
     title = "Screech and boink"
     subtitle = "Random complex notation"
diff --git a/input/template/gregorian-transcription.ly b/input/template/gregorian-transcription.ly
index 7525213475..b8432e402e 100644
--- a/input/template/gregorian-transcription.ly
+++ b/input/template/gregorian-transcription.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 
 
 \header {
diff --git a/input/template/header.ly b/input/template/header.ly
index 7d6a064417..eef2187897 100644
--- a/input/template/header.ly
+++ b/input/template/header.ly
@@ -1,4 +1,4 @@
-\version "2.1.29"
+\version "2.1.36"
 \header {
   dedication = "dedication"
   title = "Title"
diff --git a/input/template/jazz-combo.ly b/input/template/jazz-combo.ly
index f5ec4f66dd..7df8428907 100644
--- a/input/template/jazz-combo.ly
+++ b/input/template/jazz-combo.ly
@@ -1,4 +1,4 @@
-\version "2.1.29"
+\version "2.1.36"
 \header {
         title = "Song"
         subtitle = "(tune)"
diff --git a/input/template/melody-chords.ly b/input/template/melody-chords.ly
index 53b6941fb1..d98d13b04d 100644
--- a/input/template/melody-chords.ly
+++ b/input/template/melody-chords.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 
 \header {
   texidoc = "Lead sheet format: chords with melody."
diff --git a/input/template/melody-lyrics-chords.ly b/input/template/melody-lyrics-chords.ly
index 9e28e041c6..7af75caf70 100644
--- a/input/template/melody-lyrics-chords.ly
+++ b/input/template/melody-lyrics-chords.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 \header
 {
     texidoc = "Popsong format: chords, melody and lyrics."
diff --git a/input/template/melody-lyrics.ly b/input/template/melody-lyrics.ly
index db0ca807ba..8aa18e3057 100644
--- a/input/template/melody-lyrics.ly
+++ b/input/template/melody-lyrics.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 
 \header {
   texidoc = "Melody and lyrics."
diff --git a/input/template/melody.ly b/input/template/melody.ly
index b2c87be740..576f7c5da6 100644
--- a/input/template/melody.ly
+++ b/input/template/melody.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 
 \header {
   texidoc = "Only a melody."
diff --git a/input/template/piano-4-voices.ly b/input/template/piano-4-voices.ly
index 00ce853b9f..7f4337134f 100644
--- a/input/template/piano-4-voices.ly
+++ b/input/template/piano-4-voices.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 
 \header {
   texidoc ="Polyphonic piano music."
diff --git a/input/template/piano-dynamics.ly b/input/template/piano-dynamics.ly
index f164161137..850f079617 100644
--- a/input/template/piano-dynamics.ly
+++ b/input/template/piano-dynamics.ly
@@ -1,4 +1,4 @@
-\version "2.1.29"
+\version "2.1.36"
 \header {
 texidoc ="
   Dynamics on a separate line, neatly centered between staffs.
diff --git a/input/template/piano-lyrics.ly b/input/template/piano-lyrics.ly
index 40f14af8a8..1223bd5b3a 100644
--- a/input/template/piano-lyrics.ly
+++ b/input/template/piano-lyrics.ly
@@ -1,4 +1,4 @@
-\version "2.1.29"
+\version "2.1.36"
 
 \header {
   texidoc ="Lyrics between two staffs."
diff --git a/input/template/piano-melody-lyrics.ly b/input/template/piano-melody-lyrics.ly
index 16b457594c..a103420464 100644
--- a/input/template/piano-melody-lyrics.ly
+++ b/input/template/piano-melody-lyrics.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.29"
+\version "2.1.36"
 \header {
   texidoc ="Classical song format: one staff with melody and lyrics,
 and piano accompaniment."
diff --git a/input/template/piano.ly b/input/template/piano.ly
index 38d97394b9..f9bec19950 100644
--- a/input/template/piano.ly
+++ b/input/template/piano.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.36"
 
 \header {
   texidoc = "Simple piano music." 
diff --git a/input/template/satb.ly b/input/template/satb.ly
index 73d8a8a641..edf96959ea 100644
--- a/input/template/satb.ly
+++ b/input/template/satb.ly
@@ -1,4 +1,4 @@
-\version "2.1.29"
+\version "2.1.36"
 \header {
 
     texidoc = "
diff --git a/input/test/+.ly b/input/test/+.ly
index 7301663c84..969164784f 100644
--- a/input/test/+.ly
+++ b/input/test/+.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 %% +.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 65405feee9..80b4aeb9fa 100644
--- a/input/test/add-staccato.ly
+++ b/input/test/add-staccato.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 
diff --git a/input/test/add-text-script.ly b/input/test/add-text-script.ly
index 1ec3891a9e..05b9463117 100644
--- a/input/test/add-text-script.ly
+++ b/input/test/add-text-script.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 texidoc= "@cindex make-music Fingering
diff --git a/input/test/ambitus-mixed.ly b/input/test/ambitus-mixed.ly
index ec8f3b6f6d..ee2efb3259 100644
--- a/input/test/ambitus-mixed.ly
+++ b/input/test/ambitus-mixed.ly
@@ -13,7 +13,7 @@ in the same score (not demonstrated in this file).
 "
 }
 
-\version "2.1.30"
+\version "2.1.36"
 
 #(define (kill-ambitus grob grob-context apply-context)
   (if (memq 'ambitus-interface (ly:grob-property grob 'interfaces))
diff --git a/input/test/ancient-accidentals.ly b/input/test/ancient-accidentals.ly
index 8c2dd60145..02c5b6b68b 100644
--- a/input/test/ancient-accidentals.ly
+++ b/input/test/ancient-accidentals.ly
@@ -6,7 +6,7 @@ are collected here.
 "
 }
 
-\version "2.1.30"
+\version "2.1.36"
 
 \score { 
   \context Voice \notes\relative c {
diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly
index 256b538cf8..fb93f590fc 100644
--- a/input/test/ancient-font.ly
+++ b/input/test/ancient-font.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 % 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 df7e291ec6..ad4729ea1c 100644
--- a/input/test/ancient-time.ly
+++ b/input/test/ancient-time.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 % TODO: move stuff from ancient-font into here?  See comment
 % for ancient-font.ly
 \header {
diff --git a/input/test/bagpipe.ly b/input/test/bagpipe.ly
index f834b9d59a..2b50c43d45 100644
--- a/input/test/bagpipe.ly
+++ b/input/test/bagpipe.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
     texidoc = "@cindex Bagpipe Music
diff --git a/input/test/bar-always.ly b/input/test/bar-always.ly
index 41f2d4966f..0b8b6b1ed2 100644
--- a/input/test/bar-always.ly
+++ b/input/test/bar-always.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
     texidoc = "@cindex Bars Always
diff --git a/input/test/bar-lines-lyric-only.ly b/input/test/bar-lines-lyric-only.ly
index 346f59294c..6dbf33f3c6 100644
--- a/input/test/bar-lines-lyric-only.ly
+++ b/input/test/bar-lines-lyric-only.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \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 61b73bd6ce..d9a6043cf3 100644
--- a/input/test/bar-lines.ly
+++ b/input/test/bar-lines.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc = "@cindex Bar Lines
 There a many types of bar lines available.
diff --git a/input/test/bar-number-every-five-reset.ly b/input/test/bar-number-every-five-reset.ly
index aaf5d474b2..f9fbc30b14 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.1.30"
+\version "2.1.36"
 
 \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 e51c72e70e..8dda891e9b 100644
--- a/input/test/bar-number-regular-interval.ly
+++ b/input/test/bar-number-regular-interval.ly
@@ -5,7 +5,7 @@ Bar numbers can also be printed inside boxes.
 
 " }
 
-\version "2.1.30"
+\version "2.1.36"
 
 \score {
     \context Staff \notes \transpose  c c' {
diff --git a/input/test/bar-number-show-all.ly b/input/test/bar-number-show-all.ly
index 62e31f5d52..ee6dd5bfc1 100644
--- a/input/test/bar-number-show-all.ly
+++ b/input/test/bar-number-show-all.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \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 4acc1eb1db..b7a44d7639 100644
--- a/input/test/beam-alternate.ly
+++ b/input/test/beam-alternate.ly
@@ -8,7 +8,7 @@
 
 }
 
-\version "2.1.30"
+\version "2.1.36"
 
 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 23dde89a9b..f8861e696e 100644
--- a/input/test/beam-auto-4-8.ly
+++ b/input/test/beam-auto-4-8.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 % keep for now, although merging into beam-auto-override is a possibility.
 \header {
 	texidoc = "@cindex Auto Beaming 4/8
diff --git a/input/test/beam-auto-override.ly b/input/test/beam-auto-override.ly
index 1969600e95..9b36551749 100644
--- a/input/test/beam-auto-override.ly
+++ b/input/test/beam-auto-override.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
     texidoc = "@cindex Auto Beaming Override
diff --git a/input/test/beam-auto.ly b/input/test/beam-auto.ly
index 34f071f4e8..b9aee80bd5 100644
--- a/input/test/beam-auto.ly
+++ b/input/test/beam-auto.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
 	texidoc = "@cindex Beaming Presets
 There are presets for the @code{auto-beam} engraver in the case of common
diff --git a/input/test/beam-control.ly b/input/test/beam-control.ly
index 5df66787f1..5c0b633223 100644
--- a/input/test/beam-control.ly
+++ b/input/test/beam-control.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
     texidoc="@cindex Beam Position Control
 
diff --git a/input/test/beam-count.ly b/input/test/beam-count.ly
index f7770662b7..4b54ed6dae 100644
--- a/input/test/beam-count.ly
+++ b/input/test/beam-count.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
 	texidoc="@cindex Beam Count
 
diff --git a/input/test/beam-dir-functions.ly b/input/test/beam-dir-functions.ly
index a0f6dff769..fa6be41653 100644
--- a/input/test/beam-dir-functions.ly
+++ b/input/test/beam-dir-functions.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
   texidoc = "@cindex Beam Dir Functions
 
diff --git a/input/test/beam-isknee.ly b/input/test/beam-isknee.ly
index 7c74fb6793..320d38976a 100644
--- a/input/test/beam-isknee.ly
+++ b/input/test/beam-isknee.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
 	texidoc="@cindex Beam Isknee
 
diff --git a/input/test/beam-neutral-direction.ly b/input/test/beam-neutral-direction.ly
index 4bc36e2361..f7a4fad7a5 100644
--- a/input/test/beam-neutral-direction.ly
+++ b/input/test/beam-neutral-direction.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
 	texidoc="@cindex Beam Neutral Direction
 When a beam falls in the middle of the staff, the beams point normally 
diff --git a/input/test/beam-rest.ly b/input/test/beam-rest.ly
index fb67d4495f..c8d9773e40 100644
--- a/input/test/beam-rest.ly
+++ b/input/test/beam-rest.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="@cindex Beam Over Rests
diff --git a/input/test/blank-notes.ly b/input/test/blank-notes.ly
index 5a2588c7a1..f4c48ea3a9 100644
--- a/input/test/blank-notes.ly
+++ b/input/test/blank-notes.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 % possible rename to invis-notes.ly
 % check if other documents call this "blank notes", though.  I think
 % invisible notes sounds better, but whatever it is, it should be
diff --git a/input/test/blank-paper-tab.ly b/input/test/blank-paper-tab.ly
index 1c1e00950f..649b5ad1e7 100644
--- a/input/test/blank-paper-tab.ly
+++ b/input/test/blank-paper-tab.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
     
 texidoc = "@cindex Blank Paper Tab
diff --git a/input/test/blank-paper.ly b/input/test/blank-paper.ly
index b53e0f2421..90644029e0 100644
--- a/input/test/blank-paper.ly
+++ b/input/test/blank-paper.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
   texidoc="@cindex Blank Paper
 
diff --git a/input/test/boxed-molecule.ly b/input/test/boxed-molecule.ly
index 2996fef73d..833e6444fa 100644
--- a/input/test/boxed-molecule.ly
+++ b/input/test/boxed-molecule.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 texidoc = "@cindex Boxed Stencil
 
diff --git a/input/test/caps.ly b/input/test/caps.ly
index 0d3758b04a..017490f2ec 100644
--- a/input/test/caps.ly
+++ b/input/test/caps.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
 texidoc = "@cindex Capital Letters
 The font can be changed to small caps.
diff --git a/input/test/cautionaries.ly b/input/test/cautionaries.ly
index 1e3344968d..c1531df7c3 100644
--- a/input/test/cautionaries.ly
+++ b/input/test/cautionaries.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header{
 	texidoc="@cindex Cautionary Accidentals
 Cautinary accidentals are displayed in slurs by default. They can be 
diff --git a/input/test/chord-names-german.ly b/input/test/chord-names-german.ly
index 4a4ae98ac2..670cc581b8 100644
--- a/input/test/chord-names-german.ly
+++ b/input/test/chord-names-german.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header  {
     texidoc = "@cindex Chord Names German
 The english naming of chords (default) can be changed to german 
diff --git a/input/test/chord-names-jazz.ly b/input/test/chord-names-jazz.ly
index 148bee915f..9bd3d84a76 100644
--- a/input/test/chord-names-jazz.ly
+++ b/input/test/chord-names-jazz.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 
 \header {
diff --git a/input/test/chord-names-no-inversions.ly b/input/test/chord-names-no-inversions.ly
index 406665ab90..ef0576b521 100644
--- a/input/test/chord-names-no-inversions.ly
+++ b/input/test/chord-names-no-inversions.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header { texidoc= "@cindex Chord Names No Inversions
 Since there are several interpretations for recognizing 
 chord names, the lowest note is the bass note of a chord and the inversion 
diff --git a/input/test/chords-without-melody.ly b/input/test/chords-without-melody.ly
index 74ee7be730..72a8e9ec14 100644
--- a/input/test/chords-without-melody.ly
+++ b/input/test/chords-without-melody.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 texidoc = "Jazz chord names can also be printed without notes."
 }
diff --git a/input/test/clef-8-syntax.ly b/input/test/clef-8-syntax.ly
index dedb4b7305..5f33f45af7 100644
--- a/input/test/clef-8-syntax.ly
+++ b/input/test/clef-8-syntax.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc = "@cindex Chord Octavation
 Appending @code{_8} or @code{^8} to a clef name will
diff --git a/input/test/clef-end-of-line.ly b/input/test/clef-end-of-line.ly
index cd4989bc5f..72399ebc85 100644
--- a/input/test/clef-end-of-line.ly
+++ b/input/test/clef-end-of-line.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
     texidoc = "@cindex Clef End of Line
diff --git a/input/test/clef-manual-control.ly b/input/test/clef-manual-control.ly
index 36e8f16487..898f6731f7 100644
--- a/input/test/clef-manual-control.ly
+++ b/input/test/clef-manual-control.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header{ texidoc = "
 
 @cindex Clef Manual Control
diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index e430486f42..6ef405126b 100644
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 
 % Ugh, we need to override some LaTeX titling stuff
diff --git a/input/test/count-systems.ly b/input/test/count-systems.ly
index 84353abff9..d52905e57d 100644
--- a/input/test/count-systems.ly
+++ b/input/test/count-systems.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
     
     texidoc="@cindex Count Systems
diff --git a/input/test/crescendi.ly b/input/test/crescendi.ly
index 8d3b61799f..b2d093d45f 100644
--- a/input/test/crescendi.ly
+++ b/input/test/crescendi.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{
 	texidoc="@cindex Crescendi
 Crescendi can be printed in a number of different ways.
diff --git a/input/test/cue-notes.ly b/input/test/cue-notes.ly
index 9d63c56293..09fa82cf9d 100644
--- a/input/test/cue-notes.ly
+++ b/input/test/cue-notes.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 % TODO: check to see if this example can be simplified using \small
 % or \tiny.
 \header { texidoc = "@cindex Cue Notes
diff --git a/input/test/divisiones.ly b/input/test/divisiones.ly
index 177fc5a0bd..9aa5eef57a 100644
--- a/input/test/divisiones.ly
+++ b/input/test/divisiones.ly
@@ -7,7 +7,7 @@ Choices are @code{divisioMinima}, @code{divisioMaior},
 @code{caesura}.
 " }
 
-\version "2.1.30"
+\version "2.1.36"
 
 \include "gregorian-init.ly"
 
diff --git a/input/test/drarn-slurs.ly b/input/test/drarn-slurs.ly
index a2943912b1..99b8199953 100644
--- a/input/test/drarn-slurs.ly
+++ b/input/test/drarn-slurs.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 % possible rename to slurs-?
 % TODO: find out what drarn means, and if there's an overlap with drarn.ly
 \header{
diff --git a/input/test/drarn.ly b/input/test/drarn.ly
index 0f09b4cead..cbd6fd1cd2 100644
--- a/input/test/drarn.ly
+++ b/input/test/drarn.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{texidoc="@cindex Drarn
 You can attach slurs and ties to noteheads.
 " }
diff --git a/input/test/dynamic-absolute-volume.ly b/input/test/dynamic-absolute-volume.ly
index 0aa9ae74fb..64bccd8bf4 100644
--- a/input/test/dynamic-absolute-volume.ly
+++ b/input/test/dynamic-absolute-volume.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc = "@cindex Dynamic Absolute Volume
 Absolute dynamics have an effect on MIDI files.
diff --git a/input/test/dynamic-extra.ly b/input/test/dynamic-extra.ly
index 558bcbb676..1bcad238a2 100644
--- a/input/test/dynamic-extra.ly
+++ b/input/test/dynamic-extra.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 % 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 bff104fa30..55adc6e3af 100644
--- a/input/test/embedded-postscript.ly
+++ b/input/test/embedded-postscript.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
   texidoc = "@cindex Embedded Postscript
 By inserting the @TeX{} command \embeddedps, you can
diff --git a/input/test/embedded-scm.ly b/input/test/embedded-scm.ly
index 4efc2bfabc..fbb5e5ffaf 100644
--- a/input/test/embedded-scm.ly
+++ b/input/test/embedded-scm.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
     
     texidoc = "@cindex Embedded scm
diff --git a/input/test/embedded-tex.ly b/input/test/embedded-tex.ly
index 0487414da8..fc84dad87e 100644
--- a/input/test/embedded-tex.ly
+++ b/input/test/embedded-tex.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{ texidoc="@cindex Embedded Tex
 You can embed Tex commands in your score. "}
 
diff --git a/input/test/engraver-contexts.ly b/input/test/engraver-contexts.ly
index 65836d575a..564710b2c7 100644
--- a/input/test/engraver-contexts.ly
+++ b/input/test/engraver-contexts.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
     
 texidoc ="In polyphonic notation, many voices can share a staff: In
diff --git a/input/test/engraver-example.lyinc b/input/test/engraver-example.lyinc
index 10f849102e..6c5ca58b9a 100644
--- a/input/test/engraver-example.lyinc
+++ b/input/test/engraver-example.lyinc
@@ -1,5 +1,5 @@
 %% texidoc = "Include file for engraver example."
-
+\version "2.2.0"
 topVoice = \notes \relative c' {
   \key d\major
   es8([ g] a[ fis])
diff --git a/input/test/engraver-one-by-one.ly b/input/test/engraver-one-by-one.ly
index f80c2ff470..ef7ef073e9 100644
--- a/input/test/engraver-one-by-one.ly
+++ b/input/test/engraver-one-by-one.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
     
 texidoc = "The notation problem, creating a certain symbol,
diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly
index 9219398282..445337ef75 100644
--- a/input/test/extra-staff.ly
+++ b/input/test/extra-staff.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 % definitely wil be renamed to something.
 %{
diff --git a/input/test/figured-bass-alternate.ly b/input/test/figured-bass-alternate.ly
index 60945a0ff6..98a044f829 100644
--- a/input/test/figured-bass-alternate.ly
+++ b/input/test/figured-bass-alternate.ly
@@ -3,7 +3,7 @@
 texidoc = "An alternate method to make bass figures is to use
 @code{markup} texts."
 }
-\version "2.1.30"
+\version "2.1.36"
 
 nat = \markup { \natural }
 sh = \markup { \smaller \raise #0.6 \sharp }
diff --git a/input/test/fill-a4.ly b/input/test/fill-a4.ly
index 8986037301..18a0bcd184 100644
--- a/input/test/fill-a4.ly
+++ b/input/test/fill-a4.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 %possible rename to paper-fill-a4.ly -gp
 % candidate for reg -gp
 % Han says no, but keeping this comment temporarily so that I don't
diff --git a/input/test/follow-voice.ly b/input/test/follow-voice.ly
index d118a7b227..b3f7a84dab 100644
--- a/input/test/follow-voice.ly
+++ b/input/test/follow-voice.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 % MERGED: stuff from follow-break.ly to follow-thread.ly
 
 % followVoice: connect note heads with line when thread switches staff 
diff --git a/input/test/force-hshift.ly b/input/test/force-hshift.ly
index f3c3d6c306..33cbeed3d7 100644
--- a/input/test/force-hshift.ly
+++ b/input/test/force-hshift.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc="@cindex Force hshift
 Horizontal shift (@code{hshift}) can be forced in order to avoid collisions. " }
diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly
index efde3671a3..8cfca18cce 100644
--- a/input/test/gourlay.ly
+++ b/input/test/gourlay.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header{
 
     texidoc="@cindex Gourlay
diff --git a/input/test/gregorian-scripts.ly b/input/test/gregorian-scripts.ly
index 05b7b238ae..ebb06ac7bd 100644
--- a/input/test/gregorian-scripts.ly
+++ b/input/test/gregorian-scripts.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
     title	= "Gregorian Scripts"
     texidoc  = "@cindex Gregorian Scripts
diff --git a/input/test/harmonic.ly b/input/test/harmonic.ly
index d364e69d48..564a66637a 100644
--- a/input/test/harmonic.ly
+++ b/input/test/harmonic.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc ="@cindex Artificial Harmonics
 
diff --git a/input/test/header-ifelse.ly b/input/test/header-ifelse.ly
index bab5d1e22a..617925e3ae 100644
--- a/input/test/header-ifelse.ly
+++ b/input/test/header-ifelse.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 
 #(if (not (defined? 'pieceTagLine))
diff --git a/input/test/hshift.ly b/input/test/hshift.ly
index 06657fe793..5744a84d43 100644
--- a/input/test/hshift.ly
+++ b/input/test/hshift.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header { texidoc = "@cindex Horizontal Shift
 Notes may be manually horizontally shifted. " }
 
diff --git a/input/test/hymn.ly b/input/test/hymn.ly
index 24955c0eec..50734d39fb 100644
--- a/input/test/hymn.ly
+++ b/input/test/hymn.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header { texidoc = "
 
diff --git a/input/test/improv.ly b/input/test/improv.ly
index ef44fb5461..e367c89c0e 100644
--- a/input/test/improv.ly
+++ b/input/test/improv.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
     texidoc =
diff --git a/input/test/incipit.ly b/input/test/incipit.ly
index c3a73e7e46..44b8f2450b 100644
--- a/input/test/incipit.ly
+++ b/input/test/incipit.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header { texidoc = "@cindex Incipit
 This example shows how to make an ``incipit'' to indicate 
 scordatora tuning of a violin part, by overriding the @code{style} of
diff --git a/input/test/instrument-name-grandstaff.ly b/input/test/instrument-name-grandstaff.ly
index a9758c05e0..40314b8c8e 100644
--- a/input/test/instrument-name-grandstaff.ly
+++ b/input/test/instrument-name-grandstaff.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \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 80cc669680..7af95704d3 100644
--- a/input/test/ligature-vaticana.ly
+++ b/input/test/ligature-vaticana.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header { texidoc	= "@cindex Ancient Vaticana
 Vaticana ligature uses four staff lines, special clef, an notes
diff --git a/input/test/lilypond-testpage.ly b/input/test/lilypond-testpage.ly
index 5cd7332382..e8c58b342d 100644
--- a/input/test/lilypond-testpage.ly
+++ b/input/test/lilypond-testpage.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 % MERGE with title.ly -gp
 
 %{
diff --git a/input/test/lyric-hyphen-retain.ly b/input/test/lyric-hyphen-retain.ly
index 906f0393f3..86d633cb19 100644
--- a/input/test/lyric-hyphen-retain.ly
+++ b/input/test/lyric-hyphen-retain.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 
diff --git a/input/test/lyrics-skip-notes.ly b/input/test/lyrics-skip-notes.ly
index 069d589abc..029caec7d6 100644
--- a/input/test/lyrics-skip-notes.ly
+++ b/input/test/lyrics-skip-notes.ly
@@ -13,7 +13,7 @@ less lyric syllables to a melody.
 % shorthand for Skip Lyric
 sl = \notes { \skip 4 }
 
-\version "2.1.30"
+\version "2.1.36"
 \score {
   <<
   \context Voice = "A"  \notes  {c4 c c c}
diff --git a/input/test/mensural-ligatures.ly b/input/test/mensural-ligatures.ly
index 38f3067402..2d1aece230 100644
--- a/input/test/mensural-ligatures.ly
+++ b/input/test/mensural-ligatures.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 % 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 8587b519c8..84a5cad662 100644
--- a/input/test/mensural-note-heads.ly
+++ b/input/test/mensural-note-heads.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
     texidoc ="@cindex Ancient Mensural Note Heads
diff --git a/input/test/midi-scales.ly b/input/test/midi-scales.ly
index c396af29e1..6d38620cc1 100644
--- a/input/test/midi-scales.ly
+++ b/input/test/midi-scales.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 % candidate for regression.  -gp
 \header {
   texidoc="Converting LilyPond input to MIDI and then again back with
diff --git a/input/test/move-accidentals.ly b/input/test/move-accidentals.ly
index 61302f6ff8..5316705c23 100644
--- a/input/test/move-accidentals.ly
+++ b/input/test/move-accidentals.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 % possible rename to scheme- or something like that.  -gp
 \header { texidoc= "@cindex Scheme Manual Accidentals
diff --git a/input/test/move-specific-text.ly b/input/test/move-specific-text.ly
index 6e08655a10..b4eda85b1c 100644
--- a/input/test/move-specific-text.ly
+++ b/input/test/move-specific-text.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 % 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 2495ad75b2..3fcd63aa2e 100644
--- a/input/test/music-box.ly
+++ b/input/test/music-box.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \include "deutsch.ly"
 % possible rename to scheme- something.  -gp
 % TODO: ask if it needs to have so many empty bars in the middle.  -gp
@@ -62,7 +62,7 @@ using Scheme functions to avoid typing work. " }
 
 
 
-\version "2.1.30"
+\version "2.1.36"
 
 pat = \notes \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 33f9264058..a3214609a3 100644
--- a/input/test/music-creation.ly
+++ b/input/test/music-creation.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 % 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 9a514eb6b8..0c339d068f 100644
--- a/input/test/no-bar-lines.ly
+++ b/input/test/no-bar-lines.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 % possible rename to bar-lines-foo.  -gp
 
 \header{ texidoc = "@cindex Bar Lines Remove
diff --git a/input/test/no-staff.ly b/input/test/no-staff.ly
index 0b5c13fa82..07976b09c8 100644
--- a/input/test/no-staff.ly
+++ b/input/test/no-staff.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 % possible rename to staff-something.  -gp
 
 \header{ texidoc = "@cindex Staff Remove
diff --git a/input/test/ossia.ly b/input/test/ossia.ly
index ec19de9141..edd5283e85 100644
--- a/input/test/ossia.ly
+++ b/input/test/ossia.ly
@@ -4,7 +4,7 @@
     @code{RemoveEmptyStaffContext} take out the unused parts.
 " }
 
-\version "2.1.30"
+\version "2.1.36"
 
 \score {
     \notes\relative c''
diff --git a/input/test/page-breaks.ly b/input/test/page-breaks.ly
index 2a988bf05a..fd737e7b35 100644
--- a/input/test/page-breaks.ly
+++ b/input/test/page-breaks.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
     texidoc = "Stress optimal page breaking.  This should look nice on 4 a6 pages."
@@ -25,7 +25,7 @@
 	\repeat unfold 17 { a b c d \break }
     }
     \paper {
-	#(set-paper-size "a6")
+	#(set-default-paper-size "a6")
 	#(define page-breaking ly:optimal-page-breaks)
     }
 }
diff --git a/input/test/part-combine.ly b/input/test/part-combine.ly
index cda14931d8..91016e8887 100644
--- a/input/test/part-combine.ly
+++ b/input/test/part-combine.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{ texidoc="@cindex Part Combine
 In orchestral scores and hymns, voices are traditionally combined into
diff --git a/input/test/partial-blank.ly b/input/test/partial-blank.ly
index 66104337f2..9b99048bec 100644
--- a/input/test/partial-blank.ly
+++ b/input/test/partial-blank.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 % 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/phrasing-slur-height.ly b/input/test/phrasing-slur-height.ly
index 45a00381c7..28e7870434 100644
--- a/input/test/phrasing-slur-height.ly
+++ b/input/test/phrasing-slur-height.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header{ texidoc="@cindex Phrasing Slur Height
 The @code{PhrasingSlur} can be made higher in order to avoid collision 
 with other slurs. "
diff --git a/input/test/piano-staff-distance.ly b/input/test/piano-staff-distance.ly
index 26f0b84884..af768963c7 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.1.30"
+\version "2.1.36"
 
 #(define ((futz-alignment-callback distance count) grob axis)
 
diff --git a/input/test/polymetric-differing-notes.ly b/input/test/polymetric-differing-notes.ly
index 8951d915b1..84b002ffad 100644
--- a/input/test/polymetric-differing-notes.ly
+++ b/input/test/polymetric-differing-notes.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header{ texidoc="
 
diff --git a/input/test/polymetric.ly b/input/test/polymetric.ly
index 4840fc210d..41370185ee 100644
--- a/input/test/polymetric.ly
+++ b/input/test/polymetric.ly
@@ -1,4 +1,4 @@
-\version "2.1.31"
+\version "2.1.36"
 
 \header{ texidoc="@cindex Time Signature Multiple
 
diff --git a/input/test/preset-extent.ly b/input/test/preset-extent.ly
index d2398f1b27..f6dbad0bb5 100644
--- a/input/test/preset-extent.ly
+++ b/input/test/preset-extent.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header { texidoc = "
 
 @cindex Preset Extent
diff --git a/input/test/repeat-manual.ly b/input/test/repeat-manual.ly
index dcc8fb2e22..b20e9d86d4 100644
--- a/input/test/repeat-manual.ly
+++ b/input/test/repeat-manual.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header { texidoc = "@cindex Repeat Manual
 By controlling manually the signs and numbers in repeats, an unusual 
 output can be produced. "
diff --git a/input/test/repeat-shorter-bracket.ly b/input/test/repeat-shorter-bracket.ly
index e85478834a..6d452f472d 100644
--- a/input/test/repeat-shorter-bracket.ly
+++ b/input/test/repeat-shorter-bracket.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header{
     texidoc="
 
diff --git a/input/test/repeat.ly b/input/test/repeat.ly
index 03a9976520..d99cd63b37 100644
--- a/input/test/repeat.ly
+++ b/input/test/repeat.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 % possible rename to lyric-repeat or repeat-lyric.
 
diff --git a/input/test/rest-dot-positions.ly b/input/test/rest-dot-positions.ly
index 7eec84e0e4..c5d456285e 100644
--- a/input/test/rest-dot-positions.ly
+++ b/input/test/rest-dot-positions.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 % candidate for regression.  -gp
 \header { texidoc = "@cindex Rest Dot Positions
 Dots of rests should follow the rest positions. " }
diff --git a/input/test/rests.ly b/input/test/rests.ly
index f1bbb1a893..5b46715f83 100644
--- a/input/test/rests.ly
+++ b/input/test/rests.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {
     texidoc = "@cindex Rests
 
diff --git a/input/test/reverse-music.ly b/input/test/reverse-music.ly
index abc5ad4601..f2e363029d 100644
--- a/input/test/reverse-music.ly
+++ b/input/test/reverse-music.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 % 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/rhythm-excercise.ly b/input/test/rhythm-excercise.ly
index 785fa958b1..0ae16e4f9e 100644
--- a/input/test/rhythm-excercise.ly
+++ b/input/test/rhythm-excercise.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header { texidoc = "@cindex Rhythm Exercise
 Rythmic exercises may be produced by removing the @code{Clef} engraver,
 putting all notes to the same pitch and using transparent staff lines.
diff --git a/input/test/scales-greek.ly b/input/test/scales-greek.ly
index 9881845e22..f778701b38 100644
--- a/input/test/scales-greek.ly
+++ b/input/test/scales-greek.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
   texidoc = "
 
diff --git a/input/test/scheme-interactions.ly b/input/test/scheme-interactions.ly
index 1fc3f4a319..233fbcc3b3 100644
--- a/input/test/scheme-interactions.ly
+++ b/input/test/scheme-interactions.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header { texidoc = "@cindex Scheme Interactions
 Using @code{ly:export}, the result of Scheme expressions can be passed
 as LilyPond input.  Within a Scheme expression, you can use, define or 
diff --git a/input/test/script-abbreviations.ly b/input/test/script-abbreviations.ly
index 90234889ec..918265b604 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.1.30"
+\version "2.1.36"
 \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 bd40ae2a02..a3aad2556a 100644
--- a/input/test/script-chart.ly
+++ b/input/test/script-chart.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 % this chart is used in the manual too.
 
diff --git a/input/test/script-priority.ly b/input/test/script-priority.ly
index 917ce847ff..be74bed134 100644
--- a/input/test/script-priority.ly
+++ b/input/test/script-priority.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header { texidoc = "@cindex Script Priority
 Relative placements of different script types can be controlled
diff --git a/input/test/script-stack.ly b/input/test/script-stack.ly
index b180060fa8..f3b6fb777f 100644
--- a/input/test/script-stack.ly
+++ b/input/test/script-stack.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header { texidoc = "@cindex Stacked Text Articulation
 Text and articulations may be stacked on top of each other. "
diff --git a/input/test/separate-staccato.ly b/input/test/separate-staccato.ly
index 5aa6f4c814..5b8d66d704 100644
--- a/input/test/separate-staccato.ly
+++ b/input/test/separate-staccato.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 % possible rename.  -gp
 
 \header { texidoc="@cindex Seperate Staccato
diff --git a/input/test/slur-attachment-override.ly b/input/test/slur-attachment-override.ly
index 9fd680b13e..f683d20d93 100644
--- a/input/test/slur-attachment-override.ly
+++ b/input/test/slur-attachment-override.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{
 texidoc="@cindex Slur Attachment Override
diff --git a/input/test/slur-beautiful.ly b/input/test/slur-beautiful.ly
index 397a2662a1..4d1e6ab02e 100644
--- a/input/test/slur-beautiful.ly
+++ b/input/test/slur-beautiful.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header { texidoc ="@cindex Slur Beautiful
 The curvature of a slur is adjusted to stay away from note heads and 
diff --git a/input/test/slur-dash.ly b/input/test/slur-dash.ly
index 208fb09731..3ed2fb29e3 100644
--- a/input/test/slur-dash.ly
+++ b/input/test/slur-dash.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {texidoc = "@cindex Slur, dotted
 The appearance of slurs may be changed from solid to dotted or dashed.
 "
diff --git a/input/test/slur-manual.ly b/input/test/slur-manual.ly
index cf84ae8278..5db4bdb428 100644
--- a/input/test/slur-manual.ly
+++ b/input/test/slur-manual.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \header {
 
 
diff --git a/input/test/slur-minimum-length.ly b/input/test/slur-minimum-length.ly
index 0f136e7275..78af3f265d 100644
--- a/input/test/slur-minimum-length.ly
+++ b/input/test/slur-minimum-length.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header { texidoc = "@cindex Slur Minimum Length
 By setting the minimum length of a slur, notes are more separated. " 
diff --git a/input/test/slur-ugly.ly b/input/test/slur-ugly.ly
index 8e28938740..01850ca4c9 100644
--- a/input/test/slur-ugly.ly
+++ b/input/test/slur-ugly.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header { texidoc="@cindex Slur Ugly
 Strange slurs can be produced by setting properties by hand. "
diff --git a/input/test/smart-transpose.ly b/input/test/smart-transpose.ly
index 9904813e9e..f587306aae 100644
--- a/input/test/smart-transpose.ly
+++ b/input/test/smart-transpose.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 texidoc="@cindex Smart Transpose
diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly
index 10f4fce150..62958e634e 100644
--- a/input/test/spacing-2.ly
+++ b/input/test/spacing-2.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 % more yummy regression goodness.  -gp
 \header {
diff --git a/input/test/spanner-after-break-tweak.ly b/input/test/spanner-after-break-tweak.ly
index 939cb6b439..6c3d0e91b3 100644
--- a/input/test/spanner-after-break-tweak.ly
+++ b/input/test/spanner-after-break-tweak.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header { texidoc = "@cindex Spanner after break
 
diff --git a/input/test/staff-bracket.ly b/input/test/staff-bracket.ly
index 7a881d2f10..b7f2ae3e05 100644
--- a/input/test/staff-bracket.ly
+++ b/input/test/staff-bracket.ly
@@ -1,4 +1,4 @@
-\version "2.1.30" 
+\version "2.1.36" 
 
 \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 694858a47e..726cfb7eae 100644
--- a/input/test/staff-container.ly
+++ b/input/test/staff-container.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 
diff --git a/input/test/staff-lines.ly b/input/test/staff-lines.ly
index 42aa58f3fc..933ae95745 100644
--- a/input/test/staff-lines.ly
+++ b/input/test/staff-lines.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 
diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly
index cf777f9a24..533dafb414 100644
--- a/input/test/staff-size.ly
+++ b/input/test/staff-size.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header { texidoc = "@cindex Staff Size
 
diff --git a/input/test/staff-space.ly b/input/test/staff-space.ly
index 75e0f77be6..f4c5f7011c 100644
--- a/input/test/staff-space.ly
+++ b/input/test/staff-space.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header{ texidoc ="@cindex Staff Space
 By just increasing @code{staff-space} on a staff, you may produce strange
diff --git a/input/test/stem-cross-staff.ly b/input/test/stem-cross-staff.ly
index 6c4dee3796..cdd4d5d4cd 100644
--- a/input/test/stem-cross-staff.ly
+++ b/input/test/stem-cross-staff.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header { texidoc = "@cindex Stem Cross Staff
 The chords which exceptionally cross staves may be produced by increasing 
diff --git a/input/test/stem-extend.ly b/input/test/stem-extend.ly
index 8845b0830c..e926c1aa3d 100644
--- a/input/test/stem-extend.ly
+++ b/input/test/stem-extend.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header { texidoc = "@cindex Stem Extend
 Extending stems to the center line may be prevented using @code{no-stem-extend}.
diff --git a/input/test/stem-length.ly b/input/test/stem-length.ly
index bebe1dc174..78e727b7a8 100644
--- a/input/test/stem-length.ly
+++ b/input/test/stem-length.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{ texidoc = "@cindex Stem Length
 The length of stems can be altered. "
diff --git a/input/test/tablature-hammer.ly b/input/test/tablature-hammer.ly
index 48e7232e25..008cf7a654 100644
--- a/input/test/tablature-hammer.ly
+++ b/input/test/tablature-hammer.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 \header {texidoc = "@cindex Tablature hammer
 A hammer in tablature can be faked with slurs. "
 } 
diff --git a/input/test/tablature.ly b/input/test/tablature.ly
index 9e3e2f2180..f4631eab16 100644
--- a/input/test/tablature.ly
+++ b/input/test/tablature.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header{ texidoc = "@cindex Tabulature
 Tablature is internally done by overriding the note-head formatting function
diff --git a/input/test/temporary-stave.ly b/input/test/temporary-stave.ly
index a6e7dccf32..007133b977 100644
--- a/input/test/temporary-stave.ly
+++ b/input/test/temporary-stave.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 
diff --git a/input/test/text-rotate.ly b/input/test/text-rotate.ly
index 23a406f54a..c0fdc02978 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.1.30"
+\version "2.1.36"
 
 \score {
 \new Staff \notes \relative c'' {
diff --git a/input/test/text-spanner.ly b/input/test/text-spanner.ly
index e9d9292856..62d0894181 100644
--- a/input/test/text-spanner.ly
+++ b/input/test/text-spanner.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header { texidoc = "@cindex text spanner
 Text spanners can be used in the similar manner than markings for pedals
diff --git a/input/test/textscript.ly b/input/test/textscript.ly
index ed9835a029..d8c1569385 100644
--- a/input/test/textscript.ly
+++ b/input/test/textscript.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header { texidoc = "@cindex Textscript
 There are different fonts and glyphs to be used with @code{\markup} command. "
diff --git a/input/test/tie-cross-voice.ly b/input/test/tie-cross-voice.ly
index c445a1f059..c87cad0fb9 100644
--- a/input/test/tie-cross-voice.ly
+++ b/input/test/tie-cross-voice.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 
 
diff --git a/input/test/time-signature-double.ly b/input/test/time-signature-double.ly
index 64b7c2f217..99bfb8cd74 100644
--- a/input/test/time-signature-double.ly
+++ b/input/test/time-signature-double.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header { texidoc= "
 
diff --git a/input/test/time.ly b/input/test/time.ly
index fdd24c43dd..c92ac14c45 100644
--- a/input/test/time.ly
+++ b/input/test/time.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 % TODO: This file could be old.  Ask about it later.  -gp
 
 \header { texidoc = "@cindex Time
diff --git a/input/test/timing.ly b/input/test/timing.ly
index 51d5855246..8dd5ab540c 100644
--- a/input/test/timing.ly
+++ b/input/test/timing.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 % possible rename to bar-something.
 
 \header{ texidoc = "@cindex Bar Length
diff --git a/input/test/title-markup.ly b/input/test/title-markup.ly
index 138d1760ad..2a10a8faa9 100644
--- a/input/test/title-markup.ly
+++ b/input/test/title-markup.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 %{
    Experimental markup titles are available in direct PostScript output:
 
diff --git a/input/test/title.ly b/input/test/title.ly
index bc33785297..f04c022152 100644
--- a/input/test/title.ly
+++ b/input/test/title.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 % MERGE with lilypond-
 \header {
   filename = "title.ly"
diff --git a/input/test/to-xml.ly b/input/test/to-xml.ly
index 9e532be3fc..a93191b0e6 100644
--- a/input/test/to-xml.ly
+++ b/input/test/to-xml.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 fooBar = \notes { << c''4 \\ g'4 >> }
 
diff --git a/input/test/transposition.ly b/input/test/transposition.ly
index 40028a208e..1a2b857e5b 100644
--- a/input/test/transposition.ly
+++ b/input/test/transposition.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 \header{ texidoc = "@cindex Transposition
 Transposing has also an effect key signature, if it is given using
diff --git a/input/test/trill.ly b/input/test/trill.ly
index bd4d8864a6..e5ffc644be 100644
--- a/input/test/trill.ly
+++ b/input/test/trill.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header { texidoc="@cindex Trill
 The extended trill may be produced using @code{TextSpanner} with @code{trill} 
diff --git a/input/test/trills.ly b/input/test/trills.ly
index 76dda0997c..cd40cb19fa 100644
--- a/input/test/trills.ly
+++ b/input/test/trills.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
   texidoc="@cindex Trills
diff --git a/input/test/unfold-all-repeats.ly b/input/test/unfold-all-repeats.ly
index b3160a59e0..e52400efe6 100644
--- a/input/test/unfold-all-repeats.ly
+++ b/input/test/unfold-all-repeats.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 % regression.  -gp
 
 \header { 
diff --git a/input/test/version-output.ly b/input/test/version-output.ly
index 4bce17911f..b0611a8a9b 100644
--- a/input/test/version-output.ly
+++ b/input/test/version-output.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \header {
 
diff --git a/input/test/vertical-extent.ly b/input/test/vertical-extent.ly
index 251f97f328..c6fbe95bfb 100644
--- a/input/test/vertical-extent.ly
+++ b/input/test/vertical-extent.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 % TODO: huh?  what's this file about?  -gp
 
 \header { texidoc = "
diff --git a/input/tutorial/brahms-original.ly b/input/tutorial/brahms-original.ly
index 3e32f2bb42..b55b783dec 100644
--- a/input/tutorial/brahms-original.ly
+++ b/input/tutorial/brahms-original.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "2.1.28"
+\version "2.1.36"
 \score {
     \notes\context PianoStaff <<
     \context Staff = up
diff --git a/input/tutorial/brahms-tweaked.ly b/input/tutorial/brahms-tweaked.ly
index 2bd90ebed5..5aaa98eb04 100644
--- a/input/tutorial/brahms-tweaked.ly
+++ b/input/tutorial/brahms-tweaked.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "2.1.28"
+\version "2.1.36"
 \score {
     \notes\context PianoStaff <<
     \context Staff = up
diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index 504d938b0f..38ce2e705e 100644
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "2.1.28"
+\version "2.1.36"
 \header{
 filename = 	 "twinkle-pop.ly"
 xtitle = 	 "Ah, vous dirais-je, maman "
diff --git a/input/wilhelmus.ly b/input/wilhelmus.ly
index f9f0cc7c76..eb7b5737ee 100644
--- a/input/wilhelmus.ly
+++ b/input/wilhelmus.ly
@@ -1,4 +1,4 @@
-\version "2.1.34"
+\version "2.1.36"
 
 \header {
   texidoc = "Wilhelmus van Nassouwe"
diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc
index c39279072c..48308142fd 100644
--- a/lily/accidental-placement.cc
+++ b/lily/accidental-placement.cc
@@ -1,15 +1,15 @@
 /*   
-accidental-placement.cc --  implement Accidental_placement
+     accidental-placement.cc --  implement Accidental_placement
 
-source file of the GNU LilyPond music typesetter
+     source file of the GNU LilyPond music typesetter
 
-(c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+     (c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
- */
+*/
 
 #include <math.h>
-#include <libc-extension.hh>
 
+#include "libc-extension.hh" 	// isinf
 #include "item.hh"
 #include "skyline.hh"
 #include "music.hh"
diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index ebd3426ac0..aa03614bab 100644
--- a/lily/change-iterator.cc
+++ b/lily/change-iterator.cc
@@ -64,16 +64,22 @@ Change_iterator::process (Moment m)
   if (current) 
     if (last)
       {
-	Context * dest = 
-	  get_outlet ()->find_existing_context (to_type, to_id);
+	Context * dest = 0;
+	Context * where = get_outlet ();
+	while (!dest && where)
+	  {
+	    dest = where->find_context_below (to_type, to_id);
+	    where = where->daddy_context_;
+	  }
+	
 	if (dest)
 	  {
-	current->remove_context (last);
-	dest->add_context (last);
+	    current->remove_context (last);
+	    dest->add_context (last);
 	  }
 	else
 	  {
-	    get_music ()->origin ()->warning  ("Could not find context to switch to.");
+	    get_music ()->origin ()->warning  ("could not find context to switch to.");
 	  }
       }
     else
diff --git a/lily/cluster.cc b/lily/cluster.cc
index 666a91a847..2b7bc77c2b 100644
--- a/lily/cluster.cc
+++ b/lily/cluster.cc
@@ -230,7 +230,7 @@ public:
 
 MAKE_SCHEME_CALLBACK (Cluster_beacon,height,2);
 SCM
-Cluster_beacon::height (SCM g, SCM ax)
+Cluster_beacon::height (SCM g, SCM)
 {
   (void) ax;
   Grob *me = unsmob_grob (g);
diff --git a/lily/context.cc b/lily/context.cc
index a61d9fdf74..d891aac163 100644
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -96,7 +96,7 @@ Context::Context ()
 }
 
 Context *
-Context::find_existing_context (SCM n, String id)
+Context::find_context_below (SCM n, String id)
 {
   if ((is_alias (n) && (id_string_ == id || id.is_empty ())))
     return this;
@@ -106,7 +106,7 @@ Context::find_existing_context (SCM n, String id)
     {
       Context *  t = unsmob_context (ly_car (p));
       
-      r = dynamic_cast<Context*> (t)->find_existing_context (n, id);
+      r = dynamic_cast<Context*> (t)->find_context_below (n, id);
     }
 
   return r;
@@ -125,7 +125,7 @@ Context::find_create_context (SCM n, String id,
     return get_score_context ()->find_create_context (n, id, operations);
     
   
-  Context * existing = find_existing_context (n,id);
+  Context * existing = find_context_below (n,id);
   if (existing)
     return existing;
 
diff --git a/lily/include/context.hh b/lily/include/context.hh
index 8a651e2a7f..004f68fdba 100644
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -55,7 +55,7 @@ public:
   
   virtual Music_output_def *get_output_def () const;
   virtual Moment now_mom () const;
-  Context *find_existing_context (SCM context_name, String id);
+  Context *find_context_below (SCM context_name, String id);
   Context *find_create_context (SCM context_name,
 					    String id, SCM ops);
   Link_array<Context> path_to_acceptable_context (SCM alias,
diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index e93c9bccdf..dbb159b8af 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -85,12 +85,12 @@ get_voice_to_lyrics (Context *lyrics)
 	nm = nm.left_string (idx);
     }
 
-  Context *c =  lyrics->find_existing_context (ly_symbol2scm ("Voice"), nm);
+  Context *c =  lyrics->find_context_below (ly_symbol2scm ("Voice"), nm);
 
   if (c)
     return c;
 
-  return lyrics->find_existing_context (ly_symbol2scm ("Voice"), "");
+  return lyrics->find_context_below (ly_symbol2scm ("Voice"), "");
 }
 
 Grob *
diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc
index 2523b33999..c30547f71f 100644
--- a/lily/parse-scm.cc
+++ b/lily/parse-scm.cc
@@ -77,7 +77,8 @@ SCM
 parse_handler (void * data, SCM tag, SCM args)
 {
   Parse_start* ps = (Parse_start*) data;
-
+  (void) tag;			// prevent warning
+  
   ps->start_location_.error (_("GUILE signaled an error for the expression beginning here"));
 
   if (scm_ilength (args) > 2)
diff --git a/lily/parser.yy b/lily/parser.yy
index 0c411542c0..9a46520cfd 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -9,29 +9,6 @@
                  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-/* Four shift/reduce problems
-
-1.  foo = bar
-
-    "bar" -> String -> Lyric -> Music -> music-assignment
-  or
-    "bar" -> String -> string-assignment
-
-Similar problem for
-
-2.  \markup identifier
-3.  \markup { }
-
-4.  \repeat
-    \repeat .. \alternative
-    \repeat { \repeat .. \alternative }
-or
-    \repeat { \repeat } \alternative
-
---hwn
-
-*/
-
 /*
 
 TODO:
@@ -220,6 +197,41 @@ yylex (YYSTYPE *s, void *v)
 
 %}
 
+%expect 4
+
+/*
+  Four shift/reduce problems:
+
+1.	foo = bar.
+
+	"bar" -> String -> Lyric -> Music -> music-assignment
+
+	"bar" -> String -> string-assignment
+
+
+Similar problem for
+
+2. \markup identifier.
+
+3. \markup { }
+
+4.  \repeat
+	\repeat .. \alternative
+
+
+    \repeat { \repeat .. \alternative }
+
+or
+
+    \repeat { \repeat } \alternative 
+
+)
+
+--hwn
+
+ */
+
+
 %pure_parser
 
 
diff --git a/ly/a3-init.ly b/ly/a3-init.ly
index e1980fae81..64240acd9e 100644
--- a/ly/a3-init.ly
+++ b/ly/a3-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 % a3-init.ly
 
 hsize = 296.9 \mm
diff --git a/ly/a4-init.ly b/ly/a4-init.ly
index 2fb61d2a8f..12b7d2bf24 100644
--- a/ly/a4-init.ly
+++ b/ly/a4-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 % a4.ly
 
 hsize = 210.0 \mm
diff --git a/ly/accordion-defs-init.ly b/ly/accordion-defs-init.ly
index 90b5edaf0d..6cf9d04d7e 100644
--- a/ly/accordion-defs-init.ly
+++ b/ly/accordion-defs-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 % Symbols needed to print accordion music
 % 
 %  2' = T
diff --git a/ly/book-init-init.ly b/ly/book-init-init.ly
index d1466f8055..c4ae2ee4a0 100644
--- a/ly/book-init-init.ly
+++ b/ly/book-init-init.ly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
 	
-\version "2.1.30"
+\version "2.1.36"
 
 
 \include "declarations-init.ly"
diff --git a/ly/catalan.ly b/ly/catalan.ly
index 37452f06e6..a6ad8d66b8 100644
--- a/ly/catalan.ly
+++ b/ly/catalan.ly
@@ -73,4 +73,4 @@ pitchnamesCatalan = #`(
 
 pitchnames = \pitchnamesCatalan
 
-\version "2.1.30"
+\version "2.1.36"
diff --git a/ly/center-init.ly b/ly/center-init.ly
index ca26b5caea..699d0638c6 100644
--- a/ly/center-init.ly
+++ b/ly/center-init.ly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
 	
-\version "2.1.30"
+\version "2.1.36"
 
 
 \include "declarations-init.ly"
diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly
index 590729b63c..3e528ae1b6 100644
--- a/ly/chord-modifiers-init.ly
+++ b/ly/chord-modifiers-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 chordmodifiers = #default-chord-modifier-list
 
diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 00ae0f46f6..d39b691411 100644
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,6 +1,6 @@
 #(ly:set-option 'old-relative)
 
-\version "2.1.30"
+\version "2.1.36"
 breve = #(ly:make-duration -1 0)
 longa = #(ly:make-duration -2 0 )
 maxima = #(ly:make-duration -3 0)
diff --git a/ly/deutsch.ly b/ly/deutsch.ly
index 548929f549..38fcfaa75e 100644
--- a/ly/deutsch.ly
+++ b/ly/deutsch.ly
@@ -49,4 +49,4 @@ pitchnamesDeutsch = #`(
 
 pitchnames = \pitchnamesDeutsch
 
-\version "2.1.30"
+\version "2.1.36"
diff --git a/ly/drumpitch-init.ly b/ly/drumpitch-init.ly
index 61929346cd..c9339e1c1e 100644
--- a/ly/drumpitch-init.ly
+++ b/ly/drumpitch-init.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.30"
+\version "2.1.36"
 
 drumPitchNames =
 #'((acousticbassdrum . acousticbassdrum)
diff --git a/ly/dynamic-scripts-init.ly b/ly/dynamic-scripts-init.ly
index 8bfcac5086..82b864ba0d 100644
--- a/ly/dynamic-scripts-init.ly
+++ b/ly/dynamic-scripts-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 %
 % declare the standard dynamic identifiers.
diff --git a/ly/english.ly b/ly/english.ly
index af754fa53a..f0535243d6 100644
--- a/ly/english.ly
+++ b/ly/english.ly
@@ -87,5 +87,5 @@ pitchnamesEnglish = #`(
 
 pitchnames = \pitchnamesEnglish
 
-\version "2.1.30"
+\version "2.1.36"
 
diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 9c37b26c5a..7b0d7b99b0 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 \context {
     \name Global
diff --git a/ly/espanol.ly b/ly/espanol.ly
index ecdc1492f5..93ff125771 100644
--- a/ly/espanol.ly
+++ b/ly/espanol.ly
@@ -58,4 +58,4 @@ pitchnamesEspanol = #`(
 
 pitchnames = \pitchnamesEspanol
 
-\version "2.1.30"
+\version "2.1.36"
diff --git a/ly/generate-documentation.ly b/ly/generate-documentation.ly
index 7cd7d60fb1..813b21cc34 100644
--- a/ly/generate-documentation.ly
+++ b/ly/generate-documentation.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 %
 % Running LilyPond on this file generates the documentation
diff --git a/ly/generate-interface-doc-init.ly b/ly/generate-interface-doc-init.ly
index fd1b270727..2a6696268d 100644
--- a/ly/generate-interface-doc-init.ly
+++ b/ly/generate-interface-doc-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 %
 % Running LilyPond on this file generates the short interface doc
diff --git a/ly/grace-init.ly b/ly/grace-init.ly
index 03a5df28fa..0528f47422 100644
--- a/ly/grace-init.ly
+++ b/ly/grace-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 
 startGraceMusic = \notes {
diff --git a/ly/gregorian-init.ly b/ly/gregorian-init.ly
index 8b4c01ad66..f135e18f2b 100644
--- a/ly/gregorian-init.ly
+++ b/ly/gregorian-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 %%%%%%%%
 %%%%%%%% shortcuts common for all styles of gregorian chant notation
diff --git a/ly/init.ly b/ly/init.ly
index a86ad966a7..08334138ff 100644
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -4,7 +4,7 @@
 #(define-public midi-debug #f)
 
 
-\version "2.1.30"
+\version "2.1.36"
 
 \include "declarations-init.ly"
 
diff --git a/ly/italiano.ly b/ly/italiano.ly
index e59f8fc78f..2b99fba152 100644
--- a/ly/italiano.ly
+++ b/ly/italiano.ly
@@ -86,4 +86,4 @@ pitchnamesItaliano = #`(
 
 pitchnames = \pitchnamesItaliano
 
-\version "2.1.30"
+\version "2.1.36"
diff --git a/ly/legal-init.ly b/ly/legal-init.ly
index 2b02f8fc02..dd0459242c 100644
--- a/ly/legal-init.ly
+++ b/ly/legal-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 % legal-init.ly
 
 hsize = 8.5 \in
diff --git a/ly/letter-init.ly b/ly/letter-init.ly
index fcc13b5973..b51d384a74 100644
--- a/ly/letter-init.ly
+++ b/ly/letter-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 % letter-init.ly
 
 hsize = 8.5 \in
diff --git a/ly/midi-init.ly b/ly/midi-init.ly
index 95f012d188..dd5b3c2c53 100644
--- a/ly/midi-init.ly
+++ b/ly/midi-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 \midi {
         \tempo 4=60
 	\include "performer-init.ly"
diff --git a/ly/nederlands.ly b/ly/nederlands.ly
index c3e2a96306..8b6b7076fc 100644
--- a/ly/nederlands.ly
+++ b/ly/nederlands.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 %{
  common dutch names for notes. es means flat, is means sharp
 %}
diff --git a/ly/norsk.ly b/ly/norsk.ly
index 96f5333e30..d21bf06b13 100644
--- a/ly/norsk.ly
+++ b/ly/norsk.ly
@@ -105,4 +105,4 @@ pitchnamesNorsk = #`(
 
 pitchnames =\pitchnamesNorsk
 
-\version "2.1.30"
+\version "2.1.36"
diff --git a/ly/params-init.ly b/ly/params-init.ly
index f2a6f6f794..6761ce6f3a 100644
--- a/ly/params-init.ly
+++ b/ly/params-init.ly
@@ -1,2 +1,2 @@
-\version "2.1.30"
+\version "2.1.36"
 
diff --git a/ly/part-paper-init.ly b/ly/part-paper-init.ly
index e0eb32ecc3..c42ce24716 100644
--- a/ly/part-paper-init.ly
+++ b/ly/part-paper-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 % JUNKME
 %part-paper-init.ly
diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index 27d041644f..06a01c1ed5 100644
--- a/ly/performer-init.ly
+++ b/ly/performer-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 				%
 				% setup for Request->Element conversion. Guru-only
@@ -86,7 +86,7 @@
     \type "Score_performer"
 
     \name Score
-    \alias Timing
+    
     melismaBusyProperties = #default-melisma-properties
     instrument = #"bright acoustic"
     \accepts Staff
@@ -102,7 +102,7 @@
     \accepts ChordNames
     \accepts FiguredBass
     \accepts Lyrics
-    \alias "Timing"
+    
     \consists "Timing_translator"
     \consists "Swallow_performer"
     
diff --git a/ly/property-init.ly b/ly/property-init.ly
index 81378b7628..4d11d8ff68 100644
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -1,6 +1,6 @@
 % property-init.ly
 
-\version "2.1.30"
+\version "2.1.36"
 
 stemUp = \override Stem  #'direction = #1
 stemDown = \override Stem  #'direction = #-1 
diff --git a/ly/scale-definitions-init.ly b/ly/scale-definitions-init.ly
index 633c15a307..4fd21b5371 100644
--- a/ly/scale-definitions-init.ly
+++ b/ly/scale-definitions-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 
 major = #`(
diff --git a/ly/script-init.ly b/ly/script-init.ly
index 366bb2abb9..5cf5f99d82 100644
--- a/ly/script-init.ly
+++ b/ly/script-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 
 dashHat= "marcato"
diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly
index 3e1eae9c7d..d022ab1c1d 100644
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 startGroup = #(make-span-event 'NoteGroupingEvent START)
 stopGroup = #(make-span-event 'NoteGroupingEvent STOP)
diff --git a/ly/suomi.ly b/ly/suomi.ly
index 22813ee100..7bb331e6d4 100644
--- a/ly/suomi.ly
+++ b/ly/suomi.ly
@@ -48,4 +48,4 @@ pitchnamesSuomi = #`(
 
 pitchnames = \pitchnamesSuomi
 
-\version "2.1.30"
+\version "2.1.36"
diff --git a/ly/svenska.ly b/ly/svenska.ly
index 897433120f..c0dae064c3 100644
--- a/ly/svenska.ly
+++ b/ly/svenska.ly
@@ -42,4 +42,4 @@ pitchnamesSvenska = #`(
 )
 
 pitchnames = \pitchnamesSvenska
-\version "2.1.30"
+\version "2.1.36"
diff --git a/ly/tabloid-init.ly b/ly/tabloid-init.ly
index 2cc637e301..36bcd5f589 100644
--- a/ly/tabloid-init.ly
+++ b/ly/tabloid-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.30"
+\version "2.1.36"
 
 % tabloid-init.ly
 
diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 2d5d0e7a9b..4272e0fb65 100644
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -2062,6 +2062,14 @@ def conv (str):
 conversions.append (((2,1, 36), conv,
 		     '''ly:mutable-music-properties -> ly:music-mutable-properties'''))
 
+
+
+def conv (str):
+	return str
+
+conversions.append (((2,2, 0), conv,
+		     '''clean up version. '''))
+
 ################################
 #	END OF CONVERSIONS	
 ################################
-- 
2.39.5