more conversion for dash-change.

492 files changed, 1463 insertions, 1465 deletions

diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index d7bfe4e4ca..ea65a21bad 100644
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -53,13 +53,13 @@ above or below notes by using a string @code{c^"text"}.  By default,
 these indications do not influence the note spacing, but by using the
 command @code{\fatText}, the widths will be taken into account
 
-@lilypond[quote,fragment,raggedright,verbatim,relative=1]
+@lilypond[quote,fragment,ragged-right,verbatim,relative=1]
 c4^"longtext" \fatText c4_"longlongtext" c4
 @end lilypond
 
 More complex formatting may also be added to a note by using the
 markup command,
-@lilypond[fragment,raggedright,verbatim,quote]
+@lilypond[fragment,ragged-right,verbatim,quote]
 c'4^\markup { bla \bold bla }
 @end lilypond
 
@@ -105,7 +105,7 @@ notes of the spanner.
 The string to be printed, as well as the style, is set through object
 properties
 
-@lilypond[quote,raggedright,fragment,relative=1,verbatim]
+@lilypond[quote,ragged-right,fragment,relative=1,verbatim]
 c1
 \textSpannerDown
 \override TextSpanner #'edge-text = #'("rall " . "")
@@ -148,7 +148,7 @@ but it can also be used to put signs like coda,
 segno, and fermata on a bar line.  Use @code{\markup} to
 access the appropriate symbol
 
-@lilypond[fragment,quote,raggedright,verbatim,relative=2]
+@lilypond[fragment,quote,ragged-right,verbatim,relative=2]
 c1 \mark \markup { \musicglyph #"scripts.ufermata" }
 c1
 @end lilypond
@@ -179,7 +179,7 @@ To print the mark at the end of the current line, use
 @code{\mark} is often useful for adding text to the end of bar.  In
 such cases, changing the @code{#'self-alignment} is very useful
 
-@lilypond[fragment,quote,raggedright,verbatim,relative=2]
+@lilypond[fragment,quote,ragged-right,verbatim,relative=2]
 \override Score.RehearsalMark
   #'break-visibility = #begin-of-line-invisible
 c1 c c c4 c c c
@@ -243,7 +243,7 @@ Text can also be placed on its own, away from any @code{\score}
 block.  This is primarily used in a @code{\book} (see
 @ref{Multiple movements}).
 
-@lilypond[quote,raggedright,verbatim]
+@lilypond[quote,ragged-right,verbatim]
 \markup{ Here is some text. }
 @end lilypond
 
@@ -408,7 +408,7 @@ It is possible to nest music inside markups, by adding a @code{\score}
 block to a markup expression.  Such a score must contain a @code{\layout}
 block.
 
-@lilypond[quote,verbatim,raggedright]
+@lilypond[quote,verbatim,ragged-right]
 \relative {
   c4 d^\markup {
     \score {
@@ -541,7 +541,7 @@ with dynamics.  Use @code{make-dynamic-script} to create these marks.
 
 @cindex make-dynamic-script
 
-@lilypond[quote,verbatim,raggedright]
+@lilypond[quote,verbatim,ragged-right]
 sfzp = #(make-dynamic-script "sfzp")
 \relative c' {
   c4 c c\sfzp c
@@ -554,7 +554,7 @@ sfzp = #(make-dynamic-script "sfzp")
 It is also possible to print dynamics in round parenthesis or square
 brackets.  These are often used for adding editorial dynamics.
 
-@lilypond[quote,verbatim,raggedright]
+@lilypond[quote,verbatim,ragged-right]
 rndf = \markup{ \center-align {\line { \bold{\italic (}
   \dynamic f \bold{\italic )} }} }
 boxf = \markup{ \bracket { \dynamic f } }
@@ -598,7 +598,7 @@ multi-measure rest.  This expansion is controlled by the property
 @code{Score.skipBars}.  If this is set to true, empty measures will not
 be expanded, and the appropriate number is added automatically
 
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 \time 4/4 r1 | R1 | R1*2
 \set Score.skipBars = ##t R1*17 R1*4
 @end lilypond
@@ -607,7 +607,7 @@ The @code{1} in @code{R1} is similar to the duration notation used for
 notes.  Hence, for time signatures other than 4/4, you must enter other
 durations.  This can be done with augmentation dots or fractions
 
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 \set Score.skipBars = ##t
 \time 3/4
 R2. | R2.*2
@@ -624,7 +624,7 @@ If there are only a few measures of rest, LilyPond prints ``church rests''
 (a series of rectangles) in the staff.  To replace that with a simple
 rest, use @code{MultiMeasureRest.expand-limit}.
 
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 \set Score.skipBars = ##t
 R1*2 | R1*5 | R1*9
 \override MultiMeasureRest #'expand-limit = 1
@@ -640,7 +640,7 @@ Texts can be added to multi-measure rests by using the
 A variable (@code{\fermataMarkup}) is provided for
 adding fermatas
 
-@lilypond[quote,raggedright,verbatim,fragment]
+@lilypond[quote,ragged-right,verbatim,fragment]
 \set Score.skipBars = ##t
 \time 3/4
 R2.*10^\markup { \italic "ad lib." }
@@ -650,7 +650,7 @@ R2.^\fermataMarkup
 Warning!  This text is created by @code{MultiMeasureRestText}, not
 @code{TextScript}.
 
-@lilypond[quote,raggedright,verbatim,fragment]
+@lilypond[quote,ragged-right,verbatim,fragment]
 \override TextScript #'padding = #5
 R1^"low"
 \override MultiMeasureRestText #'padding = #5
@@ -712,7 +712,7 @@ Metronome settings can be entered as follows
 In the MIDI output, they are interpreted as a tempo change.  In the
 layout output, a metronome marking is printed
 @cindex @code{\tempo}
-@lilypond[quote,raggedright,verbatim,fragment]
+@lilypond[quote,ragged-right,verbatim,fragment]
 \tempo 8.=120 c''1
 @end lilypond
 
@@ -726,7 +726,7 @@ the metronome marking invisible
 @end example
 
 To print other metronome markings, use these markup commands
-@lilypond[quote,raggedright,verbatim,relative,fragment]
+@lilypond[quote,ragged-right,verbatim,relative,fragment]
 c4^\markup {
   (
   \smaller \general-align #Y #DOWN \note #"16." #1
@@ -765,7 +765,7 @@ further away from the staff.
 
 To print a rehearsal mark, use the @code{\mark} command
 
-@lilypond[quote,raggedright,fragment,verbatim,relative=2]
+@lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 c1 \mark \default
 c1 \mark \default
 c1 \mark #8
@@ -792,7 +792,7 @@ as argument.  It should return a markup object.  In the following
 example, @code{markFormatter} is set to a canned procedure.  After a
 few measures, it is set to function that produces a boxed number.
 
-@lilypond[fragment,quote,raggedright,verbatim,relative=2]
+@lilypond[fragment,quote,ragged-right,verbatim,relative=2]
 \set Score.markFormatter = #format-mark-numbers
 c1 \mark \default
 c1 \mark \default
@@ -838,12 +838,12 @@ beginning of each line.  This is illustrated in the following example,
 whose source is available as
 @inputfileref{input/@/test,bar@/-number@/-regular@/-interval@/.ly}
 
-@lilypondfile[raggedright,quote]{bar-number-regular-interval.ly}
+@lilypondfile[ragged-right,quote]{bar-number-regular-interval.ly}
 
 Bar numbers can be typeset manually by tweaking the
 @code{markFormatter} property
 
-@lilypond[verbatim,raggedright,quote]
+@lilypond[verbatim,ragged-right,quote]
 \relative c' {
   \set Score.markFormatter
     = #(lambda (mark context)
@@ -859,7 +859,7 @@ Bar numbers can be typeset manually by tweaking the
 Bar numbers can be manually changed by setting the
 @code{Staff.currentBarNumber} property
 
-@lilypond[verbatim,raggedright,quote]
+@lilypond[verbatim,ragged-right,quote]
 \relative c' {
   \repeat unfold 4 {c4 c c c} \break
   \set Score.currentBarNumber = #50
@@ -896,7 +896,7 @@ and @internalsref{Staff}.@code{instr}.  This will print a string before
 the start of the staff.  For the first staff, @code{instrument} is
 used, for the following ones, @code{instr} is used.
 
-@lilypond[quote,verbatim,raggedright,relative=1,fragment]
+@lilypond[quote,verbatim,ragged-right,relative=1,fragment]
 \set Staff.instrument = "Ploink "
 \set Staff.instr = "Plk "
 c1
@@ -907,7 +907,7 @@ c''
 You can also use markup texts to construct more complicated instrument
 names, for example
 
-@lilypond[quote,fragment,verbatim,raggedright]
+@lilypond[quote,fragment,verbatim,ragged-right]
 \set Staff.instrument = \markup {
   \column { "Clarinetti"
             \line { "in B" \smaller \flat } } }
@@ -916,7 +916,7 @@ c''1
 
 If you wish to center the instrument names, you must center all of them
 
-@lilypond[quote,verbatim,raggedright]
+@lilypond[quote,verbatim,ragged-right]
 { <<
 \new Staff {
   \set Staff.instrument = \markup {
@@ -1016,7 +1016,7 @@ the staff.  They are created by invoking the function
 @cindex 15ma
 @cindex octavation
 
-@lilypond[quote,raggedright,verbatim,fragment]
+@lilypond[quote,ragged-right,verbatim,fragment]
 \relative c''' {
   a2 b
   #(set-octavation 1)
@@ -1032,7 +1032,7 @@ The @code{set-octavation} function also takes -1 (for 8va bassa) and 2
 @code{centralCPosition}.  For overriding the text of the bracket, set
 @code{ottavation} after invoking @code{set-octavation}, i.e.,
 
-@lilypond[quote,raggedright,verbatim]
+@lilypond[quote,ragged-right,verbatim]
 {
   #(set-octavation 1)
   \set Staff.ottavation = #"8"
@@ -1107,7 +1107,7 @@ commands, tagged expressions can be filtered.  For example,
 @end example
 would yield
 
-@lilypondfile[raggedright,quote]{tag-filter.ly}
+@lilypondfile[ragged-right,quote]{tag-filter.ly}
 
 The argument of the @code{\tag} command should be a symbol. It's 
 possible to put multiple tags on a piece of music, with multiple
@@ -1168,7 +1168,7 @@ The following example demonstrates the basic functionality of the part
 combiner: putting parts on one staff, and setting stem directions and
 polyphony
 
-@lilypond[quote,verbatim,raggedright,fragment]
+@lilypond[quote,verbatim,ragged-right,fragment]
 \new Staff \partcombine
   \relative g' { g g a( b) c c r r }
   \relative g' { g g r4 r e e g g }
@@ -1184,7 +1184,7 @@ first part (with context called @code{one}) always gets up stems, and
 If you just want the merging parts, and not the textual markings, you
 may set the property @code{printPartCombineTexts} to false
 
-@lilypond[quote,verbatim,raggedright,fragment,relative=2]
+@lilypond[quote,verbatim,ragged-right,fragment,relative=2]
 \new Staff <<
   \set Staff.printPartCombineTexts = ##f
   \partcombine
@@ -1197,7 +1197,7 @@ To change the text that is printed for solos or merging, you may
 set the @code{soloText}, @code{soloIIText}, and @code{aDueText}
 properties.
 
-@lilypond[quote,verbatim,raggedright,fragment,relative=2]
+@lilypond[quote,verbatim,ragged-right,fragment,relative=2]
 \new Staff <<
   \set Score.soloText = #"ichi"
   \set Score.soloIIText = #"ni"
@@ -1262,7 +1262,7 @@ multi-measure rests) are removed.  The context definition is stored in
 @code{\RemoveEmptyStaffContext} variable.  Observe how the second staff
 in this example disappears in the second line
 
-@lilypond[quote,raggedright,verbatim]
+@lilypond[quote,ragged-right,verbatim]
 \layout {
   \context { \RemoveEmptyStaffContext }
 }
@@ -1343,7 +1343,7 @@ rests at the beginning.
 Quotations take into account the transposition of both source and target
 instruments, if they are specified using the @code{\transposition} command.
 
-@lilypond[quote,raggedright,verbatim]
+@lilypond[quote,ragged-right,verbatim]
 \addquote clarinet \relative c' {
   \transposition bes
   f4 fis g gis
@@ -1408,7 +1408,7 @@ the staff in effect becomes polyphonic for a moment.  The argument
 first or second voice.
 
 
-@lilypond[verbatim,raggedright]
+@lilypond[verbatim,ragged-right]
 smaller = {
   \set fontSize = #-2
   \override Stem #'length-fraction = #0.8
@@ -1481,7 +1481,7 @@ as argument, and generate a @code{\skip} or multi-rest, exactly as
 long as the piece.  The use of @code{mmrest-of-length} is demonstrated
 in the following example.
 
-@lilypond[verbatim,raggedright,quote]
+@lilypond[verbatim,ragged-right,quote]
 cadenza = \relative c' {
   c4 d8 << { e f g } \\ { d4. } >>
   g4 f2 g4 g
@@ -1532,7 +1532,7 @@ faked.  In the next example, the markup for the time signature is
 created with a markup text.  This markup text is inserted in the
 @internalsref{TimeSignature} grob.
 
-@lilypond[verbatim,raggedright]
+@lilypond[verbatim,ragged-right]
 % create 2/4 + 5/8
 tsMarkup =\markup {
   \number {
@@ -1588,7 +1588,7 @@ Now, each staff has its own time signature.
 >>
 @end example
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 \layout{
   \context{
      \Score
@@ -1638,7 +1638,7 @@ used in parallel.  In the second staff, shown durations are multiplied by
 2/3, so that 2/3 * 9/8 = 3/4, and in the third staff, shown durations are
 multiplied by 3/5, so that 3/5 * 10/8 = 3/4.
 
-@lilypond[quote,raggedright,verbatim,fragment]
+@lilypond[quote,ragged-right,verbatim,fragment]
 \relative c' { <<
   \new Staff {
     \time 3/4
@@ -1707,7 +1707,7 @@ in the measure, so the next bar line will fall at 2/4 + 3/8.  The
 3/8 arises because 5/4 normally has 10/8, but we have manually
 set the measure position to be 7/8 and 10/8 - 7/8 = 3/8.
 
-@lilypond[quote,raggedright,verbatim,relative,fragment]
+@lilypond[quote,ragged-right,verbatim,relative,fragment]
 \set Score.measureLength = #(ly:make-moment 5 4)
 c1 c4
 c1 c4
@@ -1728,7 +1728,7 @@ A cluster indicates a continuous range of pitches to be played.  They
 can be denoted as the envelope of a set of notes.  They are entered by
 applying the function @code{makeClusters} to a sequence of
 chords, e.g.,
-@lilypond[quote,raggedright,relative=2,fragment,verbatim]
+@lilypond[quote,ragged-right,relative=2,fragment,verbatim]
 \makeClusters { <c e > <b f'> }
 @end lilypond
 
@@ -1736,7 +1736,7 @@ The following example (from
 @inputfileref{input/@/regression,cluster@/.ly}) shows what the result
 looks like
 
-@lilypondfile[raggedright,quote]{cluster.ly}
+@lilypondfile[ragged-right,quote]{cluster.ly}
 
 Ordinary notes and clusters can be put together in the same staff,
 even simultaneously.  In such a case no attempt is made to
@@ -1765,7 +1765,7 @@ accurately.  Use @code{<g a>8 <e a>8} instead.
 In contemporary music notation, special fermata symbols denote breaks
 of differing lengths.  The following fermatas are supported
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 <<
   \oldaddlyrics {
     b'2
@@ -1808,7 +1808,7 @@ notes on guitar; diamonds are used for harmonics on string instruments,
 etc.  There is a shorthand (@code{\harmonic}) for diamond shapes; the
 other notehead styles are produced by tweaking the property
 
-@lilypond[raggedright,relative=1,fragment,verbatim,quote]
+@lilypond[ragged-right,relative=1,fragment,verbatim,quote]
 c4 d
 \override NoteHead #'style = #'cross
 e f
@@ -1831,7 +1831,7 @@ Program reference: @internalsref{NoteHead}.
 Trills that should be executed on an explicitly specified pitch can be
 typeset with the command @code{pitchedTrill}, 
 
-@lilypond[raggedright,verbatim,fragment]
+@lilypond[ragged-right,verbatim,fragment]
   \pitchedTrill c'4\startTrillSpan fis
   f'\stopTrillSpan
 @end lilypond
@@ -1846,7 +1846,7 @@ Feathered beams are not supported natively, but they can be faked by
 forcing two beams to overlap.  Here is an example,
 
 @c don't change relative setting witout changing positions!
-@lilypond[raggedright,relative=1,fragment,verbatim,quote]
+@lilypond[ragged-right,relative=1,fragment,verbatim,quote]
 \new Staff <<
   \new Voice
   {
@@ -1883,7 +1883,7 @@ There are shortcuts @code{\improvisationOn} (and an accompanying
 @code{\improvisationOff}) for this command sequence.  They are used in
 the following example
 
-@lilypond[verbatim,raggedright,quote]
+@lilypond[verbatim,ragged-right,quote]
 \new Staff \with {
   \consists Pitch_squash_engraver
 } \transpose c c' {
@@ -1919,7 +1919,7 @@ balloon.  The primary purpose of this feature is to explain notation.
 
 The following example demonstrates its use.
 
-@lilypond[quote,verbatim,fragment,raggedright,relative=2]
+@lilypond[quote,verbatim,fragment,ragged-right,relative=2]
 \context Voice {
   \applyOutput
     #(add-balloon-text 'NoteHead "heads, or tails?"
@@ -1982,7 +1982,7 @@ emptymusic = {
 Hidden (or invisible or transparent) notes can be useful in preparing theory
 or composition exercises.
 
-@lilypond[quote,raggedright,verbatim,relative=2,fragment]
+@lilypond[quote,ragged-right,verbatim,relative=2,fragment]
 c4 d4
 \hideNotes
 e4 f4
@@ -1996,7 +1996,7 @@ to include that in your score -- string instruments use this notation
 when doing pizzicato to indicate that the note should ring for as long
 as possible.
 
-@lilypond[quote,raggedright,verbatim,relative=0,fragment]
+@lilypond[quote,ragged-right,verbatim,relative=0,fragment]
 \clef bass
 << {
   c4^"pizz"( \hideNotes c)
@@ -2053,7 +2053,7 @@ combinations are possible, eg.,
 The `easy play' note head includes a note name inside the head.  It is
 used in music for beginners
 
-@lilypond[quote,raggedright,verbatim,fragment,staffsize=26]
+@lilypond[quote,ragged-right,verbatim,fragment,staffsize=26]
   \setEasyHeads
   c'2 e'4 f' | g'1
 @end lilypond
@@ -2082,7 +2082,7 @@ brackets.  To use this, add the @internalsref{Horizontal_bracket_engraver}
 to @internalsref{Staff} context.  A bracket is started with
 @code{\startGroup} and closed with @code{\stopGroup}
 
-@lilypond[quote,raggedright,verbatim]
+@lilypond[quote,ragged-right,verbatim]
 \score {
   \relative c'' {
     c4\startGroup\startGroup
@@ -2109,7 +2109,7 @@ Examples: @inputfileref{input/@/regression,note@/-group@/-bracket@/.ly}.
 Individual objects may be assigned colors.  You may use the
 color names listed in the @ref{List of colors}.
 
-@lilypond[quote,raggedright,verbatim,fragment,relative=1]
+@lilypond[quote,ragged-right,verbatim,fragment,relative=1]
 \override NoteHead #'color = #red
 c4 c
 \override NoteHead #'color = #(x11-color 'LimeGreen)
@@ -2148,7 +2148,7 @@ This example, illustrates the use of x11-color.  Notice that the stem
 color remains black after being set to (x11-color 'Boggle), which is
 deliberate nonsense.
 
-@lilypond[quote,raggedright,verbatim]
+@lilypond[quote,ragged-right,verbatim]
 {
   \override Staff.StaffSymbol #'color = #(x11-color 'SlateBlue2)
   \set Staff.instrument = \markup {
@@ -2228,7 +2228,7 @@ individually for each voice.  Apart from that, the rule is similar to
 As a result, accidentals from one voice do not get canceled in other
 voices, which is often an unwanted result
 
-@lilypond[quote,raggedright,relative=1,fragment,verbatim]
+@lilypond[quote,ragged-right,relative=1,fragment,verbatim]
 \context Staff <<
   #(set-accidental-style 'voice)
   <<
@@ -2251,7 +2251,7 @@ accidentals also are canceled in other octaves.  Furthermore,
 in the same octave, they also get canceled in the following
 measure
 
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 #(set-accidental-style 'modern)
 cis' c'' cis'2 | c'' c'
 @end lilypond
@@ -2261,7 +2261,7 @@ cis' c'' cis'2 | c'' c'
 This rule is similar to @code{modern}, but the ``extra'' accidentals
 (the ones not typeset by @code{default}) are typeset as cautionary
 accidentals.  They are printed in reduced size or with parentheses
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 #(set-accidental-style 'modern-cautionary)
 cis' c'' cis'2 | c'' c'
 @end lilypond
@@ -2297,7 +2297,7 @@ accidentals typeset as cautionaries.
 @cindex @code{no-reset} accidental style
 This is the same as @code{default} but with accidentals lasting
 ``forever'' and not only until the next measure
-@lilypond[quote,raggedright,fragment,verbatim,relative=1]
+@lilypond[quote,ragged-right,fragment,verbatim,relative=1]
 #(set-accidental-style 'no-reset)
 c1 cis cis c
 @end lilypond
@@ -2308,7 +2308,7 @@ are not remembered at all---and hence all accidentals are
 typeset relative to the key signature, regardless of what was
 before in the music
 
-@lilypond[quote,raggedright,fragment,verbatim,relative=1]
+@lilypond[quote,ragged-right,fragment,verbatim,relative=1]
 #(set-accidental-style 'forget)
 \key d\major c4 c cis cis d d dis dis
 @end lilypond
@@ -2390,7 +2390,7 @@ node, use
 You can force the beam settings to only take effect on beams whose shortest
 note is a certain duration
 
-@lilypond[quote,fragment,raggedright,verbatim,relative=2]
+@lilypond[quote,fragment,ragged-right,verbatim,relative=2]
 \time 2/4
 #(override-auto-beam-setting '(end 1 16 * *) 1 16)
 a16 a a a a a a a |
@@ -2402,7 +2402,7 @@ a32 a a a a16 a a a a a |
 You can force the beam settings to only take effect in certain time
 signatures
 
-@lilypond[quote,fragment,raggedright,verbatim,relative=2]
+@lilypond[quote,fragment,ragged-right,verbatim,relative=2]
 \time 5/8
 #(override-auto-beam-setting '(end * * 5 8) 2 8)
 c8 c d d d
@@ -2423,7 +2423,7 @@ be, p, q, n, m, a, b and context are the same as above.  Note that the
 default rules are specified in @file{scm/@/auto@/-beam@/.scm},
 so you can revert rules that you did not explicitly create.
 
-@lilypond[quote,fragment,raggedright,verbatim,relative=2]
+@lilypond[quote,fragment,ragged-right,verbatim,relative=2]
 \time 4/4
 a16 a a a a a a a a a a a a a a a
 #(revert-auto-beam-setting '(end 1 16 4 4) 1 4)
@@ -2433,7 +2433,7 @@ a16 a a a a a a a a a a a a a a a
 The rule in a revert-auto-beam-setting statement must exactly match the
 original rule.  That is, no wildcard expansion is taken into account.
 
-@lilypond[quote,fragment,raggedright,verbatim,relative=2]
+@lilypond[quote,fragment,ragged-right,verbatim,relative=2]
 \time 1/4
 #(override-auto-beam-setting '(end 1 16 1 4) 1 8)
 a16 a a a
diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index fcc9fea43f..6bb89991f0 100644
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -54,7 +54,7 @@ related constructs, such as stems, tuplets and ties.
 
 A note is printed by specifying its pitch and then its duration,
 
-@lilypond[quote,verbatim,raggedright,fragment]
+@lilypond[quote,verbatim,ragged-right,fragment]
 cis'4 d'8 e'16 c'16
 @end lilypond
 
@@ -76,7 +76,7 @@ names.  The notes are specified by the letters @code{a} through
 to @code{b}.  The pitch @code{c} is an octave below middle C and the
 letters span the octave above that C
 
-@lilypond[quote,fragment,verbatim,raggedright]
+@lilypond[quote,fragment,verbatim,ragged-right]
 \clef bass
 a,4 b, c d e f g a b c' d' e' \clef treble f' g' a' b' c''
 @end lilypond
@@ -89,7 +89,7 @@ single quote (`@code{'}') characters or a series of comma
 (`@code{,}') characters.  Each @code{'} raises the pitch by one
 octave; each @code{,} lowers the pitch by an octave
 
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 c' c'' e' g d'' d'
 @end lilypond
 
@@ -102,7 +102,7 @@ names are the Dutch note names.  In Dutch, @code{aes} is contracted to
 @code{as}, but both forms are accepted.  Similarly, both
 @code{es} and @code{ees} are accepted
 
-@lilypond[fragment,quote,raggedright,verbatim,relative=2]
+@lilypond[fragment,quote,ragged-right,verbatim,relative=2]
 ceses4
 ces
 c
@@ -138,7 +138,7 @@ before a sharp or flat if a previous accidental needs to be
 cancelled.  To change this behaviour, use
 @code{\set Staff.extraNatural = ##f}
 
-@lilypond[fragment,quote,raggedright,verbatim,relative=2]
+@lilypond[fragment,quote,ragged-right,verbatim,relative=2]
 ceses4 ces cis c
 \set Staff.extraNatural = ##f
 ceses4 ces cis c
@@ -167,7 +167,7 @@ after the pitch.  A cautionary accidental
 question mark `@code{?}' after the pitch.  These extra accidentals
 can be used to produce natural signs, too.
 
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 cis' cis' cis'! cis'? c c? c! c
 @end lilypond
 
@@ -188,7 +188,7 @@ ways.  For more information, refer to @ref{Automatic accidentals}.
 Half-flats and half-sharps are formed by adding @code{-eh} and
 @code{-ih}; the following is a series of Cs with increasing pitches
 
-@lilypond[verbatim,raggedright,quote,relative=2,fragment]
+@lilypond[verbatim,ragged-right,quote,relative=2,fragment]
 \set Staff.extraNatural = ##f
 ceseh ceh cih cisih
 @end lilypond
@@ -211,7 +211,7 @@ A chord is formed by a enclosing a set of pitches in @code{<} and
 @code{>}.  A chord may be followed by a duration, and a set of
 articulations, just like simple notes
 
-@lilypond[verbatim,raggedright,fragment,quote,relative=1]
+@lilypond[verbatim,ragged-right,fragment,quote,relative=1]
 <c e g>4 <c>8
 @end lilypond
 
@@ -228,7 +228,7 @@ For more information about chords, see @ref{Chord names}.
 
 Rests are entered like notes with the note name @code{r}
 
-@lilypond[fragment,quote,raggedright,verbatim]
+@lilypond[fragment,quote,ragged-right,verbatim]
 r1 r2 r4 r8
 @end lilypond
 
@@ -244,7 +244,7 @@ the note's place.  This makes manual formatting in polyphonic music
 easier.  Automatic rest collision formatting will leave these rests
 alone
 
-@lilypond[fragment,quote,raggedright,verbatim]
+@lilypond[fragment,quote,ragged-right,verbatim]
 a'4\rest d'4\rest
 @end lilypond
 
@@ -265,7 +265,7 @@ Program reference: @internalsref{Rest}.
 An invisible rest (also called a `skip') can be entered like a note
 with note name `@code{s}' or with @code{\skip @var{duration}}
 
-@lilypond[fragment,quote,raggedright,verbatim,relative=2]
+@lilypond[fragment,quote,ragged-right,verbatim,relative=2]
 a4 a4 s4 a4 \skip 1 a4
 @end lilypond
 
@@ -273,7 +273,7 @@ The @code{s} syntax is only available in note mode and chord mode.  In
 other situations, for example, when entering lyrics, you should use
 the @code{\skip} command
 
-@lilypond[quote,raggedright,verbatim]
+@lilypond[quote,ragged-right,verbatim]
 <<
   \relative { a'2 a2 }
   \new Lyrics \lyricmode { \skip 2 bla2 }
@@ -287,7 +287,7 @@ The @code{s} skip command does create @internalsref{Staff} and
 @internalsref{Voice} when necessary, similar to note and rest
 commands.  For example, the following results in an empty staff.
 
-@lilypond[quote,raggedright,verbatim]
+@lilypond[quote,ragged-right,verbatim]
 { s4 }
 @end lilypond
 
@@ -331,7 +331,7 @@ r1 r2 r4 r8 r16 r32 r64 r64
     r1 r2 r4 r8 r16 r32 r64 r64
   }
   \layout {
-    raggedright = ##t
+    ragged-right = ##t
     \context {
       \Staff
         \remove "Clef_engraver"
@@ -347,7 +347,7 @@ r1 r2 r4 r8 r16 r32 r64 r64
 If the duration is omitted then it is set to the previously entered
 duration.  The default for the first note is a quarter note.
 
-@lilypond[quote,raggedright,verbatim,fragment]
+@lilypond[quote,ragged-right,verbatim,fragment]
 { a a a2 a a4 a a1 a }
 @end lilypond
 
@@ -360,7 +360,7 @@ duration.  The default for the first note is a quarter note.
 To obtain dotted note lenghts, simply add a dot (`@code{.}') to
 the number.  Double-dotted notes are produced in a similar way.
 
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 a'4 b' c''4. b'8 a'4. b'4.. c''8.
 @end lilypond
 
@@ -403,13 +403,13 @@ with a bracket.  The most common tuplet is the triplet in which 3
 notes have the length of 2, so the notes are 2/3 of their written
 length
 
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 g'4 \times 2/3 {c'4 c' c'} d'4 d'4
 @end lilypond
 
 Tuplets may be nested, for example,
 
-@lilypond[fragment,raggedright,verbatim,relative=2]
+@lilypond[fragment,ragged-right,verbatim,relative=2]
 \set tupletNumberFormatFunction = #fraction-tuplet-formatter
 \times 4/6 {
   a4 a 
@@ -438,7 +438,7 @@ typing @code{\times} only once, thus saving lots of typing.  In the next
 example, there are two triplets shown, while @code{\times} was only
 used once
 
-@lilypond[quote,fragment,relative=2,raggedright,verbatim]
+@lilypond[quote,fragment,relative=2,ragged-right,verbatim]
 \set tupletSpannerDuration = #(ly:make-moment 1 4)
 \times 2/3 { c8 c c c c c }
 @end lilypond
@@ -451,7 +451,7 @@ instead.
 
 To avoid printing tuplet numbers, use
 
-@lilypond[quote,fragment,relative=2,raggedright,verbatim]
+@lilypond[quote,fragment,relative=2,ragged-right,verbatim]
 \times 2/3 { c8 c c } \times 2/3 { c8 c c }
 \override TupletNumber #'transparent = ##t
 \times 2/3 { c8 c c } \times 2/3 { c8 c c }
@@ -476,7 +476,7 @@ will not affect the appearance of the notes or rests produced.
 
 In the following example, the first three notes take up exactly two
 beats, but no triplet bracket is printed.
-@lilypond[quote,raggedright,fragment,relative=2,verbatim]
+@lilypond[quote,ragged-right,fragment,relative=2,verbatim]
 \time 2/4
 a4*2/3 gis4*2/3 a4*2/3
 a4 a4 a4*2
@@ -571,14 +571,14 @@ predecessor of the first note of @var{musicexpr}.  If no starting pitch
 is specified, then middle C is used as a start.
 
 Here is the relative mode shown in action
-@lilypond[quote,fragment,raggedright,verbatim]
+@lilypond[quote,fragment,ragged-right,verbatim]
 \relative c'' {
   b c d c b c bes a
 }
 @end lilypond
 
 Octave changing marks are used for intervals greater than a fourth
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 \relative c'' {
   c g c f, c' a, e''
 }
@@ -587,7 +587,7 @@ Octave changing marks are used for intervals greater than a fourth
 If the preceding item is a chord, the first note of the chord is used
 to determine the first note of the next chord
 
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 \relative c' {
   c <c e g>
   <c' e g>
@@ -654,7 +654,7 @@ is an @code{a'}, above middle C.  That means that the @code{\octave}
 check passes successfully, so the check could be deleted without changing
 the output of the piece.
 
-@lilypond[quote,raggedright,verbatim,fragment]
+@lilypond[quote,ragged-right,verbatim,fragment]
 \relative c' {
   e
   \octave b
@@ -700,7 +700,7 @@ transposition will produce the appropriate part
 half a tone.  The first version will print sharps and the second
 version will print flats
 
-@lilypond[quote,raggedright,verbatim]
+@lilypond[quote,ragged-right,verbatim]
 mus = { \key d \major cis d fis g }
 \context Staff {
   \clef "F" \mus
@@ -778,7 +778,7 @@ input is by scanning for failed bar checks and incorrect durations.
 It is also possible to redefine the meaning of @code{|}.  This is done
 by assigning a music expression to @code{pipeSymbol},
 
-@lilypond[quote,raggedright,verbatim]
+@lilypond[quote,ragged-right,verbatim]
 pipeSymbol = \bar "||"
 
 { c'2 c' | c'2 c' }
@@ -829,7 +829,7 @@ Skipping parts of a score can be controlled in a more fine-grained
 fashing with the property @code{Score.skipTypesetting}.  When it is
 set, no typesetting is performed at all.
 
-@lilypond[quote,fragment,raggedright,verbatim]
+@lilypond[quote,fragment,ragged-right,verbatim]
 \relative c'' {
   c8 d
   \set Score.skipTypesetting = ##t
@@ -850,7 +850,7 @@ by replacing the @internalsref{Note_heads_engraver} by the
 @internalsref{Completion_heads_engraver}.
 In the following examples, notes crossing the bar line are split and tied.
 
-@lilypond[quote,fragment,verbatim,relative=1,linewidth=12\cm]
+@lilypond[quote,fragment,verbatim,relative=1,line-width=12\cm]
 \new Voice \with {
   \remove "Note_heads_engraver"
   \consists "Completion_heads_engraver"
@@ -913,7 +913,7 @@ such as key signatures, clefs and time signatures.
 The clef indicates which lines of the staff correspond to which
 pitches.  The clef is set with the @code{\clef} command
 
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 { c''2 \clef alto g'2 }
 @end lilypond
 
@@ -964,7 +964,7 @@ must be enclosed in quotes when it contains underscores or digits.  For
 example,
 
 @cindex choral tenor clef
-@lilypond[quote,raggedright,verbatim,fragment,relative=1]
+@lilypond[quote,ragged-right,verbatim,fragment,relative=1]
 \clef "G_8" c4
 @end lilypond
 
@@ -977,7 +977,7 @@ The command @code{\clef "treble_8"} is equivalent to setting @code{clefGlyph},
 when any of these properties are changed.  The following example shows
 possibilities when setting properties manually.
 
-@lilypond[quote,raggedright,verbatim]
+@lilypond[quote,ragged-right,verbatim]
 {
   \set Staff.clefGlyph = #"clefs.F"
   \set Staff.clefPosition = #2
@@ -1054,7 +1054,7 @@ A natural sign is printed to cancel any previous accidentals.  This
 can be suppressed by setting the @code{Staff.printKeyCancellation}
 property.
 
-@lilypond[quote,fragment,raggedright,fragment,verbatim,relative=2]
+@lilypond[quote,fragment,ragged-right,fragment,verbatim,relative=2]
 \key d \major
 a b cis d
 \key g \minor
@@ -1085,7 +1085,7 @@ staff.
 
 The time signature is set with the @code{\time} command
 
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 \time 2/4 c'2 \time 3/4 c'2.
 @end lilypond
 
@@ -1095,7 +1095,7 @@ The symbol that is printed can be customized with the @code{style}
 property.  Setting it to @code{#'()} uses fraction style for 4/4 and
 2/2 time,
 
-@lilypond[fragment,quote,raggedright,verbatim]
+@lilypond[fragment,quote,ragged-right,verbatim]
 \time 4/4 c'1
 \time 2/2 c'1
 \override Staff.TimeSignature #'style = #'()
@@ -1122,7 +1122,7 @@ rhythmically complex modern music.  In the following example, the 9/8
 measure is subdivided in 2, 2, 2 and 3.  This is passed to
 @code{set-time-signature} as the third argument @code{(2 2 2 3)}
 
-@lilypond[quote,raggedright,verbatim]
+@lilypond[quote,ragged-right,verbatim]
 \score {
   \relative c'' {
     #(set-time-signature 9 8 '(2 2 2 3))
@@ -1162,7 +1162,7 @@ Automatic beaming does not use the measure grouping specified with
 
 Partial measures, such as an anacrusis or upbeat, are entered using the
 
-@lilypond[quote,raggedright,fragment,verbatim,relative=2]
+@lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \partial 16*5 c16 cis d dis e | a2. c,4 | b2
 @end lilypond
 
@@ -1188,7 +1188,7 @@ This command does not take into account grace notes at the start of
 the music.  When a piece starts with graces notes in the pickup, then
 the @code{\partial} should follow the grace notes
 
-@lilypond[verbatim,quote,raggedright,relative,fragment]
+@lilypond[verbatim,quote,ragged-right,relative,fragment]
 \grace f16
 \partial 4
 g4
@@ -1210,13 +1210,13 @@ breaks may only happen on bar lines.
 
 Special types of bar lines can be forced with the @code{\bar} command
 
-@lilypond[quote,raggedright,relative=2,fragment,verbatim]
+@lilypond[quote,ragged-right,relative=2,fragment,verbatim]
 c4 \bar "|:" c4
 @end lilypond
 
 The following bar types are available
 
-@lilypondfile[raggedright,quote]{bar-lines.ly}
+@lilypondfile[ragged-right,quote]{bar-lines.ly}
 
 To allow a line break where there is no visible bar line, use
 
@@ -1232,7 +1232,7 @@ In scores with many staves, a @code{\bar} command in one staff is
 automatically applied to all staves.  The resulting bar lines are
 connected between different staves of a StaffGroup
 
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 <<
   \context StaffGroup <<
     \new Staff {
@@ -1288,7 +1288,7 @@ music (cadenzas, for example), this is not desirable.  To turn off
 automatic bar lines and bar numbers, use the commands @code{\cadenzaOn}
 and @code{\cadenzaOff}.
 
-@lilypond[verbatim,quote,raggedright,relative=2,fragment]
+@lilypond[verbatim,quote,ragged-right,relative=2,fragment]
 c4 d e d
 \cadenzaOn
 c4 c d8 d d f4 g4.
@@ -1330,7 +1330,7 @@ joined in four different ways
 @item The group is started with a brace at the left, and bar lines are
 connected.  This is done with the @internalsref{GrandStaff} context.
 
-@lilypond[verbatim,raggedright,quote]
+@lilypond[verbatim,ragged-right,quote]
 \new GrandStaff
 \relative <<
   \new Staff { c1 c }
@@ -1342,7 +1342,7 @@ connected.  This is done with the @internalsref{GrandStaff} context.
 This is done with the
 @internalsref{StaffGroup} context
 
-@lilypond[verbatim,raggedright,quote]
+@lilypond[verbatim,ragged-right,quote]
 \new StaffGroup
 \relative <<
   \new Staff { c1 c }
@@ -1353,7 +1353,7 @@ This is done with the
 @item The group is started with a bracket, but bar lines are not
 connected.  This is done with the @internalsref{ChoirStaff} context.
 
-@lilypond[verbatim,raggedright,quote]
+@lilypond[verbatim,ragged-right,quote]
 \new ChoirStaff
 \relative <<
   \new Staff { c1 c }
@@ -1364,7 +1364,7 @@ connected.  This is done with the @internalsref{ChoirStaff} context.
 @item The group is started with a vertical line.  Bar lines are not
 connected.  This is the default for the score.
 
-@lilypond[verbatim,raggedright,quote]
+@lilypond[verbatim,ragged-right,quote]
 \relative <<
   \new Staff { c1 c }
   \new Staff { c c }
@@ -1459,7 +1459,7 @@ effect extends the length of a note.  Ties should not be confused with
 slurs, which indicate articulation, or phrasing slurs, which indicate
 musical phrasing.  A tie is entered using the tilde symbol `@code{~}'
 
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 e' ~ e' <c' e' g'> ~ <c' e' g'>
 @end lilypond
 
@@ -1470,7 +1470,7 @@ A tie is just a way of extending a note duration, similar to the
 augmentation dot.  The following example shows two ways of notating
 exactly the same concept
 
-@lilypond[quote,fragment,raggedright]
+@lilypond[quote,fragment,ragged-right]
 \time 3/4 c'2. c'2 ~ c'4
 @end lilypond
 
@@ -1479,7 +1479,7 @@ Ties are used either when the note crosses a bar line, or when dots
 cannot be used to denote the rhythm.  When using ties, larger note
 values should be aligned to subdivisions of the measure, eg.
 
-@lilypond[fragment,quote,raggedright]
+@lilypond[fragment,quote,ragged-right]
 \relative {
   r8 c8 ~ c2 r4 | r8^"not" c2 ~ c8 r4
 }
@@ -1498,7 +1498,7 @@ notes need not be consecutive.  This can be achieved by setting the
 @code{tieWaitForNote} property to true. The same feature is also useful,
 for example, to tie a tremolo to a chord. For example,
 
-@lilypond[fragment,verbatim,relative=1,raggedright]
+@lilypond[fragment,verbatim,relative=1,ragged-right]
 \set tieWaitForNote = ##t
 \grace { c16[~ e~ g]~ } <c, e g>2   
 \repeat "tremolo" 8 { c32~ c'~ } <c c,>1
@@ -1548,7 +1548,7 @@ Switching staves when a tie is active will not produce a slanted tie.
 A slur indicates that notes are to be played bound or
 @emph{legato}.  They are entered using parentheses
 
-@lilypond[quote,raggedright,relative=2,fragment,verbatim]
+@lilypond[quote,ragged-right,relative=2,fragment,verbatim]
 f( g a) a8 b( a4 g2 f4)
 <c e>2( <b d>2)
 @end lilypond
@@ -1562,7 +1562,7 @@ However, there is a convenient shorthand for forcing slur
 directions.  By adding @code{_} or @code{^} before the opening
 parentheses, the direction is also set.  For example,
 
-@lilypond[relative=2,raggedright,quote,verbatim,fragment]
+@lilypond[relative=2,ragged-right,quote,verbatim,fragment]
 c4_( c) c^( c)
 @end lilypond
 
@@ -1575,7 +1575,7 @@ slur over a few small slurs, please see @ref{Phrasing slurs}.
 Some composers write two slurs when they want legato chords.  This can
 be achieved in LilyPond by setting @code{doubleSlurs},
 
-@lilypond[verbatim,raggedright,relative,fragment,quote]
+@lilypond[verbatim,ragged-right,relative,fragment,quote]
 \set doubleSlurs = ##t
 <c e>4 ( <d f> <c e> <d f> )
 @end lilypond
@@ -1611,7 +1611,7 @@ A phrasing slur (or phrasing mark) connects notes and is used to
 indicate a musical sentence.  It is written using @code{\(} and @code{\)}
 respectively
 
-@lilypond[quote,raggedright,fragment,verbatim,relative=1]
+@lilypond[quote,ragged-right,fragment,verbatim,relative=1]
 \time 6/4 c'\( d( e) f( e) d\)
 @end lilypond
 
@@ -1644,7 +1644,7 @@ Program reference: @internalsref{PhrasingSlur}.
 
 LilyPond inserts beams automatically
 
-@lilypond[quote,raggedright,fragment,verbatim,relative=2]
+@lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \time 2/4 c8 c c c \time 6/8 c c c c8. c16 c8
 @end lilypond
 
@@ -1656,7 +1656,7 @@ for details.
 Individual notes may be marked with @code{\noBeam} to prevent them
 from being beamed
 
-@lilypond[quote,raggedright,fragment,verbatim,relative=2]
+@lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \time 2/4 c8 c\noBeam c c
 @end lilypond
 
@@ -1678,7 +1678,7 @@ algorithm.  For example, the autobeamer will not put beams over rests
 or bar lines.  Such beams are specified manually by marking the begin
 and end point with @code{[} and @code{]}
 
-@lilypond[quote,raggedright,fragment,relative=1,verbatim]
+@lilypond[quote,ragged-right,fragment,relative=1,verbatim]
 {
   r4 r8[ g' a r8] r8 g[ | a] r8
 }
@@ -1696,7 +1696,7 @@ If necessary, the properties @code{stemLeftBeamCount} and
 either property is set, its value will be used only once, and then it
 is erased
 
-@lilypond[quote,raggedright,fragment,relative=1,verbatim]
+@lilypond[quote,ragged-right,fragment,relative=1,verbatim]
 {
    f8[ r16
       f g a]
@@ -1758,7 +1758,7 @@ denoted as a slurred note in small print without a slash.  They
 are entered with the commands @code{\acciaccatura} and
 @code{\appoggiatura}, as demonstrated in the following example
 
-@lilypond[quote,raggedright,relative=2,verbatim,fragment]
+@lilypond[quote,ragged-right,relative=2,verbatim,fragment]
 b4 \acciaccatura d8 c4 \appoggiatura e8 d4
 \acciaccatura { g16[ f] } e4
 @end lilypond
@@ -1767,7 +1767,7 @@ Both are special forms of the @code{\grace} command.  By prefixing this
 keyword to a music expression, a new one is formed, which will be
 printed in a smaller font and takes up no logical time in a measure.
 
-@lilypond[quote,raggedright,relative=2,verbatim,fragment]
+@lilypond[quote,ragged-right,relative=2,verbatim,fragment]
 c4 \grace c16 c4
 \grace { c16[ d16] } c2 c4
 @end lilypond
@@ -1781,7 +1781,7 @@ timing.  Every point in time consists of two rational numbers: one
 denotes the logical time, one denotes the grace timing.  The above
 example is shown here with timing tuples
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 <<
   \relative c''{
     c4 \grace c16 c4 \grace {
@@ -1807,7 +1807,7 @@ The placement of grace notes is synchronized between different staves.
 In the following example, there are two sixteenth grace notes for
 every eighth grace note
 
-@lilypond[quote,raggedright,relative=2,verbatim,fragment]
+@lilypond[quote,ragged-right,relative=2,verbatim,fragment]
 << \new Staff { e4 \grace { c16[ d e f] } e4 }
    \new Staff { c4 \grace { g8[ b] } c4 } >>
 @end lilypond
@@ -1818,7 +1818,7 @@ If you want to end a note with a grace, use the @code{\afterGrace}
 command.  It takes two arguments: the main note, and the grace notes
 following the main note. 
 
-@lilypond[raggedright, verbatim,relative=2,fragment]
+@lilypond[ragged-right, verbatim,relative=2,fragment]
 c1 \afterGrace d1 { c16[ d] } c4   
 @end lilypond
 
@@ -1835,7 +1835,7 @@ will put the grace note at 7/8 of the main note.
 
 The same effect can be achieved manually by doing
 
-@lilypond[quote,raggedright,fragment,verbatim,relative=2]
+@lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \context Voice {
   << { d1^\trill_( }
      { s2 \grace { c16[ d] } } >>
@@ -1851,7 +1851,7 @@ A @code{\grace} section will introduce special typesetting settings,
 for example, to produce smaller type, and set directions.  Hence, when
 introducing layout tweaks, they should be inside the grace section,
 for example,
-@lilypond[quote,raggedright,fragment,verbatim,relative=2]
+@lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \new Voice {
   \acciaccatura {
     \stemDown
@@ -1903,7 +1903,7 @@ Grace note synchronization can also lead to surprises.  Staff notation,
 such as key signatures, bar lines, etc., are also synchronized.  Take
 care when you mix staves with grace notes and staves without, for example,
 
-@lilypond[quote,raggedright,relative=2,verbatim,fragment]
+@lilypond[quote,ragged-right,relative=2,verbatim,fragment]
 << \new Staff { e4 \bar "|:" \grace c16 d4 }
    \new Staff { c4 \bar "|:" d4 } >>
 @end lilypond
@@ -1951,7 +1951,7 @@ different characteristics of the performance.  They are added to a note
 by adding a dash and the character signifying the
 articulation.  They are demonstrated here
 
-@lilypondfile[quote,raggedright]{script-abbreviations.ly}
+@lilypondfile[quote,ragged-right]{script-abbreviations.ly}
 
 The meanings of these shorthands can be changed.  See
 @file{ly/@/script@/-init@/.ly} for examples.
@@ -1960,7 +1960,7 @@ The script is automatically placed, but the direction can be forced as
 well.  Like other pieces of LilyPond code, @code{_} will place them
 below the staff, and @code{^} will place them above.
 
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 c''4^^ c''4_^
 @end lilypond
 
@@ -1969,7 +1969,7 @@ Other symbols can be added using the syntax
 can be forced up or down using @code{^} and @code{_},
 e.g.,
 
-@lilypond[quote,raggedright,verbatim,fragment,relative=2]
+@lilypond[quote,ragged-right,verbatim,fragment,relative=2]
 c\fermata c^\fermata c_\fermata
 @end lilypond
 
@@ -2005,7 +2005,7 @@ c\fermata c^\fermata c_\fermata
 
 Here is a chart showing all scripts available,
 
-@lilypondfile[raggedright,quote]{script-chart.ly}
+@lilypondfile[ragged-right,quote]{script-chart.ly}
 
 
 @commonprop
@@ -2019,7 +2019,7 @@ prall trill (the @internalsref{Script}) has the lowest, so it is on the
 inside.  When two objects have the same priority, the order in which
 they are entered decides which one comes first.
 
-@lilypond[verbatim,relative=3,raggedright,fragment,quote]
+@lilypond[verbatim,relative=3,ragged-right,fragment,quote]
 \once \override TextScript #'script-priority = #-100
 a4^\prall^\markup { \sharp }
 
@@ -2051,20 +2051,20 @@ Fingering instructions can be entered using
 @end example
 For finger changes, use markup texts
 
-@lilypond[quote,verbatim,raggedright,fragment,relative=1]
+@lilypond[quote,verbatim,ragged-right,fragment,relative=1]
 c4-1 c-2 c-3 c-4
 c^\markup { \finger "2 - 3" }
 @end lilypond
 
 You can use the thumb-script to indicate that a note should be
 played with the thumb (e.g., in cello music)
-@lilypond[quote,verbatim,raggedright,fragment,relative=2]
+@lilypond[quote,verbatim,ragged-right,fragment,relative=2]
 <a_\thumb a'-3>8 <b_\thumb b'-3>
 @end lilypond
 
 Fingerings for chords can also be added to individual notes
 of the chord by adding them after the pitches
-@lilypond[quote,verbatim,raggedright,fragment,relative=2]
+@lilypond[quote,verbatim,ragged-right,fragment,relative=2]
 < c-1 e-2 g-3 b-5 >4
 @end lilypond
 
@@ -2074,7 +2074,7 @@ of the chord by adding them after the pitches
 You may exercise greater control over fingering chords by
 setting @code{fingeringOrientations}
 
-@lilypond[quote,verbatim,raggedright,fragment,relative=1]
+@lilypond[quote,verbatim,ragged-right,fragment,relative=1]
 \set fingeringOrientations = #'(left down)
 <c-1 es-2 g-4 bes-5 > 4
 \set fingeringOrientations = #'(up right down)
@@ -2084,7 +2084,7 @@ setting @code{fingeringOrientations}
 Using this feature, it is also possible to put fingering instructions
 very close to note heads in monophonic music,
 
-@lilypond[verbatim,raggedright,quote,fragment]
+@lilypond[verbatim,ragged-right,quote,fragment]
 \set fingeringOrientations = #'(right)
 <es'-2>4
 @end lilypond
@@ -2124,7 +2124,7 @@ Absolute dynamic marks are specified using a command after a note
 @code{\fff}, @code{\fff}, @code{\fp}, @code{\sf}, @code{\sff},
 @code{\sp}, @code{\spp}, @code{\sfz}, and @code{\rfz}.
 
-@lilypond[quote,verbatim,raggedright,fragment,relative=2]
+@lilypond[quote,verbatim,ragged-right,fragment,relative=2]
 c\ppp c\pp c \p c\mp c\mf c\f c\ff c\fff
 c2\fp c\sf c\sff c\sp c\spp c\sfz c\rfz
 @end lilypond
@@ -2139,7 +2139,7 @@ A crescendo mark is started with @code{\<} and terminated with
 dynamic.  Because these marks are bound to notes, you must
 use spacer notes if multiple marks are needed during one note
 
-@lilypond[quote,raggedright,fragment,verbatim,relative=2]
+@lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 c\< c\! d\> e\!
 << f1 { s4 s4\< s4\! \> s4\! } >>
 @end lilypond
@@ -2162,7 +2162,7 @@ example
 
 You can also use a text saying @emph{cresc.} instead of hairpins
 
-@lilypond[quote,raggedright,fragment,relative=2,verbatim]
+@lilypond[quote,ragged-right,fragment,relative=2,verbatim]
 \setTextCresc
 c\< d e f\!
 \setHairpinCresc
@@ -2174,7 +2174,7 @@ e\> d c b\!
 @end lilypond
 
 You can also supply your own texts
-@lilypond[quote,raggedright,fragment,relative=1,verbatim]
+@lilypond[quote,ragged-right,fragment,relative=1,verbatim]
 \set crescendoText = \markup { \italic "cresc. poco" }
 \set crescendoSpanner = #'dashed-line
 a'2\< a a a\!\mf
@@ -2228,7 +2228,7 @@ Vertical positioning of these symbols is handled by
 
 Breath marks are entered using @code{\breathe}
 
-@lilypond[quote,raggedright,fragment,relative=1,verbatim]
+@lilypond[quote,ragged-right,fragment,relative=1,verbatim]
 c'4 \breathe d4
 @end lilypond
 
@@ -2238,7 +2238,7 @@ c'4 \breathe d4
 The glyph of the breath mark can be tuned by overriding the
 @code{text} property of the @code{BreathingSign} layout object with
 any markup text.  For example,
-@lilypond[quote,raggedright,fragment,verbatim,relative=1]
+@lilypond[quote,ragged-right,fragment,verbatim,relative=1]
 c'4
 \override BreathingSign #'text
   = #(make-musicglyph-markup "scripts.rvarcomma")
@@ -2259,7 +2259,7 @@ Examples: @inputfileref{input/@/regression,breathing@/-sign@/.ly}.
 Long running trills are made with @code{\startTrillSpan} and
 @code{\stopTrillSpan},
 
-@lilypond[verbatim,raggedright,relative=2,quote,fragment]
+@lilypond[verbatim,ragged-right,relative=2,quote,fragment]
 \new Voice {
   << { c1 \startTrillSpan }
      { s2. \grace { d16[\stopTrillSpan e] } } >>
@@ -2292,7 +2292,7 @@ A glissando is a smooth change in pitch.  It is denoted by a line or a
 wavy line between two notes.  It is requested by attaching
 @code{\glissando} to a note
 
-@lilypond[quote,raggedright,fragment,relative=2,verbatim]
+@lilypond[quote,ragged-right,fragment,relative=2,verbatim]
 c2\glissando c'
 \override Glissando #'style = #'zigzag
 c2\glissando c,
@@ -2321,14 +2321,14 @@ Printing text over the line (such as @emph{gliss.}) is not supported.
 You can specify an arpeggio sign (also known as broken chord) on a
 chord by attaching an @code{\arpeggio} to a chord
 
-@lilypond[quote,raggedright,fragment,relative=1,verbatim]
+@lilypond[quote,ragged-right,fragment,relative=1,verbatim]
 <c e g c>\arpeggio
 @end lilypond
 
 A square bracket on the left indicates that the player should not
 arpeggiate the chord
 
-@lilypond[quote,raggedright,fragment,relative=1,verbatim]
+@lilypond[quote,ragged-right,fragment,relative=1,verbatim]
 \arpeggioBracket
 <c' e g c>\arpeggio
 @end lilypond
@@ -2336,7 +2336,7 @@ arpeggiate the chord
 The direction of the arpeggio is sometimes denoted by adding an
 arrowhead to the wiggly line
 
-@lilypond[quote,raggedright,fragment,relative=1,verbatim]
+@lilypond[quote,ragged-right,fragment,relative=1,verbatim]
 \context Voice {
   \arpeggioUp
   <c e g c>\arpeggio
@@ -2352,7 +2352,7 @@ When an arpeggio crosses staves, you may attach an arpeggio to the chords
 in both staves and set
 @internalsref{PianoStaff}.@code{connectArpeggios}
 
-@lilypond[quote,raggedright,fragment,relative=1,verbatim]
+@lilypond[quote,ragged-right,fragment,relative=1,verbatim]
 \context PianoStaff <<
   \set PianoStaff.connectArpeggios = ##t
   \new Staff { <c' e g c>\arpeggio }
@@ -2507,7 +2507,7 @@ voice is playing.  Here is a more correct rendition of the example from
 the previous section.  The crossed noteheads demonstrate that the main
 melody is now in a single voice context.
 
-@lilypond[quote,raggedright,verbatim]
+@lilypond[quote,ragged-right,verbatim]
 \new Staff \relative c' {
   \override NoteHead #'style = #'cross
   c16 d e f 
@@ -2528,7 +2528,7 @@ melody is now in a single voice context.
 @end lilypond
 
 The correct definition of the voices allows the melody to be slurred.
-@lilypond[quote,raggedright,verbatim]
+@lilypond[quote,ragged-right,verbatim]
 \new Staff \relative c' {
   c16^( d e f 
   \voiceOne
@@ -2551,7 +2551,7 @@ Avoiding the @code{\\} seperator also allows nesting polyphony
 constructs, which in some case might be a more natural way to typeset
 the music.
 
-@lilypond[quote,raggedright,verbatim]
+@lilypond[quote,ragged-right,verbatim]
 \new Staff \relative c' {
   c16^( d e f 
   \voiceOne
@@ -2580,7 +2580,7 @@ the music.
 Normally, note heads with a different number of dots are not merged, but
 when the object property @code{merge-differently-dotted} is set in
 the @internalsref{NoteCollision} object, they are merged
-@lilypond[quote,verbatim,fragment,raggedright,relative=2]
+@lilypond[quote,verbatim,fragment,ragged-right,relative=2]
 \context Voice << {
   g8 g8
   \override Staff.NoteCollision
@@ -2591,7 +2591,7 @@ the @internalsref{NoteCollision} object, they are merged
 
 Similarly, you can merge half note heads with eighth notes, by setting
 @code{merge-differently-headed}
-@lilypond[quote,raggedright,fragment,relative=2,verbatim]
+@lilypond[quote,ragged-right,fragment,relative=2,verbatim]
 \context Voice << {
   c8 c4.
   \override Staff.NoteCollision
@@ -2602,7 +2602,7 @@ c8 c4. } \\ { c2 c2 } >>
 LilyPond also vertically shifts rests that are opposite of a stem,
 for example
 
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 \context Voice << c''4 \\ r4 >>
 @end lilypond
 
@@ -2637,7 +2637,7 @@ When LilyPond cannot cope, the @code{force-hshift}
 property of the @internalsref{NoteColumn} object and pitched rests can
 be used to override typesetting decisions.
 
-@lilypond[quote,verbatim,raggedright]
+@lilypond[quote,verbatim,ragged-right]
 \relative <<
 {
   <d g>
@@ -2757,20 +2757,20 @@ give enough alternatives for all of the repeats, the first alternative
 is assumed to be played more than once.
 
 Standard repeats are used like this
-@lilypond[quote,raggedright,fragment,verbatim,relative=2]
+@lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 c1
 \repeat volta 2 { c4 d e f }
 \repeat volta 2 { f e d c }
 @end lilypond
 
 With alternative endings
-@lilypond[quote,raggedright,fragment,verbatim,relative=2]
+@lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 c1
 \repeat volta 2 {c4 d e f}
 \alternative { {d2 d} {f f,} }
 @end lilypond
 
-@lilypond[quote,raggedright,fragment,verbatim,relative=2]
+@lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \context Staff {
   \partial 4
   \repeat volta 4 { e | c2 d2 | e2 f2 | }
@@ -2782,7 +2782,7 @@ It is possible to shorten volta brackets
 by setting @code{voltaSpannerDuration}.  In the next example, the
 bracket only lasts one measure, which is a duration of 3/4.
 
-@lilypond[verbatim,raggedright,quote]
+@lilypond[verbatim,ragged-right,quote]
 \relative c''{
   \time 3/4
   c c c
@@ -2838,7 +2838,7 @@ in the MIDI output.  This is achieved by applying the
 @code{\unfoldRepeats} music function.  This functions changes all
 repeats to unfold repeats.
 
-@lilypond[quote,verbatim,fragment,linewidth=8.0\cm]
+@lilypond[quote,verbatim,fragment,line-width=8.0\cm]
 \unfoldRepeats {
   \repeat tremolo 8 {c'32 e' }
   \repeat percent 2 { c''8 d'' }
@@ -2893,7 +2893,7 @@ alphabetic characters;
 Stop a running volta bracket.
 @end table
 
-@lilypond[quote,raggedright,verbatim,fragment,relative=2]
+@lilypond[quote,ragged-right,verbatim,fragment,relative=2]
 c4
   \set Score.repeatCommands = #'((volta "93") end-repeat)
 c4 c4
@@ -2917,7 +2917,7 @@ Program reference: @internalsref{VoltaBracket}, @internalsref{RepeatedMusic},
 
 To place tremolo marks between notes, use @code{\repeat} with tremolo
 style
-@lilypond[quote,verbatim,raggedright]
+@lilypond[quote,verbatim,ragged-right]
 \new Voice \relative c' {
   \repeat "tremolo" 8 { c16 d16 }
   \repeat "tremolo" 4 { c16 d16 }
@@ -2927,7 +2927,7 @@ style
 
 Tremolo marks can also be put on a single note.  In this case, the
 note should not be surrounded by braces.
-@lilypond[quote,verbatim,raggedright]
+@lilypond[quote,verbatim,ragged-right]
 \repeat "tremolo" 4 c'16
 @end lilypond
 
@@ -2958,7 +2958,7 @@ duration of the subdivision, and it must be at least 8.  A
 length is omitted, the last value (stored in @code{tremoloFlags}) is
 used
 
-@lilypond[quote,raggedright,verbatim,fragment]
+@lilypond[quote,ragged-right,verbatim,fragment]
 c'2:8 c':32 | c': c': |
 @end lilypond
 
@@ -2987,7 +2987,7 @@ Patterns of one and two measures are replaced by percent-like signs,
 patterns that divide the measure length are replaced by slashes.
 Percent repeats must be declared within a @code{Voice} context.
 
-@lilypond[quote,verbatim,raggedright]
+@lilypond[quote,verbatim,ragged-right]
 \new Voice \relative c' {
   \repeat "percent" 4 { c4 }
   \repeat "percent" 2 { c2 es2 f4 fis4 g4 c4 }
@@ -2997,7 +2997,7 @@ Percent repeats must be declared within a @code{Voice} context.
 Measure repeats of more than 2 measures get a counter, if you switch
 on the @code{countPercentRepeats} property,
 
-@lilypond[relative=2,fragment,quote,verbatim,raggedright]
+@lilypond[relative=2,fragment,quote,verbatim,ragged-right]
 \set countPercentRepeats = ##t
 \new Voice
   \repeat "percent" 4 { c1 }
diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 1796ec6450..b1d66dea4f 100644
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -153,7 +153,7 @@ A practical application of @code{\new} is a score with many
 staves.  Each part that should be on its own staff, is preceded with 
 @code{\new Staff}.
 
-@lilypond[quote,verbatim,relative=2,raggedright,fragment]
+@lilypond[quote,verbatim,relative=2,ragged-right,fragment]
 << \new Staff { c4 c }
    \new Staff { d4 d }
 >>
@@ -203,7 +203,7 @@ They are combined by sending both to the same @context{Voice} context,
    \context Voice = "A" \arts
 >>
 @end example
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 music = { c4 c4 }
 arts = { s4-. s4-> }
 \relative c'' <<
@@ -447,7 +447,7 @@ time signature.
 @cindex polymetric scores
 @cindex Time signatures, multiple
 
-@lilypond[quote,relative=1,raggedright,verbatim,fragment]
+@lilypond[quote,relative=1,ragged-right,verbatim,fragment]
 \new Score \with {
   \remove "Timing_translator"
   \remove "Default_bar_line_engraver"
@@ -660,7 +660,7 @@ The next example shows how to build a different type of
 @code{Voice}, but prints centered slash noteheads only.  It can be used
 to indicate improvisation in Jazz pieces,
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 \layout { \context {
   \name ImproVoice
   \type "Engraver_group"
@@ -1311,7 +1311,7 @@ if yes, it sets @code{extra-offset}.
 This procedure is installed into @internalsref{Tie}, so the last part
 of the broken tie is translated up.
 
-@lilypond[quote,verbatim,raggedright]
+@lilypond[quote,verbatim,ragged-right]
 #(define (my-callback grob)
   (let* (
          ; have we been split? 
diff --git a/Documentation/user/examples.itely b/Documentation/user/examples.itely
index 5d4a8d106b..b38536280b 100644
--- a/Documentation/user/examples.itely
+++ b/Documentation/user/examples.itely
@@ -27,8 +27,8 @@ The first example gives you a staff with notes, suitable for a solo
 instrument or a melodic fragment.  Cut and paste this into a file,
 add notes, and you're finished!
 
-@lilypond[quote,verbatim,raggedright]
-\version "2.6.0"
+@lilypond[quote,verbatim,ragged-right]
+\version "2.7.32"
 melody = \relative c' {
    \clef treble
    \key c \major
@@ -52,8 +52,8 @@ automatic beaming, which is common for vocal parts.  If you want to use
 automatic beaming, you'll have to change or comment out the relevant
 line.
 
-@lilypond[quote,verbatim,raggedright]
-\version "2.6.0"
+@lilypond[quote,verbatim,ragged-right]
+\version "2.7.32"
 melody = \relative c' {
    \clef treble
    \key c \major
@@ -83,8 +83,8 @@ text = \lyricmode {
 
 Want to prepare a lead sheet with a melody and chords?  Look no further!
 
-@lilypond[quote,verbatim,raggedright]
-\version "2.6.0"
+@lilypond[quote,verbatim,ragged-right]
+\version "2.7.32"
 melody = \relative c' {
    \clef treble
    \key c \major
@@ -116,8 +116,8 @@ harmonies = \chordmode {
 
 This template allows you to prepare a song with melody, words, and chords.
 
-@lilypond[quote,verbatim,raggedright]
-\version "2.6.0"
+@lilypond[quote,verbatim,ragged-right]
+\version "2.7.32"
 melody = \relative c' {
    \clef treble
    \key c \major
@@ -157,8 +157,8 @@ harmonies = \chordmode {
 
 Here is a simple piano staff.
 
-@lilypond[quote,verbatim,raggedright]
-\version "2.6.0"
+@lilypond[quote,verbatim,ragged-right]
+\version "2.7.32"
 upper = \relative c'' {
    \clef treble
    \key c \major
@@ -191,8 +191,8 @@ lower = \relative c {
 Here is a typical song format: one staff with the melody and lyrics, with
 piano accompaniment underneath.
 
-@lilypond[quote,verbatim,raggedright]
-\version "2.6.0"
+@lilypond[quote,verbatim,ragged-right]
+\version "2.7.32"
 melody = \relative c'' {
    \clef treble
    \key c \major
@@ -247,8 +247,8 @@ lower = \relative c {
 Instead of having a full staff for the melody and lyrics, you can place
 the lyrics between the piano staff (and omit the separate melody staff).
 
-@lilypond[quote,verbatim,raggedright]
-\version "2.6.0"
+@lilypond[quote,verbatim,ragged-right]
+\version "2.7.32"
 upper = \relative c'' {
    \clef treble
    \key c \major
@@ -294,8 +294,8 @@ staffs.  This requires a bit of tweaking to implement, but
 since the template is right here, you don't have to do the
 tweaking yourself.
 
-@lilypond[quote,verbatim,raggedright]
-\version "2.6.0"
+@lilypond[quote,verbatim,ragged-right]
+\version "2.7.32"
 upper = \relative c'' {
   \clef treble
   \key c \major
@@ -391,8 +391,8 @@ pedal = {
 This template demonstrates a string quartet.  It also uses a @code{\global}
 section for time and key signatures.
 
-@lilypond[quote,verbatim,raggedright]
-\version "2.6.0"
+@lilypond[quote,verbatim,ragged-right]
+\version "2.7.32"
 
 global= {
   \time 4/4
@@ -452,7 +452,7 @@ contains all the music definitions.  The other files -- @code{score.ly},
 
 @verbatim
 %%%%% piece.ly
-\version "2.6.0"
+\version "2.7.32"
 
 global= {
   \time 4/4
@@ -498,7 +498,7 @@ music = {
 
 
 %%%%% score.ly
-\version "2.6.0"
+\version "2.7.32"
 \include "piece.ly"
 #(set-global-staff-size 14)
 \score {
@@ -509,7 +509,7 @@ music = {
 
 
 %%%%% vn1.ly
-\version "2.6.0"
+\version "2.7.32"
 \include "piece.ly"
 \score { 
   \keepWithTag #'vn1 \music
@@ -518,7 +518,7 @@ music = {
 
 
 %%%%% vn2.ly
-\version "2.6.0"
+\version "2.7.32"
 \include "piece.ly"
 \score { 
   \keepWithTag #'vn2 \music
@@ -527,7 +527,7 @@ music = {
 
 
 %%%%% vla.ly
-\version "2.6.0"
+\version "2.7.32"
 \include "piece.ly"
 \score { 
   \keepWithTag #'vla \music
@@ -536,7 +536,7 @@ music = {
 
 
 %%%%% vlc.ly
-\version "2.6.0"
+\version "2.7.32"
 \include "piece.ly"
 \score { 
   \keepWithTag #'vlc \music
@@ -555,8 +555,8 @@ it's often useful to include a section which is included in all
 parts.  For example, the time signature and key signatures are almost
 always the same for all parts.
 
-@lilypond[quote,verbatim,raggedright]
-\version "2.6.0"
+@lilypond[quote,verbatim,ragged-right]
+\version "2.7.32"
 global = {
    \key c \major
    \time 4/4
@@ -635,8 +635,8 @@ can use a music definition more than once.  If you make any changes
 to the vocal notes (say, tenorMusic), then the changes will also
 apply to the piano reduction.
 
-@lilypond[quote,verbatim,raggedright]
-\version "2.6.0"
+@lilypond[quote,verbatim,ragged-right]
+\version "2.7.32"
 global = {
    \key c \major
    \time 4/4
@@ -737,8 +737,8 @@ mensural music; in fact, the meter often changed after every few
 notes.  As a compromise, bar lines are often printed between the
 staves rather than on the staves.
 
-@lilypond[quote,verbatim,linewidth=11.0\cm]
-\version "2.6.0"
+@lilypond[quote,verbatim,line-width=11.0\cm]
+\version "2.7.32"
 
 global = {
   \set Score.skipBars = ##t
@@ -973,10 +973,10 @@ is within a @code{\transpose} section.
 @c     make whatever changes I feel like.
 
 @c FIXME: produces a warning ; key change merge.
-@c The `linewidth' argument is for the \header.
+@c The `line-width' argument is for the \header.
 
-@lilypond[quote,verbatim,raggedright,linewidth]
-\version "2.6.0"
+@lilypond[quote,verbatim,ragged-right,line-width]
+\version "2.7.32"
 \header {
   title = "Song"
   subtitle = "(tune)"
@@ -1240,9 +1240,9 @@ music.  For example, Mutopia lists the composer of the famous D major
 violin concerto as TchaikovskyPI, whereas perhaps you wish to print
 "Petr Tchaikowski" on your music.
 
-@ The `linewidth' is for \header.
-@lilypond[quote,verbatim,raggedright,linewidth]
-\version "2.6.0"
+@ The `line-width' is for \header.
+@lilypond[quote,verbatim,ragged-right,line-width]
+\version "2.7.32"
 \header {
   dedication = "dedication"
   title = "Title"
@@ -1296,7 +1296,7 @@ music.  Gregorian music has no measure, no stems; it uses only half and
 quarter notes, and two types of barlines, a short one indicating a rest,
 and a second one indicating a breath mark.
 
-@lilypond[quote,verbatim,raggedright]
+@lilypond[quote,verbatim,ragged-right]
 barOne = { \once \override Staff.BarLine #'bar-size = #2
   \bar "|" }
 barTwo = { \once \override Staff.BarLine #'extra-offset = #'(0 . 2)
@@ -1362,13 +1362,13 @@ is written in Texinfo.
 
 Texinfo text
 
-@@lilypond[verbatim,fragment,raggedright]
+@@lilypond[verbatim,fragment,ragged-right]
 a4 b c d
 @@end lilypond
 
 More Texinfo text
 
-@@lilypond[verbatim,fragment,raggedright]
+@@lilypond[verbatim,fragment,ragged-right]
 d4 c b a
 @@end lilypond
 
diff --git a/Documentation/user/global.itely b/Documentation/user/global.itely
index 1dc36b860a..6edb97df34 100644
--- a/Documentation/user/global.itely
+++ b/Documentation/user/global.itely
@@ -257,73 +257,73 @@ The default layout responds to the following settings in the
 
 @quotation
 @table @code
-@cindex @code{firstpagenumber}
-@item firstpagenumber
+@cindex @code{first-page-number}
+@item first-page-number
 The value of the page number of the first page.  Default is@tie{}1.
 
-@cindex @code{printfirstpagenumber}
-@item printfirstpagenumber
+@cindex @code{printfirst-page-number}
+@item printfirst-page-number
 If set to true, will print the page number in the first page.  Default is
 false.
 
-@cindex @code{printpagenumber}
-@item printpagenumber
+@cindex @code{print-page-number}
+@item print-page-number
 If set to false, page numbers will not be printed.
 
-@cindex @code{hsize}
-@item hsize
+@cindex @code{paper-width}
+@item paper-width
 The width of the page.
 
-@cindex @code{vsize}
-@item vsize
+@cindex @code{paper-height}
+@item paper-height
 The height of the page.
 
-@cindex @code{topmargin}
-@item topmargin
+@cindex @code{top-margin}
+@item top-margin
 Margin between header and top of the page.
 
-@cindex @code{bottommargin}
-@item bottommargin
+@cindex @code{bottom-margin}
+@item bottom-margin
 Margin between footer and bottom of the page.
 
-@cindex @code{leftmargin}
-@item leftmargin
+@cindex @code{left-margin}
+@item left-margin
 Margin between the left side of the page and the beginning of the music.
 
-@cindex @code{linewidth}
-@item linewidth
+@cindex @code{line-width}
+@item line-width
 The length of the systems.
 
-@cindex @code{headsep}
-@item headsep
+@cindex @code{heap-separation}
+@item heap-separation
 Distance between the top-most music system and the page header.
 
-@cindex @code{footsep}
-@item footsep
+@cindex @code{foot-separation}
+@item foot-separation
 Distance between the bottom-most music system and the page footer.
 
-@cindex @code{pagetopspace}
+@cindex @code{page-top-space}
 Distance from the top of the printable area to the center of the first
 staff. This only works for staves which are vertically small. Big staves
 are set with the top of their bounding box aligned to the top of the
 printable area.
 
-@cindex @code{raggedbottom}
-@item raggedbottom
+@cindex @code{ragged-bottom}
+@item ragged-bottom
 If set to true, systems will not be spread across the page.
 
 This should be set false for pieces that have only two or three
 systems per page, for example orchestral scores.
  
-@cindex @code{raggedlastbottom}
-@item raggedlastbottom
+@cindex @code{ragged-last-bottom}
+@item ragged-last-bottom
 If set to false, systems will be spread to fill the last page.
 
 Pieces that amply fill two pages or more should have this set to
 true.
 
-@cindex @code{betweensystemspace}
-@item betweensystemspace
+@cindex @code{between-system-space}
+@item between-system-space
 This dimensions determines the distance between systems.  It is the
 ideal distance between the center of the bottom staff of one system
 and the center of the top staff of the next system.
@@ -331,8 +331,8 @@ and the center of the top staff of the next system.
 Increasing this will provide a more even appearance of the page at the
 cost of using more vertical space.
 
-@cindex @code{betweensystempadding}
-@item betweensystempadding
+@cindex @code{between-system-padding}
+@item between-system-padding
 This dimension is the minimum amount of white space that will always
 be present between the bottom-most symbol of one system, and the
 top-most of the next system.
@@ -341,24 +341,24 @@ Increasing this will put systems whose bounding boxes almost touch
 farther apart.
 
 
-@cindex @code{horizontalshift}
-@item horizontalshift
+@cindex @code{horizontal-shift}
+@item horizontal-shift
 All systems (including titles and system separators) are shifted by
 this amount to the right. Page markup, such as headers and footers are
 not affected by this. The purpose of this variable is to make space
 for instrument names at the left.
 
-@cindex @code{aftertitlespace}
-@item aftertitlespace
+@cindex @code{after-title-space}
+@item after-title-space
 Amount of space between the title and the first system.
 
-@cindex @code{aftertitlespace}
-@item beforetitlespace 
+@cindex @code{after-title-space}
+@item before-title-space 
 Amount of space between the last system of the previous piece and the
 title of the next.
 
-@cindex @code{betweentitlespace}
-@item betweentitlespace
+@cindex @code{between-title-space}
+@item between-title-space
 Amount of space between consecutive titles (e.g., the title of the
 book and the title of a piece).
 
@@ -375,7 +375,7 @@ systems.  This is often used for orchestral scores.
 The markup command @code{\slashSeparator} is provided as a sensible
 default,  for example
 
-@lilypond[raggedright]
+@lilypond[ragged-right]
 \paper {
   systemSeparatorMarkup = \slashSeparator
 }
@@ -391,10 +391,10 @@ Example:
 
 @example
 \paper@{
-  hsize = 2\cm
-  topmargin = 3\cm
-  bottommargin = 3\cm
-  raggedlastbottom = ##t
+  paper-width = 2\cm
+  top-margin = 3\cm
+  bottom-margin = 3\cm
+  ragged-last-bottom = ##t
 @}
 @end example
 
@@ -405,7 +405,7 @@ value has to be multiplied in the example
 
 @example
 \paper @{
-  #(define bottommargin (* 2 cm)) 
+  #(define bottom-margin (* 2 cm)) 
 @}
 @end example
 
@@ -432,9 +432,9 @@ page given the system to put on it.
 
 @refbugs
 
-The option rightmargin is defined but doesn't set the right margin
+The option right-margin is defined but doesn't set the right margin
 yet.  The value for the right margin has to be defined adjusting the
-values of the leftmargin and linewidth.
+values of the left-margin and line-width.
 
 The default page header puts the page number and the @code{instrument}
 field from the @code{\header} block on a line.
@@ -517,7 +517,7 @@ at the line break before the system to be changed. The distance
 @code{15} is distributed over all staves that have a fixed distance
 alignment.  For example,
 
-@lilypond[raggedright, fragment, relative=2, staffsize=13]
+@lilypond[ragged-right, fragment, relative=2, staffsize=13]
 \new StaffGroup <<
   \new Staff { 
     c1\break 
@@ -537,14 +537,14 @@ The distance for @code{alignment-extra-space} may also be negative.
 
 
 To change the amount of space between systems, use
-@code{betweensystemspace}.  A score with only one staff is still
-considered to have systems, so setting @code{betweensystemspace} will
+@code{between-system-space}.  A score with only one staff is still
+considered to have systems, so setting @code{between-system-space} will
 be much more useful than changing @code{minimum-Y-extent} of a Staff
 context.
 
 @example
 \paper @{
-  betweensystemspace = 10\mm
+  between-system-space = 10\mm
 @}
 @end example
 
@@ -554,9 +554,9 @@ then use the following
 
 @example
 \paper @{
-  betweensystempadding = #1
-  raggedbottom=##f
-  raggedlastbottom=##f
+  between-system-padding = #1
+  ragged-bottom=##f
+  ragged-last-bottom=##f
 @}
 @end example
 
@@ -652,7 +652,7 @@ at the line break before the system to be changed. The distance
 @code{15} is distributed over all staves that have a fixed distance
 alignment.  For example,
 
-@lilypond[raggedright, fragment, relative=2, staffsize=13]
+@lilypond[ragged-right, fragment, relative=2, staffsize=13]
 \new PianoStaff <<
   \new Staff { 
     c1\break 
@@ -749,7 +749,7 @@ for controlling the stem/bar line spacing.  The following example shows
 these corrections, once with default settings, and once with
 exaggerated corrections:
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 {
   c'4 e''4 e'4 b'4 |
   b'4 e''4 b'4 e''4|
@@ -790,27 +790,27 @@ No work-around exists for decreasing the amount of space.
 @cindex breaking pages
 
 @cindex @code{indent}
-@cindex @code{linewidth}
-@cindex @code{raggedright}
+@cindex @code{line-width}
+@cindex @code{ragged-right}
 
-@c Although linewidth can be set in \layout, it should be set in paper
+@c Although line-width can be set in \layout, it should be set in paper
 @c block, to get page layout right.
 @c Setting indent in \paper block makes not much sense, but it works.
 
 @c Bit verbose and vague, use examples?
 The most basic settings influencing the spacing are @code{indent} and
-@code{linewidth}.  They are set in the @code{\layout} block.  They
+@code{line-width}.  They are set in the @code{\layout} block.  They
 control the indentation of the first line of music, and the lengths of
 the lines.
 
-If @code{raggedright} is set to true in the @code{\layout} block, then
+If @code{ragged-right} is set to true in the @code{\layout} block, then
 the lines are justified at their natural length.  This is useful for
 short fragments, and for checking how tight the natural spacing is.
 
 @cindex page layout
 @cindex vertical spacing
 
-The option @code{raggedlast} is similar to @code{raggedright}, but
+The option @code{raggedlast} is similar to @code{ragged-right}, but
 only affects the last line of the piece.  No restrictions are put on
 that line.  The result is similar to formatting text paragraphs.  In a
 paragraph, the last line simply takes its natural length.
@@ -1042,10 +1042,10 @@ Centered at the bottom of the last page.
 Here is a demonstration of the fields available.  Note that you
 may use any @ref{Text markup} commands in the header.
 
-@lilypond[quote,verbatim,linewidth=11.0\cm]
+@lilypond[quote,verbatim,line-width=11.0\cm]
 \paper {
-  linewidth = 9.0\cm
-  vsize = 10.0\cm
+  line-width = 9.0\cm
+  paper-height = 10.0\cm
 }
 
 \book {
@@ -1105,7 +1105,7 @@ Here is a short example.
 If you define the @code{\header} inside the @code{\score} block, then
 normally only the @code{piece} and @code{opus} headers will be printed.
 
-@lilypond[quote,verbatim,linewidth=11.0\cm]
+@lilypond[quote,verbatim,line-width=11.0\cm]
 \score {
   { c'4 }
   \header {
diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index d32e080e35..4941a4d822 100644
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -90,7 +90,7 @@ The autochanger switches on basis of the pitch (middle C is the turning
 point), and it looks ahead skipping over rests to switch in
 advance.  Here is a practical example
 
-@lilypond[quote,verbatim,raggedright]
+@lilypond[quote,verbatim,ragged-right]
 \context PianoStaff
   \autochange \relative c'
   {
@@ -163,7 +163,7 @@ L.v. ties (laissez vibrer) indicate that notes must not be damped at the
 end. It is used in notation for piano, harp and other string and
 percussion instruments. They can be entered using @code{\laissezVibrer},
 
-@lilypond[fragment,raggedright,verbatim,relative=1]
+@lilypond[fragment,ragged-right,verbatim,relative=1]
 <c f g>\laissezVibrer 
 @end lilypond
 
@@ -189,7 +189,7 @@ Piano pedal instruction can be expressed by attaching
 @code{\treCorde}, @code{\sostenutoDown} and @code{\sostenutoUp} to a
 note or chord
 
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 c'4\sustainDown c'4\sustainUp
 @end lilypond
 
@@ -202,7 +202,7 @@ information.
 Pedals can also be indicated by a sequence of brackets, by setting the
 @code{pedalSustainStyle} property to bracket objects
 
-@lilypond[quote,raggedright,fragment,verbatim,relative=2]
+@lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \set Staff.pedalSustainStyle = #'bracket
 c\sustainDown d e
 b\sustainUp\sustainDown
@@ -213,7 +213,7 @@ A third style of pedal notation is a mixture of text and brackets,
 obtained by setting the @code{pedalSustainStyle} property to
 @code{mixed}
 
-@lilypond[quote,raggedright,fragment,verbatim,relative=2]
+@lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \set Staff.pedalSustainStyle = #'mixed
 c\sustainDown d e
 b\sustainUp\sustainDown
@@ -224,7 +224,7 @@ The default `*Ped.' style for sustain and damper pedals corresponds to
 style @code{#'text}.  The sostenuto pedal uses @code{mixed} style by
 default.
 
-@lilypond[quote,raggedright,fragment,verbatim,relative=2]
+@lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 c\sostenutoDown d e c, f g a\sostenutoUp
 @end lilypond
 
@@ -235,7 +235,7 @@ For fine-tuning the appearance of a pedal bracket, the properties
 modified.  For example, the bracket may be extended to the right edge
 of the note head
 
-@lilypond[quote,raggedright,fragment,verbatim,relative=2]
+@lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \override Staff.PianoPedalBracket #'shorten-pair = #'(0 . -1.0)
 c\sostenutoDown d e c, f g a\sostenutoUp
 @end lilypond
@@ -258,7 +258,7 @@ Whenever a voice switches to another staff, a line connecting the notes
 can be printed automatically.  This is switched on by setting
 @code{followVoice} to true
 
-@lilypond[quote,raggedright,fragment,relative=1,verbatim]
+@lilypond[quote,ragged-right,fragment,relative=1,verbatim]
 \new PianoStaff <<
   \context Staff=one {
     \set followVoice = ##t
@@ -289,7 +289,7 @@ Chords that cross staves may be produced by increasing the length
 of the stem in the lower staff, so it reaches the stem in the upper
 staff, or vice versa.
 
-@lilypond[raggedright,verbatim,quote]
+@lilypond[ragged-right,verbatim,quote]
 stemExtend = \once \override Stem #'length = #22
 noFlag = \once \override Stem #'flag-style = #'no-flag
 \context PianoStaff <<
@@ -330,7 +330,7 @@ entered by name.  Internally, the chords are represented as a set of
 pitches, so they can be transposed
 
 
-@lilypond[quote,raggedright,verbatim,raggedright]
+@lilypond[quote,ragged-right,verbatim,ragged-right]
 twoWays = \transpose c c' {
   \chordmode {
     c1 f:sus4 bes/f
@@ -364,7 +364,7 @@ In chord mode sets of pitches (chords) are entered with normal note
 names.  A chord is entered by the root, which is entered like a
 normal pitch
 
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 \chordmode { es4. d8 c2 }
 @end lilypond
 
@@ -445,7 +445,7 @@ Modifiers can be mixed with additions
 Since an unaltered 11 does not sound good when combined with an
 unaltered 3, the 11 is removed in this case (unless it is added
 explicitly)
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 \chordmode { c:13 c:13.11 c:m13 }
 @end lilypond
 
@@ -454,7 +454,7 @@ explicitly)
 An inversion (putting one pitch of the chord on the bottom), as well
 as bass notes, can be specified by appending
 @code{/}@var{pitch} to the chord
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 \chordmode { c1 c/g c/f }
 @end lilypond
 @cindex @code{/+}
@@ -462,7 +462,7 @@ as bass notes, can be specified by appending
 A bass note can be added instead transposed out of the chord,
 by using @code{/+}@var{pitch}.
 
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 \chordmode { c1 c/+g c/+f }
 @end lilypond
 
@@ -479,7 +479,7 @@ Each step can only be present in a chord once.  The following
 simply produces the augmented chord, since @code{5+} is interpreted
 last
 @cindex clusters
-@lilypond[quote,raggedright,verbatim,fragment]
+@lilypond[quote,ragged-right,verbatim,fragment]
 \chordmode { c:5.5-.5+ }
 @end lilypond
 
@@ -495,7 +495,7 @@ For displaying printed chord names, use the @internalsref{ChordNames} context.
 The chords may be entered either using the notation
 described above, or directly using @code{<} and @code{>}
 
-@lilypond[quote,verbatim,raggedright]
+@lilypond[quote,verbatim,ragged-right]
 harmonies = {
   \chordmode {a1 b c} <d' f' a'> <e' g' b'>
 }
@@ -510,7 +510,7 @@ You can make the chord changes stand out by setting
 display chord names when there is a change in the chords scheme and at
 the start of a new line
 
-@lilypond[quote,verbatim,raggedright]
+@lilypond[quote,verbatim,ragged-right]
 harmonies = \chordmode {
   c1:m c:m \break c:m c:m d
 }
@@ -527,7 +527,7 @@ necessary.  Chords may also be printed separately.  It may be necessary
 to add @internalsref{Volta_engraver} and @internalsref{Bar_engraver}
 for showing repeats.
 
-@lilypond[raggedright,verbatim]
+@lilypond[ragged-right,verbatim]
 \new ChordNames \with {
   \override BarLine #'bar-size = #4
   voltaOnThisStaff = ##t
@@ -590,7 +590,7 @@ it is major.  Predefined options are @code{whiteTriangleMarkup} and
 Different parts of a chord name are normally separated by a
 slash.  By setting @code{chordNameSeparator}, you can specify other
 separators, e.g.,
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 \context ChordNames \chordmode {
   c:7sus4
   \set chordNameSeparator
@@ -627,7 +627,7 @@ The predefined variables @code{\germanChords},
 set these variables.  The effect is
 demonstrated here,
 
-@lilypondfile[raggedright]{chord-names-languages.ly}
+@lilypondfile[ragged-right]{chord-names-languages.ly}
 
 There are also two other chord name schemes implemented: an alternate
 Jazz chord notation, and a systematic scheme called Banter chords.  The
@@ -731,7 +731,7 @@ The easiest way to add lyrics to a melody is to append
 @noindent
 to a melody.  Here is an example,
 
-@lilypond[raggedright,verbatim,fragment,quote]
+@lilypond[ragged-right,verbatim,fragment,quote]
 \time 3/4
 \relative { c2 e4 g2. }
 \addlyrics { play the game }
@@ -740,7 +740,7 @@ to a melody.  Here is an example,
 More stanzas can be added by adding more
 @code{\addlyrics} sections
 
-@lilypond[raggedright,verbatim,fragment,quote]
+@lilypond[ragged-right,verbatim,fragment,quote]
 \time 3/4
 \relative { c2 e4 g2. }
 \addlyrics { play the game }
@@ -756,7 +756,7 @@ of the main score block.  Notice that there are two
 different ways to force linebreaks when using
 @code{\markup}.
 
-@lilypond[raggedright,verbatim,quote]
+@lilypond[ragged-right,verbatim,quote]
 melody = \relative c' {
 e d c d | e e e e |
 d d e d | c1 |
@@ -987,7 +987,7 @@ an unslurred group of notes to be a melisma, insert @code{\melisma}
 after the first note of the group, and @code{\melismaEnd} after the
 last one, e.g.,
 
-@lilypond[quote,relative=2,raggedright,fragment,verbatim]
+@lilypond[quote,relative=2,ragged-right,fragment,verbatim]
 <<
   \context Voice = "lala" {
     \time 3/4
@@ -1040,7 +1040,7 @@ will not be formatted properly.
 
 Here is an example demonstrating manual lyric durations,
 
-@lilypond[relative=1,raggedright,verbatim,fragment,quote]
+@lilypond[relative=1,ragged-right,verbatim,fragment,quote]
 << \context Voice = melody {
      \time 3/4
      c2 e4 g2.
@@ -1100,7 +1100,7 @@ There has one tricky aspect.  The setting for @code{ignoreMelismata}
 must be set one syllable @emph{before} the non-melismatic syllable
 in the text, as shown here,
 
-@lilypond[verbatim,raggedright,quote]
+@lilypond[verbatim,ragged-right,quote]
 <<
   \relative \context Voice = "lahlah" {
     \set Staff.autoBeaming = ##f
@@ -1130,7 +1130,7 @@ standard.  This can be achieved by insert @code{\skip}s into the
 lyrics.  For every @code{\skip}, the text will be delayed another note.
 For example,
 
-@lilypond[verbatim,raggedright,quote]
+@lilypond[verbatim,ragged-right,quote]
 \relative { c c g' }
 \addlyrics {
   twin -- \skip 4
@@ -1147,7 +1147,7 @@ More complex variations in text underlay are possible.  It is possible
 to switch the melody for a line of lyrics during the text.  This is
 done by setting the @code{associatedVoice} property.  In the example
 
-@lilypond[raggedright,quote]
+@lilypond[ragged-right,quote]
 <<
   \relative \context Voice = "lahlah" {
     \set Staff.autoBeaming = ##f
@@ -1257,7 +1257,7 @@ set @code{melismaBusyProperties}, as is done in the example above.
 To increase the space between lyrics, use the @code{SeparationItem}
 property.
 
-@lilypond[relative,verbatim,fragment,quote,raggedright]
+@lilypond[relative,verbatim,fragment,quote,ragged-right]
 { 
   c c c c
   \override Score.SeparationItem #'padding = #5
@@ -1283,7 +1283,7 @@ property.
 
 Stanza numbers can be added by setting @code{stanza}, e.g.,
 
-@lilypond[quote,raggedright,verbatim,relative=2,fragment]
+@lilypond[quote,ragged-right,verbatim,relative=2,fragment]
 \new Voice {
   \time 3/4 g2 e4 a2 f4 g2.
 } \addlyrics {
@@ -1302,7 +1302,7 @@ the line, just like instrument names.  They are created by setting
 @code{vocalName}.  A short version may be entered as @code{vocNam}.
 
 
-@lilypond[fragment,raggedright,quote,verbatim,relative=2]
+@lilypond[fragment,ragged-right,quote,verbatim,relative=2]
 \new Voice {
   \time 3/4 g2 e4 a2 f4 g2.
 } \addlyrics {
@@ -1317,7 +1317,7 @@ the line, just like instrument names.  They are created by setting
 You can display alternate (or divisi) lyrics by naming voice
 contexts and attaching lyrics to those specific contexts.
 
-@lilypond[verbatim,raggedright,quote]
+@lilypond[verbatim,ragged-right,quote]
 \score{ <<
   \context Voice = "melody" {
     \relative c' {
@@ -1338,7 +1338,7 @@ contexts and attaching lyrics to those specific contexts.
 You can use this trick to display different lyrics for a repeated
 section.
 
-@lilypond[verbatim,raggedright,quote]
+@lilypond[verbatim,ragged-right,quote]
 \score{ <<
   \context Voice = melody \relative c' {
     c2 e | g e | c1 |
@@ -1388,7 +1388,7 @@ for example,
 
 This results in the following output
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 \layout {
   \context {
     \Staff
@@ -1406,7 +1406,7 @@ ambitus per staff rather than per each voice, add the
 @internalsref{Ambitus_engraver} to the @internalsref{Staff} context
 rather than to the @internalsref{Voice} context.  Here is an example,
 
-@lilypond[verbatim,raggedright,quote]
+@lilypond[verbatim,ragged-right,quote]
 \new Staff \with {
   \consists "Ambitus_engraver"
 }
@@ -1491,7 +1491,7 @@ Sometimes you might want to show only the rhythm of a melody.  This
 can be done with the rhythmic staff.  All pitches of notes on such a
 staff are squashed, and the staff itself has a single line
 
-@lilypond[quote,raggedright,fragment,relative=1,verbatim]
+@lilypond[quote,ragged-right,fragment,relative=1,verbatim]
 \context RhythmicStaff {
   \time 4/4
   c4 e8 f g2 | r4 g r2 | g1:32 | r1 |
@@ -1517,7 +1517,7 @@ similar to the standard mode for entering notes.  Each piece of
 percussion has a full name and an abbreviated name, and both can be used
 in input files
 
-@lilypond[quote,raggedright,verbatim]
+@lilypond[quote,ragged-right,verbatim]
 \drums {
   hihat hh bassdrum bd
 }
@@ -1544,7 +1544,7 @@ of percussion.
 To typeset the music, the notes must be interpreted in a
 @internalsref{DrumStaff} and @internalsref{DrumVoice} contexts
 
-@lilypond[quote,raggedright,verbatim]
+@lilypond[quote,ragged-right,verbatim]
 up = \drummode { crashcymbal4 hihat8 halfopenhihat hh hh hh openhihat }
 down = \drummode { bassdrum4 snare8 bd r bd sn4 }
   \new DrumStaff <<
@@ -1557,7 +1557,7 @@ The above example shows verbose polyphonic notation.  The short
 polyphonic notation, described in @ref{Polyphony}, can also be used if
 the @internalsref{DrumVoice}s are instantiated by hand first.  For example,
 
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 \new DrumStaff <<
   \context DrumVoice = "1" { s1 *2 }
   \context DrumVoice = "2" { s1 *2 }
@@ -1581,7 +1581,7 @@ The following variables have been predefined
 @item drums-style
 This is the default.  It typesets a typical drum kit on a five-line staff
 
-@lilypond[quote,linewidth=10.0\cm]
+@lilypond[quote,line-width=10.0\cm]
 nam = \lyricmode {
   cymc cyms cymr hh hhc hho hhho hhp
   cb hc bd sn ss tomh tommh tomml toml tomfh tomfl }
@@ -1616,7 +1616,7 @@ on the three middle lines you use @code{tommh}, @code{tomml}, and
 @item timbales-style
 This typesets timbales on a two line staff
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 nam = \lyricmode { timh ssh timl ssl cb }
 mus = \drummode { timh ssh timl ssl cb s16 }
 
@@ -1641,7 +1641,7 @@ mus = \drummode { timh ssh timl ssl cb s16 }
 @item congas-style
 This typesets congas on a two line staff
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 nam = \lyricmode { cgh cgho cghm ssh cgl cglo cglm ssl }
 mus = \drummode { cgh cgho cghm ssh cgl cglo cglm ssl s16 }
 
@@ -1667,7 +1667,7 @@ mus = \drummode { cgh cgho cghm ssh cgl cglo cglm ssl s16 }
 @item bongos-style
 This typesets bongos on a two line staff
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 nam = \lyricmode { boh boho bohm ssh bol bolo bolm ssl }
 mus = \drummode { boh boho bohm ssh bol bolo bolm ssl s16 }
 
@@ -1693,7 +1693,7 @@ mus = \drummode { boh boho bohm ssh bol bolo bolm ssl s16 }
 @item percussion-style
 To typeset all kinds of simple percussion on one line staves.
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 nam = \lyricmode { tri trio trim gui guis guil cb cl tamb cab mar hc }
 mus = \drummode { tri trio trim gui guis guil cb cl tamb cab mar hc s16 }
 
@@ -1717,7 +1717,7 @@ mus = \drummode { tri trio trim gui guis guil cb cl tamb cab mar hc s16 }
 If you do not like any of the predefined lists you can define your own
 list at the top of your file
 
-@lilypond[quote,raggedright,verbatim]
+@lilypond[quote,ragged-right,verbatim]
 #(define mydrums '(
          (bassdrum     default   #f         -1)
          (snare        default   #f         0)
@@ -1770,7 +1770,7 @@ for this purpose instead.
 String numbers can be added to chords, by indicating the string number
 with @code{\}@var{number}, 
 
-@lilypond[relative,relative=1,raggedright,fragment]
+@lilypond[relative,relative=1,ragged-right,fragment]
 <c\1 e\2 g\3>
 @end lilypond
 
@@ -1798,7 +1798,7 @@ defaults to the standard guitar tuning (with 6 strings).  The notes
 are printed as tablature, by using @internalsref{TabStaff} and
 @internalsref{TabVoice} contexts
 
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 \context TabStaff {
   a,4\5 c'\2 a\3 e'\1
   e\4 c'\2 a\3 e'\1
@@ -1818,7 +1818,7 @@ e16 fis gis a b4
 \set TabStaff.minimumFret = #8
 e16 fis gis a b4
 @end example
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 frag = {
   \key e \major
   e16 fis gis a b4
@@ -1857,7 +1857,7 @@ numbers of semitones to subtract or add, starting the specified pitch
 by default middle C, in string order.  In the next example,
 @code{stringTunings} is set for the pitches e, a, d, and g
 
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 \context TabStaff <<
   \set TabStaff.stringTunings = #'(-5 -10 -15 -20)
   {
@@ -1884,7 +1884,7 @@ Fret diagrams can be added to music as a markup to the desired note.  The
 markup contains information about the desired fret diagram, as shown in the
 following example
 
-@lilypond[verbatim, raggedright, quote]
+@lilypond[verbatim, ragged-right, quote]
 \context Voice {
   d'^\markup \fret-diagram #"6-x;5-x;4-o;3-2;2-3;1-2;"
   d' d' d'
@@ -1930,7 +1930,7 @@ Examples: @inputfileref{input/@/test,fret@/-diagram@/.ly}
 This example demonstrates how to include guitar position and
 barring indications.
 
-@lilypond[quote,raggedright,fragment,verbatim,relative=0]
+@lilypond[quote,ragged-right,fragment,verbatim,relative=0]
 \clef "G_8"
 b16 d16 g16 b16 e16
 \textSpannerDown
@@ -1983,7 +1983,7 @@ write @code{\taor} instead of
 notes in the appropiate octaves, so you do not need to worry about
 @code{\relative} or @code{\transpose}.
 
-@lilypond[raggedright,verbatim,quote,notime]
+@lilypond[ragged-right,verbatim,quote,notime]
 \include "bagpipe.ly"
 { \grg G4 \grg a \grg b \grg c \grg d \grg e \grg f \grA g A }
 @end lilypond
@@ -2167,7 +2167,7 @@ note heads.
 
 The following example demonstrates the @code{neomensural} style
 
-@lilypond[quote,fragment,raggedright,verbatim]
+@lilypond[quote,fragment,ragged-right,verbatim]
 \set Score.skipBars = ##t
 \override NoteHead #'style = #'neomensural
 a'\longa a'\breve a'1 a'2 a'4 a'8 a'16
@@ -2198,7 +2198,7 @@ Use the @code{style} property of grob @internalsref{Accidental} to
 select ancient accidentals.   Supported styles are
 @code{mensural}, @code{vaticana}, @code{hufnagel}, and @code{medicaea}.
 
-@lilypond[quote,raggedright,staffsize=26]
+@lilypond[quote,ragged-right,staffsize=26]
 \score {
 {
   \fatText
@@ -2274,7 +2274,7 @@ in historic prints of the 16th century.
 
 The following example demonstrates the @code{neomensural} style
 
-@lilypond[quote,fragment,raggedright,verbatim]
+@lilypond[quote,fragment,ragged-right,verbatim]
 \set Score.skipBars = ##t
 \override Rest #'style = #'neomensural
 r\longa r\breve r1 r2 r4 r8 r16
@@ -2542,7 +2542,7 @@ Use the @code{flag-style} property of grob @internalsref{Stem} to
 select ancient flags.  Besides the @code{default} flag style,
 only the @code{mensural} style is supported
 
-@lilypond[quote,fragment,raggedright,verbatim]
+@lilypond[quote,fragment,ragged-right,verbatim]
 \override Stem #'flag-style = #'mensural
 \override Stem #'thickness = #1.0
 \override NoteHead #'style = #'mensural
@@ -2582,7 +2582,7 @@ to get a particular mensural signature glyph with the @code{\time n/m}
 command, @code{n} and @code{m} have to be chosen according to the
 following table
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 \layout {
   indent = 0.0
   \context {
@@ -2626,7 +2626,7 @@ style mimics the look of historical printings of the 16th century.
 
 The following examples show the differences in style,
 
-@lilypond[raggedright,fragment,relative=1,quote]
+@lilypond[ragged-right,fragment,relative=1,quote]
 {
   \fatText
 
@@ -2683,7 +2683,7 @@ In addition to the standard articulation signs described in section
 provided.  These are specifically designed for use with notation in
 Editio Vaticana style.
 
-@lilypond[quote,raggedright,verbatim]
+@lilypond[quote,ragged-right,verbatim]
 \include "gregorian-init.ly"
 \score {
   \context VaticanaVoice {
@@ -2739,7 +2739,7 @@ as shown in the following example
 
 The result looks like this
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 \score {
 {
   a'1
@@ -2757,7 +2757,7 @@ The custos glyph is selected by the @code{style} property.  The styles
 supported are @code{vaticana}, @code{medicaea}, @code{hufnagel}, and
 @code{mensural}.  They are demonstrated in the following fragment
 
-@lilypond[quote,raggedright,fragment]
+@lilypond[quote,ragged-right,fragment]
 \new Lyrics \lyricmode {
   \markup { \column {
     \typewriter "vaticana"
@@ -2810,7 +2810,7 @@ and @code{\finalis} at proper places in the input.  Some editions use
 Therefore, @file{gregorian@/-init@/.ly} also defines @code{\virgula} and
 @code{\caesura}
 
-@lilypondfile[quote,raggedright]{divisiones.ly}
+@lilypondfile[quote,ragged-right]{divisiones.ly}
 
 @refcommands
 
@@ -2853,7 +2853,7 @@ this particular type of ligature.  By default, the
 @internalsref{LigatureBracket} engraver just puts a square bracket
 above the ligature
 
-@lilypond[quote,raggedright,verbatim]
+@lilypond[quote,ragged-right,verbatim]
 \transpose c c' {
   \[ g c a f d' \]
   a g f
@@ -2942,7 +2942,7 @@ s4
 s4
 \[ e'1 a g\breve \]
 @end example
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 \score {
   \transpose c c' {
     \set Score.timing = ##f
@@ -2972,7 +2972,7 @@ Without replacing @internalsref{Ligature_bracket_engraver} with
 @internalsref{Mensural_ligature_engraver}, the same music transcribes
 to the following
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 \transpose c c' {
   \set Score.timing = ##f
   \set Score.defaultBarType = "empty"
@@ -3041,7 +3041,7 @@ Deminutae}
 @item
 @code{1. Punctum}
 @tab
-@lilypond[staffsize=26,linewidth=1.5\cm]
+@lilypond[staffsize=26,line-width=1.5\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3056,7 +3056,7 @@ Deminutae}
 \layout { \neumeDemoLayout }}
 @end lilypond
 @tab
-@lilypond[staffsize=26,linewidth=2.5\cm]
+@lilypond[staffsize=26,line-width=2.5\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3075,7 +3075,7 @@ Deminutae}
 \layout { \neumeDemoLayout }}
 @end lilypond
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3089,7 +3089,7 @@ Deminutae}
 @item
 @code{2. Virga}
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3105,7 +3105,7 @@ Deminutae}
 @item
 @code{3. Apostropha vel Stropha}
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3116,7 +3116,7 @@ Deminutae}
 \layout { \neumeDemoLayout }}
 @end lilypond
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3131,7 +3131,7 @@ Deminutae}
 @item
 @code{4. Oriscus}
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3147,7 +3147,7 @@ Deminutae}
 @item
 @code{5. Clivis vel Flexa}
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3158,7 +3158,7 @@ Deminutae}
 \layout { \neumeDemoLayout }}
 @end lilypond
 @tab
-@lilypond[staffsize=26,linewidth=2.0\cm]
+@lilypond[staffsize=26,line-width=2.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3173,7 +3173,7 @@ Deminutae}
 \layout { \neumeDemoLayout }}
 @end lilypond
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3187,7 +3187,7 @@ Deminutae}
 @item
 @code{6. Podatus vel Pes}
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3198,7 +3198,7 @@ Deminutae}
 \layout { \neumeDemoLayout }}
 @end lilypond
 @tab
-@lilypond[staffsize=26,linewidth=2.0\cm]
+@lilypond[staffsize=26,line-width=2.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3213,7 +3213,7 @@ Deminutae}
 \layout { \neumeDemoLayout }}
 @end lilypond
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3227,7 +3227,7 @@ Deminutae}
 @item
 @code{7. Pes Quassus}
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3238,7 +3238,7 @@ Deminutae}
 \layout { \neumeDemoLayout }}
 @end lilypond
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3253,7 +3253,7 @@ Deminutae}
 @item
 @code{8. Quilisma Pes}
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3264,7 +3264,7 @@ Deminutae}
 \layout { \neumeDemoLayout }}
 @end lilypond
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3279,7 +3279,7 @@ Deminutae}
 @item
 @code{9. Podatus Initio Debilis}
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3290,7 +3290,7 @@ Deminutae}
 \layout { \neumeDemoLayout }}
 @end lilypond
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3305,7 +3305,7 @@ Deminutae}
 @item
 @code{10. Torculus}
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3316,7 +3316,7 @@ Deminutae}
 \layout { \neumeDemoLayout }}
 @end lilypond
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3327,7 +3327,7 @@ Deminutae}
 \layout { \neumeDemoLayout }}
 @end lilypond
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3341,7 +3341,7 @@ Deminutae}
 @item
 @code{11. Torculus Initio Debilis}
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3352,7 +3352,7 @@ Deminutae}
 \layout { \neumeDemoLayout }}
 @end lilypond
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3363,7 +3363,7 @@ Deminutae}
 \layout { \neumeDemoLayout }}
 @end lilypond
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3377,7 +3377,7 @@ Deminutae}
 @item
 @code{12. Porrectus}
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3388,7 +3388,7 @@ Deminutae}
 \layout { \neumeDemoLayout }}
 @end lilypond
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3399,7 +3399,7 @@ Deminutae}
 \layout { \neumeDemoLayout }}
 @end lilypond
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3413,7 +3413,7 @@ Deminutae}
 @item
 @code{13. Climacus}
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3425,7 +3425,7 @@ Deminutae}
 }
 @end lilypond
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3436,7 +3436,7 @@ Deminutae}
 \layout { \neumeDemoLayout }}
 @end lilypond
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3450,7 +3450,7 @@ Deminutae}
 @item
 @code{14. Scandicus}
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3461,7 +3461,7 @@ Deminutae}
 \layout { \neumeDemoLayout }}
 @end lilypond
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3472,7 +3472,7 @@ Deminutae}
 \layout { \neumeDemoLayout }}
 @end lilypond
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3486,7 +3486,7 @@ Deminutae}
 @item
 @code{15. Salicus}
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3497,7 +3497,7 @@ Deminutae}
 \layout { \neumeDemoLayout }}
 @end lilypond
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3512,7 +3512,7 @@ Deminutae}
 @item
 @code{16. Trigonus}
 @tab
-@lilypond[staffsize=26,linewidth=1.0\cm]
+@lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian-init.ly"
 \score {
   \transpose c c' {
@@ -3914,7 +3914,7 @@ initialize all relevant context properties and grob properties to
 proper values, so you can immediately go ahead entering the chant, as
 the following excerpt demonstrates
 
-@lilypond[quote,raggedright,packed,verbatim]
+@lilypond[quote,ragged-right,packed,verbatim]
 \include "gregorian-init.ly"
 \score {
   <<
@@ -3951,7 +3951,7 @@ style.  These contexts initialize all relevant context properties and
 grob properties to proper values, so you can immediately go ahead
 entering the chant, as the following excerpt demonstrates
 
-@lilypond[quote,raggedright,verbatim]
+@lilypond[quote,ragged-right,verbatim]
 \score {
   <<
     \context MensuralVoice = "discantus" \transpose c c' {
@@ -4007,7 +4007,7 @@ Program reference: @internalsref{Accidental_engraver} engraver and the
 
 LilyPond has support for figured bass
 
-@lilypond[quote,raggedright,verbatim,fragment]
+@lilypond[quote,ragged-right,verbatim,fragment]
 <<
   \context Voice { \clef bass dis4 c d ais g fis}
   \context FiguredBass \figuremode {
@@ -4028,7 +4028,7 @@ In figures input mode, a group of bass figures is delimited by
 @example
 <4 6>
 @end example
-@lilypond[quote,raggedright,fragment]
+@lilypond[quote,ragged-right,fragment]
 \context FiguredBass
 \figuremode { <4 6> }
 @end lilypond
@@ -4040,7 +4040,7 @@ diminished fifths and sevenths can be obtained with @code{5/} and @code{7/}.
 @example
 <4- 6+ 7!> <5++> <3--> <7/> r <6\+ 5/>
 @end example
-@lilypond[quote,raggedright,fragment]
+@lilypond[quote,ragged-right,fragment]
 \figures { <4- 6+ 7!> <5++> <3--> <7/> r <6\+ 5/> }
 @end lilypond
 
@@ -4051,7 +4051,7 @@ strings and text markups, see @ref{Overview of text markup commands}.
 @example
 < [4 6] 8 [_! 12] > < 5 \markup @{ \number 6 \super (1) @} >
 @end example
-@lilypond[quote,raggedright,fragment]
+@lilypond[quote,ragged-right,fragment]
 \context FiguredBass
 \figuremode { < [4 6] 8 [_! 12] > < 5 \markup{ \tiny \number 6 \super (1)} > }
 @end lilypond
@@ -4163,7 +4163,7 @@ This section includes extra information for writing for instruments.
 Artificial harmonics are notated with a different notehead style.  They
 are entered by marking the harmonic pitch with @code{\harmonic}.
 
-@lilypond[raggedright,verbatim,quote,fragment,relative=1]
+@lilypond[ragged-right,verbatim,quote,fragment,relative=1]
 <c g'\harmonic>4
 @end lilypond
 
diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index fad434478a..68129817e2 100644
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -113,7 +113,7 @@ spot which fragment is which?
 @c need to include it here,  because we want two images.
 @lilypond
 \paper {
-  raggedright = ##t
+  ragged-right = ##t
   indent = #0.0
 }
 
@@ -139,7 +139,7 @@ music = {
 
 @lilypond
 \paper {
-  raggedright = ##t
+  ragged-right = ##t
   indent = #0.0
 }
 
@@ -268,7 +268,7 @@ with accents and arpeggios.  In the first chord, the graphical objects
 have all directions down (or left).  The second chord has all
 directions up (right).
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 \new Score \with {
    \override SpacingSpanner #'spacing-increment = #3
    \override TimeSignature #'transparent = ##t
@@ -286,7 +286,7 @@ example, the thickness of many lines -- a characteristic of typographical
 style -- is a variable with a preset value.  You are free to alter this
 value, giving your score a different typographical impression.
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 fragment = {
    \clef bass f8 as8
    c'4-~ c'16 as g f e16 g bes c' des'4
@@ -312,7 +312,7 @@ appearance of objects.  In the following example, the rule which note
 head objects are used to produce their symbol is changed during the music
 fragment.
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 #(define (mc-squared grob orig current)
   (let ((interfaces (ly:grob-property grob 'interfaces))
         (pos (ly:grob-property grob 'staff-position)))
@@ -381,7 +381,7 @@ craftsmen who translate musical ideas to graphic symbols.
 In the following example, we see how we start out with a plug-in for
 note heads, the @code{Note_heads_engraver}.
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 \include "engraver-example.ily"
 
 \score {
@@ -413,7 +413,7 @@ note heads, the @code{Note_heads_engraver}.
 @noindent
 Then a @code{Staff_symbol_engraver} adds the staff
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 \include "engraver-example.ily"
 
 \score {
@@ -444,7 +444,7 @@ Then a @code{Staff_symbol_engraver} adds the staff
 @noindent
 the @code{Clef_engraver} defines a reference point for the staff
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 \include "engraver-example.ily"
 
 \score {
@@ -473,7 +473,7 @@ the @code{Clef_engraver} defines a reference point for the staff
 @noindent
 and the @code{Stem_engraver} adds stems.
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 \include "engraver-example.ily"
 
 \score {
@@ -505,7 +505,7 @@ engravers for beams, slurs, accents, accidentals, bar lines,
 time signature, and key signature, we get a complete piece of
 notation.
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 \include "engraver-example.ily"
 \score { \topVoice }
 @end lilypond
@@ -513,7 +513,7 @@ notation.
 This system works well for monophonic music, but what about
 polyphony?  In polyphonic notation, many voices can share a staff.
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 \include "engraver-example.ily"
 \new Staff << \topVoice \\ \botVoice >> 
 @end lilypond
@@ -531,7 +531,7 @@ context.  The Score context is the top level notation context.
 
 Program reference: @internalsref{Contexts}.
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 \include "engraver-example.ily"
 \score {
    <<
@@ -647,7 +647,7 @@ simplest application is printing notes.
 @noindent
 By adding chord names and lyrics we obtain a lead sheet.
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 <<
    \chords { c2 c f2 c }
    \new Staff \relative c' { \time 2/4 c4 c g'4 g a4 a g2 }
@@ -658,7 +658,7 @@ By adding chord names and lyrics we obtain a lead sheet.
 Polyphonic notation and piano music can also be printed.  The following
 example combines some more exotic constructs.
 
-@lilypondfile[quote,raggedright]{screech-boink.ly}
+@lilypondfile[quote,ragged-right]{screech-boink.ly}
 
 The fragments shown above have all been written by hand, but that is
 not a requirement.  Since the formatting engine is mostly automatic, it
diff --git a/Documentation/user/invoking.itely b/Documentation/user/invoking.itely
index 6955c33c67..68e8ea1e35 100644
--- a/Documentation/user/invoking.itely
+++ b/Documentation/user/invoking.itely
@@ -495,8 +495,8 @@ here for reference.
     - \magnify #m => \fontsize #f, where f = 6ln(m)/ln(2)
  remove-tag isn't changed.
     - \applyMusic #(remove-tag '. . .) => \keepWithTag #'. . .
- firstpagenumber isn't changed.
-    - firstpagenumber no => printfirstpagenumber = ##f
+ first-page-number isn't changed.
+    - first-page-number no => printfirst-page-number = ##f
  Line breaks in header strings aren't converted.
     - \\\\  as line break in \header strings => \markup \center-align <
       "First Line" "Second Line" >
@@ -550,14 +550,14 @@ following example, the accidental touches the note head.
 
 Using Mac OSX 10.3.7, fink package lilypond-devel
 
-\version "2.5.18"
+\version "2.7.32"
 \relative c''@{
    a4 b cis d
 @}
 @end example
 
 @lilypond[quote]
-\version "2.5.18"
+\version "2.7.32"
 \relative c''{
   \override Accidental #'extra-offset = #'(1.0 . 0)
   a4 b cis d
@@ -714,7 +714,7 @@ toplevel
 @example
 \layout @{
   % movements are non-justified by default    
-  raggedright = ##t
+  ragged-right = ##t
 @}
 
 \header @{
diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index 976aaf188a..be6ce69b26 100644
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -224,13 +224,13 @@ Currently, you cannot include @code{@{} or @code{@}} within
 @code{\lilypond@{@}}, so this command is only useful with the
 @code{fragment} option.
 
-The default linewidth of the music will be adjusted by examining the
+The default line-width of the music will be adjusted by examining the
 commands in the document preamble, the part of the document before
 @code{\begin@{document@}}.  The @command{lilypond-book} command sends
 these to La@TeX{} to find out how wide the text is.  The line width for
 the music fragments is then adjusted to the text width.  Note that this
 heuristic algorithm can fail easily; in such cases it is necessary to
-use the @code{linewidth} music fragment option.
+use the @code{line-width} music fragment option.
 
 @cindex titling and lilypond-book
 @cindex @code{\header} in La@TeX{} documents
@@ -426,10 +426,10 @@ The following options are available for LilyPond commands:
 @item staffsize=@var{ht}
 Set staff size to @var{ht}, which is measured in points.
 
-@item raggedright
-Produce ragged-right lines with natural spacing (i.e., @code{raggedright
+@item ragged-right
+Produce ragged-right lines with natural spacing (i.e., @code{ragged-right
 = ##t} is added to the LilyPond snippet).  This is the default for the
-@code{\lilypond@{@}} command if no @code{linewidth} option is present.
+@code{\lilypond@{@}} command if no @code{line-width} option is present.
 It is also the default for the @code{lilypond} environment if the
 @code{fragment} option is set, and no line width is explicitly
 specified.
@@ -438,8 +438,8 @@ specified.
 Produce lines with packed spacing (i.e., @code{packed = ##t} is added
 to the LilyPond snippet).
 
-@item linewidth
-@itemx linewidth=@var{size}\@var{unit}
+@item line-width
+@itemx line-width=@var{size}\@var{unit}
 Set line width to @var{size}, using @var{unit} as units.  @var{unit} is
 one of the following strings: @code{cm}, @code{mm}, @code{in}, or
 @code{pt}.  This option affects LilyPond output (this is, the staff
@@ -448,9 +448,9 @@ length of the music snippet), not the text layout.
 If used without an argument, set line width to a default value (as
 computed with a heuristic algorithm).
 
-If no @code{linewidth} option is given, @command{lilypond-book} tries to
+If no @code{line-width} option is given, @command{lilypond-book} tries to
 guess a default for @code{lilypond} environments which don't use the
-@code{raggedright} option.
+@code{ragged-right} option.
 
 @item notime
 Do not print the time signature, and turns off the timing (key signature,
diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 01b61c190f..d2052cb82b 100644
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -204,7 +204,7 @@ Copyright @copyright{} 1999--2005 by the authors
 
 @c Not yet debugged or reported.  This crashes gs-8.01:
 @c compiling gs-8.01 right now... -- jcn
-@lilypond[raggedright]
+@lilypond[ragged-right]
 \score {
     \context Lyrics {
         \override Score.RehearsalMark #'self-alignment-X = #LEFT
@@ -215,7 +215,7 @@ Copyright @copyright{} 1999--2005 by the authors
      }
      \layout {
          indent = 0.0\pt
-         raggedright = ##t
+         ragged-right = ##t
      }
 }
 @end lilypond
diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index 32307ee462..0f25a84399 100644
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -449,7 +449,7 @@ a @aref{whole tone}, a flat lowers it by a semitone and a double flat
 lowers it by a whole tone.  A natural cancels the effect of a previous
 accidental.
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 %\override TextScript #'font-style = #'large
 \oldaddlyrics
@@ -585,7 +585,7 @@ FI: luonnollinen molliasteikko.
 
 @aref{diatonic scale}.
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 \relative c'' {
 a1 b c d e f g a }
@@ -623,7 +623,7 @@ performed on the beat, after that mostly before the beat.  While the short
 a.@: is performed as a short note regardless of the duration of the main note
 the duration of the long a.@: is proportional to that of the main note.
 
-@lilypond[linewidth=13.0\cm]
+@lilypond[line-width=13.0\cm]
 \context Voice \relative c'' {
   \key d \major
   \time 4/4
@@ -649,7 +649,7 @@ the duration of the long a.@: is proportional to that of the main note.
 
 An appoggiatura may have more notes preceding the main note.
 
-@lilypond[linewidth=13.0\cm]
+@lilypond[line-width=13.0\cm]
 \relative c'' {
   \key as \major
   \time 2/4
@@ -676,7 +676,7 @@ DK: arpeggio, akkordbrydning,
 S: arpeggio,
 FI: arpeggio, murtosointu.
 
-@lilypond[fragment,linewidth=13.0\cm]
+@lilypond[fragment,line-width=13.0\cm]
  \context PianoStaff <<
   \context Staff = SA \relative c'' {
     \time 4/4
@@ -852,7 +852,7 @@ FI: palkki.
 Line connecting a series of notes (shorter than a quarter note).
 The number of beams determines the note value of the connected notes.
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 %\override TextScript #'font-style = #'large
 \relative c'' {
@@ -878,7 +878,7 @@ Note value used for counting, most often half-, fourth-, and eighth notes.
 The base counting value and the number of them per measure is indicated at
 the start of the music.
 
-@lilypond[fragment,linewidth=13.0\cm]
+@lilypond[fragment,line-width=13.0\cm]
 \key g \major
 \time 4/4
 \relative c'' { g4 c b a | g1 \bar "||"}
@@ -907,13 +907,13 @@ Symbol at the start of a system connecting staves.  Curly braces are used
 for connecting piano staves, angular brackets for connecting parts in an
 orchestral or choral score.
 
-@lilypond[fragment,raggedright]
+@lilypond[fragment,ragged-right]
 \context GrandStaff <<
   \relative c''\context Staff = SA { \clef treble g4 e c2 }
   \relative c \context Staff = SB { \clef bass c1 \bar "|." } >>
 @end lilypond
 
-@lilypond[fragment,raggedright]
+@lilypond[fragment,ragged-right]
 \context StaffGroup <<
 %  \set StaffGroup.minVerticalAlign = #12
   \relative c'' \context Staff = SA { \clef treble g4 e c2 }
@@ -963,7 +963,7 @@ FI: brevis.
 @aref{note value}, twice as long as a whole note.  Mainly used
 in pre-1650 music.
 
-@lilypond[fragment,notime,raggedright]
+@lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 \relative c'' { g\breve }
 @end lilypond
@@ -995,7 +995,7 @@ FI: C-avain.
 Clef symbol indicating the position of the middle C.  Used on all note
 lines.
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 \override Score.Clef #'full-size-change = ##t
 %\override Score.LyricText #'font-style = #'large
@@ -1101,7 +1101,7 @@ and five-tone @emph{ninth} major chords are most often used as dominants
 third above the lower notes to define their quality as major or minor.  Such
 chords are denoted open chords
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 %\override TextScript #'font-style = #'large
 \oldaddlyrics
@@ -1137,7 +1137,7 @@ FI: kromaattinen asteikko.
 
 A scale consisting of all 12 @aref{semitone}s.
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 \relative c' { c1 cis d dis e f fis g gis a ais b c }
 @end lilypond
@@ -1209,7 +1209,7 @@ geometrically describes the development of a range of pitches
 geometrical shape of a cluster covers the area in which any single
 pitch contained in the cluster would be notated as an ordinary note.
 
-@lilypond[fragment,relative=2,verbatim,raggedright]
+@lilypond[fragment,relative=2,verbatim,ragged-right]
 \makeClusters { <c e> <b f'> <b g'> <c g> <f e> }
 @end lilypond
 
@@ -1276,7 +1276,7 @@ FI: asteittainen liike.
 Progressing melodically by intervals of a second.  The opposite of a
 @aref{disjunct movement}.
 
-@lilypond[fragment,linewidth=13.0\cm]
+@lilypond[fragment,line-width=13.0\cm]
 \key g \major \time 4/4
 \relative c'' { g4 g g a | b2 a | g4 b a a | g1 \bar "||" }
 @end lilypond
@@ -1330,7 +1330,7 @@ also the contrapunctal technique used in the @emph{fugue} which, since the
 music of the baroque era, has been one of the most popular polyphonic
 composition methods.
 
-@lilypond[fragment,staffsize=12,linewidth=13.0\cm]
+@lilypond[fragment,staffsize=12,line-width=13.0\cm]
 \override Score.TimeSignature #'break-visibility = #all-invisible
 \context PianoStaff <<
   \context Staff = SA \relative c' {
@@ -1404,7 +1404,7 @@ FI: cresendo, voimistuen.
 Increasing volume.  Indicated by a rightwards opening horizontal wedge or the
 abbreviation ``cresc.''.
 
-@lilypond[fragment,raggedright]
+@lilypond[fragment,ragged-right]
 \key g \major \time 4/4
 \relative c'' { g4 \< a b c | d1\! \bar "|." }
 @end lilypond
@@ -1454,7 +1454,7 @@ of the 20th century
       \Staff
       \consists Custos_engraver
     }
-    raggedright = ##t
+    ragged-right = ##t
   }
 }
 @end lilypond
@@ -1501,7 +1501,7 @@ FI: dal segno, lähtien merkistä.
 Abbreviated ``d.s.''.  Repetition, not from the beginning, but from
 another place frequently near the beginning marked by a sign:
 
-@lilypond[fragment,raggedright]
+@lilypond[fragment,ragged-right]
 %\override TextScript #'font-style = #'large
 \override TextScript #'font-shape = #'italic
 \key g \major \time 4/4
@@ -1528,7 +1528,7 @@ FI: decresendo, hiljentyen.
 Decreasing tone volume.  Indicated by a leftwards opening horizontal wedge
 or the abbreviation ``decresc.''.
 
-@lilypond[fragment,raggedright]
+@lilypond[fragment,ragged-right]
 \relative c'' {
   \key g \major \time 4/4
   d4 \> c b a | g1 \! \bar "|."
@@ -1568,7 +1568,7 @@ of a piano keybord are diatonic.
 The church modes are used in gregorial chant and in pre-baroque early
 music but also to some extent in newer jazz music.
 
-@lilypond[fragment,notime,raggedright]
+@lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 %\override Score.LyricText #'font-style = #'large
 %\override Score.TextScript #'font-style = #'large
@@ -1583,7 +1583,7 @@ music but also to some extent in newer jazz music.
   }
 @end lilypond
 
-@lilypond[fragment,notime,raggedright]
+@lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 %\override Score.LyricText #'font-style = #'large
 %\override Score.TextScript #'font-style = #'large
@@ -1598,7 +1598,7 @@ music but also to some extent in newer jazz music.
   }
 @end lilypond
 
-@lilypond[fragment,notime,raggedright]
+@lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 %\override Score.LyricText #'font-style = #'large
 %\override Score.TextScript #'font-style = #'large
@@ -1612,7 +1612,7 @@ music but also to some extent in newer jazz music.
   }
 @end lilypond
 
-@lilypond[fragment,notime,raggedright]
+@lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 %\override Score.LyricText #'font-style = #'large
 %\override Score.TextScript #'font-style = #'large
@@ -1627,7 +1627,7 @@ music but also to some extent in newer jazz music.
   }
 @end lilypond
 
-@lilypond[fragment,notime,raggedright]
+@lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 %\override Score.LyricText #'font-style = #'large
 %\override Score.TextScript #'font-style = #'large
@@ -1641,7 +1641,7 @@ music but also to some extent in newer jazz music.
   }
 @end lilypond
 
-@lilypond[fragment,notime,raggedright]
+@lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 %\override Score.LyricText #'font-style = #'large
 %\override Score.TextScript #'font-style = #'large
@@ -1661,7 +1661,7 @@ compositional music are primarily the major and the minor scales.  In the
 harmonic minor scale type an augmented second (A) occurs between the 6th and
 7th tone.
 
-@lilypond[fragment,notime,raggedright]
+@lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 %\override Score.LyricText #'font-style = #'large
 %\override Score.TextScript #'font-style = #'large
@@ -1676,7 +1676,7 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and
   }
 @end lilypond
 
-@lilypond[fragment,notime,raggedright]
+@lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 %\override Score.LyricText #'font-style = #'large
 %\override Score.TextScript #'font-style = #'large
@@ -1691,7 +1691,7 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and
   }
 @end lilypond
 
-@lilypond[fragment,notime,raggedright]
+@lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 %\override Score.LyricText #'font-style = #'large
 %\override Score.TextScript #'font-style = #'large
@@ -1706,7 +1706,7 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and
   }
 @end lilypond
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 %\override Score.LyricText #'font-style = #'large
 %\override Score.TextScript #'font-style = #'large
@@ -1765,7 +1765,7 @@ FI: melodian hyppivä liike.
 Progressing melodically by intervals larger than a major second.  
 Opposite of @aref{conjunct movement}.
 
-@lilypond[fragment,raggedright]
+@lilypond[fragment,ragged-right]
 \key a \major
 \time 4/4
 \relative c' {
@@ -2094,7 +2094,7 @@ FI: enharmoninen.
 Two notes, intervals, or scales are enharmonic if they have different names
 but equal pitch.
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 %\override Score.TextScript #'font-style = #'large
 \oldaddlyrics
@@ -2169,7 +2169,7 @@ an octave higher (for example bass recorder) while 8@w{ }below the clef
 symbol indicates playing an octave lower (for example on double bass
 @aref{strings}).
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 \override Staff.Clef #'full-size-change = ##t
 %\override Score.LyricText #'font-style = #'large
@@ -2212,7 +2212,7 @@ FI: fermaatti, pidäke.
 
 Prolonged note or rest of indefinite duration.
 
-@lilypond[fragment,raggedright]
+@lilypond[fragment,ragged-right]
 \time 4/4
 \relative c'' {
   a4 b c2^\fermata \bar "|."
@@ -2268,7 +2268,7 @@ Ornament at the end of the stem of a note used for notes with values
 less than a quarter note.  The number of flags determines the
 @aref{note value}.
 
-@lilypond[fragment,notime,raggedright]
+@lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 %\override Score.TextScript #'font-style = #'large
 \relative c'' {
@@ -2359,7 +2359,7 @@ first note of the scale), subdominant (S, the chord on the fourth note), and
 dominant (D, the chord on the fifth note).  Others are considered to be
 variants of the base chords.
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 %\override Score.LyricText #'font-style = #'large
 %\override Score.TextScript #'font-style = #'large
@@ -2400,7 +2400,7 @@ the notes must be played an octave higher while 8 below the clef symbol
 indicates playing or singing an octave lower (most tenor parts in choral
 scores are notated like that).
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 \override Staff.Clef #'full-size-change = ##t
 %\override Score.LyricText #'font-style = #'large
@@ -2532,7 +2532,7 @@ FI: harmoninen kadenssi.
 A sequence of chords that terminates a musical phrase or
 section.  @aref{functional harmony}.
 
-@lilypond[fragment,raggedright]
+@lilypond[fragment,ragged-right]
 \context PianoStaff <<
   \context Staff = SA \relative c'' {
     \time 4/4
@@ -2571,7 +2571,7 @@ Tones sounding simultaneously.  Two note harmonies fall into the categories
 
 Consonances:
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 %\override Score.TextScript #'font-style = #'large
 \context Voice \relative c'' {
@@ -2587,7 +2587,7 @@ Consonances:
 
 Dissonances:
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 %\override Score.TextScript #'font-style = #'large
 \context Voice \relative c'' {
@@ -2632,7 +2632,7 @@ identical (@aref{enharmonic}) and are called @emph{tritonus}
 because they consist of three @aref{whole tone}s.  The addition
 of such two intervals forms an octave.
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 %\override Score.LyricText #'font-style = #'large
 %\override Score.TextScript #'font-style = #'large
@@ -2653,7 +2653,7 @@ of such two intervals forms an octave.
 }
 @end lilypond
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 %\override Score.LyricText #'font-style = #'large
 %\override Score.TextScript #'font-style = #'large
@@ -2674,7 +2674,7 @@ of such two intervals forms an octave.
 }
 @end lilypond
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 %\override Score.LyricText #'font-style = #'large
 %\override Score.TextScript #'font-style = #'large
@@ -2709,7 +2709,7 @@ FI: käänteisintervalli.
 
 The difference between an interval and an octave.
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 %\override Score.TextScript #'font-style = #'large
 \context Staff \relative c'' {
@@ -2809,7 +2809,7 @@ FI: apuviiva.
 
 A ledger line is an extension of the staff.
 
-@lilypond[fragment,notime,raggedright]
+@lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 \relative c'' { a,1 s c'' }
 @end lilypond
@@ -2830,7 +2830,7 @@ To be performed (a) without any perceptible interruption between the notes,
 unlike (b) @emph{leggiero} or @emph{non-legato}, (c) @emph{portato}, and
 (d) @aref{staccato}.
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 \oldaddlyrics
 \context Staff \relative c'' {
@@ -2928,7 +2928,7 @@ FI: longa.
 Note value: double length of @aref{breve}.
 @aref{note value}.
 
-@lilypond[fragment,notime,raggedright]
+@lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 \relative c'' {
   \override NoteHead #'style = #'mensural
@@ -3062,14 +3062,14 @@ whether there are two, three, or four units to the measure,
 one speaks of @emph{duple} (2/2, 2/4, 2/8), @emph{triple} (3/2, 3/4, 3/8), or
 @emph{quadruple} (4/2, 4/4, 4/8) meter.  4/4 is also called common meter.
 
-@lilypond[fragment,linewidth=13.0\cm]
+@lilypond[fragment,line-width=13.0\cm]
 \relative c'' {
   \time 3/4
   \key f \major
   c es d | c bes8 a bes4 | c es d | c2 \bar "||"}
 @end lilypond
 
-@lilypond[fragment,linewidth=13.0\cm]
+@lilypond[fragment,line-width=13.0\cm]
 \relative c' {
   \time 6/8
   \key f \major
@@ -3077,7 +3077,7 @@ one speaks of @emph{duple} (2/2, 2/4, 2/8), @emph{triple} (3/2, 3/4, 3/8), or
   c'8 c c c e16 d e c \bar "||"}
 @end lilypond
 
-@lilypond[fragment,linewidth=13.0\cm]
+@lilypond[fragment,line-width=13.0\cm]
 \relative c'' {
   \time 5/4
   \key g \major
@@ -3144,7 +3144,7 @@ FI: keski-C.
 
 First C below the 440 Hz A.
 
-@lilypond[fragment,notime,raggedright]
+@lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 \override Staff.Clef #'full-size-change = ##t
 \relative c' {
@@ -3246,7 +3246,7 @@ FI: teema, sävelaihe.
 The briefest intelligible and self-contained fragment of a musical theme or
 subject.
 
-@lilypond[fragment,linewidth=13.0\cm]
+@lilypond[fragment,line-width=13.0\cm]
 \override Score.TimeSignature #'break-visibility = #all-invisible
 %\override Score.TextScript #'font-style = #'large
 \relative c'' {
@@ -3286,7 +3286,7 @@ DK: flertaktspause,
 S: flertaktspaus,
 FI: usean tahdin mittainen tauko.
 
-@lilypond[fragment,raggedright]
+@lilypond[fragment,ragged-right]
 \relative c'' {
   a1
   \set Score.skipBars = ##t R1*3
@@ -3391,7 +3391,7 @@ higher note value.  The longest duration normally used is called @emph{brevis},
 but sometimes (mostly in pre-baroque music) the double length note value
 @emph{longa} is used.
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 %\override Score.TextScript #'font-style = #'large
 \set Score.automaticBars = ##f
 \relative c'' {
@@ -3402,7 +3402,7 @@ but sometimes (mostly in pre-baroque music) the double length note value
   a16_"1/16" s16 a32_"1/32" s16 a64_"1/64" s32 }
 @end lilypond
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 %\override Score.TextScript #'font-style = #'large
 \set Score.automaticBars = ##f
 \relative c'' {
@@ -3414,7 +3414,7 @@ but sometimes (mostly in pre-baroque music) the double length note value
 An augmentation dot after a note multiplies the duration by one and a
 half.  Another dot adds yet a fourth of the duration.
 
-@lilypond[fragment,linewidth=13.0\cm]
+@lilypond[fragment,line-width=13.0\cm]
 %\override Score.TextScript #'font-style = #'large
 \relative c'' {
   \time 4/4
@@ -3427,7 +3427,7 @@ subdivision by@w{ }3 (@emph{triplets}) and@w{ }5 (@emph{quintuplets}).
 Subdivisions by@w{ }2 (@emph{tuplets}) or@w{ }4 (@emph{quadruplets}) of
 dotted notes are also frequently used.
 
-@lilypond[fragment,linewidth=13.0\cm]
+@lilypond[fragment,line-width=13.0\cm]
 %\override Score.TextScript #'font-style = #'large
 \relative c'' {
   \time 4/4
@@ -3436,7 +3436,7 @@ dotted notes are also frequently used.
 }
 @end lilypond
 
-@lilypond[fragment,linewidth=13.0\cm]
+@lilypond[fragment,line-width=13.0\cm]
 \relative c'' {
   \time 3/4
   \times 3/2 {g4_"duplets" g} |
@@ -3483,7 +3483,7 @@ middle of the 19th century and onwards the trill is performed with the main
 note first while in the music from the preceding baroque and classic periods
 the upper note is played first.
 
-@lilypond[fragment,linewidth=13.0\cm]
+@lilypond[fragment,line-width=13.0\cm]
 <<
   \context Staff = sa {
 % \override Score.TextScript #'font-style = #'large
@@ -3502,7 +3502,7 @@ the upper note is played first.
 Other frequently used ornaments are the @emph{turn}, the @emph{mordent}, and the
 @emph{prall} (inverted mordent).
 
-@lilypond[fragment,linewidth=13.0\cm]
+@lilypond[fragment,line-width=13.0\cm]
 <<
   \context Staff = sa {
 % \override Score.TextScript #'font-style = #'large
@@ -3801,7 +3801,7 @@ FI: rinnakkaissävellaji.
 @aref{major} and @aref{minor} @aref{key}
 with the same @aref{key signature}.
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 %\override Score.TextScript #'font-style = #'large
 \relative c' {
@@ -3811,7 +3811,7 @@ with the same @aref{key signature}.
 }
 @end lilypond
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 %\override Score.TextScript #'font-style = #'large
 \relative c' {
@@ -3832,7 +3832,7 @@ DK: gen@-ta@-gel@-se,
 S: repris,
 FI: toisto.
 
-@lilypond[fragment,linewidth=13.0\cm]
+@lilypond[fragment,line-width=13.0\cm]
 \key g \major
 \time 4/4
 \relative c'' {
@@ -3936,7 +3936,7 @@ Names and symbols used in harmonic analysis to denote tones of the scale as
 roots of chords.  The most important are degrees I = tonic (T), IV =
 sub@-do@-mi@-nant (S) and V = dominant (D).
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 %\override Score.LyricText #'font-style = #'large
 %\set minVerticalAlign = #8
@@ -4003,7 +4003,7 @@ tones on the piano keyboard -- including black and white keys -- is a
 semitone.  An octave may be divided into 12@w{ }semitones.
 @aref{interval}, @aref{chromatic scale}.
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 \relative c'' { g1 gis s a bes s b! c }
 @end lilypond
@@ -4245,7 +4245,7 @@ FI: staccato, lyhyesti, terävästi.
 Playing the note(s) short.  Staccato is indicated by a dot above or below the
 note head.
 
-@lilypond[fragment,raggedright]
+@lilypond[fragment,ragged-right]
 \key d \major
 \time 4/4
 \relative c'' {
@@ -4292,7 +4292,7 @@ FI: nuottipalkki.
 Vertical line above or below a @aref{note head} shorter than a
 whole note.  @aref{beam}.
 
-@lilypond[fragment,notime,linewidth=13.0\cm]
+@lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.autoBeaming = ##f
 \set Score.automaticBars = ##f
 %\override Score.TextScript #'font-style = #'large
@@ -4437,7 +4437,7 @@ with a regularly recurrent accent on the first beat of each group.  Any
 deviation from this scheme is felt as a disturbance or contradiction between
 the underlaying (normal) pulse and the actual (abnormal) rhythm.
 
-@lilypond[fragment,raggedright]
+@lilypond[fragment,ragged-right]
 \time 4/4
 \relative c' {
   \partial 4
@@ -4609,7 +4609,7 @@ A method of indicating an accompaniment part by the bass notes only, together
 with figures designating the chief @aref{interval}s and
 @aref{chord}s to be played above the bass notes.
 
-@lilypond[fragment,linewidth=13.0\cm]
+@lilypond[fragment,line-width=13.0\cm]
 \context GrandStaff <<
   \context Staff = lh \relative c'' {
     \time 4/4
@@ -4653,7 +4653,7 @@ A curved line, identical in appearance with the @aref{slur}, which
 connects two succesive notes of the same pitch, and which has the function of
 uniting them into a single sound (tone) equal to the combined durations.
 
-@lilypond[fragment,notime,raggedright]
+@lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 \relative c'' { g2 ~ g4. }
 @end lilypond
@@ -4723,7 +4723,7 @@ FI: transponointi.
 Shifting a melody up or down in pitch, while keeping the same
 relative pitches.
 
-@lilypond[fragment,linewidth=13.0\cm]
+@lilypond[fragment,line-width=13.0\cm]
 \context Staff {
   \time 3/4
   \relative c'' {
@@ -4733,7 +4733,7 @@ relative pitches.
 }
 @end lilypond
 
-@lilypond[fragment,linewidth=13.0\cm]
+@lilypond[fragment,line-width=13.0\cm]
 \context Staff {
   \time 3/4
   \transpose c bes \relative c'' {
@@ -4775,7 +4775,7 @@ the same tone, produced by a rapid up-and-down movement of the bow
 a @aref{chord}, usually in the distance of a third
 (@aref{interval}).
 
-@lilypond[fragment,notime,raggedright]
+@lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 %\override Score.TextScript #'font-style = #'large
 \relative c' {
@@ -4915,7 +4915,7 @@ FI: kohotahti.
 Initial note(s) of a melody occurring before the first bar
 line.  @aref{measure}, @aref{meter}.
 
-@lilypond[fragment,linewidth=13.0\cm]
+@lilypond[fragment,line-width=13.0\cm]
 \key f \major
 \time 4/4
 \relative c' {
diff --git a/Documentation/user/programming-interface.itely b/Documentation/user/programming-interface.itely
index e62d864f82..47496aa9d6 100644
--- a/Documentation/user/programming-interface.itely
+++ b/Documentation/user/programming-interface.itely
@@ -235,7 +235,7 @@ properties using the functions @code{ly:music-property} and
 
 An example is a function that reverses the order of elements in
 its argument,
-@lilypond[quote,verbatim,raggedright]
+@lilypond[quote,verbatim,ragged-right]
 #(define (rev-music-1 m)
   (ly:music-set-property! m 'elements 
     (reverse (ly:music-property m 'elements)))
@@ -369,7 +369,7 @@ produce a single @code{$} character).  This makes the creation of simple
 functions straightforward.  In the following example, a function
 setting the TextScript's padding is defined:
 
-@lilypond[quote,verbatim,raggedright]
+@lilypond[quote,verbatim,ragged-right]
 #(use-modules (ice-9 optargs))
 #(define* (textpad padding #:optional once?)
   (ly:export   ; this is necessary for using the expression
@@ -393,7 +393,7 @@ Here, the variable @code{padding} is a number; music expression
 variables may also be used in a similar fashion, as in the following
 example:
 
-@lilypond[quote,verbatim,raggedright]
+@lilypond[quote,verbatim,ragged-right]
 #(define (with-padding padding)
   (lambda (music)
    #{ \override TextScript #'padding = #$padding
@@ -424,7 +424,7 @@ this new expression.  Thus, this example is equivalent to:
 
 This function may also be defined as a music function:
 
-@lilypond[quote,verbatim,raggedright]
+@lilypond[quote,verbatim,ragged-right]
 withPadding =
   #(def-music-function (parser location padding music) (number? ly:music?)
     #{ \override TextScript #'padding = #$padding
@@ -648,7 +648,7 @@ The final result is as follows:
 @}
 @end example
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 #(def-markup-command (smallcaps layout props str) (string?)
   "Print the string argument in small caps.  Syntax: \\smallcaps #\"string\""
   (interpret-markup layout props
diff --git a/Documentation/user/putting.itely b/Documentation/user/putting.itely
index acf0bab2d7..c95dff598d 100644
--- a/Documentation/user/putting.itely
+++ b/Documentation/user/putting.itely
@@ -34,7 +34,7 @@ problems:
 
 @itemize @bullet
 @item Include @code{\version} numbers in every file.  Note that all
-templates contain a @code{\version "2.6.0"} string.  We
+templates contain a @code{\version "2.7.32"} string.  We
 highly recommend that you always include the @code{\version}, no matter
 how small your file is.  Speaking from personal experience, it's
 quite frustrating to try to remember which version of LilyPond you were
@@ -98,7 +98,7 @@ cello.  In this case, we would start with ``Notes and lyrics'' (for the
 soprano part).
 
 @example
-\version "2.6.0"
+\version "2.7.32"
 melody = \relative c' @{
   \clef treble
   \key c \major
@@ -127,7 +127,7 @@ text = \lyricmode @{
 Now we want to add a cello part.  Let's look at the ``Notes only'' example:
 
 @example
-\version "2.6.0"
+\version "2.7.32"
 melody = \relative c' @{
   \clef treble
   \key c \major
@@ -163,7 +163,7 @@ normally use bass clef.  We'll also give the cello some different
 notes.
 
 @example
-\version "2.6.0"
+\version "2.7.32"
 sopranoMusic = \relative c' @{
   \clef treble
   \key c \major
@@ -232,8 +232,8 @@ more than one thing (in this case staff) happening at once.  The
 This looks a bit messy; the indentation is messed up now.  That is
 easily fixed.  Here's the complete soprano and cello template.
 
-@lilypond[quote,verbatim,raggedright]
-\version "2.6.0"
+@lilypond[quote,verbatim,ragged-right]
+\version "2.7.32"
 sopranoMusic = \relative c' {
   \clef treble
   \key c \major
@@ -279,7 +279,7 @@ This may come as a surprise, but LilyPond isn't perfect.  Some notation
 elements can overlap.  This is unfortunate, but (in most cases) is easily
 solved.
 
-@lilypond[quote,fragment,raggedright,verbatim,relative=2]
+@lilypond[quote,fragment,ragged-right,verbatim,relative=2]
 e4^\markup{ \italic ritenuto } g b e
 @end lilypond
 
@@ -292,7 +292,7 @@ instead) and the note.  In LilyPond, this is called the
 less (it varies with each object).  We want to increase it, so let's
 try 1.5
 
-@lilypond[quote,fragment,raggedright,verbatim,relative=2]
+@lilypond[quote,fragment,ragged-right,verbatim,relative=2]
 \once \override TextScript #'padding = #1.5
 e4^\markup{ \italic ritenuto } g b e
 @end lilypond
@@ -312,7 +312,7 @@ cause other problems.  When we move objects with @code{extra-offset},
 the movement is done after LilyPond has placed all other objects.  This means
 that the result can overlap with other objects.
 
-@lilypond[quote,fragment,raggedright,verbatim,relative=2]
+@lilypond[quote,fragment,ragged-right,verbatim,relative=2]
 \once \override TextScript #'extra-offset = #'( 1.0 . -1.0 )
 e4^\markup{ \italic ritenuto } g b e
 @end lilypond
@@ -322,7 +322,7 @@ movement (left is negative); the second number controls the vertial
 movement (up is positive).  After a bit of experimenting, we decided
 that these values look good
 
-@lilypond[quote,fragment,raggedright,verbatim,relative=2]
+@lilypond[quote,fragment,ragged-right,verbatim,relative=2]
 \once \override TextScript #'extra-offset = #'( -1.6 . 1.0 )
 e4^\markup{ \italic ritenuto } g b e
 @end lilypond
@@ -369,7 +369,7 @@ Most examples also make use of the @code{\relative c'}
 compile the examples, but in most cases the output will
 look very odd if you omit the @code{\relative c'}.
 
-@lilypond[quote,fragment,raggedright,verbatim]
+@lilypond[quote,fragment,ragged-right,verbatim]
 \relative c'' {
   c4 a b c
 }
diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 4f94eaeab5..442a464fb6 100644
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -26,7 +26,7 @@ picture in the HTML version of this manual, you will see the exact
 LilyPond input that was used to generate that image.
 Try it on this image
 
-@lilypond[fragment,quote,raggedright,relative=2]
+@lilypond[fragment,quote,ragged-right,relative=2]
 c-\markup { \bold \huge { Click here.  } }
 @end lilypond
 @end ifhtml
@@ -171,7 +171,7 @@ s16_" "
 Remember to enclose the notes and commands in curly braces
 @code{@{@tie{}@dots{}@tie{}@}} to convert it to printable output.
 
-@lilypond[fragment,quote,noindent,linewidth=55\staffspace]
+@lilypond[fragment,quote,noindent,line-width=55\staff-space]
 \time 3/4
 \clef bass
 c2 e4 g2.
@@ -414,7 +414,7 @@ For more information on beams, see @ref{Manual beams}.
 
 Here are key signatures, accidentals and ties in action
 
-@lilypond[fragment,quote,noindent,linewidth=50\staffspace,verbatim]
+@lilypond[fragment,quote,noindent,line-width=50\staff-space,verbatim]
 \relative c'' {
   \time 4/4
   \key g \minor
@@ -459,7 +459,7 @@ c'4 c'' c''' \clef bass c c,
 
 An example of the use of quotes is in the following Mozart fragment
 
-@lilypond[quote,raggedright,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 \key a \major
 \time 6/8
 cis''8. d''16 cis''8 e''4 e''8
@@ -495,7 +495,7 @@ Since most music has small intervals, pieces can be written almost
 without octavation quotes in relative mode.  The previous example is
 entered as
 
-@lilypond[quote,raggedright,verbatim]
+@lilypond[quote,ragged-right,verbatim]
 \relative {
   \key a \major
   \time 6/8
@@ -665,7 +665,7 @@ We can now typeset a melody with two staves
 
 @c TODO: (c) status of this Paul McCartney (?) song (let's all stand together)
 
-@lilypond[fragment,quote,verbatim,raggedright]
+@lilypond[fragment,quote,verbatim,ragged-right]
 \relative <<
   \new Staff {
     \time 3/4
@@ -911,7 +911,7 @@ statement marks for which version of LilyPond the file was written.
 To mark a file for version 2.6.0, use
 
 @example
-\version "2.6.0"
+\version "2.7.32"
 @end example
 
 @noindent
@@ -937,7 +937,7 @@ I want to break free
 
 Consider the melody
 
-@lilypond[quote,verbatim,fragment,raggedright]
+@lilypond[quote,verbatim,fragment,ragged-right]
 \relative {
   r4 c \times 2/3 { f g g }
   \times 2/3 { g4( a2) }
@@ -947,7 +947,7 @@ Consider the melody
 The lyrics can be set to these notes, combining both with the
 @code{\addlyrics} keyword
 
-@lilypond[quote,verbatim,fragment,raggedright]
+@lilypond[quote,verbatim,fragment,ragged-right]
 <<
   \relative {
     r4 c \times 2/3 { f g g }
@@ -968,7 +968,7 @@ line}.  It is entered as two underscores, i.e.,
 @{ I want to break free __ @}
 @end example 
 
-@lilypond[fragment,quote,raggedright]
+@lilypond[fragment,quote,ragged-right]
 <<
   \relative {
     r4 c \times 2/3 { f g g }
@@ -985,7 +985,7 @@ resulting in a centered hyphen between two syllables
 Twin -- kle twin -- kle
 @end example
 
-@lilypond[fragment,quote,raggedright]
+@lilypond[fragment,quote,ragged-right]
 <<
   \relative {
     \time 2/4
@@ -1011,7 +1011,7 @@ discussed in @ref{Vocal music}.
 In popular music, it is common to denote accompaniment with chord names.
 Such chords can be entered like notes,
 
-@lilypond[quote,verbatim,raggedright]
+@lilypond[quote,verbatim,ragged-right]
 \chordmode { c2 f4. g8 }
 @end lilypond
 
@@ -1022,7 +1022,7 @@ This mode is switched on with @code{\chordmode}
 Other chords can be created by adding modifiers after a colon.  The
 following example shows a few common modifiers
 
-@lilypond[quote,verbatim,raggedright]
+@lilypond[quote,verbatim,ragged-right]
 \chordmode { c2 f4:m g4:maj7 gis1:dim7 }
 @end lilypond
 
@@ -1032,7 +1032,7 @@ of @code{\chordmode}.  This uses the same syntax as @code{\chordmode},
 but renders the notes in a @code{ChordNames} context, with the
 following result.
  
-@lilypond[quote,verbatim,raggedright]
+@lilypond[quote,verbatim,ragged-right]
 \chords { c2 f4.:m g4.:maj7 gis8:dim7 }
 @end lilypond
 
@@ -1049,7 +1049,7 @@ a lead sheet, for example,
 @}
 @end example
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 <<
   \chords { r2 c:sus4 f } 
   \relative {
@@ -1193,7 +1193,7 @@ later by preceding the name with a backslash, i.e., @code{\namedMusic}.
 In the next example, a two-note motive is repeated two times by using
 variable substitution
 
-@lilypond[quote,raggedright,verbatim,nofragment]
+@lilypond[quote,ragged-right,verbatim,nofragment]
 seufzer = {
   e'4( dis'4)
 }
@@ -1219,7 +1219,7 @@ places.  The following example uses the above variables
 @example
 \paper @{
   \aFivePaper
-  linewidth = \width
+  line-width = \width
 @}
 @{ c4^\name @}
 @end example
@@ -1278,7 +1278,7 @@ the file, so @code{hornNotes} is defined afterwards.  The command
 tuning of a normal French Horn in@tie{}F.  The transposition can be seen
 in the following output
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 \transpose f c' \relative c {
   \time 2/4
   r4 f8 a cis4 f e d
@@ -1308,7 +1308,7 @@ This command sets the property @code{skipBars} in the
 @code{Score} context to true (@code{##t}).  Prepending the rest and
 this option to the music above, leads to the following result
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 \transpose f c' \relative c {
   \time 2/4
   \set Score.skipBars = ##t 
@@ -1335,7 +1335,7 @@ that the other voice is in @code{bassoonNotes} in the file
 @noindent
 leading to 
 
-@lilypond[quote,raggedright]
+@lilypond[quote,ragged-right]
 \relative c <<
   \new Staff {
     \time 2/4 R2*3
diff --git a/input/bach-schenker.ly b/input/bach-schenker.ly
index 768b9b594f..cd9e6ba8f7 100644
--- a/input/bach-schenker.ly
+++ b/input/bach-schenker.ly
@@ -11,7 +11,7 @@
 }
 
 
-\version "2.7.28"
+\version "2.7.32"
 
 staffPiano = \new PianoStaff {
   \set Score.timing = ##f
@@ -276,7 +276,7 @@ staffPiano = \new PianoStaff {
   }
 
   \layout  {
-    raggedright = ##t
+    ragged-right = ##t
     \context { \Staff \remove "Time_signature_engraver" }
   }
 }
diff --git a/input/example-1.ly b/input/example-1.ly
index ab81c27750..e0e8345402 100644
--- a/input/example-1.ly
+++ b/input/example-1.ly
@@ -18,4 +18,4 @@ also included in the user-manual.
 %}
 
 %% Optional version number
-\version "2.6.0"
+\version "2.7.32"
diff --git a/input/example-2.ly b/input/example-2.ly
index 7c62ceddde..687c1f1e5c 100644
--- a/input/example-2.ly
+++ b/input/example-2.ly
@@ -17,5 +17,5 @@ also included in the user-manual.
 %}
 
 %% Optional version number
-\version "2.6.0"
+\version "2.7.32"
 
diff --git a/input/example-3.ly b/input/example-3.ly
index a67de05741..368c15fb5b 100644
--- a/input/example-3.ly
+++ b/input/example-3.ly
@@ -33,4 +33,4 @@ also included in the user-manual.
 %}
 
 %% Optional version number
-\version "2.6.0"
+\version "2.7.32"
diff --git a/input/les-nereides.ly b/input/les-nereides.ly
index 716e877263..a9e367f27f 100644
--- a/input/les-nereides.ly
+++ b/input/les-nereides.ly
@@ -1,4 +1,4 @@
-\version "2.7.14"
+\version "2.7.32"
 
 \header {
     composer = "ARTHUR GRAY"
diff --git a/input/mutopia-header.ly b/input/mutopia-header.ly
index 50b4ab7aba..11d4a682da 100644
--- a/input/mutopia-header.ly
+++ b/input/mutopia-header.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.7.32"
 \header {
   title =	"Title"
   subtitle =	"Subtitle"
@@ -23,7 +23,7 @@
   maintainer = "Jan Nieuwenhuizen"
   maintainerEmail = "janneke@gnu.org"
   lastupdated =	 "2001/Mar/19"
-  mutopiapublicdomain = "\\parbox{\hsize}{\\thefooter\\quad\\small
+  mutopiapublicdomain = "\\parbox{\paper-width}{\\thefooter\\quad\\small
     \\\\This music is part of the Mutopia project,
     \\texttt{http://www.mutopiaproject.org/}\\\\It has been typeset
     and placed in the public domain by " + \maintainer +
diff --git a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
index 14a80ca382..0b344044e7 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.6.0"
+\version "2.7.32"
 
 global =  {
   \key a \minor
diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly
index 743c909bbc..4d14401521 100644
--- a/input/mutopia/F.Schubert/morgenlied.ly
+++ b/input/mutopia/F.Schubert/morgenlied.ly
@@ -27,7 +27,7 @@ been lowered
 
 }
 
-\version "2.7.14"
+\version "2.7.32"
 manuscriptBreak = { \break }
 
 
@@ -36,11 +36,11 @@ manuscriptBreak = { \break }
 
 \paper  {
 %#(set-global-staff-size (* 5.8 mm))
-    linewidth = #(* mm 160)
+    line-width = #(* mm 160)
     indent = 8\mm
     interscoreline = 2.\mm
-    betweensystemspace = 15\mm
-    raggedbottom = ##t 
+    between-system-space = 15\mm
+    ragged-bottom = ##t 
     }
 
 modernAccidentals = {
diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly
index 02de0f4254..321d71602c 100644
--- a/input/mutopia/F.Schubert/standchen.ly
+++ b/input/mutopia/F.Schubert/standchen.ly
@@ -30,7 +30,7 @@ instrument = "Piano"
   maintainer = "Jan Nieuwenhuizen"
   maintainerEmail = "janneke@gnu.org"
   lastupdated =	 "2001/Apr/27"
-  mutopiapublicdomain = "\\parbox[b]{\\hsize}{\\thefooter\\quad\\small
+  mutopiapublicdomain = "\\parbox[b]{\\paper-width}{\\thefooter\\quad\\small
     \\\\This music is part of the Mutopia project,
     \\texttt{http://www.mutopiaproject.org/}\\\\It has been typeset
     and placed in the public domain by " + \maintainer +
@@ -40,7 +40,7 @@ instrument = "Piano"
  footer = "Mutopia-2001/04/27-xx"
 } 
 
-\version "2.5.18"
+\version "2.7.32"
 
 #(set-global-staff-size 16)
 
@@ -401,9 +401,7 @@ trebleStaff = \context Staff = "treble"<<
 	\global
 	{
 	  \clef treble
-	  #(override-auto-beam-setting
-	    '(begin * * * *) @var{a} @var{b}
-	    (ly:make-moment 0 1))
+
 	  \trebleIntro 
 	  \trebleVerseOne 
 	  \trebleEentje
@@ -441,12 +439,12 @@ bassStaff = \context Staff = "bass"<<
     \layout {
 				% Use
 				%   textheight = 280.\mm
-				%   linewidth = 190.\mm
+				%   line-width = 190.\mm
 				% to get this on 3 pages of a4.
 	
 				% Mandatory Mutopia settings yield 4 pages :(
 	textheight = 270.0\mm
-	linewidth = 180.0\mm
+	line-width = 180.0\mm
 
 	\context { \RemoveEmptyStaffContext }
     }
diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
index bfe8bbe133..a399f477b0 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.6.0"
+\version "2.7.32"
 
 forcedLastBreak =  { \break }
 
@@ -16,8 +16,7 @@ forcedLastBreak =  { \break }
             
 
 #(define (assert-system-count-override count)
-  (ly:export #{ \override NoteHead
-     #'after-line-breaking-callback
+  (ly:export #{ \override NoteHead #'after-line-breaking
        = #(lambda (smob) (assert-system-count smob $count))
   #}))
 
@@ -165,15 +164,15 @@ smallerPaper = \layout {
   }
   
   indent = 5.6 \mm
-  linewidth = 146.8 \mm
+  line-width = 146.8 \mm
 }
 
 \paper {
-  raggedbottom = ##t
+  ragged-bottom = ##t
   indent = 7. \mm
-  linewidth =183.5 \mm
-  betweensystemspace = 25\mm 
-  betweensystempadding = 0\mm
+  line-width =183.5 \mm
+  between-system-space = 25\mm 
+  between-system-padding = 0\mm
 
 %%  annotatespacing = ##t
 }
diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly
index c3bd504672..8ca4e3f359 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.6.0"
+\version "2.7.32"
 
 %{
  Header for Petites Preludes.
@@ -31,7 +31,7 @@
   maintainer = "Jan Nieuwenhuizen"
   maintainerEmail = "janneke@gnu.org"
   lastupdated =	 "2003/Aug/22"
-  mutopiapublicdomain = "\\parbox{\hsize}{\\thefooter\\quad\\small
+  mutopiapublicdomain = "\\parbox{\paper-width}{\\thefooter\\quad\\small
     \\\\This music is part of the Mutopia project,
     \\texttt{http://www.mutopiaproject.org/}\\\\It has been typeset
     and placed in the public domain by " + \maintainer +
@@ -150,7 +150,7 @@ global = {
 		>>
 	>>
 	\layout{
-		linewidth = 17.0 \cm  
+		line-width = 17.0 \cm  
 		\context {
 		    \Score
 		    \override SpacingSpanner #'spacing-increment = #2.0
diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly
index 3fa773fae0..b486f34c83 100644
--- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly
+++ b/input/mutopia/J.S.Bach/wtk1-fugue2.ly
@@ -41,7 +41,7 @@
 
 
 
-\version "2.6.0"
+\version "2.7.32"
 
 
 
@@ -223,7 +223,7 @@ bassdux = \context Voice = "three"  \relative c' {
 	}
     }
     \paper {
-	linewidth = 18.0 \cm
-	raggedlastbottom = ##f
+	line-width = 18.0 \cm
+	ragged-last-bottom = ##f
     }
 }
diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly
index 1a84a5ed4d..23fed9746f 100644
--- a/input/mutopia/R.Schumann/romanze-op28-2.ly
+++ b/input/mutopia/R.Schumann/romanze-op28-2.ly
@@ -4,7 +4,7 @@
 
 #(set-global-staff-size 16)
 
-\version "2.7.31"
+\version "2.7.32"
 
 \header {
   title = "Romanzen"
@@ -241,7 +241,7 @@ leftb =  \transpose c cis {
     indent = 0.5 \in
     % textheight = 29.8 \cm
     pagenumber = no
-    linewidth = 17.0 \cm
+    line-width = 17.0 \cm
 }  
 		       
 \score { 
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
index 8ef2b4624a..8e6cca2862 100644
--- a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
@@ -41,7 +41,7 @@ virtuoso that taught in Geneva.
 
 %}
 
-\version "2.6.0"
+\version "2.7.32"
 
 \include "mozart-hrn3-defs.ily"
 \include "mozart-hrn3-allegro.ily"
@@ -49,8 +49,8 @@ virtuoso that taught in Geneva.
 \include "mozart-hrn3-rondo.ily"
 
 \paper {
-    betweensystempadding = 0.0
-    betweensystemspace = 20 \mm
+    between-system-padding = 0.0
+    between-system-space = 20 \mm
 }
 
 
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily
index e8e911d422..6a9d82c35a 100644
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.7.32"
 \include  "mozart-hrn3-defs.ily"
 
 allegro =
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ily b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ily
index 09cd064a90..066ad6d410 100644
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ily
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ily
@@ -4,7 +4,7 @@ longgrace = \override Stem  #'stroke-style = #'()
 endlonggrace = \revert Stem #'stroke-style
 ritenuto = \markup { \italic  "rit." }
 
-\version "2.5.13"
+\version "2.7.32"
   
 cresc =  {
     #(ly:export (make-event-chord (list (make-span-event 'CrescendoEvent START)))) 
@@ -30,7 +30,7 @@ cresc =  {
     }
     \context {
         \Staff
-        minimumVerticalExtent = #'(-2.5 . 3.5)
+        \override VerticalAxisGroup #'minimum-Y-extent = #'(-2.5 . 3.5)
     }
 }
 
@@ -39,12 +39,12 @@ cresc =  {
     % #(define fonts my-sheet)
 
     % stress page breaking on a6 paper:
-    % linewidth = 80 \mm
-    % hsize = 105 \mm
-    % vsize = 149 \mm
+    % line-width = 80 \mm
+    % paper-width = 105 \mm
+    % paper-height = 149 \mm
     
     indent = 10. \mm
-    linewidth = 189. \mm
+    line-width = 189. \mm
 
 }
 
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ily b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ily
index a65f8ddebf..3007a6a3fe 100644
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ily
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ily
@@ -1,4 +1,4 @@
-\version "2.5.13"
+\version "2.7.32"
 \include  "mozart-hrn3-defs.ily"
 
 romanze =  \relative c' {
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ily b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ily
index ec36ca971a..58815517da 100644
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ily
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ily
@@ -1,4 +1,4 @@
-\version "2.5.13"
+\version "2.7.32"
 
 % \include "mozart-hrn3-defs.ily"
 
diff --git a/input/proportional.ly b/input/proportional.ly
index db3aecdaf9..97b5cf398c 100644
--- a/input/proportional.ly
+++ b/input/proportional.ly
@@ -1,4 +1,4 @@
-\version "2.7.4"
+\version "2.7.32"
 
 \header
 {
diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly
index a38a819310..bdb7fa86f4 100644
--- a/input/puer-fragment.ly
+++ b/input/puer-fragment.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.7.32"
 \header {
     title	= "Puer natus est nobis (excerptum)"
     subtitle	= "Antiphona ad introitum VII"
@@ -81,7 +81,7 @@ verba = \context Lyrics = "verba" \lyricmode {
 }
 
 \paper  {
-    linethickness = \staffspace / 7.0
+    line-thickness = \staff-space / 7.0
 }
 
 \score {
@@ -90,10 +90,10 @@ verba = \context Lyrics = "verba" \lyricmode {
     \lyricsto "cantus" \verba
   >>
   \layout {
-    linewidth = 137.0\mm
+    line-width = 137.0\mm
     width = 137.0\mm
     indent = 0.0
-    raggedright = ##t
+    ragged-right = ##t
     packed = ##t
     \context {
       \Score
diff --git a/input/regression/+.ly b/input/regression/+.ly
index dbf5ab798b..4f4e2243d8 100644
--- a/input/regression/+.ly
+++ b/input/regression/+.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 %% +.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 1edec4a0bc..b45932676d 100644
--- a/input/regression/accidental-cautionary.ly
+++ b/input/regression/accidental-cautionary.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
 texidoc = "Cautionary accidentals are indicated using either
@@ -8,7 +8,7 @@ parentheses (default) or smaller accidentals.
 
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 {
     c''4
diff --git a/input/regression/accidental-clef-change.ly b/input/regression/accidental-clef-change.ly
index 3470819898..9bc81b347f 100644
--- a/input/regression/accidental-clef-change.ly
+++ b/input/regression/accidental-clef-change.ly
@@ -2,7 +2,7 @@
   texidoc = "Accidentals are reset for clef changes."
 }
 
-\version "2.7.18"
+\version "2.7.32"
 \new Staff \relative c' {
     \clef treble
     cis dis fis
@@ -10,4 +10,4 @@
     <cis dis fis gis>
 }
 
-\layout {raggedright = ##t} 
+\layout {ragged-right = ##t} 
diff --git a/input/regression/accidental-double.ly b/input/regression/accidental-double.ly
index 11460dd577..451305fdc7 100644
--- a/input/regression/accidental-double.ly
+++ b/input/regression/accidental-double.ly
@@ -1,10 +1,10 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
 	texidoc = "If two forced accidentals happen at the same time, only one
 	sharp sign is printed."
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 \transpose c c'
 \context Staff <<
diff --git a/input/regression/accidental-ledger.ly b/input/regression/accidental-ledger.ly
index fae9f6d1e7..cc6d4794d0 100644
--- a/input/regression/accidental-ledger.ly
+++ b/input/regression/accidental-ledger.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
diff --git a/input/regression/accidental-octave.ly b/input/regression/accidental-octave.ly
index c79a4dc194..c866beae9d 100644
--- a/input/regression/accidental-octave.ly
+++ b/input/regression/accidental-octave.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
   texidoc="
diff --git a/input/regression/accidental-piano.ly b/input/regression/accidental-piano.ly
index 0c229cc677..a9d2270a0b 100644
--- a/input/regression/accidental-piano.ly
+++ b/input/regression/accidental-piano.ly
@@ -6,11 +6,11 @@ accidental."
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \layout
 {
-    raggedright = ##t
+    ragged-right = ##t
 }
     
 \new PianoStaff \relative <<
diff --git a/input/regression/accidental-placement.ly b/input/regression/accidental-placement.ly
index c0ef2b07f4..40c77e3df6 100644
--- a/input/regression/accidental-placement.ly
+++ b/input/regression/accidental-placement.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
@@ -11,7 +11,7 @@ flats in a sixth should be staggered.  "
 }
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 
diff --git a/input/regression/accidental-quarter.ly b/input/regression/accidental-quarter.ly
index 0aca2134cd..1b71480c7c 100644
--- a/input/regression/accidental-quarter.ly
+++ b/input/regression/accidental-quarter.ly
@@ -3,8 +3,8 @@
   texidoc = "Quarter tone notation is supported, including
     threequarters flat."
 }
-\version "2.7.13"
-\layout { raggedright = ##t }
+\version "2.7.32"
+\layout { ragged-right = ##t }
 
 \relative c'' {
   \time 12/4 
diff --git a/input/regression/accidental-single-double.ly b/input/regression/accidental-single-double.ly
index 824e419fc6..a2473a506a 100644
--- a/input/regression/accidental-single-double.ly
+++ b/input/regression/accidental-single-double.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header{
   texidoc="
 A sharp sign after a double sharp sign, as well as a flat sign
@@ -9,7 +9,7 @@ natural sign.
 }
 
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 thenotes =  \relative cis' {
   \time 4/4
diff --git a/input/regression/accidental-suggestions.ly b/input/regression/accidental-suggestions.ly
index 7f1c534af3..d932792530 100644
--- a/input/regression/accidental-suggestions.ly
+++ b/input/regression/accidental-suggestions.ly
@@ -7,9 +7,9 @@ denoting Musica Ficta."
  
 }
 
-\version "2.7.13"
+\version "2.7.32"
 \paper {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 \relative c'' {
diff --git a/input/regression/accidental-tie.ly b/input/regression/accidental-tie.ly
index 3651468934..ba07a7bf1b 100644
--- a/input/regression/accidental-tie.ly
+++ b/input/regression/accidental-tie.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
   texidoc = "The second and third notes should not get accidentals,
@@ -8,7 +8,7 @@
 
 }
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 mus =  	\relative c' {
diff --git a/input/regression/accidental-unbroken-tie-spacing.ly b/input/regression/accidental-unbroken-tie-spacing.ly
index 2ca2d36b33..0e6a41a016 100644
--- a/input/regression/accidental-unbroken-tie-spacing.ly
+++ b/input/regression/accidental-unbroken-tie-spacing.ly
@@ -4,9 +4,9 @@ texidoc = "Tied accidentaled notes (which cause reminder accidentals) do not
 wreak havoc in the spacing when unbroken."
 }
 
-\version "2.7.13"
+\version "2.7.32"
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 \relative c' {
diff --git a/input/regression/accidental-voice.ly b/input/regression/accidental-voice.ly
index a0d5a2c5a1..63f13156bd 100644
--- a/input/regression/accidental-voice.ly
+++ b/input/regression/accidental-voice.ly
@@ -1,5 +1,5 @@
-\version "2.7.13"
-\layout { raggedright = ##t }
+\version "2.7.32"
+\layout { ragged-right = ##t }
 
 \header{
   texidoc="
diff --git a/input/regression/accidental.ly b/input/regression/accidental.ly
index 0c04e44d46..829e8eeafa 100644
--- a/input/regression/accidental.ly
+++ b/input/regression/accidental.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
   texidoc="
@@ -8,7 +8,7 @@ fourth show forced and courtesy accidentals.
 "
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 foo = \relative c''   {   \key as \major dis4 dis dis!^"force" dis? }
 
diff --git a/input/regression/alignment-order.ly b/input/regression/alignment-order.ly
index 718187b862..3fb5d76e72 100644
--- a/input/regression/alignment-order.ly
+++ b/input/regression/alignment-order.ly
@@ -3,10 +3,10 @@
 anywhere in the vertical alignment. "
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \paper {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 \relative <<
diff --git a/input/regression/alignment-vertical-manual-setting.ly b/input/regression/alignment-vertical-manual-setting.ly
index dc51ba16cf..da3235a107 100644
--- a/input/regression/alignment-vertical-manual-setting.ly
+++ b/input/regression/alignment-vertical-manual-setting.ly
@@ -6,7 +6,7 @@
 
 }
 
-\version "2.7.29"
+\version "2.7.32"
 
 \book {
   \score {
diff --git a/input/regression/alignment-vertical-spacing.ly b/input/regression/alignment-vertical-spacing.ly
index 5b7a8339b2..36250d258f 100644
--- a/input/regression/alignment-vertical-spacing.ly
+++ b/input/regression/alignment-vertical-spacing.ly
@@ -16,7 +16,7 @@ setting properties on individual object. @code{\override} in a
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 #(set-global-staff-size 13)
 
diff --git a/input/regression/allfontstyle.ily b/input/regression/allfontstyle.ily
index e3b7bb958c..200a5cfa07 100644
--- a/input/regression/allfontstyle.ily
+++ b/input/regression/allfontstyle.ily
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
     texidoc="
@@ -7,7 +7,7 @@ Different text styles are used for various purposes.
 }
 
 \paper {
-    raggedright = ##t
+    ragged-right = ##t
 }
 
 \relative c'' \context Staff {
diff --git a/input/regression/ambitus.ly b/input/regression/ambitus.ly
index ceab79155d..3449264ced 100644
--- a/input/regression/ambitus.ly
+++ b/input/regression/ambitus.ly
@@ -6,10 +6,10 @@ signature. @code{AmbitusNoteHead} grobs also have ledger lines.
 
 "
 }
-\version "2.7.13"
+\version "2.7.32"
 
 \layout {
-    raggedright = ##t
+    ragged-right = ##t
     \context {
 	\Voice
 	\consists Ambitus_engraver
diff --git a/input/regression/apply-context.ly b/input/regression/apply-context.ly
index e8bf2e1f16..a750926403 100644
--- a/input/regression/apply-context.ly
+++ b/input/regression/apply-context.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 
 \header {
@@ -14,7 +14,7 @@ This example prints a bar-number during processing on stdout.
 
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 
 \relative c'' {
diff --git a/input/regression/apply-output.ly b/input/regression/apply-output.ly
index e5f714851b..186842a32d 100644
--- a/input/regression/apply-output.ly
+++ b/input/regression/apply-output.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.31" 
+\version "2.7.32" 
 \header {
 
   texidoc = "The @code{\applyOutput} expression is the most flexible way to
@@ -10,7 +10,7 @@ position.
 "
 
 }
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 #(define  (mc-squared gr org cur)
   (let*
diff --git a/input/regression/arpeggio-bracket.ly b/input/regression/arpeggio-bracket.ly
index fc0122858b..0c79b1217f 100644
--- a/input/regression/arpeggio-bracket.ly
+++ b/input/regression/arpeggio-bracket.ly
@@ -1,7 +1,7 @@
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 
-\version "2.7.13"
+\version "2.7.32"
 \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 9e13f8bc5e..d4672042a6 100644
--- a/input/regression/arpeggio-collision.ly
+++ b/input/regression/arpeggio-collision.ly
@@ -1,10 +1,10 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header  {
 texidoc = "Arpeggio stays clear of accidentals and flipped note heads."
 }
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
   \context{
     \Staff
     connectArpeggios = ##t
diff --git a/input/regression/arpeggio.ly b/input/regression/arpeggio.ly
index 163c2743cb..7e793f197d 100644
--- a/input/regression/arpeggio.ly
+++ b/input/regression/arpeggio.ly
@@ -1,12 +1,12 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header{
   texidoc="
 Arpeggios are supported, both cross-staff and broken single staff.
 "
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 
 \context PianoStaff << 
diff --git a/input/regression/auto-beam-bar.ly b/input/regression/auto-beam-bar.ly
index 70ba750ef7..7bafde78a4 100644
--- a/input/regression/auto-beam-bar.ly
+++ b/input/regression/auto-beam-bar.ly
@@ -1,10 +1,10 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
 texidoc="No auto beams will be put over (manual) repeat bars."
 }
-\layout{ raggedright = ##t }
+\layout{ ragged-right = ##t }
 
 {
   \time 3/4
diff --git a/input/regression/auto-beam-no-beam.ly b/input/regression/auto-beam-no-beam.ly
index b2a33cf4b8..f1b42e059d 100644
--- a/input/regression/auto-beam-no-beam.ly
+++ b/input/regression/auto-beam-no-beam.ly
@@ -6,9 +6,9 @@
 
     }
 
-\version "2.7.13"
+\version "2.7.32"
 \layout {
-    raggedright = ##t
+    ragged-right = ##t
 }
 
 \relative  { c8 c-\noBeam c c }
diff --git a/input/regression/auto-beam-triplet.ly b/input/regression/auto-beam-triplet.ly
index b732ee7ae2..5065f5ef53 100644
--- a/input/regression/auto-beam-triplet.ly
+++ b/input/regression/auto-beam-triplet.ly
@@ -4,8 +4,8 @@
   texidoc = "Automatic beaming is also done on tuplets."
 }
 
-\version "2.7.13"
-\layout { raggedright= ##t }
+\version "2.7.32"
+\layout { ragged-right= ##t }
 
 \relative c''{
   c8 c c c
diff --git a/input/regression/auto-beam-tuplets.ly b/input/regression/auto-beam-tuplets.ly
index dfc57b9878..ab8a981325 100644
--- a/input/regression/auto-beam-tuplets.ly
+++ b/input/regression/auto-beam-tuplets.ly
@@ -1,11 +1,11 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
   texidoc = "Tuplet-spanner should not put (visible) brackets on
 beams even if they're auto generated."
 }
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 \relative c' {
   \set tupletSpannerDuration = #(ly:make-moment 1 4)
diff --git a/input/regression/auto-beam.ly b/input/regression/auto-beam.ly
index 4d7317c291..44bd46355b 100644
--- a/input/regression/auto-beam.ly
+++ b/input/regression/auto-beam.ly
@@ -3,10 +3,10 @@
 beam."
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \layout  {
-  raggedright = ##t 
+  ragged-right = ##t 
   \context {
     \Staff
     \remove "Clef_engraver"
diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly
index 2148042df0..14ab804e6a 100644
--- a/input/regression/auto-change.ly
+++ b/input/regression/auto-change.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
@@ -9,7 +9,7 @@ note. When central C is reached, staff is not yet switched (by default).
 
 "
 }
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 \context PianoStaff <<
   \context Staff = "up" {
diff --git a/input/regression/backend-excercise.ly b/input/regression/backend-excercise.ly
index 1232cd9dcc..5e6c36e615 100644
--- a/input/regression/backend-excercise.ly
+++ b/input/regression/backend-excercise.ly
@@ -2,9 +2,9 @@
   texidoc = "Excercise all output functions"
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
-\paper { raggedright = ##t }
+\paper { ragged-right = ##t }
 
 \relative {
   \new StaffGroup \new PianoStaff <<
diff --git a/input/regression/balloon.ly b/input/regression/balloon.ly
index 00a11bed3c..d18e2cf2ed 100644
--- a/input/regression/balloon.ly
+++ b/input/regression/balloon.ly
@@ -3,9 +3,9 @@
   texidoc = "With balloon texts, objects in the output can be marked,
 with lines and explanatory text added."
 }
-\version "2.7.31"
+\version "2.7.32"
 
-\layout{ raggedright = ##t }
+\layout{ ragged-right = ##t }
 
 {
   
diff --git a/input/regression/bar-check-redefine.ly b/input/regression/bar-check-redefine.ly
index faf450709d..98c8484c36 100644
--- a/input/regression/bar-check-redefine.ly
+++ b/input/regression/bar-check-redefine.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
     texidoc = "The meaning of @code{|} is stored in the
 identifier @code{pipeSymbol}."
@@ -6,7 +6,7 @@ identifier @code{pipeSymbol}."
 
 pipeSymbol = \bar "||"
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 
 { c'2 | c'2 | }
diff --git a/input/regression/bar-number.ly b/input/regression/bar-number.ly
index 4c137aeb5c..5fdb38b80e 100644
--- a/input/regression/bar-number.ly
+++ b/input/regression/bar-number.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
@@ -13,7 +13,7 @@ be increased.
 }
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 \relative c'' {
diff --git a/input/regression/bar-scripts.ly b/input/regression/bar-scripts.ly
index b334fce780..9030fe9d65 100644
--- a/input/regression/bar-scripts.ly
+++ b/input/regression/bar-scripts.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header{
 texidoc="
 
@@ -6,7 +6,7 @@ Markings can be attached to (invisible) barlines.
 "
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 onestaff = \new Staff\relative c''  {
 	\set Staff.instr = instr
diff --git a/input/regression/beam-auto-knee.ly b/input/regression/beam-auto-knee.ly
index 0e82705a76..d4be09fcd4 100644
--- a/input/regression/beam-auto-knee.ly
+++ b/input/regression/beam-auto-knee.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header
 {
@@ -8,7 +8,7 @@ beam fits in a gap between note heads that is larger than a predefined
 threshold.
 "
 }
-\layout{ raggedright = ##t }
+\layout{ ragged-right = ##t }
 
 \context Staff \relative c''{ 
   c'8[ c,,]  c8[ e']
diff --git a/input/regression/beam-auto.ly b/input/regression/beam-auto.ly
index 590fed758a..bba393efd1 100644
--- a/input/regression/beam-auto.ly
+++ b/input/regression/beam-auto.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header{
   texidoc = "@cindex Beaming Presets
 There are presets for the @code{auto-beam} engraver in the case of common
diff --git a/input/regression/beam-break.ly b/input/regression/beam-break.ly
index 51ae95eb73..3c34169648 100644
--- a/input/regression/beam-break.ly
+++ b/input/regression/beam-break.ly
@@ -4,8 +4,8 @@
 "
 
 }
-\version "2.7.13"
-\layout { raggedright= ##t }
+\version "2.7.32"
+\layout { ragged-right= ##t }
 
 \relative c''  {
   \set Score.allowBeamBreak = ##t
diff --git a/input/regression/beam-center-slope.ly b/input/regression/beam-center-slope.ly
index 75240bac7c..db1c32572d 100644
--- a/input/regression/beam-center-slope.ly
+++ b/input/regression/beam-center-slope.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header{
 
   texidoc="Simple beams on middle staffline are allowed to be
@@ -9,7 +9,7 @@
 }
 
 \layout{
-  raggedright = ##t
+  ragged-right = ##t
   indent = 0
 }
 
diff --git a/input/regression/beam-concave-damped.ly b/input/regression/beam-concave-damped.ly
index f1baac5863..88ea5437f9 100644
--- a/input/regression/beam-concave-damped.ly
+++ b/input/regression/beam-concave-damped.ly
@@ -2,9 +2,9 @@
     texidoc = "Beams that are not strictly concave are damped
  according to their concaveness. "
 }
-\version "2.7.13"
+\version "2.7.32"
 \layout {
-    raggedright = ##t
+    ragged-right = ##t
 }
 
 \relative c'' {
diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly
index 659e5a7d67..4ab8813e22 100644
--- a/input/regression/beam-concave.ly
+++ b/input/regression/beam-concave.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header{
 
   texidoc = "Fully concave beams should be horizontal. Informally spoken,
@@ -49,7 +49,7 @@ rossBeams = \relative c'' {
 }
 
 \layout{
-  raggedright = ##t
+  ragged-right = ##t
   #(define debug-beam-quanting #t)
 }
 
diff --git a/input/regression/beam-cross-staff-auto-knee.ly b/input/regression/beam-cross-staff-auto-knee.ly
index 63d3cd3888..85fe59300d 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.7.13"
+\version "2.7.32"
 
 \header{
 
@@ -9,7 +9,7 @@ produced with explicit staff switches)."
 }
 
 \layout{
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 \context PianoStaff <<
diff --git a/input/regression/beam-cross-staff-slope.ly b/input/regression/beam-cross-staff-slope.ly
index 0d8a3e3a1a..71814b3949 100644
--- a/input/regression/beam-cross-staff-slope.ly
+++ b/input/regression/beam-cross-staff-slope.ly
@@ -1,9 +1,9 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
     texidoc = "Cross staff  (kneed) beams do not cause extreme slopes."
 }
 
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 \context PianoStaff <<
   \context Staff = "up"
diff --git a/input/regression/beam-cross-staff.ly b/input/regression/beam-cross-staff.ly
index faef9ca622..f0417f975e 100644
--- a/input/regression/beam-cross-staff.ly
+++ b/input/regression/beam-cross-staff.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \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 4b5d107d5e..cb759060f5 100644
--- a/input/regression/beam-damp.ly
+++ b/input/regression/beam-damp.ly
@@ -1,9 +1,9 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header { texidoc = "@cindex Beam Damp
 Beams are less steep than the notes they encompass. " }
 \layout{
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 \relative c''{
diff --git a/input/regression/beam-default-lengths.ly b/input/regression/beam-default-lengths.ly
index a05c709680..febeb86fbb 100644
--- a/input/regression/beam-default-lengths.ly
+++ b/input/regression/beam-default-lengths.ly
@@ -1,6 +1,6 @@
-\layout{ raggedright = ##t}
+\layout{ ragged-right = ##t}
 
-\version "2.7.31"
+\version "2.7.32"
 
 \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 157463bebf..a4a4f5dde8 100644
--- a/input/regression/beam-extreme.ly
+++ b/input/regression/beam-extreme.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header{
 texidoc="
 Beams should behave reasonably well, even under extreme circumstances.
@@ -10,8 +10,8 @@ under normal circumstances, these beams would get knees here
 }
 
 \layout{
-  %%    raggedright = ##t
-  raggedright = ##t
+  %%    ragged-right = ##t
+  ragged-right = ##t
 }
 
 extreme = \relative c'' {
diff --git a/input/regression/beam-french.ly b/input/regression/beam-french.ly
index fe7c507664..dc83b63f9a 100644
--- a/input/regression/beam-french.ly
+++ b/input/regression/beam-french.ly
@@ -1,10 +1,10 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
     texidoc = "In french style beaming, the stems do not go between beams."
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 \relative c'
 {
diff --git a/input/regression/beam-funky-beamlet.ly b/input/regression/beam-funky-beamlet.ly
index 2587fe4da6..7e1e46bf26 100644
--- a/input/regression/beam-funky-beamlet.ly
+++ b/input/regression/beam-funky-beamlet.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
   texidoc=" Funky kneed beams with beamlets also work. The beamlets
@@ -8,7 +8,7 @@ should be pointing to the note head.
 
 }
 
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 \relative c' {
   c16 c''8 c,,16
diff --git a/input/regression/beam-funky.ly b/input/regression/beam-funky.ly
index a0cec97014..bd3eeb980e 100644
--- a/input/regression/beam-funky.ly
+++ b/input/regression/beam-funky.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
   
   texidoc = "In complex configurations of knee beaming, according to
@@ -9,7 +9,7 @@ beam. This is in disagreement with the current algorithm."
   
 }
 
-\layout { raggedright = ##t} 
+\layout { ragged-right = ##t} 
 
 \relative c'
 {
diff --git a/input/regression/beam-isknee.ly b/input/regression/beam-isknee.ly
index 399b85881d..cb99101c38 100644
--- a/input/regression/beam-isknee.ly
+++ b/input/regression/beam-isknee.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header{
 	texidoc="@cindex Beam Isknee
 
@@ -10,7 +10,7 @@ Beams can be placed across a @code{PianoStaff}.
 }
 
 \layout{
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 \context PianoStaff <<
diff --git a/input/regression/beam-knee-symmetry.ly b/input/regression/beam-knee-symmetry.ly
index 6fa6c6f6e2..d9152faaa1 100644
--- a/input/regression/beam-knee-symmetry.ly
+++ b/input/regression/beam-knee-symmetry.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
     texidoc = "Point-symmetric beams should receive the same
@@ -7,7 +7,7 @@
 
 }
 \layout{
-  raggedright = ##t 
+  ragged-right = ##t 
 }
 
 \relative c'{
diff --git a/input/regression/beam-length.ly b/input/regression/beam-length.ly
index 1fb32d9667..83dc3f21b2 100644
--- a/input/regression/beam-length.ly
+++ b/input/regression/beam-length.ly
@@ -1,12 +1,12 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
   texidoc="
 Beams should look the same.
 "
 }
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 
 \context Voice \relative c {
diff --git a/input/regression/beam-manual-beaming.ly b/input/regression/beam-manual-beaming.ly
index cbda79c40f..21ef9e1c57 100644
--- a/input/regression/beam-manual-beaming.ly
+++ b/input/regression/beam-manual-beaming.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 
 \header {
@@ -7,7 +7,7 @@
   "Beaming can be overidden for individual stems."
 }
 \layout{ 
-  raggedright = ##t 
+  ragged-right = ##t 
 }
 
 \relative c'' {
diff --git a/input/regression/beam-multiple-cross-staff.ly b/input/regression/beam-multiple-cross-staff.ly
index 11388ecf10..07500e0003 100644
--- a/input/regression/beam-multiple-cross-staff.ly
+++ b/input/regression/beam-multiple-cross-staff.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
   texidoc = "Kneed beams (often happens with cross-staff beams)
@@ -9,7 +9,7 @@ to the last beam.
 }
 
 \layout {
-  raggedright= ##t
+  ragged-right= ##t
 }
 
 \context PianoStaff \relative c' <<
diff --git a/input/regression/beam-outside-beamlets.ly b/input/regression/beam-outside-beamlets.ly
index 5a82a0c640..22c1ecb6a6 100644
--- a/input/regression/beam-outside-beamlets.ly
+++ b/input/regression/beam-outside-beamlets.ly
@@ -3,9 +3,9 @@
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 \paper {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 
diff --git a/input/regression/beam-over-barline.ly b/input/regression/beam-over-barline.ly
index ed26a677a1..59f89ad624 100644
--- a/input/regression/beam-over-barline.ly
+++ b/input/regression/beam-over-barline.ly
@@ -1,9 +1,9 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
   texidoc = "Explicit beams may cross barlines. "
 }
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 \relative c'' { c2.  c8[ c8 c8 c8] }
 
diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly
index 0783a2e44b..8cbe676d9d 100644
--- a/input/regression/beam-position.ly
+++ b/input/regression/beam-position.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header{
 
   texidoc=" Beams on ledgered notes should always reach the middle staff
@@ -10,7 +10,7 @@ note beams.  Override with @code{no-stem-extend}.  "
 }
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 }  
 
 
diff --git a/input/regression/beam-quant-standard.ly b/input/regression/beam-quant-standard.ly
index e96236c2ac..55c35d87ed 100644
--- a/input/regression/beam-quant-standard.ly
+++ b/input/regression/beam-quant-standard.ly
@@ -6,10 +6,10 @@
   
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \layout  {
-  raggedright = ##t
+  ragged-right = ##t
   #(define debug-beam-quanting #t)
 }
 
diff --git a/input/regression/beam-quanting-32nd.ly b/input/regression/beam-quanting-32nd.ly
index c6c503745d..c4334760cd 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.7.13"
+\version "2.7.32"
 
 \relative c''{ 
   \time 3/8
diff --git a/input/regression/beam-quanting-horizontal.ly b/input/regression/beam-quanting-horizontal.ly
index b73601fcbc..a5ae24f227 100644
--- a/input/regression/beam-quanting-horizontal.ly
+++ b/input/regression/beam-quanting-horizontal.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
 
diff --git a/input/regression/beam-quarter.ly b/input/regression/beam-quarter.ly
index 7d489e287a..9d650a31ab 100644
--- a/input/regression/beam-quarter.ly
+++ b/input/regression/beam-quarter.ly
@@ -1,11 +1,11 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header
 {
   texidoc= "Quarter notes may be beamed: the beam is halted momentarily."
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 \relative c'' {
   c8[ c4 c8] % should warn here!
diff --git a/input/regression/beam-rest.ly b/input/regression/beam-rest.ly
index 91babad2f8..fef17403ae 100644
--- a/input/regression/beam-rest.ly
+++ b/input/regression/beam-rest.ly
@@ -3,9 +3,9 @@
   texidoc = "The number of beams does not change on a rest."
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 \relative c, {
   \clef bass	 
diff --git a/input/regression/beam-second.ly b/input/regression/beam-second.ly
index 1a2becefa9..011097753b 100644
--- a/input/regression/beam-second.ly
+++ b/input/regression/beam-second.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
 
@@ -11,7 +11,7 @@ quickly."
 }
 
 \layout{
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 \relative c''{
diff --git a/input/regression/beam-shortened-lengths.ly b/input/regression/beam-shortened-lengths.ly
index a774f19018..fa6aef9982 100644
--- a/input/regression/beam-shortened-lengths.ly
+++ b/input/regression/beam-shortened-lengths.ly
@@ -1,10 +1,10 @@
 
-\version "2.7.31"
+\version "2.7.32"
 
 \header{
   texidoc="Beams in unnatural direction, have shortened stems, but do not look too short."
 }
-\layout{ raggedright = ##t }
+\layout{ ragged-right = ##t }
 
 
 \relative c'{
diff --git a/input/regression/beaming-ternary-metrum.ly b/input/regression/beaming-ternary-metrum.ly
index 63efc88908..e2cce0ff9e 100644
--- a/input/regression/beaming-ternary-metrum.ly
+++ b/input/regression/beaming-ternary-metrum.ly
@@ -1,9 +1,9 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
   texidoc = "Automatic beaming works also in ternary time sigs."
 }
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 \relative c'' {
   \time 6/8
diff --git a/input/regression/beaming.ly b/input/regression/beaming.ly
index 9acb38d092..a38c9732e9 100644
--- a/input/regression/beaming.ly
+++ b/input/regression/beaming.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
 texidoc="
diff --git a/input/regression/beams.ly b/input/regression/beams.ly
index ebb7f8780f..75c6d5fae4 100644
--- a/input/regression/beams.ly
+++ b/input/regression/beams.ly
@@ -1,10 +1,10 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
     texidoc = "Beaming can be also given explicitly."
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 \relative c'
 {
diff --git a/input/regression/break.ly b/input/regression/break.ly
index 22fa437f10..2f6d7008cf 100644
--- a/input/regression/break.ly
+++ b/input/regression/break.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
   texidoc="
@@ -15,5 +15,5 @@ Breaks can be encouraged and discouraged using @code{\\break} and
 }
 \layout {
   indent = 0.0
-  linewidth = 4.0\cm
+  line-width = 4.0\cm
 }
diff --git a/input/regression/breathing-sign-ancient.ly b/input/regression/breathing-sign-ancient.ly
index 827d388d4d..da5c89ee94 100644
--- a/input/regression/breathing-sign-ancient.ly
+++ b/input/regression/breathing-sign-ancient.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
   texidoc="
diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly
index ca1aa86795..3b64550772 100644
--- a/input/regression/breathing-sign.ly
+++ b/input/regression/breathing-sign.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \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 7c4da95897..376af3b610 100644
--- a/input/regression/chord-changes.ly
+++ b/input/regression/chord-changes.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
   texidoc="Property chordChanges: display chord names only when
@@ -7,7 +7,7 @@ chord name after a line break.
 "
 }
 
-\layout{ raggedright = ##t }
+\layout{ ragged-right = ##t }
 
 
 scheme = \chordmode {
diff --git a/input/regression/chord-name-entry-11.ly b/input/regression/chord-name-entry-11.ly
index e41dede2e7..27d1e7257a 100644
--- a/input/regression/chord-name-entry-11.ly
+++ b/input/regression/chord-name-entry-11.ly
@@ -1,4 +1,4 @@
-\version "2.7.13" 
+\version "2.7.32" 
 
 \header {
 
@@ -7,7 +7,7 @@
 
 }
 
-\layout { raggedright = ##t } 
+\layout { ragged-right = ##t } 
 
 \chordmode { c:13 c:13.11 c:m13 }
 
diff --git a/input/regression/chord-name-entry.ly b/input/regression/chord-name-entry.ly
index 6423709b77..2e53d248f7 100644
--- a/input/regression/chord-name-entry.ly
+++ b/input/regression/chord-name-entry.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 
 \header {
diff --git a/input/regression/chord-name-exceptions.ly b/input/regression/chord-name-exceptions.ly
index cc4d3532fe..b7855da970 100644
--- a/input/regression/chord-name-exceptions.ly
+++ b/input/regression/chord-name-exceptions.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
     texidoc = "The property @code{chordNameExceptions} can used
@@ -22,7 +22,7 @@ theMusic = \chordmode {
     c:7sus4 c:dim7/+f
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 << \context ChordNames \theMusic
    \context Voice \theMusic
diff --git a/input/regression/chord-name-major7.ly b/input/regression/chord-name-major7.ly
index 9feb0f4865..2922c46688 100644
--- a/input/regression/chord-name-major7.ly
+++ b/input/regression/chord-name-major7.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \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 08d594c312..93130866e6 100644
--- a/input/regression/chord-names-bass.ly
+++ b/input/regression/chord-names-bass.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
diff --git a/input/regression/chord-scripts.ly b/input/regression/chord-scripts.ly
index d6d6ec413c..2d5e2a4ae6 100644
--- a/input/regression/chord-scripts.ly
+++ b/input/regression/chord-scripts.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \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 41a32ca594..e8241d697d 100644
--- a/input/regression/chord-tremolo-short.ly
+++ b/input/regression/chord-tremolo-short.ly
@@ -1,10 +1,10 @@
-\version "2.7.13"
+\version "2.7.32"
 \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. 
   "
 }
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 
 \context Staff  \relative c' {
diff --git a/input/regression/chord-tremolo.ly b/input/regression/chord-tremolo.ly
index c061ba3ee8..1c3d353fed 100644
--- a/input/regression/chord-tremolo.ly
+++ b/input/regression/chord-tremolo.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
 texidoc="
diff --git a/input/regression/chords-funky-ignatzek.ly b/input/regression/chords-funky-ignatzek.ly
index a9971b7ce0..25f6208f1e 100644
--- a/input/regression/chords-funky-ignatzek.ly
+++ b/input/regression/chords-funky-ignatzek.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 
 \header {
diff --git a/input/regression/clef-oct.ly b/input/regression/clef-oct.ly
index 7861cc6cd4..71e8b73af6 100644
--- a/input/regression/clef-oct.ly
+++ b/input/regression/clef-oct.ly
@@ -1,12 +1,12 @@
 
-\version "2.7.13" \header {
+\version "2.7.32" \header {
 
     texidoc = "Octavation signs may be added to clefs.  These
 octavation signs may be placed below or above (meaning an octave
 higher or lower), and can take any value, including 15 for two octaves."
 
 }
-\layout { raggedright = ##t  }
+\layout { ragged-right = ##t  }
 
 
 \relative c'' {
diff --git a/input/regression/clefs.ly b/input/regression/clefs.ly
index 14f76719cf..116741a0a4 100644
--- a/input/regression/clefs.ly
+++ b/input/regression/clefs.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
 
@@ -9,7 +9,7 @@ or below the clef respectively."
 }
 
 \layout{
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 
diff --git a/input/regression/cluster-cross-staff.ly b/input/regression/cluster-cross-staff.ly
index 4139f3a880..c42385c256 100644
--- a/input/regression/cluster-cross-staff.ly
+++ b/input/regression/cluster-cross-staff.ly
@@ -4,10 +4,10 @@
 
 }
 \layout {
-  raggedright= ##t
+  ragged-right= ##t
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \new PianoStaff <<
   \context Staff = "up"     {
diff --git a/input/regression/cluster.ly b/input/regression/cluster.ly
index 4e31bcd0ac..da5605585b 100644
--- a/input/regression/cluster.ly
+++ b/input/regression/cluster.ly
@@ -1,10 +1,10 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
   texidoc = "Clusters are a device to denote that a complete range of
 notes is to be played."
 }
-  \layout { raggedright = ##t }
+  \layout { ragged-right = ##t }
 
 
 fragment = \relative c' {
diff --git a/input/regression/collision-2.ly b/input/regression/collision-2.ly
index 88a281f539..d0efcf68c6 100644
--- a/input/regression/collision-2.ly
+++ b/input/regression/collision-2.ly
@@ -1,9 +1,9 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
 texidoc = "Single head notes may collide. "
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 
 \context Staff  \transpose c c' <<  
diff --git a/input/regression/collision-alignment.ly b/input/regression/collision-alignment.ly
index e43e42461d..907ac13f91 100644
--- a/input/regression/collision-alignment.ly
+++ b/input/regression/collision-alignment.ly
@@ -5,9 +5,9 @@
 
 }
 
-\layout  { raggedright = ##t }
+\layout  { ragged-right = ##t }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \relative <<
     \new Staff {
diff --git a/input/regression/collision-dots-invert.ly b/input/regression/collision-dots-invert.ly
index a59be63951..a94a69b219 100644
--- a/input/regression/collision-dots-invert.ly
+++ b/input/regression/collision-dots-invert.ly
@@ -4,9 +4,9 @@
     dots: notes with dots should go to the right, if there could be
     confusion to which notes the dots belong."
 }
-\layout {  raggedright = ##t }
+\layout {  ragged-right = ##t }
 
-\version "2.7.13"
+\version "2.7.32"
 \relative c'' { 
   << <a c>2\\ { <b d>4 <b d>4 }   >>
   << { <a c>2 } \\ { <b d>4. <b e>8 } >> 
diff --git a/input/regression/collision-dots-move.ly b/input/regression/collision-dots-move.ly
index 9a29b55caf..19f1c0f72e 100644
--- a/input/regression/collision-dots-move.ly
+++ b/input/regression/collision-dots-move.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
     
     texidoc = "If collision resolution finds dotted note head must
@@ -6,7 +6,7 @@
 
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 \relative c {
   \key d \minor
diff --git a/input/regression/collision-dots.ly b/input/regression/collision-dots.ly
index e26c61150c..3432d77508 100644
--- a/input/regression/collision-dots.ly
+++ b/input/regression/collision-dots.ly
@@ -5,8 +5,8 @@
   on the right side."
 }
 
-\version "2.7.13"
-\layout { raggedright= ##t }
+\version "2.7.32"
+\layout { ragged-right= ##t }
 
 % todo: b2 (up) + b8 down looks strange compared to c2up + b8. (down)
 \context Staff  <<
diff --git a/input/regression/collision-head-chords.ly b/input/regression/collision-head-chords.ly
index 4d57472ad9..ee7254bb39 100644
--- a/input/regression/collision-head-chords.ly
+++ b/input/regression/collision-head-chords.ly
@@ -1,11 +1,11 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
   texidoc = "Note heads in collisions should be merged if
 they have the same positions in the extreme note heads.  
 "
 
 }
-\layout {raggedright = ##t}
+\layout {ragged-right = ##t}
 
 
 
diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly
index be3fdd52bf..8e5c9860b8 100644
--- a/input/regression/collision-heads.ly
+++ b/input/regression/collision-heads.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
   texidoc =
 
@@ -9,7 +9,7 @@ if the black note heads are from 8th or shorter notes.
   
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 
 \context Staff  \relative c'' <<
diff --git a/input/regression/collision-merge-differently-dotted.ly b/input/regression/collision-merge-differently-dotted.ly
index 79157be561..71571a1980 100644
--- a/input/regression/collision-merge-differently-dotted.ly
+++ b/input/regression/collision-merge-differently-dotted.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
     
     texidoc = "If NoteCollision has merge-differently-dotted = ##t note
@@ -7,7 +7,7 @@ should not disappear when merging similar note heads."
     
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 	
 \context Staff \relative c'' <<
   {
diff --git a/input/regression/collision-merge-dots.ly b/input/regression/collision-merge-dots.ly
index cd667b0e11..a8c1fb440d 100644
--- a/input/regression/collision-merge-dots.ly
+++ b/input/regression/collision-merge-dots.ly
@@ -2,9 +2,9 @@
 
     texidoc = "When merging heads, the dots are merged too."
     }
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
-\version "2.7.13"
+\version "2.7.32"
 
 {
   \relative c'' \new Staff {
diff --git a/input/regression/collision-mesh.ly b/input/regression/collision-mesh.ly
index 828af71302..cc4381ec09 100644
--- a/input/regression/collision-mesh.ly
+++ b/input/regression/collision-mesh.ly
@@ -1,10 +1,10 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
   texidoc = "Oppositely stemmed chords,  meshing into each other,
 are resolved."
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 
 \context Staff  \transpose c c' {
diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly
index 056ec3a820..537df8851a 100644
--- a/input/regression/collisions.ly
+++ b/input/regression/collisions.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header{
   texidoc="
 In addition to normal collision rules, there is support for polyphony, 
diff --git a/input/regression/color.ly b/input/regression/color.ly
index d7bc6ed492..2b83b1a2e2 100644
--- a/input/regression/color.ly
+++ b/input/regression/color.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
   texidoc = "Each grob can have a color assigned to it.
@@ -6,7 +6,7 @@ Use the @code{\override} and @code{\revert} expressions to set the
 @code{color} property."
 }
 
-\paper { raggedright = ##t }
+\paper { ragged-right = ##t }
 
 \relative {
   \override Accidental #'color = #darkgreen
diff --git a/input/regression/completion-heads-polyphony.ly b/input/regression/completion-heads-polyphony.ly
index 316814a64e..9ce2dbe05a 100644
--- a/input/regression/completion-heads-polyphony.ly
+++ b/input/regression/completion-heads-polyphony.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \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 831c6d86cf..ad81d1e0dd 100644
--- a/input/regression/completion-heads.ly
+++ b/input/regression/completion-heads.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
 texidoc="
@@ -8,7 +8,7 @@ If the @code{Note_heads_engraver} is replaced by the @code{Completion_heads_engr
 "
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 
 \new Voice \with {
diff --git a/input/regression/custos.ly b/input/regression/custos.ly
index 5724cf9971..5be074b244 100644
--- a/input/regression/custos.ly
+++ b/input/regression/custos.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
     texidoc = "Custodes may be engraved in various styles."
 }
@@ -8,7 +8,7 @@
     \Staff
     \consists Custos_engraver
   }
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 
diff --git a/input/regression/dot-flag-collision.ly b/input/regression/dot-flag-collision.ly
index f7b9fdf259..e8b74f1225 100644
--- a/input/regression/dot-flag-collision.ly
+++ b/input/regression/dot-flag-collision.ly
@@ -1,9 +1,9 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
   texidoc = "Dots move to the right when a collision with the (up)flag happens."
 }
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 
 \relative c''
diff --git a/input/regression/dots.ly b/input/regression/dots.ly
index ceab222562..3d4c86ef3b 100644
--- a/input/regression/dots.ly
+++ b/input/regression/dots.ly
@@ -1,4 +1,4 @@
-\version "2.7.13" \header{
+\version "2.7.32" \header{
 
 
     texidoc=" Noteheads can have dots, and rests too.  
diff --git a/input/regression/drums.ly b/input/regression/drums.ly
index d49ddd4ac7..a81684e9d3 100644
--- a/input/regression/drums.ly
+++ b/input/regression/drums.ly
@@ -7,7 +7,7 @@
 }
 
 
-\version "2.7.13"
+\version "2.7.32"
 
 drh = \drummode { cymc4.^"crash" hhc16^"h.h." hh \repeat "unfold" 5 {hhc8 hho hhc8 hh16 hh} hhc4 r4 r2 }
 drl = \drummode {\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 f8a1c36b60..baebb61527 100644
--- a/input/regression/dynamics-broken-hairpin.ly
+++ b/input/regression/dynamics-broken-hairpin.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header{
 texidoc = "Broken crescendi should be open on one side."
 }
@@ -8,7 +8,7 @@ texidoc = "Broken crescendi should be open on one side."
   c1 \< \break c1\!  \> \break c1\!
 }
 \layout {
-  linewidth = 4.\cm
+  line-width = 4.\cm
 }
 
 
diff --git a/input/regression/dynamics-glyphs.ly b/input/regression/dynamics-glyphs.ly
index 9bec007cc4..3824a105b4 100644
--- a/input/regression/dynamics-glyphs.ly
+++ b/input/regression/dynamics-glyphs.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \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-hairpin-length.ly b/input/regression/dynamics-hairpin-length.ly
index 820c9bc1e5..963009fa8b 100644
--- a/input/regression/dynamics-hairpin-length.ly
+++ b/input/regression/dynamics-hairpin-length.ly
@@ -6,10 +6,10 @@
     respectively."
 
 }
-\version "2.7.13"
+\version "2.7.32"
 
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 \relative c'' { 
   c4 \< c4 \!
diff --git a/input/regression/dynamics-line.ly b/input/regression/dynamics-line.ly
index e9b753c28b..5e0dd08530 100644
--- a/input/regression/dynamics-line.ly
+++ b/input/regression/dynamics-line.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \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 4c73be8bbd..ca65d141de 100644
--- a/input/regression/dynamics-unbound-hairpin.ly
+++ b/input/regression/dynamics-unbound-hairpin.ly
@@ -1,9 +1,9 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 texidoc = "Crescendi may start off-notes, however, they should  not collapse into flat lines."
 }
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 
 \context  Voice { 
diff --git a/input/regression/easy-notation.ly b/input/regression/easy-notation.ly
index 9dbb963ee5..17f442f2a4 100644
--- a/input/regression/easy-notation.ly
+++ b/input/regression/easy-notation.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
     texidoc = " Easy-notation (or Ez-notation) prints names in note heads.
@@ -7,7 +7,7 @@ You also get ledger lines, of course."
 
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 } 
 
 \relative {
diff --git a/input/regression/fermata-rest-position.ly b/input/regression/fermata-rest-position.ly
index 715d8225c6..491a20e17c 100644
--- a/input/regression/fermata-rest-position.ly
+++ b/input/regression/fermata-rest-position.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header { texidoc = "
 Fermatas over multimeasure rests are positioned as over normal rests.
@@ -6,7 +6,7 @@ Fermatas over multimeasure rests are positioned as over normal rests.
 
 
 \layout {
-    raggedright = ##t 
+    ragged-right = ##t 
 }
 \relative c' {
     r1^\fermata R1^\fermataMarkup
diff --git a/input/regression/figured-bass-continuation-center.ly b/input/regression/figured-bass-continuation-center.ly
index 4570709d7c..4bbc8757f5 100644
--- a/input/regression/figured-bass-continuation-center.ly
+++ b/input/regression/figured-bass-continuation-center.ly
@@ -6,9 +6,9 @@ true."
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 \paper {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 <<
diff --git a/input/regression/figured-bass-continuation-forbid.ly b/input/regression/figured-bass-continuation-forbid.ly
index 749c875e22..061a87b42b 100644
--- a/input/regression/figured-bass-continuation-forbid.ly
+++ b/input/regression/figured-bass-continuation-forbid.ly
@@ -4,8 +4,8 @@
   may be forbidden. "
 
 }
-\version "2.7.13"
-\paper { raggedright = ##t }
+\version "2.7.32"
+\paper { ragged-right = ##t }
 
 \figures {
   \set useBassFigureExtenders = ##t
diff --git a/input/regression/figured-bass-continuation.ly b/input/regression/figured-bass-continuation.ly
index ea3cce57f4..c44f93a442 100644
--- a/input/regression/figured-bass-continuation.ly
+++ b/input/regression/figured-bass-continuation.ly
@@ -5,9 +5,9 @@ figures. They are switched on with @code{useBassFigureExtenders}"
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 \paper {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 <<
diff --git a/input/regression/figured-bass-implicit.ly b/input/regression/figured-bass-implicit.ly
index 92eeed066b..214a740ff1 100644
--- a/input/regression/figured-bass-implicit.ly
+++ b/input/regression/figured-bass-implicit.ly
@@ -6,10 +6,10 @@
 }
 
 
-\version "2.7.13"
+\version "2.7.32"
 \paper
 {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 <<
diff --git a/input/regression/figured-bass.ly b/input/regression/figured-bass.ly
index 1cddfbabd9..a4aa7c1cad 100644
--- a/input/regression/figured-bass.ly
+++ b/input/regression/figured-bass.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
@@ -15,7 +15,7 @@ You can also enter markup strings. The vertical alignment may also be tuned.
 }
 
 
-\paper { raggedright = ##t }
+\paper { ragged-right = ##t }
 
 
 <<
diff --git a/input/regression/fill-line-test.ly b/input/regression/fill-line-test.ly
index ed4b749f35..30453f8ba1 100644
--- a/input/regression/fill-line-test.ly
+++ b/input/regression/fill-line-test.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
diff --git a/input/regression/finger-chords-order.ly b/input/regression/finger-chords-order.ly
index 1f9b240ee5..c481324355 100644
--- a/input/regression/finger-chords-order.ly
+++ b/input/regression/finger-chords-order.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
@@ -7,7 +7,7 @@ is independent of up/down direction."
 
 }
 
-\paper { raggedright = ##t }
+\paper { ragged-right = ##t }
 
 \relative {
 	%% input order is not 1 2 3 , output is.
diff --git a/input/regression/finger-chords.ly b/input/regression/finger-chords.ly
index e2d628551b..1cd94ebb11 100644
--- a/input/regression/finger-chords.ly
+++ b/input/regression/finger-chords.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
   texidoc = "With the new chord syntax, it is possible to associate
@@ -9,7 +9,7 @@ horizontal fingerings to notes.
 "
 
 }
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 
 
diff --git a/input/regression/fingering.ly b/input/regression/fingering.ly
index 18e5dc0320..3c734b541b 100644
--- a/input/regression/fingering.ly
+++ b/input/regression/fingering.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
   texidoc = "Automatic fingering tries to put fingering instructions
@@ -6,7 +6,7 @@ next to noteheads.
 "
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 \relative c' {
   c4-4
diff --git a/input/regression/follow-voice-break.ly b/input/regression/follow-voice-break.ly
index f3765e3d82..8ba853a129 100644
--- a/input/regression/follow-voice-break.ly
+++ b/input/regression/follow-voice-break.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header{
   texidoc = "
 The line-spanners connects to the Y position of the note  on the next line.
@@ -9,7 +9,7 @@ printed.
 
 }
 
-\layout{  raggedright = ##t }
+\layout{  ragged-right = ##t }
 
 
 
diff --git a/input/regression/font-family-override.ly b/input/regression/font-family-override.ly
index db39975215..ab2a3524f0 100644
--- a/input/regression/font-family-override.ly
+++ b/input/regression/font-family-override.ly
@@ -5,7 +5,7 @@
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \paper  {
   % change for other default global staff size. 
diff --git a/input/regression/font-kern.ly b/input/regression/font-kern.ly
index 8cc4ea0631..01868d3aaa 100644
--- a/input/regression/font-kern.ly
+++ b/input/regression/font-kern.ly
@@ -1,4 +1,4 @@
-\version "2.7.20"
+\version "2.7.32"
 
 \header {
   texidoc = "Text set in TrueType Fonts that contain kerning tables, are kerned. "
diff --git a/input/regression/font-magnification.ly b/input/regression/font-magnification.ly
index 2e2e03d05c..7716fa72c8 100644
--- a/input/regression/font-magnification.ly
+++ b/input/regression/font-magnification.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \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 8e7adadaea..62a65cac8c 100644
--- a/input/regression/font-name.ly
+++ b/input/regression/font-name.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
@@ -9,7 +9,7 @@ without size specification."
 
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 
 {
diff --git a/input/regression/font-postscript.ly b/input/regression/font-postscript.ly
index 10ffd5b93f..09d534321f 100644
--- a/input/regression/font-postscript.ly
+++ b/input/regression/font-postscript.ly
@@ -8,7 +8,7 @@
     passed to LaTeX and dvips to help it find the uncb font."
 
 }
-\version "2.7.13"
+\version "2.7.32"
 
 \paper
 {
@@ -26,11 +26,11 @@
 #(system "afm2tfm `kpsewhich uncb8a.afm` uncb8a.tfm") 
 
 \layout {
-    linewidth = 160 \mm - 2.0 * 9.0 \mm
+    line-width = 160 \mm - 2.0 * 9.0 \mm
 
     
     indent = 0.0\mm
-    raggedright = ##t
+    ragged-right = ##t
 }
 
 {
diff --git a/input/regression/fret-diagrams.ly b/input/regression/fret-diagrams.ly
index 1c577d2c0d..6d0a7842cc 100644
--- a/input/regression/fret-diagrams.ly
+++ b/input/regression/fret-diagrams.ly
@@ -1,12 +1,12 @@
 %% regression test for fret diagram markups
 
 
-\version "2.7.13"
+\version "2.7.32"
 
 \paper {
 
   %% stretch to prevent diagrams from colliding.
-  linewidth = 18.0 \cm
+  line-width = 18.0 \cm
 }
 
 
diff --git a/input/regression/generic-output-property.ly b/input/regression/generic-output-property.ly
index 304ceb4cb3..6f9a281ba9 100644
--- a/input/regression/generic-output-property.ly
+++ b/input/regression/generic-output-property.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
   texidoc="
@@ -8,7 +8,7 @@ setting the @code{extra-offset} of a grob.
 "
 }
 
-\layout{ raggedright = ##t }
+\layout{ ragged-right = ##t }
 
 
 \relative c''{
diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly
index ec259f54df..3eced93ace 100644
--- a/input/regression/glissando.ly
+++ b/input/regression/glissando.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
 
@@ -23,7 +23,7 @@ The engraver does no time-keeping, so it involves some trickery to get
   c4 \glissando c,, \glissando c' \glissando d
 }
 \layout{
-  linewidth = 50.\mm indent = 0
+  line-width = 50.\mm indent = 0
  
 }
 
diff --git a/input/regression/grace-auto-beam.ly b/input/regression/grace-auto-beam.ly
index ebbb6589fe..67a7b0724a 100644
--- a/input/regression/grace-auto-beam.ly
+++ b/input/regression/grace-auto-beam.ly
@@ -1,10 +1,10 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header
 {
   texidoc = "The autobeamer is not confused by grace notes."
 }
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 
 
diff --git a/input/regression/grace-bar-line.ly b/input/regression/grace-bar-line.ly
index d90100ea1c..b3d3a653fa 100644
--- a/input/regression/grace-bar-line.ly
+++ b/input/regression/grace-bar-line.ly
@@ -1,9 +1,9 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
   texidoc = "Bar line should come before the grace note."
 }
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 
 
diff --git a/input/regression/grace-bar-number.ly b/input/regression/grace-bar-number.ly
index 285d465c3d..504b3d3e97 100644
--- a/input/regression/grace-bar-number.ly
+++ b/input/regression/grace-bar-number.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
   texidoc = "Grace notes do tricky things with timing. If a measure
@@ -9,7 +9,7 @@ breaks should be possible at grace notes, and the bar number should be
 printed correctly.
 "
 }
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 
 \relative c'' { c1 \break
diff --git a/input/regression/grace-beam.ly b/input/regression/grace-beam.ly
index 03e19f5b13..ad0b9a2a1e 100644
--- a/input/regression/grace-beam.ly
+++ b/input/regression/grace-beam.ly
@@ -6,10 +6,10 @@ Unbeamed grace notes are not put into normal beams.
 "
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 
-\version "2.7.13"
+\version "2.7.32"
 \relative c'' {
   c4  d8[
     \grace {  e32[  d c d] } e8]
diff --git a/input/regression/grace-end.ly b/input/regression/grace-end.ly
index db510abce9..1ab7906bf8 100644
--- a/input/regression/grace-end.ly
+++ b/input/regression/grace-end.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
   texidoc="@cindex Grace End
@@ -9,7 +9,7 @@
 }
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 
diff --git a/input/regression/grace-nest.ly b/input/regression/grace-nest.ly
index d85a83cb69..03de473589 100644
--- a/input/regression/grace-nest.ly
+++ b/input/regression/grace-nest.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \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." 
 
@@ -6,7 +6,7 @@
 
 \layout {
 
-  raggedright = ##t 
+  ragged-right = ##t 
 }
 
 
diff --git a/input/regression/grace-nest1.ly b/input/regression/grace-nest1.ly
index 42117be451..ea46547600 100644
--- a/input/regression/grace-nest1.ly
+++ b/input/regression/grace-nest1.ly
@@ -1,10 +1,10 @@
-\version "2.7.13"
+\version "2.7.32"
 \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." 
 
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 
 
diff --git a/input/regression/grace-nest2.ly b/input/regression/grace-nest2.ly
index 52edd25151..5b2ad92e9c 100644
--- a/input/regression/grace-nest2.ly
+++ b/input/regression/grace-nest2.ly
@@ -1,10 +1,10 @@
-\version "2.7.13"
+\version "2.7.32"
 \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." 
 
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 \context Voice {
   { \grace b'8 c''2 }
diff --git a/input/regression/grace-nest3.ly b/input/regression/grace-nest3.ly
index 58ec8b327e..736c0e545a 100644
--- a/input/regression/grace-nest3.ly
+++ b/input/regression/grace-nest3.ly
@@ -1,8 +1,8 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
   texidoc = "In nested syntax, graces are still properly handled."
 }
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 \relative c'' {
   f1
diff --git a/input/regression/grace-nest4.ly b/input/regression/grace-nest4.ly
index a2d4d5298f..0ca47b8e63 100644
--- a/input/regression/grace-nest4.ly
+++ b/input/regression/grace-nest4.ly
@@ -1,9 +1,9 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
   texidoc = "Also in the nested syntax here, grace notes appear rightly."
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 \context Voice \relative c'' {
 
diff --git a/input/regression/grace-nest5.ly b/input/regression/grace-nest5.ly
index 6910618358..86e307c674 100644
--- a/input/regression/grace-nest5.ly
+++ b/input/regression/grace-nest5.ly
@@ -1,9 +1,9 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
   texidoc = "Graces notes may have the same duration as the main note."
 }
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 \relative c'' {
   s2 <f>4
diff --git a/input/regression/grace-part-combine.ly b/input/regression/grace-part-combine.ly
index 2f99bf2948..1cbd8e3788 100644
--- a/input/regression/grace-part-combine.ly
+++ b/input/regression/grace-part-combine.ly
@@ -1,10 +1,10 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
   texidoc = "Grace notes may be put in a @code{partcombine}r."
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 
 \new Staff
diff --git a/input/regression/grace-staff-length.ly b/input/regression/grace-staff-length.ly
index 9131ed50a6..e62f0ed1bb 100644
--- a/input/regression/grace-staff-length.ly
+++ b/input/regression/grace-staff-length.ly
@@ -1,9 +1,9 @@
-\version "2.7.13"
+\version "2.7.32"
 \header{
   texidoc = "Stripped version of trip.ly.  Staves should be of correct length."
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 
 \context PianoStaff  \relative c'' <<
diff --git a/input/regression/grace-start.ly b/input/regression/grace-start.ly
index 262e95581b..28ae27f4bb 100644
--- a/input/regression/grace-start.ly
+++ b/input/regression/grace-start.ly
@@ -1,10 +1,10 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
   texidoc = "Pieces may begin with grace notes."
 }
 
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 \relative c' \context Staff  { 
   \grace {  a'16[ f]  } g1
diff --git a/input/regression/grace-stem-length.ly b/input/regression/grace-stem-length.ly
index 9b1eef5ecb..11f475cd1f 100644
--- a/input/regression/grace-stem-length.ly
+++ b/input/regression/grace-stem-length.ly
@@ -5,10 +5,10 @@ normal notes, if possible. They should never be longer, even if that
 would lead to beam quanting program. "
 	 
     }
-\version "2.7.13"
+\version "2.7.32"
 
 \layout {
-    raggedright = ##t
+    ragged-right = ##t
 
 %    "debug-beam-quanting" = ##t 
 }
diff --git a/input/regression/grace-stems.ly b/input/regression/grace-stems.ly
index aff8ace2ce..b7d3bd34f5 100644
--- a/input/regression/grace-stems.ly
+++ b/input/regression/grace-stems.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header{
   texidoc = "Here @code{startGraceMusic} should set @code{no-stem-extend} to 
 true; the two grace beams should be the same here.
@@ -8,7 +8,7 @@ true; the two grace beams should be the same here.
 
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 }  
 
 \context Voice \relative c {
diff --git a/input/regression/grace-sync.ly b/input/regression/grace-sync.ly
index b9bc7701de..3bf3035e6a 100644
--- a/input/regression/grace-sync.ly
+++ b/input/regression/grace-sync.ly
@@ -1,9 +1,9 @@
-\version "2.7.13"
+\version "2.7.32"
 \header  {
   texidoc = "Grace notes in different voices/staves are synchronized."
 }
 
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 
 \relative c'' <<
diff --git a/input/regression/grace-types.ly b/input/regression/grace-types.ly
index 4953b86df1..f7bec9da4e 100644
--- a/input/regression/grace-types.ly
+++ b/input/regression/grace-types.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \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
@@ -6,7 +6,7 @@ acciaccatura inserts a slur and slashes the stem."
     }
 
 \layout {
-    raggedright = ##t
+    ragged-right = ##t
 }
 
 \relative c'' {
diff --git a/input/regression/grace-unfold-repeat.ly b/input/regression/grace-unfold-repeat.ly
index f9b7839345..9253e52099 100644
--- a/input/regression/grace-unfold-repeat.ly
+++ b/input/regression/grace-unfold-repeat.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \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 9abdddb426..bc7094a4b8 100644
--- a/input/regression/grace-volta-repeat-2.ly
+++ b/input/regression/grace-volta-repeat-2.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
@@ -7,7 +7,7 @@
 
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 \relative c' {
   \repeat volta 2 {
diff --git a/input/regression/grace-volta-repeat.ly b/input/regression/grace-volta-repeat.ly
index 09d89805f0..d81df0051a 100644
--- a/input/regression/grace-volta-repeat.ly
+++ b/input/regression/grace-volta-repeat.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
@@ -7,7 +7,7 @@
 
 }
 
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 
 
diff --git a/input/regression/grace.ly b/input/regression/grace.ly
index 1558584386..9236991865 100644
--- a/input/regression/grace.ly
+++ b/input/regression/grace.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
 
@@ -12,7 +12,7 @@ Main note scripts do not end up on the grace note.
 "
 }
 
-\layout {raggedright = ##t}
+\layout {ragged-right = ##t}
 
 \context Voice = VA \relative c'' {
   \grace b8 c4\fermata
diff --git a/input/regression/grid-lines.ly b/input/regression/grid-lines.ly
index 98e82935c1..b55790c95b 100644
--- a/input/regression/grid-lines.ly
+++ b/input/regression/grid-lines.ly
@@ -5,7 +5,7 @@
 staves synchronized with the notes."
 
 }
-\version "2.7.14"
+\version "2.7.32"
 
 skips =
 {
@@ -50,7 +50,7 @@ skips =
 }
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 }
 \new Score 
 \with {
diff --git a/input/regression/grob-tweak.ly b/input/regression/grob-tweak.ly
index 1ade70ea22..697402f842 100644
--- a/input/regression/grob-tweak.ly
+++ b/input/regression/grob-tweak.ly
@@ -6,9 +6,9 @@
 
 }
 
-\version "2.7.22"
+\version "2.7.32"
 \paper {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 {
diff --git a/input/regression/hairpin-dashed.ly b/input/regression/hairpin-dashed.ly
index 312f830449..c263528895 100644
--- a/input/regression/hairpin-dashed.ly
+++ b/input/regression/hairpin-dashed.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
   texidoc ="Hairpin crescendi may be dashed. "
diff --git a/input/regression/hairpin-ending.ly b/input/regression/hairpin-ending.ly
index 7fa4a43beb..bcf235fbf1 100644
--- a/input/regression/hairpin-ending.ly
+++ b/input/regression/hairpin-ending.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
@@ -9,7 +9,7 @@ into them."
 
 }
 
-\layout { raggedright = ##t } 
+\layout { ragged-right = ##t } 
 
 \relative c'' {
   c4 \> c4 c4\! c4_\ff \> c4 c4\!\p
diff --git a/input/regression/hara-kiri-pianostaff.ly b/input/regression/hara-kiri-pianostaff.ly
index 1b241daf89..e5acc19a4a 100644
--- a/input/regression/hara-kiri-pianostaff.ly
+++ b/input/regression/hara-kiri-pianostaff.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header { texidoc =
 
@@ -19,7 +19,7 @@ alignment; this should not confuse the mechanism.
 }
 
 \layout {
-  raggedright= ##t
+  ragged-right= ##t
   \context {
     \RemoveEmptyStaffContext
   }
diff --git a/input/regression/instrument-name-hara-kiri.ly b/input/regression/instrument-name-hara-kiri.ly
index 1b77506e7d..94a1b16d32 100644
--- a/input/regression/instrument-name-hara-kiri.ly
+++ b/input/regression/instrument-name-hara-kiri.ly
@@ -9,7 +9,7 @@ as does the instrument name.  "
 
 }
 
-\version "2.7.31"
+\version "2.7.32"
         
   \new PianoStaff <<
     \new Staff {
diff --git a/input/regression/instrument-name-markup.ly b/input/regression/instrument-name-markup.ly
index 6fbcdbc850..bcfa6a6bf2 100644
--- a/input/regression/instrument-name-markup.ly
+++ b/input/regression/instrument-name-markup.ly
@@ -7,9 +7,9 @@ including alterations. "
 }
 
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
-\version "2.7.13"
+\version "2.7.32"
 
 textFlat = \markup {\smaller \flat}
 
diff --git a/input/regression/instrument-name-partial.ly b/input/regression/instrument-name-partial.ly
index 9b3da267e7..7930dae7fe 100644
--- a/input/regression/instrument-name-partial.ly
+++ b/input/regression/instrument-name-partial.ly
@@ -1,10 +1,10 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
   texidoc = "Instrument names are also printed on  partial starting measures."
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 
 
diff --git a/input/regression/instrument-name.ly b/input/regression/instrument-name.ly
index 3590326fde..374b4a9e97 100644
--- a/input/regression/instrument-name.ly
+++ b/input/regression/instrument-name.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header{
   texidoc="
 Staff margins are also markings attached to barlines.  They should be
@@ -9,7 +9,7 @@ PianoStaff.
 }
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 
diff --git a/input/regression/key-clefs.ly b/input/regression/key-clefs.ly
index 094c6cc6be..c246a63f7a 100644
--- a/input/regression/key-clefs.ly
+++ b/input/regression/key-clefs.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header { texidoc = "Each clef have own accidental placing rules. " }
 
 #(set-global-staff-size 16)
diff --git a/input/regression/key-signature-cancellation.ly b/input/regression/key-signature-cancellation.ly
index 3b3b1ad867..0480146e60 100644
--- a/input/regression/key-signature-cancellation.ly
+++ b/input/regression/key-signature-cancellation.ly
@@ -6,10 +6,10 @@
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 {
diff --git a/input/regression/key-signature-scordatura.ly b/input/regression/key-signature-scordatura.ly
index df3a5fb418..b9a65af76e 100644
--- a/input/regression/key-signature-scordatura.ly
+++ b/input/regression/key-signature-scordatura.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header { texidoc = "By setting @code{Staff.keySignature} directly,
 key signatures can be set invidually per pitch.
@@ -7,7 +7,7 @@ key signatures can be set invidually per pitch.
 
       }
 \layout {
-    raggedright = ##T
+    ragged-right = ##T
 }
 \relative c'
 \new Staff {
diff --git a/input/regression/keys.ly b/input/regression/keys.ly
index 3dc1c411e6..5f1c8a50d7 100644
--- a/input/regression/keys.ly
+++ b/input/regression/keys.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header{
 texidoc="
 Key signatures may appear on key changes, even without a barline.  
@@ -12,7 +12,7 @@ are created also on a clef change.
 
 
 \paper {
-    raggedright = ##T
+    ragged-right = ##T
 }
 
 \relative
diff --git a/input/regression/laissez-vibrer-ties.ly b/input/regression/laissez-vibrer-ties.ly
index 329a0ff967..c02e974b27 100644
--- a/input/regression/laissez-vibrer-ties.ly
+++ b/input/regression/laissez-vibrer-ties.ly
@@ -10,9 +10,9 @@ They have fixed size. Their formatting can be tuned with
 "
   }
 
-\version "2.7.13"
+\version "2.7.32"
 \paper {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 \relative {
diff --git a/input/regression/landscape.ly b/input/regression/landscape.ly
index ce46647aac..79a30a3a0d 100644
--- a/input/regression/landscape.ly
+++ b/input/regression/landscape.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 #(set-default-paper-size "a6" 'landscape)
 
 pattern = \relative { a b c d \break }
diff --git a/input/regression/ledger-line-minimum.ly b/input/regression/ledger-line-minimum.ly
index 057547744b..e2fc417857 100644
--- a/input/regression/ledger-line-minimum.ly
+++ b/input/regression/ledger-line-minimum.ly
@@ -7,8 +7,8 @@ disappearing."
 
 }
 
-\version "2.7.13"
-\paper { raggedright = ##t}
+\version "2.7.32"
+\paper { ragged-right = ##t}
 \relative c'' {
   \time 2/4 
   c8 c c c
diff --git a/input/regression/ledger-line-shorten.ly b/input/regression/ledger-line-shorten.ly
index 42e7fd5653..d63f60bd61 100644
--- a/input/regression/ledger-line-shorten.ly
+++ b/input/regression/ledger-line-shorten.ly
@@ -2,10 +2,10 @@
     texidoc = "Ledger lines are shortened when they are very close. This ensures
 that  ledgers lines stay separate."
 }
-\version "2.7.13"
+\version "2.7.32"
 
 \layout {
-    raggedright = ##t
+    ragged-right = ##t
 }
 
 \relative {
diff --git a/input/regression/lily-in-scheme.ly b/input/regression/lily-in-scheme.ly
index 95a4794f73..b011204d12 100644
--- a/input/regression/lily-in-scheme.ly
+++ b/input/regression/lily-in-scheme.ly
@@ -12,8 +12,8 @@ the @code{TextScript} grob.
           
       }
 
-\version "2.7.13"
-\layout { raggedright = ##t }
+\version "2.7.32"
+\layout { ragged-right = ##t }
 
 withPaddingA = #(def-music-function (parser location padding music) (number? ly:music?)
 		 #{ \override TextScript #'padding = #$padding
diff --git a/input/regression/line-arrows.ly b/input/regression/line-arrows.ly
index 729c3645d8..70c55add5c 100644
--- a/input/regression/line-arrows.ly
+++ b/input/regression/line-arrows.ly
@@ -2,10 +2,10 @@
   texidoc = "Arrows can be applied to text-spanners and line-spanners (such as the Glissando)"
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \paper {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 \relative c'' {
diff --git a/input/regression/lyric-combine-new.ly b/input/regression/lyric-combine-new.ly
index 06957bf900..7e72bcfd5c 100644
--- a/input/regression/lyric-combine-new.ly
+++ b/input/regression/lyric-combine-new.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \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 46fa21f2bb..91f9801e37 100644
--- a/input/regression/lyric-combine-polyphonic.ly
+++ b/input/regression/lyric-combine-polyphonic.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
   texidoc ="Polyphonic rhythms and rests do not disturb
@@ -6,7 +6,7 @@
 
 }
 
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 {
   \clef violin
diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly
index d24fc10962..744ab7cf04 100644
--- a/input/regression/lyric-combine.ly
+++ b/input/regression/lyric-combine.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
 
@@ -13,7 +13,7 @@ lyrics ignores any other rhythms in the piece."
 
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 
 
diff --git a/input/regression/lyric-extender-broken.ly b/input/regression/lyric-extender-broken.ly
index 453b8b6586..388d066c8e 100644
--- a/input/regression/lyric-extender-broken.ly
+++ b/input/regression/lyric-extender-broken.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header
 {
 
@@ -18,6 +18,6 @@ of the melisma."
   \lyricsto A \context Lyrics \lyricmode { a __ a __ ha }
 >>
   \layout {
-    raggedright = ##t
+    ragged-right = ##t
   }
 
diff --git a/input/regression/lyric-extender.ly b/input/regression/lyric-extender.ly
index b8ffdb7593..a23cc4c1e3 100644
--- a/input/regression/lyric-extender.ly
+++ b/input/regression/lyric-extender.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
@@ -7,7 +7,7 @@ does not extend past a rest, or past the next lyric syllable."
 
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 \relative c''{
     d8( e f) r4. 
diff --git a/input/regression/lyric-hyphen-break.ly b/input/regression/lyric-hyphen-break.ly
index 0fab71b2e8..8c3f889628 100644
--- a/input/regression/lyric-hyphen-break.ly
+++ b/input/regression/lyric-hyphen-break.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
@@ -25,7 +25,7 @@ they go past the first note. "
 >>
   \layout   {
     indent = 0.0 \cm
-    linewidth = 3.4 \cm
+    line-width = 3.4 \cm
 
     \context {
       \Staff \remove "Time_signature_engraver"
diff --git a/input/regression/lyric-hyphen-retain.ly b/input/regression/lyric-hyphen-retain.ly
index c9af3bfe0d..00c4a3050c 100644
--- a/input/regression/lyric-hyphen-retain.ly
+++ b/input/regression/lyric-hyphen-retain.ly
@@ -7,10 +7,10 @@ its @code{minimum-length} setting."
 
 }
 
-\version "2.7.22"
+\version "2.7.32"
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 
diff --git a/input/regression/lyric-hyphen.ly b/input/regression/lyric-hyphen.ly
index eabec62c68..f12eeef49a 100644
--- a/input/regression/lyric-hyphen.ly
+++ b/input/regression/lyric-hyphen.ly
@@ -1,10 +1,10 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
     texidoc = "In lyrics, hyphens may be used."
 }
 \layout {
 
-    raggedright= ##t
+    ragged-right= ##t
 }
 
 <<
diff --git a/input/regression/lyric-melisma-manual.ly b/input/regression/lyric-melisma-manual.ly
index f5a05bc3f8..46700278c4 100644
--- a/input/regression/lyric-melisma-manual.ly
+++ b/input/regression/lyric-melisma-manual.ly
@@ -5,9 +5,9 @@
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 \paper {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 \relative {
diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly
index af62949dec..0ab67dd364 100644
--- a/input/regression/lyric-phrasing.ly
+++ b/input/regression/lyric-phrasing.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
   texidoc = "
@@ -8,7 +8,7 @@
 "
 }
 
-  \layout { raggedright = ##t }
+  \layout { ragged-right = ##t }
 
 
 
diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly
index 0c34ee3d23..74eed40f87 100644
--- a/input/regression/lyrics-bar.ly
+++ b/input/regression/lyrics-bar.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
 texidoc="
@@ -8,7 +8,7 @@ lyrics do not collide with barlines.
 }
 
 \layout {
-    raggedright = ##t
+    ragged-right = ##t
 }
 
 <<
diff --git a/input/regression/lyrics-melisma-beam.ly b/input/regression/lyrics-melisma-beam.ly
index 5cdc28c669..866d0c45f2 100644
--- a/input/regression/lyrics-melisma-beam.ly
+++ b/input/regression/lyrics-melisma-beam.ly
@@ -1,10 +1,10 @@
-\version "2.7.13"
+\version "2.7.32"
 \header
 {
   texidoc = "Melismata are triggered by manual beams." 
 }
 
-  \layout { raggedright = ##t }
+  \layout { ragged-right = ##t }
 
 
 
diff --git a/input/regression/lyrics-tenor-clef.ly b/input/regression/lyrics-tenor-clef.ly
index 3e64c9eb94..40537f9815 100644
--- a/input/regression/lyrics-tenor-clef.ly
+++ b/input/regression/lyrics-tenor-clef.ly
@@ -2,7 +2,7 @@
     texidoc = "Lyrics are not lowered despite the presence of an octavation 8."
 }
 
-\version "2.7.14"
+\version "2.7.32"
 \layout {
     \context {
 	\Staff
@@ -12,7 +12,7 @@
 	\Lyrics
 	\override VerticalAxisGroup #'minimum-Y-extent = ##f
     }
-    raggedright = ##t
+    ragged-right = ##t
 }
 
 \relative { \clef "G_8" c c c c }
diff --git a/input/regression/markup-arrows.ly b/input/regression/markup-arrows.ly
index 97ed575c50..e1c5f055df 100644
--- a/input/regression/markup-arrows.ly
+++ b/input/regression/markup-arrows.ly
@@ -26,4 +26,4 @@
   }
 }
 
-\version "2.7.13"
+\version "2.7.32"
diff --git a/input/regression/markup-bidi-pango.ly b/input/regression/markup-bidi-pango.ly
index ae2a752cb6..29a14a8ff4 100644
--- a/input/regression/markup-bidi-pango.ly
+++ b/input/regression/markup-bidi-pango.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
diff --git a/input/regression/markup-eps.ly b/input/regression/markup-eps.ly
index 3f6a8f5057..a6d20fda91 100644
--- a/input/regression/markup-eps.ly
+++ b/input/regression/markup-eps.ly
@@ -3,13 +3,13 @@
   texidoc = "The epsfile markup command reads an EPS file"
 
 }
-\version "2.7.31"
+\version "2.7.32"
 
 #(let* ((port (open-output-file "box.eps")))
 
   (display "%!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: 5 5 105 105
-10 setlinewidth 10 10 moveto 0 90 rlineto 90 0 rlineto 0 -90 rlineto
+10 setline-width 10 10 moveto 0 90 rlineto 90 0 rlineto 0 -90 rlineto
 closepath stroke" port)
 
   (close port))
diff --git a/input/regression/markup-note.ly b/input/regression/markup-note.ly
index 13ca046ba2..7cc6e7b0a6 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.7.13"
+\version "2.7.32"
 
 { c4^\markup {
   \note #"1" #1
diff --git a/input/regression/markup-scheme.ly b/input/regression/markup-scheme.ly
index 58c123bfee..2850e30bb5 100644
--- a/input/regression/markup-scheme.ly
+++ b/input/regression/markup-scheme.ly
@@ -15,7 +15,7 @@ For maintenance reasons, we don't excercise the entire markup command set.
 %}
 
 \layout { 
-  raggedright = ##t
+  ragged-right = ##t
   indent = #0
   \context {
     \Staff
@@ -25,7 +25,7 @@ For maintenance reasons, we don't excercise the entire markup command set.
 
 
 
-\version "2.7.13"
+\version "2.7.32"
 
 {
   \fatText
diff --git a/input/regression/markup-score.ly b/input/regression/markup-score.ly
index c5475a544e..fae23a89ce 100644
--- a/input/regression/markup-score.ly
+++ b/input/regression/markup-score.ly
@@ -2,7 +2,7 @@
     texidoc = "Use \\score block as markup command."
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 tuning = \markup {
     \score {
@@ -11,7 +11,7 @@ tuning = \markup {
 	} {
 	    \clef bass  <c, g, d g>1
 	}
-	\layout { raggedright = ##t }
+	\layout { ragged-right = ##t }
     }
 }
 
diff --git a/input/regression/markup-stack.ly b/input/regression/markup-stack.ly
index 3681da12d7..34a43e4efb 100644
--- a/input/regression/markup-stack.ly
+++ b/input/regression/markup-stack.ly
@@ -1,6 +1,6 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {texidoc="Markup scripts may be stacked."}
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 {
   c''^\markup {
     "a"
diff --git a/input/regression/markup-syntax.ly b/input/regression/markup-syntax.ly
index 84d7f92168..1a9b2757fa 100644
--- a/input/regression/markup-syntax.ly
+++ b/input/regression/markup-syntax.ly
@@ -4,7 +4,7 @@
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 {
   f'1-\markup {
diff --git a/input/regression/markup-user.ly b/input/regression/markup-user.ly
index 63bf496e2a..586e7cb0c1 100644
--- a/input/regression/markup-user.ly
+++ b/input/regression/markup-user.ly
@@ -8,11 +8,11 @@
 }
 
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
   
 
 
-\version "2.7.13" % to be updated
+\version "2.7.32" % to be updated
 
 #(def-markup-command (upcase paper props str) (string?)
   "Upcase the string characters. Syntax: \\upcase #\"string\""
diff --git a/input/regression/markup-word-wrap.ly b/input/regression/markup-word-wrap.ly
index 8653490ca0..fcc012d68d 100644
--- a/input/regression/markup-word-wrap.ly
+++ b/input/regression/markup-word-wrap.ly
@@ -5,11 +5,11 @@
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \markup {
   this is normal  text
-  \override #'(linewidth . 60)
+  \override #'(line-width . 60)
   \wordwrap {
     This is a test of the wordwrapping function.
     1 This is a test of the wordwrapping function.
@@ -22,7 +22,7 @@
 
 \markup {
   this is normal  text
-  \override #'(linewidth . 40)
+  \override #'(line-width . 40)
   \justify {
     This is a test of the wordwrapping function, but with justification.
     1 This is a test of the wordwrapping function, but with justification.
@@ -35,7 +35,7 @@
 
 \markup {
 
-  \override #'(linewidth . 40)
+  \override #'(line-width . 40)
 
 {  \wordwrap-string #" Om mani padme hum Om mani padme hum Om mani
 padme hum Om mani padme hum Om mani padme hum Om mani padme hum Om
diff --git a/input/regression/measure-grouping.ly b/input/regression/measure-grouping.ly
index d5e6a9c333..ed20ff26c7 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.7.13"
+\version "2.7.32"
 
 
 %% TODO: should have 2/4 + 5/8 time sig style.
@@ -24,7 +24,7 @@ brackets above beats when the beats of a time signature are grouped.  "
   g8 a4 g a4.->
 }
 \layout  {
-  raggedright = ##t
+  ragged-right = ##t
   \context { \Staff
 	     \consists "Measure_grouping_engraver"
 	   }
diff --git a/input/regression/mensural-ligatures.ly b/input/regression/mensural-ligatures.ly
index d7b5e96740..de5cd046b9 100644
--- a/input/regression/mensural-ligatures.ly
+++ b/input/regression/mensural-ligatures.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
   texidoc = "Mensural ligatures show different shapes, depending on the
@@ -315,7 +315,7 @@
 }
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
   packed = ##t
   indent = 0.0
   \context {
diff --git a/input/regression/mensural.ly b/input/regression/mensural.ly
index f9b8d133a0..98289aee1d 100644
--- a/input/regression/mensural.ly
+++ b/input/regression/mensural.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \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 7bf70c251f..c98610bf3d 100644
--- a/input/regression/metronome-marking.ly
+++ b/input/regression/metronome-marking.ly
@@ -12,9 +12,9 @@ The marking is left aligned with the time signature, if there is one.
   
 }
 
-\layout {  raggedright = ##t }
+\layout {  ragged-right = ##t }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \relative c'' {
   \tempo \breve = 100 c1 c1 \tempo 8.. = 50 c1
diff --git a/input/regression/mm-rests2.ly b/input/regression/mm-rests2.ly
index 74f46caefc..7132458934 100644
--- a/input/regression/mm-rests2.ly
+++ b/input/regression/mm-rests2.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
   texidoc="
diff --git a/input/regression/multi-measure-rest-center.ly b/input/regression/multi-measure-rest-center.ly
index d9deaabf06..7e3076dc6c 100644
--- a/input/regression/multi-measure-rest-center.ly
+++ b/input/regression/multi-measure-rest-center.ly
@@ -1,11 +1,11 @@
-\version "2.7.13"
+\version "2.7.32"
 \header
 {
   texidoc = "The multimeasure rest is centered exactly between bar lines."
 
 }
 
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 
 
diff --git a/input/regression/multi-measure-rest-grace.ly b/input/regression/multi-measure-rest-grace.ly
index f97b7af997..db9f6015c4 100644
--- a/input/regression/multi-measure-rest-grace.ly
+++ b/input/regression/multi-measure-rest-grace.ly
@@ -1,11 +1,11 @@
-\version "2.7.13"
+\version "2.7.32"
 
 
 \header {
 texidoc= "Multi-measure rests are centered also in the case of grace notes."
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 <<
     \new Staff { R1 R1 R1*3 }
diff --git a/input/regression/multi-measure-rest-instr-name.ly b/input/regression/multi-measure-rest-instr-name.ly
index 8b9f00bbc1..8c284c4f35 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.7.13"
+\version "2.7.32"
 \header {
 
   texidoc = "There are both long and short instrument names.
@@ -8,7 +8,7 @@ multimeasure rests. "
 }
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
   \context {
     \Staff
     \consists Instrument_name_engraver
diff --git a/input/regression/multi-measure-rest-multi-staff-center.ly b/input/regression/multi-measure-rest-multi-staff-center.ly
index 65f00fc5ba..30a300a670 100644
--- a/input/regression/multi-measure-rest-multi-staff-center.ly
+++ b/input/regression/multi-measure-rest-multi-staff-center.ly
@@ -4,8 +4,8 @@ independent on prefatory matter in other staves."
 	}
 
 
-\version "2.7.13"
-\layout { raggedright = ##t }
+\version "2.7.32"
+\layout { ragged-right = ##t }
 
 
 << \new Staff  { R1 } 
diff --git a/input/regression/multi-measure-rest-spacing.ly b/input/regression/multi-measure-rest-spacing.ly
index 0295fd4eb3..a60fef8645 100644
--- a/input/regression/multi-measure-rest-spacing.ly
+++ b/input/regression/multi-measure-rest-spacing.ly
@@ -5,10 +5,10 @@ extra spacing column is created. This should not cause problems."
 }
 
   \layout {
-    raggedright = ##t
+    ragged-right = ##t
   }
 
-\version "2.7.13"
+\version "2.7.32"
 
 
 <<
diff --git a/input/regression/multi-measure-rest-text.ly b/input/regression/multi-measure-rest-text.ly
index 005dbbffee..63a250f1bb 100644
--- a/input/regression/multi-measure-rest-text.ly
+++ b/input/regression/multi-measure-rest-text.ly
@@ -1,4 +1,4 @@
-\version "2.7.31"
+\version "2.7.32"
 
 \header  {
 
@@ -13,7 +13,7 @@ measures stretch to accomodate wide texts.
 
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 {
   \time 3/4
   \set Score.skipBars = ##t
diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly
index 5b58111dd4..7ba9c8adf5 100644
--- a/input/regression/multi-measure-rest.ly
+++ b/input/regression/multi-measure-rest.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header{
 
   texidoc="
@@ -19,7 +19,7 @@ are used then a different symbol is used.
     \Score
     skipBars = ##t
   }
-  raggedright = ##t	
+  ragged-right = ##t	
 }
 
 
diff --git a/input/regression/music-function.ly b/input/regression/music-function.ly
index 3708a03b58..680a9162ea 100644
--- a/input/regression/music-function.ly
+++ b/input/regression/music-function.ly
@@ -7,14 +7,14 @@ demonstrate a @code{\myBar} function, which works similar to
 @code{\bar}, but is implemented completely in Scheme."
 
 }
-\version "2.7.13"
+\version "2.7.32"
 
 myBar = #(def-music-function (parser location bar-type) (string?)
           (context-spec-music
            (context-spec-music (make-property-set 'whichBar bar-type) 'Timing)
            'Score))
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 {
     d4 \myBar #"|:" d4
diff --git a/input/regression/music-map.ly b/input/regression/music-map.ly
index 2dc7fe2705..5006a502b4 100644
--- a/input/regression/music-map.ly
+++ b/input/regression/music-map.ly
@@ -10,7 +10,7 @@ and dynamics are left over. These are put onto the 2nd measure."
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 #(define (notes-to-skip m)
   "Convert all stuff with duration (notes, lyrics, bass figures, etc.) to skips.
@@ -27,7 +27,7 @@ Scripts and dynamics are maintained.
 )
 
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 foobar =  \transpose c c' { c4\>-^ c4-^ c4\!-^ c4-^  } 
 
diff --git a/input/regression/newaddlyrics.ly b/input/regression/newaddlyrics.ly
index 235bff73bb..8700f16c22 100644
--- a/input/regression/newaddlyrics.ly
+++ b/input/regression/newaddlyrics.ly
@@ -3,7 +3,7 @@
     texidoc = "newlyrics, multiple stanzas, multiple lyric voices."
     
 }
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 <<
     \new Staff \relative {
 	d'2 d c4 bes a2 \break
@@ -26,4 +26,4 @@
     }
 >>
 
-\version "2.7.13"
+\version "2.7.32"
diff --git a/input/regression/no-staff.ly b/input/regression/no-staff.ly
index 1377ac5faf..8bfc432a44 100644
--- a/input/regression/no-staff.ly
+++ b/input/regression/no-staff.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 % possible rename to staff-something.  -gp
 
 \header{ texidoc = "@cindex Staff Remove
@@ -8,7 +8,7 @@ corresponding engraver.
 }
 
 \layout {
-    raggedright = ##t
+    ragged-right = ##t
 }
 
 \relative \new Staff \with {
diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly
index a1a7b27779..954306482c 100644
--- a/input/regression/non-empty-text.ly
+++ b/input/regression/non-empty-text.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
   texidoc=" By default, text is set with empty horizontal dimensions.  
@@ -16,7 +16,7 @@ to control the horizontal size of text.  " }
   c_"very wide and long text" c
 }
 \layout {
-  linewidth = 3.0\cm
+  line-width = 3.0\cm
 }
 
 
diff --git a/input/regression/note-group-bracket.ly b/input/regression/note-group-bracket.ly
index 067a72cb2f..0314f2dec7 100644
--- a/input/regression/note-group-bracket.ly
+++ b/input/regression/note-group-bracket.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
@@ -20,7 +20,7 @@ analysis brackets start and end.
   \context {
     \Staff \consists "Horizontal_bracket_engraver"
   }
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 
diff --git a/input/regression/note-head-chord.ly b/input/regression/note-head-chord.ly
index 98adbfb691..139458fc52 100644
--- a/input/regression/note-head-chord.ly
+++ b/input/regression/note-head-chord.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
   texidoc = "Note heads are flipped on the stem to prevent collisions.
@@ -8,7 +8,7 @@ It also works for whole heads that have invisible stems.
 
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 \relative c''
 \context Voice {
diff --git a/input/regression/note-head-harmonic.ly b/input/regression/note-head-harmonic.ly
index bebeda585e..e3419325d2 100644
--- a/input/regression/note-head-harmonic.ly
+++ b/input/regression/note-head-harmonic.ly
@@ -9,10 +9,10 @@
 }
 
 \layout {
-  raggedright = ##t 
+  ragged-right = ##t 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 
 {
diff --git a/input/regression/note-head-solfa.ly b/input/regression/note-head-solfa.ly
index 0a0dd2eb84..34365bc92f 100644
--- a/input/regression/note-head-solfa.ly
+++ b/input/regression/note-head-solfa.ly
@@ -6,7 +6,7 @@ is adjusted according to the step of the scale, as measured relative
 to the @code{tonic} property."
 
 }
-\version "2.7.13"
+\version "2.7.32"
 
 fragment = {
   \key c \major
diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly
index 647ed3f20d..36d93e4c25 100644
--- a/input/regression/note-head-style.ly
+++ b/input/regression/note-head-style.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header{
   texidoc="
 Note head shapes may be set from several choices.  
@@ -13,7 +13,7 @@ dimensions.
 
 \layout {
   indent = 0.0
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 pattern = <<
diff --git a/input/regression/note-line.ly b/input/regression/note-line.ly
index 57e0825e2f..0f0ac0ea55 100644
--- a/input/regression/note-line.ly
+++ b/input/regression/note-line.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
   texidoc = "Note head lines (e.g. glissando)
@@ -22,7 +22,7 @@ sd = { \change Staff = down}
   }
 >>
   \layout {
-    linewidth = 8.0 \cm
+    line-width = 8.0 \cm
   }
 
 
diff --git a/input/regression/number-staff-lines.ly b/input/regression/number-staff-lines.ly
index e55b8e63a8..46cd29292e 100644
--- a/input/regression/number-staff-lines.ly
+++ b/input/regression/number-staff-lines.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \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 71eb3bbb90..d49a6140a9 100644
--- a/input/regression/ottava-broken.ly
+++ b/input/regression/ottava-broken.ly
@@ -10,10 +10,10 @@ the end of the line (regardless of prefatory matter).
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 \relative c'''  {
     a2 b
     #(set-octavation 1)
diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly
index ee44664e32..063cae702e 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.7.13"
+\version "2.7.32"
 
 %% . There must be a minimum distance between the octavation line and the
 %%   topmost staff line, taking into account the height of the closing
@@ -32,7 +32,7 @@ string can be tuned with @code{Staff.ottavation}.
 %%   by the user).  The same holds for `8va' and `15ma'.
 
 
-\layout { raggedright = ##t} 
+\layout { ragged-right = ##t} 
 
 \relative c'''  {
   a b c a
diff --git a/input/regression/override-nest.ly b/input/regression/override-nest.ly
index 305c6de20b..7680c0b95c 100644
--- a/input/regression/override-nest.ly
+++ b/input/regression/override-nest.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
   texidoc = "Sublist of grob property lists may be also tuned. In the
diff --git a/input/regression/page-breaks.ly b/input/regression/page-breaks.ly
index b77b541286..cb4361f5f5 100644
--- a/input/regression/page-breaks.ly
+++ b/input/regression/page-breaks.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
@@ -24,7 +24,7 @@
 }
 
 \paper {
-  raggedlastbottom = ##f
+  ragged-last-bottom = ##f
 
   bookTitleMarkup = \markup {
     \override #'(baseline-skip . -3)
diff --git a/input/regression/page-layout-manual-position.ly b/input/regression/page-layout-manual-position.ly
index d9a98f3449..6c41a63e40 100644
--- a/input/regression/page-layout-manual-position.ly
+++ b/input/regression/page-layout-manual-position.ly
@@ -8,12 +8,12 @@ systems may be placed absolutely on the printable area of the page."
 
 }
 
-\version "2.7.29"
+\version "2.7.32"
 
 #(set-default-paper-size "a6" 'portrait)
 
 \paper {
-  linewidth = 5.0\cm
+  line-width = 5.0\cm
   headerMarkup = "header"
   indent =0.0
   annotatespacing = ##f
diff --git a/input/regression/page-layout-twopass.ly b/input/regression/page-layout-twopass.ly
index ab94573695..345f63daca 100644
--- a/input/regression/page-layout-twopass.ly
+++ b/input/regression/page-layout-twopass.ly
@@ -3,7 +3,7 @@
   texidoc = "Page breaking details can be stored for later reference." 
 }
 
-\version "2.7.29"
+\version "2.7.32"
 
 \paper  {
   #(define write-page-layout #t)
diff --git a/input/regression/page-layout.ly b/input/regression/page-layout.ly
index 0ecc725e0b..484bfdb35c 100644
--- a/input/regression/page-layout.ly
+++ b/input/regression/page-layout.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 
     
@@ -25,16 +25,16 @@ This file is best viewed outside the collated files document.
   }
 
 \paper {
-    %hsize = 2\cm
-    %vsize = 2\cm
-    topmargin = 2\cm
-    bottommargin = 2\cm
-    %headsep = 7\cm
-    %footsep = 7\cm
-    raggedbottom = ##t
-    raggedlastbottom = ##t
-    leftmargin = 3\cm
-    linewidth = 15\cm
+    %paper-width = 2\cm
+    %paper-height = 2\cm
+    top-margin = 2\cm
+    bottom-margin = 2\cm
+    %heap-separation = 7\cm
+    %foot-separation = 7\cm
+    ragged-bottom = ##t
+    ragged-last-bottom = ##t
+    left-margin = 3\cm
+    line-width = 15\cm
     %rigthmargin = 3\cm
     interscoreline = 3\cm
 }
@@ -48,7 +48,7 @@ This file is best viewed outside the collated files document.
             }
         }
         \header {piece = "Piece I"}
-        \layout {linewidth = 13\cm}
+        \layout {line-width = 13\cm}
     }
     \score {
         \relative c'' {
@@ -60,6 +60,6 @@ This file is best viewed outside the collated files document.
 	  breakbefore = ##f
 	  piece = "Piece II"
 	}
-        \layout {linewidth = 9\cm}
+        \layout {line-width = 9\cm}
     }
 }
diff --git a/input/regression/page-spacing.ly b/input/regression/page-spacing.ly
index 6dccbccf75..3d37679ddd 100644
--- a/input/regression/page-spacing.ly
+++ b/input/regression/page-spacing.ly
@@ -13,7 +13,7 @@ By setting @code{annotatespacing}, we can see the effect of each property.
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 #(set-global-staff-size 11)
 
@@ -66,9 +66,9 @@ By setting @code{annotatespacing}, we can see the effect of each property.
     >>
   }
   \paper {
-    raggedlastbottom = ##f
+    ragged-last-bottom = ##f
     annotatespacing = ##t
-    betweensystemspace = 1.0
+    between-system-space = 1.0
     #(set! text-font-defaults
       (acons
        'font-size 6
diff --git a/input/regression/page-top-space.ly b/input/regression/page-top-space.ly
index ef5db63dd1..a92d2dac42 100644
--- a/input/regression/page-top-space.ly
+++ b/input/regression/page-top-space.ly
@@ -1,10 +1,10 @@
 \header {
 
-  texidoc = "By setting @code{pagetopspace,} the Y position of the
+  texidoc = "By setting @code{page-top-space,} the Y position of the
 first system can be forced to be uniform."
 
 }
-\version "2.7.13"
+\version "2.7.32"
 
 #(set-default-paper-size "a6")
 
@@ -22,7 +22,7 @@ first system can be forced to be uniform."
   }
 
   \paper {
-    pagetopspace = 3 \cm
+    page-top-space = 3 \cm
   }
 }
 
diff --git a/input/regression/part-combine-a2.ly b/input/regression/part-combine-a2.ly
index 22ae352846..377af67700 100644
--- a/input/regression/part-combine-a2.ly
+++ b/input/regression/part-combine-a2.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
     texidoc ="The a2 string is printed only on notes (i.e. not on rests),
 and only after chords, solo or polyphony."
@@ -10,7 +10,7 @@ vtwo =  \relative a' { R1*2 g2 r2 g2 r2 f4 r4 g }
 
 comment = \relative { s1*2 s2_"a2" s2 s2_"no a2" s2 s4 s4 s4_"a2" } 
 
-\layout { raggedright = ##T }
+\layout { ragged-right = ##T }
 
 \new Staff << \set Score.skipBars = ##t 
    \partcombine \vone \vtwo
diff --git a/input/regression/part-combine-cross.ly b/input/regression/part-combine-cross.ly
index ea085e2014..fff8250a24 100644
--- a/input/regression/part-combine-cross.ly
+++ b/input/regression/part-combine-cross.ly
@@ -4,11 +4,11 @@
 "
     }
 
-\version "2.7.13"
+\version "2.7.32"
 
 vone =  \relative a' { g4 g f f e e d d }
 vtwo =  \relative a' { e4 e f f g g a a }
-\layout { raggedright = ##t } 
+\layout { ragged-right = ##t } 
 
 \partcombine \vone \vtwo
  
diff --git a/input/regression/part-combine-global.ly b/input/regression/part-combine-global.ly
index d6a968f02f..c80b758b89 100644
--- a/input/regression/part-combine-global.ly
+++ b/input/regression/part-combine-global.ly
@@ -11,7 +11,7 @@ voices.
   
 "
 	}
-\version "2.7.13"
+\version "2.7.32"
 
 vone =
 
diff --git a/input/regression/part-combine-mmrest-after-solo.ly b/input/regression/part-combine-mmrest-after-solo.ly
index 5552560770..de1177c089 100644
--- a/input/regression/part-combine-mmrest-after-solo.ly
+++ b/input/regression/part-combine-mmrest-after-solo.ly
@@ -1,9 +1,9 @@
 
 \header { texidoc = " Multimeasure rests are printed after solos, both
     for solo1 and for solo2."  }
-\version "2.7.13"
+\version "2.7.32"
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 \new Staff 
 \partcombine
 \relative c''{ R1*2 | c4 r2.  | c2 r  | R1 }
diff --git a/input/regression/part-combine-solo-end.ly b/input/regression/part-combine-solo-end.ly
index f43b41bf3c..fec1cddc6a 100644
--- a/input/regression/part-combine-solo-end.ly
+++ b/input/regression/part-combine-solo-end.ly
@@ -6,8 +6,8 @@
 
 }
 
-\version "2.7.13"
-\layout { raggedright = ##t }
+\version "2.7.32"
+\layout { ragged-right = ##t }
 
 <<
     \new Staff
diff --git a/input/regression/part-combine-solo-global.ly b/input/regression/part-combine-solo-global.ly
index 4f4fdaf176..bc2be665bd 100644
--- a/input/regression/part-combine-solo-global.ly
+++ b/input/regression/part-combine-solo-global.ly
@@ -5,8 +5,8 @@
 
 }
 
-\version "2.7.13"
-\paper { raggedright = ##t } 
+\version "2.7.32"
+\paper { ragged-right = ##t } 
 
 \new Staff
     \partcombine  \relative c'' {
diff --git a/input/regression/part-combine-solo.ly b/input/regression/part-combine-solo.ly
index 93a61ddca8..cb4a39841a 100644
--- a/input/regression/part-combine-solo.ly
+++ b/input/regression/part-combine-solo.ly
@@ -17,9 +17,9 @@ Solo 1/2 can not be used when a spanner is active, so there is no solo
 vone =  \relative a' { d4 r8 d8 d8 r8 d8 r8 d2 ~ d2 ~ d4 }
 vtwo =  \relative g' { g4.   g8 r2          g4 r4 r2  g4 } 
 
-\version "2.7.13"
+\version "2.7.32"
 
-\paper { raggedright = ##t } 
+\paper { ragged-right = ##t } 
 
     
 << \set Score.skipBars = ##t
diff --git a/input/regression/part-combine-text.ly b/input/regression/part-combine-text.ly
index 0b936c0b9d..650c416a7c 100644
--- a/input/regression/part-combine-text.ly
+++ b/input/regression/part-combine-text.ly
@@ -9,9 +9,9 @@ texts accordingly.
     }
 
 
-\version "2.7.13"
+\version "2.7.32"
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 vone =  \relative a' { R1 a2    r4 r a a a a }
 vtwo =  \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 1c251713f7..16508afbc5 100644
--- a/input/regression/part-combine.ly
+++ b/input/regression/part-combine.ly
@@ -9,9 +9,9 @@
 "
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
-\version "2.7.13"
+\version "2.7.32"
 
 vone =  \relative a' {
   g2 g    g  g4 g f' c c( c) c c  c ~ c
diff --git a/input/regression/pedal-bracket.ly b/input/regression/pedal-bracket.ly
index afa98a8890..ef8f1086bc 100644
--- a/input/regression/pedal-bracket.ly
+++ b/input/regression/pedal-bracket.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
@@ -21,5 +21,5 @@ At a line-break, there are no vertical endings.  " }
         c4 d \unaCorda e f g
         b  | \break c b c \treCorde c
     }
-    \layout { raggedright = ##t }
+    \layout { ragged-right = ##t }
 }
diff --git a/input/regression/pedal-end.ly b/input/regression/pedal-end.ly
index ea04198f61..59581fc622 100644
--- a/input/regression/pedal-end.ly
+++ b/input/regression/pedal-end.ly
@@ -1,11 +1,11 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
   texidoc = "Unterminated piano pedal brackets run to the end of the piece. "
 
 }
 
-\layout { raggedright  = ##t }
+\layout { ragged-right  = ##t }
 
 
 {
diff --git a/input/regression/pedal-ped.ly b/input/regression/pedal-ped.ly
index 61e0960476..f0062a3643 100644
--- a/input/regression/pedal-ped.ly
+++ b/input/regression/pedal-ped.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header
 {
   texidoc = "The standard piano pedals style comes with Ped symbols.
diff --git a/input/regression/phrasing-slur-slur-avoid.ly b/input/regression/phrasing-slur-slur-avoid.ly
index 1db9b29dcd..12bfaefa75 100644
--- a/input/regression/phrasing-slur-slur-avoid.ly
+++ b/input/regression/phrasing-slur-slur-avoid.ly
@@ -1,10 +1,10 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header{
     texidoc="@code{PhrasingSlur}s go over normal slurs."
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 \relative c''{
     c8 \( (d e f) g ( a b c)
diff --git a/input/regression/prefatory-empty-spacing.ly b/input/regression/prefatory-empty-spacing.ly
index 782bd9871e..9c365397bc 100644
--- a/input/regression/prefatory-empty-spacing.ly
+++ b/input/regression/prefatory-empty-spacing.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
@@ -8,7 +8,7 @@ the break alignment."
   
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 {
   a a a a \break
diff --git a/input/regression/prefatory-spacing-matter.ly b/input/regression/prefatory-spacing-matter.ly
index 2867b6a208..890fe181e3 100644
--- a/input/regression/prefatory-spacing-matter.ly
+++ b/input/regression/prefatory-spacing-matter.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
   texidoc = "Distances between prefatory items (e.g. clef, bar,
@@ -11,7 +11,7 @@ bar-line is different from the start of line.
 }
 
 \layout  {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 \relative c'' {
diff --git a/input/regression/property-grace-polyphony.ly b/input/regression/property-grace-polyphony.ly
index 6cafd8367b..673e56a84e 100644
--- a/input/regression/property-grace-polyphony.ly
+++ b/input/regression/property-grace-polyphony.ly
@@ -5,9 +5,9 @@
     not interfere with the overrides and reverts from polyphony."
 
 }
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
-\version "2.7.13"
+\version "2.7.32"
    \relative c'' {
       <<
 	  { \grace e8 d2 }
diff --git a/input/regression/property-once.ly b/input/regression/property-once.ly
index 10011d28f8..9b26c43d44 100644
--- a/input/regression/property-once.ly
+++ b/input/regression/property-once.ly
@@ -1,10 +1,10 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
     texidoc = "Once properties take effect during a single time step only."
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 \relative c' {
     c4
diff --git a/input/regression/quote-cue-during.ly b/input/regression/quote-cue-during.ly
index 6d6dcd4e73..718a76725f 100644
--- a/input/regression/quote-cue-during.ly
+++ b/input/regression/quote-cue-during.ly
@@ -11,9 +11,9 @@ last note."
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 quoteMe = \relative c' { fis4 r16  a8.-> b4(-\ff~  b16 c8.  b) }
diff --git a/input/regression/quote-cyclic.ly b/input/regression/quote-cyclic.ly
index 200f6776b4..e18f678706 100644
--- a/input/regression/quote-cyclic.ly
+++ b/input/regression/quote-cyclic.ly
@@ -6,7 +6,7 @@ example, there are notes with each full-bar rest."
 	  
  
 }
-\version "2.7.13"
+\version "2.7.32"
 
 A = \relative c' { c4 d e f | \cueDuring #"qB" #1 { R1 } | }
 B = \relative c' { \cueDuring #"qA" #1 { R1 } | f4 e d c  | }
@@ -14,7 +14,7 @@ B = \relative c' { \cueDuring #"qA" #1 { R1 } | f4 e d c  | }
 \addquote "qA" \A
 \addquote "qB" \B
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 <<
     \context Staff = "A" \A
diff --git a/input/regression/quote-during.ly b/input/regression/quote-during.ly
index c9ab28d421..0112ad7786 100644
--- a/input/regression/quote-during.ly
+++ b/input/regression/quote-during.ly
@@ -8,9 +8,9 @@ quoted. In this example, a 16th rests is not quoted, since
 @code{rest-event} is not in @code{quotedEventTypes}."
 
 }
-\version "2.7.13"
+\version "2.7.32"
 \layout {
-    raggedright = ##t
+    ragged-right = ##t
 }
 
 
diff --git a/input/regression/quote-grace.ly b/input/regression/quote-grace.ly
index 249a04df08..f6409fd0c8 100644
--- a/input/regression/quote-grace.ly
+++ b/input/regression/quote-grace.ly
@@ -5,9 +5,9 @@
   to an unquoted note is not quoted."
 
 }
-\paper { raggedright= ##t }
+\paper { ragged-right= ##t }
 
-\version "2.7.13"
+\version "2.7.32"
 quoted = \relative c'' {
   R1
   \grace g16 f4 \grace a16 bes4 \grace b16 c4 c4
diff --git a/input/regression/quote-transposition.ly b/input/regression/quote-transposition.ly
index 5b90a8cd45..5bf1848ce3 100644
--- a/input/regression/quote-transposition.ly
+++ b/input/regression/quote-transposition.ly
@@ -10,9 +10,9 @@ quoted ones) will transposed as well.  "
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 
 \addquote clarinet  {
diff --git a/input/regression/quote.ly b/input/regression/quote.ly
index c43a600ba0..6b5118fd83 100644
--- a/input/regression/quote.ly
+++ b/input/regression/quote.ly
@@ -7,9 +7,9 @@ things are quoted. In this example, a 16th rests is not quoted, since
 @code{rest-event} is not in @code{quotedEventTypes}."
 
 }
-\version "2.7.13"
+\version "2.7.32"
 \layout {
-    raggedright = ##t
+    ragged-right = ##t
 }
 
 
diff --git a/input/regression/rehearsal-mark-align.ly b/input/regression/rehearsal-mark-align.ly
index d37153d4ef..39a8601c97 100644
--- a/input/regression/rehearsal-mark-align.ly
+++ b/input/regression/rehearsal-mark-align.ly
@@ -6,7 +6,7 @@
 
 }
 
-\version "2.7.19"
+\version "2.7.32"
   
 \relative {
   c1 \mark "foo"
diff --git a/input/regression/rehearsal-mark-letter.ly b/input/regression/rehearsal-mark-letter.ly
index efd8a0411e..bddd16cf0f 100644
--- a/input/regression/rehearsal-mark-letter.ly
+++ b/input/regression/rehearsal-mark-letter.ly
@@ -8,8 +8,8 @@ after Z, double letters are used.  The mark may be set with
 
 }
 
-\version "2.7.13"
-\paper { raggedright = ##t } 
+\version "2.7.32"
+\paper { ragged-right = ##t } 
 
 \relative c'' {
   c1  \mark \default
diff --git a/input/regression/rehearsal-mark-number.ly b/input/regression/rehearsal-mark-number.ly
index 44f624def0..9c55f8d0bf 100644
--- a/input/regression/rehearsal-mark-number.ly
+++ b/input/regression/rehearsal-mark-number.ly
@@ -5,9 +5,9 @@ By setting @code{markFormatter} we may choose a different style of mark printing
 	  
       }
 
-\version "2.7.13"
+\version "2.7.32"
 
-\paper { raggedright = ##t } 
+\paper { ragged-right = ##t } 
 
 \relative c''{
   \set Score.markFormatter = #format-mark-numbers 
diff --git a/input/regression/repeat-fold.ly b/input/regression/repeat-fold.ly
index 109804cba0..0f4e83b90b 100644
--- a/input/regression/repeat-fold.ly
+++ b/input/regression/repeat-fold.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
 texidoc="
@@ -7,7 +7,7 @@ should not be more alternatives than repeats.
 "
 }
 
-\paper { raggedright = ##t } 
+\paper { ragged-right = ##t } 
 
 \context Staff  \relative c'' {
     \repeat fold 3 { c^"3x 0alt" d }
diff --git a/input/regression/repeat-line-break.ly b/input/regression/repeat-line-break.ly
index e24067c3eb..50e701341b 100644
--- a/input/regression/repeat-line-break.ly
+++ b/input/regression/repeat-line-break.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
   texidoc="
@@ -7,7 +7,7 @@ bracket should be equal.
 "
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 \context Staff\relative c''  {
   \repeat "volta" 2 { c1 \break } \alternative { d e }
diff --git a/input/regression/repeat-percent-count.ly b/input/regression/repeat-percent-count.ly
index b1d3f14c5e..7c39d6e9bd 100644
--- a/input/regression/repeat-percent-count.ly
+++ b/input/regression/repeat-percent-count.ly
@@ -9,7 +9,7 @@ only if there are more than two repeats."
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \relative c'' \new Voice {
   \set countPercentRepeats = ##t 
diff --git a/input/regression/repeat-percent-skipbars.ly b/input/regression/repeat-percent-skipbars.ly
index f1fab7cda7..f0ce23f6f9 100644
--- a/input/regression/repeat-percent-skipbars.ly
+++ b/input/regression/repeat-percent-skipbars.ly
@@ -1,11 +1,11 @@
-\version "2.7.13"
+\version "2.7.32"
 
 
 \header {
   texidoc = "Percent repeats are not skipped, even when @code{skipBars} is set."
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 
 \context Staff <<
diff --git a/input/regression/repeat-percent.ly b/input/regression/repeat-percent.ly
index fe86bc5cc6..1977bf5f03 100644
--- a/input/regression/repeat-percent.ly
+++ b/input/regression/repeat-percent.ly
@@ -1,10 +1,10 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
   texidoc = "Measure repeats may be nested with beat repeats."
 }
 
 \paper {
-  raggedright = ##t
+  ragged-right = ##t
 }
 \relative c'' \context Voice {
   \set Score.skipBars = ##t
diff --git a/input/regression/repeat-slash.ly b/input/regression/repeat-slash.ly
index 21eabcd8fe..4b294b2c2e 100644
--- a/input/regression/repeat-slash.ly
+++ b/input/regression/repeat-slash.ly
@@ -1,10 +1,10 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
   texidoc = "Within a bar, beat repeats denote that a music snippet should be
 played again."
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 \relative c'
 \context Voice {
diff --git a/input/regression/repeat-unfold-all.ly b/input/regression/repeat-unfold-all.ly
index 6a03e801d9..fc6a8c3744 100644
--- a/input/regression/repeat-unfold-all.ly
+++ b/input/regression/repeat-unfold-all.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header { texidoc = "Volta repeats may be unfolded through the music
     function @code{\unfoldRepeats}."
@@ -8,7 +8,7 @@
 nots = \relative c'   {
     c4 \repeat volta 2 c4 \alternative { d e  }
 }
-\layout {raggedright = ##t} 
+\layout {ragged-right = ##t} 
 
 \context Voice {
     \nots
diff --git a/input/regression/repeat-unfold-tremolo.ly b/input/regression/repeat-unfold-tremolo.ly
index d8aa3ec8d7..669aadc16f 100644
--- a/input/regression/repeat-unfold-tremolo.ly
+++ b/input/regression/repeat-unfold-tremolo.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
   texidoc = "Unfolding tremolo repeats. All fragments fill one
@@ -6,7 +6,7 @@
 
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 
 
diff --git a/input/regression/repeat-unfold.ly b/input/regression/repeat-unfold.ly
index 9d8dde2db9..d04e866d71 100644
--- a/input/regression/repeat-unfold.ly
+++ b/input/regression/repeat-unfold.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
   texidoc="
diff --git a/input/regression/repeat-volta-skip-alternatives.ly b/input/regression/repeat-volta-skip-alternatives.ly
index bb99d3ca32..c0ef87f1d7 100644
--- a/input/regression/repeat-volta-skip-alternatives.ly
+++ b/input/regression/repeat-volta-skip-alternatives.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
     texidoc = "When too few alternatives are present, the first
@@ -6,7 +6,7 @@ alternative is repeated, by printing a range for the 1st repeat."
 
 }
 
-\paper { raggedright = ##t } 
+\paper { ragged-right = ##t } 
 
 
 \relative c'' \context Voice {
diff --git a/input/regression/repeat-volta.ly b/input/regression/repeat-volta.ly
index ad6fe194a0..bb466f69ba 100644
--- a/input/regression/repeat-volta.ly
+++ b/input/regression/repeat-volta.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
   texidoc="
diff --git a/input/regression/rest-collision-beam.ly b/input/regression/rest-collision-beam.ly
index 2f061f2c68..50ba0a7324 100644
--- a/input/regression/rest-collision-beam.ly
+++ b/input/regression/rest-collision-beam.ly
@@ -3,10 +3,10 @@
 }
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 fig =   \relative c' {
   <a c e>8[ r <c e a> r <e a c> r <a c e>]
diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly
index fc02945fc3..3ba04b9f7d 100644
--- a/input/regression/rest-collision.ly
+++ b/input/regression/rest-collision.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header{
   texidoc="
 Rests should not collide with beams, stems and noteheads.  Rests may
@@ -10,7 +10,7 @@ cases.
 "
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 scale =  \relative c' {
   c8 d e f g a b c c d e f g a b c
diff --git a/input/regression/rest-dot-position.ly b/input/regression/rest-dot-position.ly
index 8fac1da4bc..b1f0117b98 100644
--- a/input/regression/rest-dot-position.ly
+++ b/input/regression/rest-dot-position.ly
@@ -4,9 +4,9 @@
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
-\paper { raggedright = ##t } 
+\paper { ragged-right = ##t } 
 
 {
     \set Score.timing = ##f
diff --git a/input/regression/rest-ledger.ly b/input/regression/rest-ledger.ly
index 4872b2c30b..91d708d870 100644
--- a/input/regression/rest-ledger.ly
+++ b/input/regression/rest-ledger.ly
@@ -1,11 +1,11 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
 texidoc = "Whole and half rests moving outside the staff should get
 ledger lines."
 }
 
 
-\paper { raggedright = ##t } 
+\paper { ragged-right = ##t } 
 
 {
    \override Rest  #'staff-position = #4
diff --git a/input/regression/rest-pitch.ly b/input/regression/rest-pitch.ly
index 7da5d7585c..d3263b2f14 100644
--- a/input/regression/rest-pitch.ly
+++ b/input/regression/rest-pitch.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
   texidoc = "Rests can have pitches--these will be affected by
@@ -7,7 +7,7 @@ beam/rest collision resolving will leave it alone."
 
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 \relative c'' 
 {
diff --git a/input/regression/rest-polyphonic.ly b/input/regression/rest-polyphonic.ly
index 687998c6eb..c308d1f9f1 100644
--- a/input/regression/rest-polyphonic.ly
+++ b/input/regression/rest-polyphonic.ly
@@ -6,10 +6,10 @@ even if there is no opposite note or rest. The amount is two
 
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 
-\version "2.7.13"
+\version "2.7.32"
 
 
 \new Staff  \relative c' {
diff --git a/input/regression/rest.ly b/input/regression/rest.ly
index df25506415..97606c331e 100644
--- a/input/regression/rest.ly
+++ b/input/regression/rest.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
   texidoc="
@@ -8,7 +8,7 @@ whole rest are centered on the middle staff line.
 "
 }
 
-\paper { raggedright = ##t } 
+\paper { ragged-right = ##t } 
 
 {
   \time 4/4
diff --git a/input/regression/rhythmic-staff.ly b/input/regression/rhythmic-staff.ly
index 32f0b507da..e8e61ff19c 100644
--- a/input/regression/rhythmic-staff.ly
+++ b/input/regression/rhythmic-staff.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header
 {
 
@@ -6,7 +6,7 @@
 have the size for a 5 line staff. The whole rest hangs from the
 rhythmic staff."  }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 \context RhythmicStaff
 {
diff --git a/input/regression/score-text.ly b/input/regression/score-text.ly
index 15803ef9c5..2ebe9fe35c 100644
--- a/input/regression/score-text.ly
+++ b/input/regression/score-text.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
@@ -7,7 +7,7 @@
 }
 
 \paper {
-    linewidth = #110
+    line-width = #110
 }
 
 %% using Book and Score to get text in lilypond-book 
diff --git a/input/regression/script-collision.ly b/input/regression/script-collision.ly
index fa92331567..a09fc5c215 100644
--- a/input/regression/script-collision.ly
+++ b/input/regression/script-collision.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
@@ -6,7 +6,7 @@
       positioned correctly when there are collisions."
 }
 
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 
 \relative c'' {
diff --git a/input/regression/script-stack-order.ly b/input/regression/script-stack-order.ly
index 0b1e74d830..4383049c94 100644
--- a/input/regression/script-stack-order.ly
+++ b/input/regression/script-stack-order.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
   texidoc = "Scripts can be stacked. The order is determined by a
 priority field, but when objects have the same priority, the input
@@ -7,7 +7,7 @@ order determines the order. Objects specified first are closest to the note.
 "
 }
 
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 \relative c'' { c4^"inner up"^"outer up"_"inner down"_"outer down" }
 
diff --git a/input/regression/script-stacked.ly b/input/regression/script-stacked.ly
index 8f4131e519..40ec8e7c51 100644
--- a/input/regression/script-stacked.ly
+++ b/input/regression/script-stacked.ly
@@ -1,6 +1,6 @@
-\version "2.7.13"
+\version "2.7.32"
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 \header { 
   texidoc = "Scripts may be stacked."
diff --git a/input/regression/script-stem-tremolo.ly b/input/regression/script-stem-tremolo.ly
index f37025909c..5ec2c445bb 100644
--- a/input/regression/script-stem-tremolo.ly
+++ b/input/regression/script-stem-tremolo.ly
@@ -3,9 +3,9 @@
   texidoc = "Scripts avoid stem tremolos even if there is no visible stem."
 
 }
-\version "2.7.16"
+\version "2.7.32"
 
-\layout {raggedright =##t}
+\layout {ragged-right =##t}
 {
   \stemDown
   g'1:32_"foo"
diff --git a/input/regression/size11.ly b/input/regression/size11.ly
index 89ef5a8b1f..c7c953e3b2 100644
--- a/input/regression/size11.ly
+++ b/input/regression/size11.ly
@@ -1,9 +1,9 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
 texidoc="
 Fonts are  available in a default set of sizes: 11, 13, 16, 20, 23 and
-26pt staffheight.  Sizes of the text fonts and symbol fonts are made
+26pt staff-height.  Sizes of the text fonts and symbol fonts are made
 to match the staff dimensions.    
 "
 foollilypondbook = "
diff --git a/input/regression/size13.ly b/input/regression/size13.ly
index e6af2f928c..c0971323af 100644
--- a/input/regression/size13.ly
+++ b/input/regression/size13.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 foollilypondbook = "
 \score
 "
diff --git a/input/regression/size16.ly b/input/regression/size16.ly
index a0059c8005..b4698cf787 100644
--- a/input/regression/size16.ly
+++ b/input/regression/size16.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 foollilypondbook = "
 \score
 "
diff --git a/input/regression/size20.ly b/input/regression/size20.ly
index fb75d76397..a0ec7a1b9e 100644
--- a/input/regression/size20.ly
+++ b/input/regression/size20.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 foollilypondbook = "
 \score
 "
diff --git a/input/regression/size23.ly b/input/regression/size23.ly
index fee9b9dda7..b464add511 100644
--- a/input/regression/size23.ly
+++ b/input/regression/size23.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 foollilypondbook = "
 \score
 "
diff --git a/input/regression/size26.ly b/input/regression/size26.ly
index 45fdae029a..1c297e7a9d 100644
--- a/input/regression/size26.ly
+++ b/input/regression/size26.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 foollilypondbook = "
 \score
 "
diff --git a/input/regression/slur-broken-trend.ly b/input/regression/slur-broken-trend.ly
index 1dab583235..919abf1128 100644
--- a/input/regression/slur-broken-trend.ly
+++ b/input/regression/slur-broken-trend.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
 texidoc="
@@ -11,7 +11,7 @@ in unbroken state.
 }
 
 \layout {
-    raggedright = ##t 
+    ragged-right = ##t 
     indent=0.
 }
 
diff --git a/input/regression/slur-cross-staff.ly b/input/regression/slur-cross-staff.ly
index d55b66f6dc..e1ef90fee3 100644
--- a/input/regression/slur-cross-staff.ly
+++ b/input/regression/slur-cross-staff.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header{
   texidoc="
 Slurs behave decently when broken across a linebreak.
diff --git a/input/regression/slur-dash.ly b/input/regression/slur-dash.ly
index 89338b4f98..0b08dd90f3 100644
--- a/input/regression/slur-dash.ly
+++ b/input/regression/slur-dash.ly
@@ -1,9 +1,9 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {texidoc = "@cindex Slur, dotted, dashed
 The appearance of slurs may be changed from solid to dotted or dashed.
 "
 } 
-\layout{ raggedright=##t }
+\layout{ ragged-right=##t }
 
 
 \relative c'{
diff --git a/input/regression/slur-dots.ly b/input/regression/slur-dots.ly
index 66679fdc6c..8e3423bee7 100644
--- a/input/regression/slur-dots.ly
+++ b/input/regression/slur-dots.ly
@@ -1,12 +1,12 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header{
   texidoc="Slurs should not get confused by augmentation dots.  With a lot
 of dots, the problems becomes more visible."
 }
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 \relative c'' {
diff --git a/input/regression/slur-double.ly b/input/regression/slur-double.ly
index f4edfc9f05..32ad2f0ae9 100644
--- a/input/regression/slur-double.ly
+++ b/input/regression/slur-double.ly
@@ -3,9 +3,9 @@
     texidoc = "Some composers use slurs both above and below chords.
  This can be typeset by setting @code{doubleSlurs}"
 }
-\version "2.7.13"
+\version "2.7.32"
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 \relative {
     \set doubleSlurs = ##t
     <c e>4 ( <d f> <c e> <d f> )
diff --git a/input/regression/slur-dynamics.ly b/input/regression/slur-dynamics.ly
index ab32714c39..2f0cdd9aa8 100644
--- a/input/regression/slur-dynamics.ly
+++ b/input/regression/slur-dynamics.ly
@@ -4,10 +4,10 @@
   texidoc = "Dynamics avoid collision with slur."
 }
 
-\version "2.7.13"
+\version "2.7.32"
 \layout {
   indent = 0\mm
-  raggedright = ##t
+  ragged-right = ##t
 }
 \relative
 {
diff --git a/input/regression/slur-extreme.ly b/input/regression/slur-extreme.ly
index 844d7a9140..d83a55b8be 100644
--- a/input/regression/slur-extreme.ly
+++ b/input/regression/slur-extreme.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
@@ -9,7 +9,7 @@ Asymmetric slurs are created by setting @code{eccentricity}."
 
 }
 \layout {
-    raggedright = ##t
+    ragged-right = ##t
 }
 
 baseWalk =  \relative c {
diff --git a/input/regression/slur-manual.ly b/input/regression/slur-manual.ly
index 59a8647b34..c821b7ae00 100644
--- a/input/regression/slur-manual.ly
+++ b/input/regression/slur-manual.ly
@@ -6,9 +6,9 @@ positioning of the slur. It selects the slur configuration closest to
 the given pair. "
   
   }
-\version "2.7.13"
+\version "2.7.32"
 
-\paper { raggedright = ##T }
+\paper { ragged-right = ##T }
 \relative {
   \override Slur #'positions = #'(-4 . -5)
   e( f g)
diff --git a/input/regression/slur-nice.ly b/input/regression/slur-nice.ly
index 5475243a4f..5952a72d42 100644
--- a/input/regression/slur-nice.ly
+++ b/input/regression/slur-nice.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header{
   texidoc="
 Slurs should look nice and symmetric.  The curvature may increase
@@ -20,7 +20,7 @@ run through noteheads or stems.
   \stemDown c( f,  c')
 }
 \layout{
-  linewidth = 120.\mm
+  line-width = 120.\mm
 }
 
 
diff --git a/input/regression/slur-rest.ly b/input/regression/slur-rest.ly
index 0067aa784a..b6bd7bf0cd 100644
--- a/input/regression/slur-rest.ly
+++ b/input/regression/slur-rest.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header
 {
   texidoc ="Slurs may be placed over rest. The slur will avoid colliding with
@@ -8,7 +8,7 @@ the rest.
 "
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 { \stemDown c'4 ( r4  c'2)
 
   \relative c'' { 
diff --git a/input/regression/slur-scoring.ly b/input/regression/slur-scoring.ly
index 8f4d8e07f5..8c6a3589b0 100644
--- a/input/regression/slur-scoring.ly
+++ b/input/regression/slur-scoring.ly
@@ -12,9 +12,9 @@
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 \layout {
-    raggedright = ##t
+    ragged-right = ##t
 %    #(define debug-slur-scoring #t)
 }
 
diff --git a/input/regression/slur-script-inside.ly b/input/regression/slur-script-inside.ly
index 2a7d338d5e..7e51efa2a6 100644
--- a/input/regression/slur-script-inside.ly
+++ b/input/regression/slur-script-inside.ly
@@ -8,9 +8,9 @@
 }
 
 
-\version "2.7.13"
+\version "2.7.32"
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 \relative c''{
     \clef alto
diff --git a/input/regression/slur-script.ly b/input/regression/slur-script.ly
index de36d7e37a..59d8718b50 100644
--- a/input/regression/slur-script.ly
+++ b/input/regression/slur-script.ly
@@ -9,10 +9,10 @@
     scripts can be moved manually."
 }
 
-\version "2.7.13"
+\version "2.7.32"
 \layout {
   indent = 0\mm
-  raggedright = ##t
+  ragged-right = ##t
 }
 \relative
 {
diff --git a/input/regression/slur-symmetry-1.ly b/input/regression/slur-symmetry-1.ly
index 2ec8bb0a72..a6ffbc956a 100644
--- a/input/regression/slur-symmetry-1.ly
+++ b/input/regression/slur-symmetry-1.ly
@@ -1,11 +1,11 @@
-\version "2.7.13"
+\version "2.7.32"
 \header
 {
   texidoc = "Symmetric figures should lead to symmetric slurs."
 }
 
 \layout{
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 
diff --git a/input/regression/slur-symmetry.ly b/input/regression/slur-symmetry.ly
index c70d5a7fdb..3bb5c7615d 100644
--- a/input/regression/slur-symmetry.ly
+++ b/input/regression/slur-symmetry.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header
 {
   texidoc = "Symmetric figures should lead to symmetric slurs."
@@ -6,7 +6,7 @@
 }
 
 \layout{
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 
diff --git a/input/regression/slur-tilt.ly b/input/regression/slur-tilt.ly
index ffcc6c4445..523471b8f6 100644
--- a/input/regression/slur-tilt.ly
+++ b/input/regression/slur-tilt.ly
@@ -6,9 +6,9 @@ point into one note head, and point over another note head."
  
 }
 \layout {
-    raggedright = ##t
+    ragged-right = ##t
 }
-\version "2.7.13"
+\version "2.7.32"
 
 \relative c'' {
     \time 2/4
diff --git a/input/regression/slur-tuplet.ly b/input/regression/slur-tuplet.ly
index f468ab4ab0..b0626bad41 100644
--- a/input/regression/slur-tuplet.ly
+++ b/input/regression/slur-tuplet.ly
@@ -5,10 +5,10 @@ This may not work if the slur starts after the tuplet.  "
   
 }
 
-\version "2.7.24"
+\version "2.7.32"
 
 \paper {
-  raggedright = ##t
+  ragged-right = ##t
 %  #(define debug-slur-scoring #t)
 }
 
diff --git a/input/regression/spacing-accidental-staffs.ly b/input/regression/spacing-accidental-staffs.ly
index d85279c41c..03e0234831 100644
--- a/input/regression/spacing-accidental-staffs.ly
+++ b/input/regression/spacing-accidental-staffs.ly
@@ -1,11 +1,11 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header { 
   texidoc = "Accidentals in different staves do not affect the
 spacing of the eighth notes here."
 }
 
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 \relative c'' <<
   \new Staff {
diff --git a/input/regression/spacing-accidental-stretch.ly b/input/regression/spacing-accidental-stretch.ly
index 9ba695a04c..4585149566 100644
--- a/input/regression/spacing-accidental-stretch.ly
+++ b/input/regression/spacing-accidental-stretch.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
   texidoc = "Accidentals do not influence the amount of stretchable space.
@@ -7,9 +7,9 @@ The accidental does add a little non-stretchable space.
 "
 }
 
-%% not raggedright!!
+%% not ragged-right!!
 \layout {
-  linewidth = 18.\cm
+  line-width = 18.\cm
 }
 \relative c'' \context GrandStaff {
   #(set-accidental-style 'piano-cautionary)
diff --git a/input/regression/spacing-accidental.ly b/input/regression/spacing-accidental.ly
index 8c6c7e7938..f246944fee 100644
--- a/input/regression/spacing-accidental.ly
+++ b/input/regression/spacing-accidental.ly
@@ -1,12 +1,12 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
   texidoc = "Accidentals sticking out to the left
 of a note will take a little more space, but only if the spacing is tight." 
 }
 
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 \relative c'' {
   \time 8/4
diff --git a/input/regression/spacing-bar-stem.ly b/input/regression/spacing-bar-stem.ly
index f8d26b6abf..c1424ee5ff 100644
--- a/input/regression/spacing-bar-stem.ly
+++ b/input/regression/spacing-bar-stem.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
   texidoc = "Downstem notes following a barline are
 printed with some extra space. This is an optical correction similar
@@ -9,7 +9,7 @@ Accidentals after the barline get some space as well.
 "
 }
 
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 \relative c''
 {
diff --git a/input/regression/spacing-clef-first-note.ly b/input/regression/spacing-clef-first-note.ly
index b11de74049..0673f687a3 100644
--- a/input/regression/spacing-clef-first-note.ly
+++ b/input/regression/spacing-clef-first-note.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
   texidoc = "Clef changes at the start of a line get much more space
@@ -7,7 +7,7 @@ than clef changes halfway the line."
 }
 
   \layout {
-    raggedright = ##t
+    ragged-right = ##t
     \context {
       \Staff
       \remove Time_signature_engraver
diff --git a/input/regression/spacing-end-of-line.ly b/input/regression/spacing-end-of-line.ly
index 9f01223c01..c847c2fc79 100644
--- a/input/regression/spacing-end-of-line.ly
+++ b/input/regression/spacing-end-of-line.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
   
   texidoc ="Broken engraving of a bar at the end of a line does not upset 
@@ -8,7 +8,7 @@
 }
 
 \layout {
-  raggedright = ##t }
+  ragged-right = ##t }
 
 
 \relative c' {
diff --git a/input/regression/spacing-ended-voice.ly b/input/regression/spacing-ended-voice.ly
index cb75832111..9e88f53d1c 100644
--- a/input/regression/spacing-ended-voice.ly
+++ b/input/regression/spacing-ended-voice.ly
@@ -1,10 +1,10 @@
-\version "2.7.13"
+\version "2.7.32"
 \header { texidoc = "
 A voicelet (a very short voice to get polyphonic chords correct)
 should not confuse the spacing engine."
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 
 {  \context Staff \relative c' {
diff --git a/input/regression/spacing-folded-clef.ly b/input/regression/spacing-folded-clef.ly
index 9be4c21f75..4cb5983413 100644
--- a/input/regression/spacing-folded-clef.ly
+++ b/input/regression/spacing-folded-clef.ly
@@ -1,10 +1,10 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
 texidoc = "A clef can be folded below notes in a different staff, if
 this does not disrupt the flow of the notes."
 }
 
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 \relative c'' <<
     \new Staff  { c4  c16[ c c  c] c4 c4 }
diff --git a/input/regression/spacing-folded-clef2.ly b/input/regression/spacing-folded-clef2.ly
index 5d50aac3c6..4cff1a3930 100644
--- a/input/regression/spacing-folded-clef2.ly
+++ b/input/regression/spacing-folded-clef2.ly
@@ -1,4 +1,4 @@
-\version "2.7.31"
+\version "2.7.32"
 \header {
 
 texidoc = "A clef can be folded below notes in a different staff, if
@@ -7,7 +7,7 @@ can show where columns are in the score."
 }
 
 \layout {
-    raggedright = ##t
+    ragged-right = ##t
 
     \context {
 	\Score
diff --git a/input/regression/spacing-grace-duration.ly b/input/regression/spacing-grace-duration.ly
index 274ca637cd..6fcac0d587 100644
--- a/input/regression/spacing-grace-duration.ly
+++ b/input/regression/spacing-grace-duration.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
   texidoc = "Spacing uses the duration of the notes, but disregards
@@ -9,7 +9,7 @@
 "
 }
 
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 \relative c''
 \context Voice 
diff --git a/input/regression/spacing-grace.ly b/input/regression/spacing-grace.ly
index 437a03a694..a249ac83e7 100644
--- a/input/regression/spacing-grace.ly
+++ b/input/regression/spacing-grace.ly
@@ -1,10 +1,10 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
   texidoc = "Grace note spacing.  "
 }
 
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 
 \context Voice \relative c'' { \grace {  c16[ d] } c4 }
diff --git a/input/regression/spacing-knee.ly b/input/regression/spacing-knee.ly
index 85663ae07a..e5a8c4214b 100644
--- a/input/regression/spacing-knee.ly
+++ b/input/regression/spacing-knee.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
   texidoc = "For knees, the spacing correction is such that the
@@ -7,7 +7,7 @@ width of the note heads and the thickness of the stem.
 "
 }
 
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 {
   g''8[ g g'' g''] 
diff --git a/input/regression/spacing-multi-tuplet.ly b/input/regression/spacing-multi-tuplet.ly
index 05539b319a..97e4a403a2 100644
--- a/input/regression/spacing-multi-tuplet.ly
+++ b/input/regression/spacing-multi-tuplet.ly
@@ -1,4 +1,4 @@
-\version "2.7.13" \header{
+\version "2.7.32" \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 e95c0d9da3..48db5d81ac 100644
--- a/input/regression/spacing-note-flags.ly
+++ b/input/regression/spacing-note-flags.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
@@ -9,7 +9,7 @@
 }
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 \relative c'' \context Staff {
diff --git a/input/regression/spacing-proportional.ly b/input/regression/spacing-proportional.ly
index ff1bbed75c..ac7b27f41d 100644
--- a/input/regression/spacing-proportional.ly
+++ b/input/regression/spacing-proportional.ly
@@ -6,9 +6,9 @@ to the distance for the given duration."
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
-\paper { raggedright = ##t }
+\paper { ragged-right = ##t }
 
 \relative c''
 <<
diff --git a/input/regression/spacing-ragged-last.ly b/input/regression/spacing-ragged-last.ly
index 6485037046..aeac0cc323 100644
--- a/input/regression/spacing-ragged-last.ly
+++ b/input/regression/spacing-ragged-last.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
diff --git a/input/regression/spacing-rest.ly b/input/regression/spacing-rest.ly
index 3577544658..d791ed0c48 100644
--- a/input/regression/spacing-rest.ly
+++ b/input/regression/spacing-rest.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
   texidoc = "Rests get a little less space, since they are narrower.
 However, the quarter rest in feta font is relatively wide, causing this 
@@ -8,7 +8,7 @@ effect to be very small.
 }
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 }
 \relative c'' \context Staff {
   \time 12/4
diff --git a/input/regression/spacing-short-notes.ly b/input/regression/spacing-short-notes.ly
index 2428e6d04f..05c8f1257b 100644
--- a/input/regression/spacing-short-notes.ly
+++ b/input/regression/spacing-short-notes.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
   
   texidoc = "Notes that are shorter than the common shortest note get a
@@ -10,7 +10,7 @@ eighth note. "
 
 }
 
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 \relative c''
 {
diff --git a/input/regression/spacing-stem-bar.ly b/input/regression/spacing-stem-bar.ly
index ef082e4c18..e256b9e8d6 100644
--- a/input/regression/spacing-stem-bar.ly
+++ b/input/regression/spacing-stem-bar.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
   texidoc = "Upstem notes before a barline are printed with some extra
@@ -8,7 +8,7 @@ space. This is an optical correction similar to juxtaposed stems.
 
 }
 
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 \relative e'
 {
diff --git a/input/regression/spacing-stem-direction.ly b/input/regression/spacing-stem-direction.ly
index 3edb6a6cde..e758cbe222 100644
--- a/input/regression/spacing-stem-direction.ly
+++ b/input/regression/spacing-stem-direction.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
 
@@ -12,7 +12,7 @@ much to correct."
 }
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 
diff --git a/input/regression/spacing-stem-same-direction.ly b/input/regression/spacing-stem-same-direction.ly
index 0a1ed16192..7416506875 100644
--- a/input/regression/spacing-stem-same-direction.ly
+++ b/input/regression/spacing-stem-same-direction.ly
@@ -1,12 +1,12 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
   texidoc = "For juxtaposed chords with the same direction, a
 slight optical correction is used. It is constant, and works only if
 two chords have no common head-positions range."
 }
 
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 \relative c'' {
   \stemDown
diff --git a/input/regression/spacing-stick-out.ly b/input/regression/spacing-stick-out.ly
index 81d43b7cdc..5c6ee2a549 100644
--- a/input/regression/spacing-stick-out.ly
+++ b/input/regression/spacing-stick-out.ly
@@ -7,9 +7,9 @@
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
-\layout { raggedright = ##t } 
+\layout { ragged-right = ##t } 
 
 \relative {
   \override Score.PaperColumn #'keep-inside-line = ##t 
diff --git a/input/regression/spacing-strict-notespacing.ly b/input/regression/spacing-strict-notespacing.ly
index af6233a6f7..282aaff698 100644
--- a/input/regression/spacing-strict-notespacing.ly
+++ b/input/regression/spacing-strict-notespacing.ly
@@ -9,10 +9,10 @@ time.  This may cause collisions.  "
 }
 
 
-\version "2.7.13"
+\version "2.7.32"
 
 \paper {
-  raggedright = ##t
+  ragged-right = ##t
   indent = 0
 }
 \layout {
diff --git a/input/regression/spacing-strict-spacing-grace.ly b/input/regression/spacing-strict-spacing-grace.ly
index 19916344a5..84c9191a1b 100644
--- a/input/regression/spacing-strict-spacing-grace.ly
+++ b/input/regression/spacing-strict-spacing-grace.ly
@@ -5,10 +5,10 @@
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \paper {
-  raggedright = ##t
+  ragged-right = ##t
   indent = 0
 }
 
diff --git a/input/regression/spacing-to-grace.ly b/input/regression/spacing-to-grace.ly
index f96e2df7fc..ace6796738 100644
--- a/input/regression/spacing-to-grace.ly
+++ b/input/regression/spacing-to-grace.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
   texidoc ="Space from a normal note (or barline) to a grace note is
@@ -7,7 +7,7 @@
   
 }
 
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 
 \context Voice 
diff --git a/input/regression/spacing-uniform-stretching.ly b/input/regression/spacing-uniform-stretching.ly
index 673da842dc..13821bd33b 100644
--- a/input/regression/spacing-uniform-stretching.ly
+++ b/input/regression/spacing-uniform-stretching.ly
@@ -6,7 +6,7 @@
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \relative c''
 <<
diff --git a/input/regression/span-bar-break.ly b/input/regression/span-bar-break.ly
index 4b5eeec3f7..233de803d7 100644
--- a/input/regression/span-bar-break.ly
+++ b/input/regression/span-bar-break.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
@@ -7,7 +7,7 @@ barline is drawn between the staves, but the @code{:|} is not."
 
 }
 
-\layout{ raggedright = ##t }
+\layout{ ragged-right = ##t }
 
 
 \new PianoStaff <<
diff --git a/input/regression/span-bar.ly b/input/regression/span-bar.ly
index bb6357b62d..9e09369b2f 100644
--- a/input/regression/span-bar.ly
+++ b/input/regression/span-bar.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
   texidoc = "Span bars are drawn only between staff bar lines. By setting 
 bar lines to transparent, they are shown only between systems.
@@ -13,7 +13,7 @@ between systems.
   \context {
     \Staff
   }
-  raggedright =##t 
+  ragged-right =##t 
 }
 
 \relative c' \new StaffGroup <<
diff --git a/input/regression/spanner-break-overshoot.ly b/input/regression/spanner-break-overshoot.ly
index 277d3fef1d..2d597c9461 100644
--- a/input/regression/spanner-break-overshoot.ly
+++ b/input/regression/spanner-break-overshoot.ly
@@ -8,9 +8,9 @@ prefatory matter."
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
-\paper { raggedright = ##t }
+\paper { ragged-right = ##t }
 
 \relative c'' {
   \override Beam #'break-overshoot = #'(1.0 . 2.0)
diff --git a/input/regression/staccato-pos.ly b/input/regression/staccato-pos.ly
index 97f6424baf..322b8a0886 100644
--- a/input/regression/staccato-pos.ly
+++ b/input/regression/staccato-pos.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
 
@@ -11,7 +11,7 @@ to it.  "
 }
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 
diff --git a/input/regression/staff-halfway.ly b/input/regression/staff-halfway.ly
index 0d7392672a..1a3ad85830 100644
--- a/input/regression/staff-halfway.ly
+++ b/input/regression/staff-halfway.ly
@@ -2,10 +2,10 @@
   texidoc = "Staves can be started and stopped at command. "
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \paper {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 \relative c'' {
diff --git a/input/regression/staff-line-positions.ly b/input/regression/staff-line-positions.ly
index 2d27ba825e..66ffd91295 100644
--- a/input/regression/staff-line-positions.ly
+++ b/input/regression/staff-line-positions.ly
@@ -6,7 +6,7 @@
 
 }
 
-\version "2.7.26"
+\version "2.7.32"
 
 
 \new Staff \relative c'  {
diff --git a/input/regression/staff-mixed-size.ly b/input/regression/staff-mixed-size.ly
index 046318881d..7ad07ab20c 100644
--- a/input/regression/staff-mixed-size.ly
+++ b/input/regression/staff-mixed-size.ly
@@ -7,11 +7,11 @@ large on smaller staves."
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \layout {
   #(layout-set-staff-size 6)
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 <<
diff --git a/input/regression/staff-tweak.ly b/input/regression/staff-tweak.ly
index ec32ce4a74..574fd2537f 100644
--- a/input/regression/staff-tweak.ly
+++ b/input/regression/staff-tweak.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \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}.
@@ -7,7 +7,7 @@ However, beams remain correctly quantized."
 }
 
 \layout  {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 
diff --git a/input/regression/stanza-number.ly b/input/regression/stanza-number.ly
index 25871250e1..c9e5f29c28 100644
--- a/input/regression/stanza-number.ly
+++ b/input/regression/stanza-number.ly
@@ -1,9 +1,9 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header { texidoc = "Stanza numbers are put left of their lyric.  They
 are aligned in a column."  }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 \relative c'' { r4 r4 c4 c4 }
 \addlyrics {
diff --git a/input/regression/stem-direction-context.ly b/input/regression/stem-direction-context.ly
index db0b790851..b7822c3b39 100644
--- a/input/regression/stem-direction-context.ly
+++ b/input/regression/stem-direction-context.ly
@@ -5,7 +5,7 @@
 
 }
 
-\version "2.7.25"
+\version "2.7.32"
 
 
 \relative c'' \new Voice {
diff --git a/input/regression/stem-direction.ly b/input/regression/stem-direction.ly
index ee806cb9d5..0292ac2c51 100644
--- a/input/regression/stem-direction.ly
+++ b/input/regression/stem-direction.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header{
 texidoc="
@@ -10,7 +10,7 @@ notes, and up for low notes.
 }
 
 \layout {
-    raggedright = ##t
+    ragged-right = ##t
 }  
 \context Voice \relative c {
     b''4 ~ b8(b8) e4 e,
diff --git a/input/regression/stem-shorten.ly b/input/regression/stem-shorten.ly
index 3aae75dd62..39828e40ff 100644
--- a/input/regression/stem-shorten.ly
+++ b/input/regression/stem-shorten.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
   
@@ -10,7 +10,7 @@
 }
 
 \layout  {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 
diff --git a/input/regression/stem-stemlet.ly b/input/regression/stem-stemlet.ly
index 661319dfe8..89df0d499a 100644
--- a/input/regression/stem-stemlet.ly
+++ b/input/regression/stem-stemlet.ly
@@ -5,8 +5,8 @@ length can be set with @code{stemlet-length}."
 
 }
 
-\version "2.7.13"
-\layout { raggedright = ##t }
+\version "2.7.32"
+\layout { ragged-right = ##t }
 
 \relative {
     \override Stem #'stemlet-length = #0.75
diff --git a/input/regression/stem-tremolo.ly b/input/regression/stem-tremolo.ly
index 0b27ae48c5..84a691c87e 100644
--- a/input/regression/stem-tremolo.ly
+++ b/input/regression/stem-tremolo.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header{
   texidoc="
 Stem tremolos or rolls are tremolo signs that look like beam segments
diff --git a/input/regression/stencil-hacking.ly b/input/regression/stencil-hacking.ly
index 1ca4d9ed9b..55dbf9e9e5 100644
--- a/input/regression/stencil-hacking.ly
+++ b/input/regression/stencil-hacking.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.31"
+\version "2.7.32"
 
 \header { texidoc=" You can write stencil callbacks in Scheme, thus
 providing custom glyphs for notation elements.  A simple example is
@@ -49,7 +49,7 @@ GROB.  The dimensions of the stencil is not affected.
    parenthesize-stencil)
     
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 \relative c' {
     c4 e
 
diff --git a/input/regression/string-number.ly b/input/regression/string-number.ly
index dcfe84de0f..dbfd3f895d 100644
--- a/input/regression/string-number.ly
+++ b/input/regression/string-number.ly
@@ -4,9 +4,9 @@ positioning mechanism as finger instructions."
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 \paper {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 \relative {
diff --git a/input/regression/system-extents.ly b/input/regression/system-extents.ly
index cbb48a2819..dc7ee178b5 100644
--- a/input/regression/system-extents.ly
+++ b/input/regression/system-extents.ly
@@ -1,4 +1,4 @@
-\version "2.7.14"
+\version "2.7.32"
 \header {
 
     texidoc = "The size of every system is correctly determined; this 
diff --git a/input/regression/system-overstrike.ly b/input/regression/system-overstrike.ly
index 58ab523741..7f04ec803e 100644
--- a/input/regression/system-overstrike.ly
+++ b/input/regression/system-overstrike.ly
@@ -1,7 +1,7 @@
-\version "2.7.13"
-\header { texidoc = "By setting betweensystempadding to a negative
+\version "2.7.32"
+\header { texidoc = "By setting between-system-padding to a negative
 value, it is possible to eliminate the anti-collision constraints.
-Then  setting @code{betweensystemspace} to a low (nonzero) value,
+Then  setting @code{between-system-space} to a low (nonzero) value,
 print  systems in overstrike.
 
 Unfortunately, this does not show in the colllated texinfo document. Run this example stand-alone to see the effect.
@@ -10,9 +10,9 @@ Unfortunately, this does not show in the colllated texinfo document. Run this ex
 }
 
 \paper {
-    raggedbottom =##t
-    betweensystempadding = - 4\cm
-    betweensystemspace = 3\mm
+    ragged-bottom =##t
+    between-system-padding = - 4\cm
+    between-system-space = 3\mm
 }
 
 {
diff --git a/input/regression/system-separator.ly b/input/regression/system-separator.ly
index 17ee8c2752..8d262bb19f 100644
--- a/input/regression/system-separator.ly
+++ b/input/regression/system-separator.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
diff --git a/input/regression/system-start-bracket.ly b/input/regression/system-start-bracket.ly
index af6e0f6de8..0cd2ecbf80 100644
--- a/input/regression/system-start-bracket.ly
+++ b/input/regression/system-start-bracket.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
   texidoc =
   "
@@ -6,7 +6,7 @@ The piano brace should be shifted horizontally if it  is enclosed in a bracket.
 "
 }
 
-\layout {raggedright = ##t}
+\layout {ragged-right = ##t}
 
 
 {
diff --git a/input/regression/system-start-heavy-bar.ly b/input/regression/system-start-heavy-bar.ly
index a5ca7e8298..a86e9e122e 100644
--- a/input/regression/system-start-heavy-bar.ly
+++ b/input/regression/system-start-heavy-bar.ly
@@ -1,10 +1,10 @@
 \header { texidoc = "A heavy-bar system start delimiter may be created by tuning the @code{SystemStartBar} grob."
 	} 
 
-\version "2.7.18"
+\version "2.7.32"
 
 \paper {
-  raggedright = ##t
+  ragged-right = ##t
 }
 <<
   \new StaffGroup
diff --git a/input/regression/system-start-nesting.ly b/input/regression/system-start-nesting.ly
index 5f5ff48d24..ff68dd26db 100644
--- a/input/regression/system-start-nesting.ly
+++ b/input/regression/system-start-nesting.ly
@@ -3,10 +3,10 @@
 
 }
 
-\version "2.7.18"
+\version "2.7.32"
 
 \paper {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 \new StaffGroup
diff --git a/input/regression/tablature-string-tunings.ly b/input/regression/tablature-string-tunings.ly
index add6c780a2..d4223c9349 100644
--- a/input/regression/tablature-string-tunings.ly
+++ b/input/regression/tablature-string-tunings.ly
@@ -6,7 +6,7 @@
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 
 \new TabStaff {
diff --git a/input/regression/tablature.ly b/input/regression/tablature.ly
index 2a41f5b1be..6315f6edcf 100644
--- a/input/regression/tablature.ly
+++ b/input/regression/tablature.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \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 f306b8b650..af26b267db 100644
--- a/input/regression/tag-filter.ly
+++ b/input/regression/tag-filter.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
   texidoc = "The @code{\\tag} command marks music expressions with a
@@ -11,7 +11,7 @@ notes and fingerings, but the score has not."
 
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 common =
 \relative c''  {
diff --git a/input/regression/text-spanner.ly b/input/regression/text-spanner.ly
index 36295730a4..36b0e7cae2 100644
--- a/input/regression/text-spanner.ly
+++ b/input/regression/text-spanner.ly
@@ -1,10 +1,10 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
     texidoc= "Text spanners should not repeat start text when broken."
 }
 \layout {
-    raggedright = ##t 
+    ragged-right = ##t 
 }
 
 \relative c'' {
diff --git a/input/regression/tie-arpeggio.ly b/input/regression/tie-arpeggio.ly
index d12303349d..e0feffd2da 100644
--- a/input/regression/tie-arpeggio.ly
+++ b/input/regression/tie-arpeggio.ly
@@ -8,9 +8,9 @@
   
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
-\paper { raggedright =  ##t }
+\paper { ragged-right =  ##t }
 \relative {
   c~ e~ g~ <c, e g>
   \set tieWaitForNote = ##t
diff --git a/input/regression/tie-broken.ly b/input/regression/tie-broken.ly
index 47fb0fca86..1a9c2e35c4 100644
--- a/input/regression/tie-broken.ly
+++ b/input/regression/tie-broken.ly
@@ -3,9 +3,9 @@
 texidoc = "Ties behave properly at line breaks."
   }
 
-\version "2.7.13"
+\version "2.7.32"
 
-\paper { raggedright = ##t } 
+\paper { ragged-right = ##t } 
 
 \relative c'
 {
diff --git a/input/regression/tie-busy-grobs.ly b/input/regression/tie-busy-grobs.ly
index a76afbdd80..1a522f3404 100644
--- a/input/regression/tie-busy-grobs.ly
+++ b/input/regression/tie-busy-grobs.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
   texidoc = "Tie engraver uses @code{busyGrobs} to keep track of
@@ -9,7 +9,7 @@ one may have collisions between ties and beams.
 }
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 
diff --git a/input/regression/tie-chord.ly b/input/regression/tie-chord.ly
index d6035a0ea6..6ca08201cc 100644
--- a/input/regression/tie-chord.ly
+++ b/input/regression/tie-chord.ly
@@ -13,11 +13,11 @@ each system.  "
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \paper {
   indent = #0.0
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 
diff --git a/input/regression/tie-dot.ly b/input/regression/tie-dot.ly
index 6338fb7f1b..9f4b73dbf7 100644
--- a/input/regression/tie-dot.ly
+++ b/input/regression/tie-dot.ly
@@ -3,9 +3,9 @@
   texidoc = "Ties avoid collisions with dots."
 }
 
-\version "2.7.23"
+\version "2.7.32"
 
-\paper { raggedright = ##T }
+\paper { ragged-right = ##T }
 
 \relative c'' {
   \time 12/8
diff --git a/input/regression/tie-grace.ly b/input/regression/tie-grace.ly
index 8628a0029a..fc0493f251 100644
--- a/input/regression/tie-grace.ly
+++ b/input/regression/tie-grace.ly
@@ -1,10 +1,10 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
   texidoc = "Tieing a grace to the to a following grace or main note works."
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 \context Voice \relative c'' {
   c4 \grace { c8 ~ c16 ~ } c4 
diff --git a/input/regression/tie-manual.ly b/input/regression/tie-manual.ly
index 6311da6660..6f2a88be6b 100644
--- a/input/regression/tie-manual.ly
+++ b/input/regression/tie-manual.ly
@@ -11,10 +11,10 @@ You can leave a Tie alone by introducing a non-pair value
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 
diff --git a/input/regression/tie-single.ly b/input/regression/tie-single.ly
index 60f37ea181..59c9bb9ef0 100644
--- a/input/regression/tie-single.ly
+++ b/input/regression/tie-single.ly
@@ -19,10 +19,10 @@ that otherwise don't fit in a space
 }
 \layout {
   indent = #0.0
-  raggedright = ##t
+  ragged-right = ##t
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 frag =
 \relative c'' {
diff --git a/input/regression/trill-spanner-pitched.ly b/input/regression/trill-spanner-pitched.ly
index 9d2917972b..7d40dbaa39 100644
--- a/input/regression/trill-spanner-pitched.ly
+++ b/input/regression/trill-spanner-pitched.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
@@ -9,7 +9,7 @@
 }
 
 \paper {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 \relative {
diff --git a/input/regression/trill-spanner.ly b/input/regression/trill-spanner.ly
index e7c1b44d76..5fbc6ec440 100644
--- a/input/regression/trill-spanner.ly
+++ b/input/regression/trill-spanner.ly
@@ -2,9 +2,9 @@
     texidoc = "Trill spanner"
 }
 
-\version "2.7.13"
+\version "2.7.32"
 \layout {
-    raggedright = ##T
+    ragged-right = ##T
 }
 \relative \new Voice {
     << { c1 \startTrillSpan }
diff --git a/input/regression/tuplet-beam.ly b/input/regression/tuplet-beam.ly
index ec6367aee7..b634d89af4 100644
--- a/input/regression/tuplet-beam.ly
+++ b/input/regression/tuplet-beam.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
   texidoc = "In combination with a beam, the bracket of the tuplet
@@ -7,7 +7,7 @@ bracket is removed. This only happens if there is one beam, as long as
 the bracket."
 
 }
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 \context Voice\relative c'' {
   \times 2/3 { r  c8[ c8] }
diff --git a/input/regression/tuplet-broken.ly b/input/regression/tuplet-broken.ly
index ffb66bc156..afe971cedd 100644
--- a/input/regression/tuplet-broken.ly
+++ b/input/regression/tuplet-broken.ly
@@ -8,10 +8,10 @@
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \paper {
-  raggedright = ##t  
+  ragged-right = ##t  
   indent = 0.0
 }
 
diff --git a/input/regression/tuplet-full-length.ly b/input/regression/tuplet-full-length.ly
index 49ad60b559..851dcd9ad6 100644
--- a/input/regression/tuplet-full-length.ly
+++ b/input/regression/tuplet-full-length.ly
@@ -5,9 +5,9 @@
 start of the next non-tuplet note.  "
 
 }
-\version "2.7.13"
+\version "2.7.32"
 
-\paper { raggedright = ##t
+\paper { ragged-right = ##t
 indent = 0.0 }
 
 \relative c'' \new Voice \with {
diff --git a/input/regression/tuplet-gap.ly b/input/regression/tuplet-gap.ly
index f4d4ce0b36..28ba43fd2e 100644
--- a/input/regression/tuplet-gap.ly
+++ b/input/regression/tuplet-gap.ly
@@ -5,11 +5,11 @@
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \layout {
   indent = 0.0\mm
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 
diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly
index 8fa9cff559..7c5d7fcf0e 100644
--- a/input/regression/tuplet-nest.ly
+++ b/input/regression/tuplet-nest.ly
@@ -1,12 +1,12 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
     texidoc=" Tuplets may be nested."
 }
 
 \paper {
-  raggedright = ##t  
+  ragged-right = ##t  
   indent = 0.0
 }
 
diff --git a/input/regression/tuplet-properties.ly b/input/regression/tuplet-properties.ly
index 0574f1eb1d..f55a48b31f 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.7.13"
+\version "2.7.32"
 
 
 
@@ -25,9 +25,11 @@ for instance, bracketed (B) and non-bracketed (NB).
   \times 2/3 {  c8[ c c]  }
   
   \tupletUp
-  \override TupletBracket  #'number-visibility = ##f
+  \override TupletBracket  #'number-visibility % number-visibility is deprecated. Tune the TupletNumber instead
+ = ##f
   \times 2/3 { c8^""^""^"up, no digit"  c[ c]  }
-  \revert TupletBracket #'number-visibility
+  \revert TupletBracket #'number-visibility % number-visibility is deprecated. Tune the TupletNumber instead
+
 
   \override TupletBracket  #'bracket-visibility = ##t
   \override TupletBracket  #'edge-height = #'(0.0 . 0.0)
diff --git a/input/regression/tuplet-rest.ly b/input/regression/tuplet-rest.ly
index 29461ec0e1..88ae902943 100644
--- a/input/regression/tuplet-rest.ly
+++ b/input/regression/tuplet-rest.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
   texidoc = "Tuplets may contain rests. "
diff --git a/input/regression/tuplet-slope.ly b/input/regression/tuplet-slope.ly
index 093096b969..a9c539af53 100644
--- a/input/regression/tuplet-slope.ly
+++ b/input/regression/tuplet-slope.ly
@@ -12,10 +12,10 @@ The bracket direction is determined by the dominating stem direction.
 }
 
 \layout {
-  raggedright = ##t 
+  ragged-right = ##t 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \new Voice {
   \relative c'' {
diff --git a/input/regression/tuplet-staffline-collision.ly b/input/regression/tuplet-staffline-collision.ly
index 0af2753898..cabc0ca178 100644
--- a/input/regression/tuplet-staffline-collision.ly
+++ b/input/regression/tuplet-staffline-collision.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
   texidoc = "Horizontal tuplet brackets are shifted vertically
@@ -7,7 +7,7 @@ to avoid staff line collisions."
 
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 \context Voice\relative c'' {
   \times 2/3 { b'4 b b }
diff --git a/input/regression/tuplets.ly b/input/regression/tuplets.ly
index 3bbd4d4597..ee60503cfe 100644
--- a/input/regression/tuplets.ly
+++ b/input/regression/tuplets.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header{
   
   texidoc="
@@ -16,7 +16,7 @@ direction as the bracket. The endings can be adjusted with
 "
 
 }
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 
 \context Voice \relative c'' {
diff --git a/input/regression/utf-8.ly b/input/regression/utf-8.ly
index 4cab961a03..dc49791426 100644
--- a/input/regression/utf-8.ly
+++ b/input/regression/utf-8.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 %% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs
 
diff --git a/input/regression/voice-follower.ly b/input/regression/voice-follower.ly
index c971ce2b8f..228b43982b 100644
--- a/input/regression/voice-follower.ly
+++ b/input/regression/voice-follower.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 
 \header { texidoc= "
@@ -10,7 +10,7 @@ can be printed automatically. This is enabled if the property
 }
 
 \layout{ 
-  raggedright = ##t 
+  ragged-right = ##t 
 }
 
 \relative c'
diff --git a/input/regression/volta-broken-left-edge.ly b/input/regression/volta-broken-left-edge.ly
index 491fadb6f7..41b865215f 100644
--- a/input/regression/volta-broken-left-edge.ly
+++ b/input/regression/volta-broken-left-edge.ly
@@ -1,11 +1,11 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
   texidoc ="Broken volta spanners behave correctly at their left edge in all cases."
 
 }
 
-\layout { raggedright =##t }
+\layout { ragged-right =##t }
 
 %{
 
diff --git a/input/regression/volta-multi-staff.ly b/input/regression/volta-multi-staff.ly
index 385885fd22..3042a764f5 100644
--- a/input/regression/volta-multi-staff.ly
+++ b/input/regression/volta-multi-staff.ly
@@ -5,8 +5,8 @@
 
 }
 
-\layout { raggedright = ##t }
-\version "2.7.13"
+\layout { ragged-right = ##t }
+\version "2.7.32"
 
 
 vmus =  { \repeat volta 2 c1 \alternative { d e } } 
diff --git a/input/regression/whiteout.ly b/input/regression/whiteout.ly
index 70adcb4c2a..581fa6ae32 100644
--- a/input/regression/whiteout.ly
+++ b/input/regression/whiteout.ly
@@ -5,11 +5,11 @@ markup.  The whitening effect only is only guaranteed for staff lines,
 since staff lines are in a different layer.  "
 
 }
-\version "2.7.13"
+\version "2.7.32"
 
 \paper
 {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 {
diff --git a/input/sakura-sakura.ly b/input/sakura-sakura.ly
index 21fb572cba..2e0d812dc5 100644
--- a/input/sakura-sakura.ly
+++ b/input/sakura-sakura.ly
@@ -1,6 +1,6 @@
 %% sakura-sakura.ly
 
-\version "2.6.0"
+\version "2.7.32"
 
 \header {
   title = "さくら さくら"
diff --git a/input/screech-boink.ly b/input/screech-boink.ly
index 967659055b..619d0c68a1 100644
--- a/input/screech-boink.ly
+++ b/input/screech-boink.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.7.32"
 \header {
     title = "Screech and boink"
     subtitle = "Random complex notation"
@@ -54,7 +54,7 @@
     \midi { \tempo 8 = 60 }
 
     \layout {
-	raggedright = ##t 
+	ragged-right = ##t 
 
 	\context {
 	    \Staff
diff --git a/input/simple-song.ly b/input/simple-song.ly
index 6eebcb11f3..0408611bc5 100644
--- a/input/simple-song.ly
+++ b/input/simple-song.ly
@@ -13,5 +13,5 @@
 >>
 
 %% Optional helper for automatic updating by convert-ly.  May be omitted.
-\version "2.6.0"
+\version "2.7.32"
     
diff --git a/input/simple.ly b/input/simple.ly
index 640eab58c2..847dc79491 100644
--- a/input/simple.ly
+++ b/input/simple.ly
@@ -4,4 +4,4 @@
 }
 
 %% Optional helper for automatic updating by convert-ly.  May be omitted.
-\version "2.6.0"
+\version "2.7.32"
diff --git a/input/test/+.ly b/input/test/+.ly
index e97bccab4b..378a98e605 100644
--- a/input/test/+.ly
+++ b/input/test/+.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 %% +.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 d7a4aefb18..782691bc4e 100644
--- a/input/test/add-staccato.ly
+++ b/input/test/add-staccato.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
@@ -27,7 +27,7 @@ example staccato dots are added to the notes."
   \relative c'' {
     a b \applyMusic #(lambda (x) (music-map add-staccato x)) { c c } 
   }
-  \layout{ raggedright = ##t }
+  \layout{ ragged-right = ##t }
 }
 
 
diff --git a/input/test/add-text-script.ly b/input/test/add-text-script.ly
index ed08cbfb8e..5db43c2463 100644
--- a/input/test/add-text-script.ly
+++ b/input/test/add-text-script.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 texidoc= "@cindex make-music Fingering
@@ -29,7 +29,7 @@ create, then write a function that will structure the music for you.
 
 \score {
   \applyMusic #(lambda (x)  (add-text-script x "6") (display-music x) x )  { c'4-3 }
-	\layout{ raggedright = ##t }
+	\layout{ ragged-right = ##t }
 }
 
 
diff --git a/input/test/ambitus-mixed.ly b/input/test/ambitus-mixed.ly
index 8665b5fb19..318314e969 100644
--- a/input/test/ambitus-mixed.ly
+++ b/input/test/ambitus-mixed.ly
@@ -6,10 +6,10 @@ ambitus must be moved manually to prevent collisions."
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \layout {
-    raggedright = ##t
+    ragged-right = ##t
 }
 
 \new Staff <<
diff --git a/input/test/ancient-accidentals.ly b/input/test/ancient-accidentals.ly
index cde3b5151e..46e920f851 100644
--- a/input/test/ancient-accidentals.ly
+++ b/input/test/ancient-accidentals.ly
@@ -6,7 +6,7 @@ are collected here.
 "
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \relative c'' {
       \time 5/4
diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly
index 94dc8f238b..08a376f573 100644
--- a/input/test/ancient-font.ly
+++ b/input/test/ancient-font.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 % TODO: split ancient-font into seperate files; possibly in
 % different locations.
 \header {
@@ -211,7 +211,7 @@ lowerStaff = \context MensuralStaff = "lowerStaff" <<
 >>
 
 \paper {
-	linethickness = #(/ staffspace 5.0)
+	line-thickness = #(/ staff-space 5.0)
 }
 
 \score {
@@ -221,7 +221,7 @@ lowerStaff = \context MensuralStaff = "lowerStaff" <<
     >>
     \layout {
 % do we want to keep these settings? -gp
-	linewidth = 17.25\cm
+	line-width = 17.25\cm
 	textheight = 26.0\cm
 	indent = 0.0
 	\context {
diff --git a/input/test/ancient-time.ly b/input/test/ancient-time.ly
index 2864bd31f5..6165de7e56 100644
--- a/input/test/ancient-time.ly
+++ b/input/test/ancient-time.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 % TODO: move stuff from ancient-font into here?  See comment
 % for ancient-font.ly
 \header {
@@ -12,6 +12,6 @@ Time signatures may also be engraved in an old style.
     \override Staff.TimeSignature  #'style = #'neomensural
     s1 
   }
-	\layout {raggedright = ##t}
+	\layout {ragged-right = ##t}
 }
 
diff --git a/input/test/bar-always.ly b/input/test/bar-always.ly
index fa1d1f2c07..97e763190b 100644
--- a/input/test/bar-always.ly
+++ b/input/test/bar-always.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
     texidoc = "@cindex Bars Always
@@ -14,6 +14,6 @@ By setting @code{barAlways} and @code{defaultBarType}, barlines may be inserted
 		\set Score.barAlways = ##t
 		\set Score.defaultBarType = ":|:"
 		c4 c4 c4 c4 }
-	\layout{raggedright = ##t}
+	\layout{ragged-right = ##t}
 }
 
diff --git a/input/test/bar-lines-lyric-only.ly b/input/test/bar-lines-lyric-only.ly
index 36f9aaeb12..5ec7c28e78 100644
--- a/input/test/bar-lines-lyric-only.ly
+++ b/input/test/bar-lines-lyric-only.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \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 
@@ -16,7 +16,7 @@ on lyrics. "
 
 
     \layout  {
-	raggedright = ##t
+	ragged-right = ##t
 	\context {
 	    \Lyrics
 	    \consists Bar_engraver
diff --git a/input/test/bar-lines.ly b/input/test/bar-lines.ly
index f11cd38cae..393d5e6c4f 100644
--- a/input/test/bar-lines.ly
+++ b/input/test/bar-lines.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
     
@@ -7,7 +7,7 @@
 
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 \relative {
     \override Score.RehearsalMark #'padding = #3
diff --git a/input/test/bar-number-every-five-reset.ly b/input/test/bar-number-every-five-reset.ly
index bef5bf563c..b53c717161 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.7.13"
+\version "2.7.32"
 
 \header {
     texidoc = "@cindex Bar Number Every Fifth Reset
@@ -26,5 +26,5 @@ resetBarnum = \context Score \applyContext
             \bar "|."
         }
     >>
-\layout{raggedright = ##t}
+\layout{ragged-right = ##t}
 }
diff --git a/input/test/bar-number-regular-interval.ly b/input/test/bar-number-regular-interval.ly
index ae6fcac0ae..1515d0a874 100644
--- a/input/test/bar-number-regular-interval.ly
+++ b/input/test/bar-number-regular-interval.ly
@@ -5,7 +5,7 @@ Bar numbers can be printed at regular intervals, inside a box or a circle.
 
 " }
 
-\version "2.7.31"
+\version "2.7.32"
 
 \relative c'{
    \override Score.BarNumber  #'break-visibility = #end-of-line-invisible
diff --git a/input/test/bar-number-show-all.ly b/input/test/bar-number-show-all.ly
index 47c9b003b3..12de1f40ad 100644
--- a/input/test/bar-number-show-all.ly
+++ b/input/test/bar-number-show-all.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header{
     texidoc="@cindex Bar Number Show All
 By default, bar numbers are printed only in the first measure.  This 
@@ -14,7 +14,7 @@ setting can be overridden, so that bar numbers on start of every measure.
 	\break
 	c c c
     }
-	\layout{ raggedright = ##t }
+	\layout{ ragged-right = ##t }
 }
 
 
diff --git a/input/test/beam-alternate.ly b/input/test/beam-alternate.ly
index 9262aca9e2..00159bbf86 100644
--- a/input/test/beam-alternate.ly
+++ b/input/test/beam-alternate.ly
@@ -8,13 +8,13 @@
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 wipeNote = {
     \once \override NoteHead #'transparent = ##t
     \once \override Stem #'transparent = ##t 
 }
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 
 \relative c''<< {
diff --git a/input/test/beam-auto-4-8.ly b/input/test/beam-auto-4-8.ly
index bc57c18286..8add92227f 100644
--- a/input/test/beam-auto-4-8.ly
+++ b/input/test/beam-auto-4-8.ly
@@ -1,5 +1,5 @@
 
-%% \version "2.7.13"
+%% \version "2.7.32"
 
 %% keep for now, although merging into beam-auto-override is a possibility.
 \header {
@@ -8,7 +8,7 @@ You can override the automatic beaming settings.
 "
 }
 
-\layout{raggedright = ##t}
+\layout{ragged-right = ##t}
 
 \relative c''{
   \time 4/8
diff --git a/input/test/beam-auto-override.ly b/input/test/beam-auto-override.ly
index 621de6836a..adc1a005d4 100644
--- a/input/test/beam-auto-override.ly
+++ b/input/test/beam-auto-override.ly
@@ -1,6 +1,6 @@
 
 %% ugh
-%% \version "2.7.13"
+%% \version "2.7.32"
 
 \header {
 
@@ -24,7 +24,7 @@ The @code{autoBeaming} can also be turned off.
 
 %% TODO: check doc string. -hw
 
-\layout{raggedright = ##t}
+\layout{ragged-right = ##t}
 \relative c''{
   %% This has now (2.5.21) changed, (end * * * *) no longer
   %% masks the default config entry ('(end * * 2 4) 1 4))
diff --git a/input/test/beam-control.ly b/input/test/beam-control.ly
index 45ae760db4..67ec78d5d1 100644
--- a/input/test/beam-control.ly
+++ b/input/test/beam-control.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header{
     texidoc="@cindex Beam Position Control
 
@@ -16,6 +16,6 @@ Beam positions may be controlled manually, by overriding the @code{positions} se
 	\override Beam  #'positions = #'(0 . 1)
 	 c[ c]
   }
-\layout{raggedright = ##t}
+\layout{ragged-right = ##t}
 }
 
diff --git a/input/test/beam-count.ly b/input/test/beam-count.ly
index 73e8e599f6..1628bbc111 100644
--- a/input/test/beam-count.ly
+++ b/input/test/beam-count.ly
@@ -1,5 +1,5 @@
 
-%%\version "2.7.13"
+%%\version "2.7.32"
 \header{
 	texidoc="@cindex Beam Count
 
@@ -8,7 +8,7 @@ two sets of four 32nds are joined, as if they were 8th notes.
 
 " }
 
-\layout { raggedright = ##t}  
+\layout { ragged-right = ##t}  
 
 \relative {
   %% This has now (2.5.21) changed, (end * * * *) no longer
diff --git a/input/test/boxed-stencil.ly b/input/test/boxed-stencil.ly
index 2a020e5c5d..3604524d66 100644
--- a/input/test/boxed-stencil.ly
+++ b/input/test/boxed-stencil.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.31"
+\version "2.7.32"
 \header {
   texidoc = "@cindex Boxed Stencil
 
@@ -7,7 +7,7 @@ The @code{print-function} can be overridden to draw a box around an arbitrary
 grob. " }
 
 
-\layout{raggedright = ##t}
+\layout{ragged-right = ##t}
 \relative c''  {
 
   \override TextScript  #'stencil =
diff --git a/input/test/caps.ly b/input/test/caps.ly
index 98e04ebb66..77ff929c41 100644
--- a/input/test/caps.ly
+++ b/input/test/caps.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
 texidoc = "@cindex Capital Letters
 The font can be changed to small caps.
@@ -13,6 +13,6 @@ shapeNorm = \revert LyricText #'font-shape
   \context Lyrics \lyricmode { 
     what4 is4 \shapeSC The8  Ma -- trix? }
   >>
-  \layout { raggedright = ##t}
+  \layout { ragged-right = ##t}
 }
 
diff --git a/input/test/chord-names-jazz.ly b/input/test/chord-names-jazz.ly
index ebac8c13fb..8d8b64e54c 100644
--- a/input/test/chord-names-jazz.ly
+++ b/input/test/chord-names-jazz.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
 texidoc = " Chord names are generated from a list pitches.  The
diff --git a/input/test/chord-names-languages.ly b/input/test/chord-names-languages.ly
index e064a1e2de..d965f27497 100644
--- a/input/test/chord-names-languages.ly
+++ b/input/test/chord-names-languages.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header  {
     texidoc = "@cindex Chord Names German
 The english naming of chords (default) can be changed to german 
@@ -21,7 +21,7 @@ scm = \chordmode {
 
 
 \layout {
-    raggedright = ##t 
+    ragged-right = ##t 
     \context {\ChordNames \consists Instrument_name_engraver }
 }
 
diff --git a/input/test/circle.ly b/input/test/circle.ly
index 3147ab6e38..c95b0b893e 100644
--- a/input/test/circle.ly
+++ b/input/test/circle.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.31"
+\version "2.7.32"
 \header {
 texidoc = "@cindex Circle
 
@@ -8,7 +8,7 @@ Circles can be drawn around various objects.
 "
 }
 
-\layout{raggedright = ##t}
+\layout{ragged-right = ##t}
 
 \relative c'{
 c1
diff --git a/input/test/compound-time.ly b/input/test/compound-time.ly
index a8a8d82888..d7ce8b6d3f 100644
--- a/input/test/compound-time.ly
+++ b/input/test/compound-time.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.14"
+\version "2.7.32"
 \header {
 texidoc = "@cindex compound time
 @cindex plus
@@ -10,7 +10,7 @@ compound time.
 "
 }
 
-\layout{raggedright = ##t}
+\layout{ragged-right = ##t}
 
 #(define (compound-time grob one two num)
   (interpret-markup
diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index 7b13ac7239..5dd0737396 100644
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 
 % Ugh, we need to override some LaTeX titling stuff
@@ -103,8 +103,8 @@ violoncello =  \relative c' {
 
 \paper {
     indent=10.0\mm
-    linewidth=150.0\mm
-    raggedbottom = ##t 
+    line-width=150.0\mm
+    ragged-bottom = ##t 
 }
 
 #(set-global-staff-size 16)
@@ -151,7 +151,7 @@ violoncello =  \relative c' {
     % this is ignored?
     \paper {
 	indent=10.0\mm
-	linewidth=150.0\mm
+	line-width=150.0\mm
     }
 }
 
diff --git a/input/test/divisiones.ly b/input/test/divisiones.ly
index d7c8db6b53..0740dabc0e 100644
--- a/input/test/divisiones.ly
+++ b/input/test/divisiones.ly
@@ -9,7 +9,7 @@ Choices are @code{divisioMinima}, @code{divisioMaior},
 
 " }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \include "gregorian-init.ly"
 
diff --git a/input/test/dynamic-extra.ly b/input/test/dynamic-extra.ly
index eee42603ca..1e88c82601 100644
--- a/input/test/dynamic-extra.ly
+++ b/input/test/dynamic-extra.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 % probably should be merged into refman.
 \header{
     texidoc = "@cindex Dynamic Piu Forte
@@ -7,7 +7,7 @@ Più forte dynamics is produced using @code{\markup}. " }
 
 piuf =	\markup {  \italic "più" \dynamic "f" }
 
-\layout{raggedright = ##t}
+\layout{ragged-right = ##t}
 
 \relative c''{
   c-\piuf
diff --git a/input/test/embedded-postscript.ly b/input/test/embedded-postscript.ly
index 96662eb147..8dbbdc254e 100644
--- a/input/test/embedded-postscript.ly
+++ b/input/test/embedded-postscript.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 
 \header {
@@ -14,7 +14,7 @@ the output."
 }
 
 \layout {
-  linewidth = 70 * 5 \pt
+  line-width = 70 * 5 \pt
 }
 
 \relative c'' {
diff --git a/input/test/engraver-contexts.ly b/input/test/engraver-contexts.ly
index 648c9e35e2..aa16d4c556 100644
--- a/input/test/engraver-contexts.ly
+++ b/input/test/engraver-contexts.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
     
 texidoc ="In polyphonic notation, many voices can share a staff: In
diff --git a/input/test/engraver-example.ily b/input/test/engraver-example.ily
index f656243cab..457db0a98e 100644
--- a/input/test/engraver-example.ily
+++ b/input/test/engraver-example.ily
@@ -1,5 +1,5 @@
 %% texidoc = "Include file for engraver example."
-\version "2.7.13"
+\version "2.7.32"
 topVoice =  \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 67ae79b46b..54533b8a5a 100644
--- a/input/test/engraver-one-by-one.ly
+++ b/input/test/engraver-one-by-one.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.14"
+\version "2.7.32"
 \header {
     
 texidoc = "The notation problem, creating a certain symbol,
@@ -22,7 +22,7 @@ Staff context.
 "
 
     }
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 \include "engraver-example.ily"
 
diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly
index 20d28fcda4..0020f0977c 100644
--- a/input/test/extra-staff.ly
+++ b/input/test/extra-staff.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 % definitely wil be renamed to something.
 %{
@@ -44,7 +44,7 @@ a piece. "
 		}
 	>>
   	\layout {
-		raggedright = ##t
+		ragged-right = ##t
 		\context{
 			\Score
 
diff --git a/input/test/font-table.ly b/input/test/font-table.ly
index 7c1be04a01..305d1f1d9b 100644
--- a/input/test/font-table.ly
+++ b/input/test/font-table.ly
@@ -9,7 +9,7 @@
   evenFooterMarkup = \markup {}
   }
 
-\version "2.7.29"
+\version "2.7.32"
 
 #(define (doc-char name)
   (make-line-markup
diff --git a/input/test/fret-diagram.ly b/input/test/fret-diagram.ly
index 50f562ed38..1db6b9db3f 100644
--- a/input/test/fret-diagram.ly
+++ b/input/test/fret-diagram.ly
@@ -3,7 +3,7 @@
   texidoc = "Frets are supported as markup commands."
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \score {
     <<
@@ -49,5 +49,5 @@
   g' ^\markup \override #'(dot-color . white) {\fret-diagram-terse #'"3 5;2 3 5;2 4 5;2 4 5;3 5;2 3;" }
   r r r}
     >>
-  \layout{ raggedright = ##f }
+  \layout{ ragged-right = ##f }
 }
diff --git a/input/test/gregorian-scripts.ly b/input/test/gregorian-scripts.ly
index 71bb9d6836..6b942941a3 100644
--- a/input/test/gregorian-scripts.ly
+++ b/input/test/gregorian-scripts.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
     texidoc  = "@cindex Gregorian Scripts
 
@@ -27,7 +27,7 @@ FIXME: episem stops one notehead too early.
 \include "gregorian-init.ly"
 
 \paper {
-    linethickness = \staffspace / 5.0
+    line-thickness = \staff-space / 5.0
 }
 
 \score {
@@ -48,9 +48,9 @@ FIXME: episem stops one notehead too early.
     }
   }
   \layout {
-    linewidth = 70.0
+    line-width = 70.0
     width = 60.0
     indent = 0.0
-    raggedright = ##t
+    ragged-right = ##t
   }
 }
diff --git a/input/test/header-ifelse.ly b/input/test/header-ifelse.ly
index e4448af31b..38a58f8622 100644
--- a/input/test/header-ifelse.ly
+++ b/input/test/header-ifelse.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 
 #(if (not (defined? 'pieceTagLine))
@@ -16,6 +16,6 @@ This example puts the current version in the title via Scheme.
 " 
 }
 
-\layout {raggedright=##t}
+\layout {ragged-right=##t}
 { c'4 }
 
diff --git a/input/test/hymn.ly b/input/test/hymn.ly
index 1fdabc642f..3aaf20d634 100644
--- a/input/test/hymn.ly
+++ b/input/test/hymn.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header { texidoc = "
 
@@ -25,7 +25,7 @@ texts, so they should be switched off.
 			}
 	>>
 	\layout{
-		linewidth=140.\mm
+		line-width=140.\mm
 		\context {
 			\Voice
 			printPartCombineTexts = ##f
diff --git a/input/test/instrument-name-grandstaff.ly b/input/test/instrument-name-grandstaff.ly
index a3329b8e8b..0087b47192 100644
--- a/input/test/instrument-name-grandstaff.ly
+++ b/input/test/instrument-name-grandstaff.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header { texidoc = "@cindex Instrument Name Grandstaff
 You can have a name for the whole @code{GrandStaff} in addition to 
 individual @code{Staff}s. " }
@@ -13,7 +13,7 @@ individual @code{Staff}s. " }
 
 
 \layout {
-raggedright = ##t
+ragged-right = ##t
 \context { \GrandStaff \consists "Instrument_name_engraver" }
 }}
 
diff --git a/input/test/ligature-vaticana.ly b/input/test/ligature-vaticana.ly
index 416380acd6..079bd8eeea 100644
--- a/input/test/ligature-vaticana.ly
+++ b/input/test/ligature-vaticana.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header { texidoc	= "@cindex Ancient Vaticana
 Vaticana ligature uses four staff lines, special clef, and
@@ -22,7 +22,7 @@ verba = \context Lyrics = "verba" \lyricmode {
 }
 
 \paper {
-    linethickness = \staffspace / 7.0
+    line-thickness = \staff-space / 7.0
 }
 
 \score {
@@ -31,10 +31,10 @@ verba = \context Lyrics = "verba" \lyricmode {
     \lyricsto "cantus" \verba
   >>
   \layout {
-    linewidth = 137.0 \mm
+    line-width = 137.0 \mm
     width = 137.0 \mm
     indent = 0.0
-    raggedright = ##t
+    ragged-right = ##t
     packed = ##t
     \context {
       \Score
diff --git a/input/test/lilypond-testpage.ly b/input/test/lilypond-testpage.ly
index ba5fdffee7..714206c43c 100644
--- a/input/test/lilypond-testpage.ly
+++ b/input/test/lilypond-testpage.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 % MERGE with title.ly -gp
 
 %{
diff --git a/input/test/mensural-ligatures.ly b/input/test/mensural-ligatures.ly
index d6158ba75f..4770e5f396 100644
--- a/input/test/mensural-ligatures.ly
+++ b/input/test/mensural-ligatures.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 % TODO:
 % check with ancient- stuff.  rename, merge, something.  -gp
 
@@ -33,7 +33,7 @@ voice =  \transpose c c' {
 }
 
 \paper {
-    linethickness = \staffspace / 5.0
+    line-thickness = \staff-space / 5.0
 }
 \score {
     \context ChoirStaff <<
diff --git a/input/test/mensural-note-heads.ly b/input/test/mensural-note-heads.ly
index 09485c537c..ea5f5e889a 100644
--- a/input/test/mensural-note-heads.ly
+++ b/input/test/mensural-note-heads.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
     texidoc ="@cindex Ancient Mensural Note Heads
@@ -14,6 +14,6 @@ Mensural notes may also have note heads. "
 		c\longa*1/4 c\breve*1/2 c1 c2 c4 c8 
 		}
 	}
-	\layout{raggedright=##t}
+	\layout{ragged-right=##t}
 }
 
diff --git a/input/test/move-specific-text.ly b/input/test/move-specific-text.ly
index 65b631b3a8..f1d3fce309 100644
--- a/input/test/move-specific-text.ly
+++ b/input/test/move-specific-text.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 % 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.
@@ -15,6 +15,6 @@ Objects, like text, can be moved around by using some Scheme code.
       'extra-offset '(-3.5 . -4.5))
     a^2^"m.d."
   }
-  \layout { raggedright = ##t}
+  \layout { ragged-right = ##t}
 }
 
diff --git a/input/test/music-box.ly b/input/test/music-box.ly
index 70a47f6b36..43baa88b3f 100644
--- a/input/test/music-box.ly
+++ b/input/test/music-box.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \include "deutsch.ly"
 % possible rename to scheme- something.  -gp
 % TODO: ask if it needs to have so many empty bars in the middle.  -gp
@@ -53,7 +53,7 @@ using Scheme functions to avoid typing work. " }
 
 
 
-\version "2.7.13"
+\version "2.7.32"
 
 pat =  \transpose c c' \repeat unfold 2 {
   << { \context Staff = "up" {r8 e16 f g e f g } }
@@ -127,7 +127,7 @@ endc =  {\stemDown \tieDown c,,2~c,, c,,~c,, c,,1_\fermata }
 	   \PianoStaff
 	   \override VerticalAlignment #'forced-distance = #10
        }
-       linewidth = 18.0 \cm
+       line-width = 18.0 \cm
    }
    
    \midi {
diff --git a/input/test/music-creation.ly b/input/test/music-creation.ly
index b5fac5e960..a2335aaafb 100644
--- a/input/test/music-creation.ly
+++ b/input/test/music-creation.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 % possible rename to scheme- something.  -gp
 \header { texidoc = "@cindex Scheme Music Creation
@@ -25,6 +25,6 @@ fooMusic = #(seq-music-list
                    (make-note (list (make-note-req (ly:make-pitch 1 1 0) (ly:make-duration 2 0))))))
      
 \score { \fooMusic 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 }
 
diff --git a/input/test/no-bar-lines.ly b/input/test/no-bar-lines.ly
index 4355abdd98..63971ae50b 100644
--- a/input/test/no-bar-lines.ly
+++ b/input/test/no-bar-lines.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 % possible rename to bar-lines-foo.  -gp
 
 \header{ texidoc = "@cindex Bar Lines Remove
@@ -14,7 +14,7 @@ have been removed.
     d c b a
   }
   \layout {
-    raggedright = ##t
+    ragged-right = ##t
     \context {
       \Staff
       whichBar = #""
diff --git a/input/test/no-key-at-end-of-line.ly b/input/test/no-key-at-end-of-line.ly
index d036d86e9e..1b191158fc 100644
--- a/input/test/no-key-at-end-of-line.ly
+++ b/input/test/no-key-at-end-of-line.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
     texidoc = "@cindex Key Signature End of Line
diff --git a/input/test/ossia.ly b/input/test/ossia.ly
index d73e3efa1a..2867b7f0f7 100644
--- a/input/test/ossia.ly
+++ b/input/test/ossia.ly
@@ -2,8 +2,8 @@
 \header { texidoc = "Ossia fragments can be done with starting and
 stopping staves. " }
 
-\version "2.7.13"
-\paper { raggedright = ##t }
+\version "2.7.32"
+\paper { ragged-right = ##t }
 
 <<
   \new Staff \with
diff --git a/input/test/partial-blank.ly b/input/test/partial-blank.ly
index d6fd42ae1a..fbb372fa50 100644
--- a/input/test/partial-blank.ly
+++ b/input/test/partial-blank.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 % 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/preset-extent.ly b/input/test/preset-extent.ly
index 1266112761..50341af585 100644
--- a/input/test/preset-extent.ly
+++ b/input/test/preset-extent.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header { texidoc = "
 
 @cindex Preset Extent
@@ -18,7 +18,7 @@ they are spaced so widely.
 	\override LyricText  #'X-extent = #'(-10.0 . 10.0)
  bar baz
 	}
-    \layout { raggedright = ##t}
+    \layout { ragged-right = ##t}
 }
     
 
diff --git a/input/test/rests.ly b/input/test/rests.ly
index 987da8a86d..becabea73b 100644
--- a/input/test/rests.ly
+++ b/input/test/rests.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {
     texidoc = "@cindex Rests
 
@@ -10,7 +10,7 @@ Rests may be used in various styles.
 
 \layout {
     indent = 0.0
-    raggedright = ##t
+    ragged-right = ##t
 }
 
 \context Staff \relative c {
diff --git a/input/test/reverse-music.ly b/input/test/reverse-music.ly
index b267b12f9b..6c7e5d3015 100644
--- a/input/test/reverse-music.ly
+++ b/input/test/reverse-music.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 % possible rename to scheme-something.
 \header { texidoc="@cindex Scheme Reverse Music
 Symmetric, or palindromical music can be produced, first, by printing
@@ -35,7 +35,7 @@ music =  \relative c'' { c4 d4( e4 f4 }
     \music
     \applyMusic #reverse-music \music
   }
-  \layout { raggedright = ##t}
+  \layout { ragged-right = ##t}
 }
 
 
diff --git a/input/test/script-abbreviations.ly b/input/test/script-abbreviations.ly
index 621cddeedd..2089ff59cd 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.7.13"
+\version "2.7.32"
 \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 1a4c4337ed..f070aa5ee6 100644
--- a/input/test/script-chart.ly
+++ b/input/test/script-chart.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 % this chart is used in the manual too.
 
@@ -50,7 +50,7 @@ This chart shows all articulations, or scripts, that feta font contains.
       }
     >>
     \layout {
-      linewidth = 5.1\in
+      line-width = 5.1\in
       indent = 0.0\mm
     }
   }
diff --git a/input/test/slur-manual.ly b/input/test/slur-manual.ly
index b164ed3e62..12ff85356f 100644
--- a/input/test/slur-manual.ly
+++ b/input/test/slur-manual.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 \header {
 
 
diff --git a/input/test/slur-minimum-length.ly b/input/test/slur-minimum-length.ly
index 3dd0e4d47e..73bad0d7af 100644
--- a/input/test/slur-minimum-length.ly
+++ b/input/test/slur-minimum-length.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header { texidoc = "@cindex Slur Minimum Length
 By setting the minimum length of a slur, notes are more separated. " 
diff --git a/input/test/smart-transpose.ly b/input/test/smart-transpose.ly
index 557a81c45e..f4058208c5 100644
--- a/input/test/smart-transpose.ly
+++ b/input/test/smart-transpose.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 texidoc="@cindex Smart Transpose
@@ -73,7 +73,7 @@ music =  \relative c' { c4 d  e f g a b  c }
     \transpose c deses \music
     \applyMusic #naturalise \transpose c deses \music
   }
-  \layout { raggedright = ##t}
+  \layout { ragged-right = ##t}
 }
 
 
diff --git a/input/test/spacing-optical.ly b/input/test/spacing-optical.ly
index 27feecd351..77a783f1ed 100644
--- a/input/test/spacing-optical.ly
+++ b/input/test/spacing-optical.ly
@@ -4,10 +4,10 @@ texidoc  = "Stem directions and head positions are taken into account for spacin
 
 }
 
-\version "2.7.13"
+\version "2.7.32"
 
 \paper {
-  raggedright = ##t
+  ragged-right = ##t
   indent = #0.0
 }
 
diff --git a/input/test/staff-bracket.ly b/input/test/staff-bracket.ly
index 70be25751e..8303307c3d 100644
--- a/input/test/staff-bracket.ly
+++ b/input/test/staff-bracket.ly
@@ -1,4 +1,4 @@
-\version "2.7.13" 
+\version "2.7.32" 
 
 \header{ texidoc="@cindex Nested Staff Groups
 Staffs can be nested in various combinations. Here, @code{StaffGroup}
@@ -40,6 +40,6 @@ and @code{InnerChoirStaff}, the brackets are shifted leftwards.
 
 >>
 
- \layout { raggedright = ##t}
+ \layout { ragged-right = ##t}
 }
 
diff --git a/input/test/staff-container.ly b/input/test/staff-container.ly
index 8070e9c49f..0ce41f02fe 100644
--- a/input/test/staff-container.ly
+++ b/input/test/staff-container.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
@@ -59,7 +59,7 @@ what you would expect.)
 	    \remove Clef_engraver
 	    \remove Time_signature_engraver
 	}
-	raggedright=##t
+	ragged-right=##t
     }
 }
 
diff --git a/input/test/staff-lines.ly b/input/test/staff-lines.ly
index c02a2c1960..f2d91ba261 100644
--- a/input/test/staff-lines.ly
+++ b/input/test/staff-lines.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
@@ -30,5 +30,5 @@ lower = \relative c {
         \lower
     }
   >>
-  \layout { raggedright=##t}  
+  \layout { ragged-right=##t}  
 }
diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly
index 8d01ad2290..d90a4e37bd 100644
--- a/input/test/staff-size.ly
+++ b/input/test/staff-size.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header { texidoc = "@cindex Staff Size
 
@@ -7,7 +7,7 @@ must be scaled."
 
 }
 
-\layout { raggedright = ##t}
+\layout { ragged-right = ##t}
 
 \relative c' <<
 %    \new Staff \relative c'' { \dynamicDown c4 \ff c c c }
diff --git a/input/test/stem-extend.ly b/input/test/stem-extend.ly
index 42fdbb452a..58b95b7a02 100644
--- a/input/test/stem-extend.ly
+++ b/input/test/stem-extend.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header { texidoc = "@cindex Stem Extend
 Extending stems to the center line may be prevented using @code{no-stem-extend}.
@@ -21,6 +21,6 @@ Extending stems to the center line may be prevented using @code{no-stem-extend}.
 	>>
 	
   }
-  \layout { raggedright = ##t}  
+  \layout { ragged-right = ##t}  
 }
 
diff --git a/input/test/tablature-hammer.ly b/input/test/tablature-hammer.ly
index 00846291bf..0f2108948c 100644
--- a/input/test/tablature-hammer.ly
+++ b/input/test/tablature-hammer.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 \header {texidoc = "@cindex Tablature hammer
 A hammer in tablature can be faked with slurs. "
 } 
@@ -13,6 +13,6 @@ A hammer in tablature can be faked with slurs. "
 		d(c)
   }
   >>
-	\layout{ raggedright = ##t}
+	\layout{ ragged-right = ##t}
 }
 
diff --git a/input/test/temporary-stave.ly b/input/test/temporary-stave.ly
index 09402d6830..8ffeacbb24 100644
--- a/input/test/temporary-stave.ly
+++ b/input/test/temporary-stave.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
diff --git a/input/test/text-rotate.ly b/input/test/text-rotate.ly
index b1a2190f89..e448d2dd08 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.7.13"
+\version "2.7.32"
 
 \score {
 \new Staff  \relative c'' {
@@ -27,7 +27,7 @@ output for printing of the source of this example (commenting one line).
 
     c4 c4 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 }
 
 
diff --git a/input/test/text-spanner.ly b/input/test/text-spanner.ly
index 60a3972256..f764c9d807 100644
--- a/input/test/text-spanner.ly
+++ b/input/test/text-spanner.ly
@@ -1,12 +1,12 @@
 
-\version "2.7.13"
+\version "2.7.32"
 
 \header { texidoc = "@cindex text spanner
 Text spanners can be used in the similar manner than markings for pedals
 or octavation.
 "
       }
-\layout{ raggedright = ##t}
+\layout{ ragged-right = ##t}
 
 \relative c''{
     \override TextSpanner  #'edge-text = #'("bla" . "blu")
diff --git a/input/test/time-signature-staff.ly b/input/test/time-signature-staff.ly
index d5c59523f3..56c1d5bafb 100644
--- a/input/test/time-signature-staff.ly
+++ b/input/test/time-signature-staff.ly
@@ -6,9 +6,9 @@
   used contemporary pieces with many time signature changes.  "
 
 }
-\version "2.7.13"
+\version "2.7.32"
 \layout {
-  raggedright =  ##T
+  ragged-right =  ##T
 }
 
 \layout{
diff --git a/input/test/unfold-all-repeats.ly b/input/test/unfold-all-repeats.ly
index 34ffdc1dac..6424b8937e 100644
--- a/input/test/unfold-all-repeats.ly
+++ b/input/test/unfold-all-repeats.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header { 
 texidoc = "Applying the standard function @code{unfold-repeats} unfolds 
diff --git a/input/test/version-output.ly b/input/test/version-output.ly
index 3d0a3f9e62..78a46784b8 100644
--- a/input/test/version-output.ly
+++ b/input/test/version-output.ly
@@ -1,4 +1,4 @@
-\version "2.7.13"
+\version "2.7.32"
 
 \header {
 
diff --git a/input/test/vertical-extent.ly b/input/test/vertical-extent.ly
index 5994df7ba5..6e533060f2 100644
--- a/input/test/vertical-extent.ly
+++ b/input/test/vertical-extent.ly
@@ -1,4 +1,4 @@
-\version "2.7.14"
+\version "2.7.32"
 % TODO: huh?  what's this file about?  -gp
 
 \header { texidoc = "
@@ -21,7 +21,7 @@ Vertical extents may increased by setting @code{\override VerticalAxisGroup #'mi
     }
   >>
   \layout{
-      raggedright = ##t
+      ragged-right = ##t
   }
 }
 
diff --git a/input/test/volta-chord-names.ly b/input/test/volta-chord-names.ly
index dc140c9616..d8c76333d3 100644
--- a/input/test/volta-chord-names.ly
+++ b/input/test/volta-chord-names.ly
@@ -3,7 +3,7 @@
 the @code{voltaOnThisStaff} property to true for the @code{ChordNames} context and to false for the topmost ordinary @code{Staff} context."
 }
 
-\version "2.7.13"
+\version "2.7.32"
 \score { <<
   \new ChordNames \with {
     voltaOnThisStaff = ##t
diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index 3d6ce030de..78232a7731 100644
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.7.32"
 \header{
   filename = "twinkle-pop.ly"
   composer = "traditional"
diff --git a/input/typography-demo.ly b/input/typography-demo.ly
index afa443c773..2e189d18f2 100644
--- a/input/typography-demo.ly
+++ b/input/typography-demo.ly
@@ -8,7 +8,7 @@ heavily mutilated Edition Peters Morgenlied by Schubert"
 
 }
 
-\version "2.7.14"
+\version "2.7.32"
 
 ignoreMelisma =	\set ignoreMelismata = ##t
 ignoreMelismaOff = \unset ignoreMelismata 
@@ -18,10 +18,10 @@ ignoreMelismaOff = \unset ignoreMelismata
 \paper  {
 				%#(set-global-staff-size (* 5.8 mm))
   indent = #(* mm 4)
-  linewidth = #(* mm 140)
+  line-width = #(* mm 140)
   interscoreline = 2.\mm
-  betweensystemspace = 15\mm
-  raggedbottom = ##t 
+  between-system-space = 15\mm
+  ragged-bottom = ##t 
 }
 
 modernAccidentals = {
diff --git a/input/wilhelmus.ly b/input/wilhelmus.ly
index 5edc1c1c62..5c334ceac2 100644
--- a/input/wilhelmus.ly
+++ b/input/wilhelmus.ly
@@ -1,4 +1,4 @@
-\version "2.7.31"
+\version "2.7.32"
 
 \header {
   texidoc = "Wilhelmus van Nassouwe"
@@ -36,7 +36,7 @@ setMargins = {
   %% first line left margin
   %% justified:
   %% \context Staff \applyContext #(set-extra-space 'TimeSignature 'first-note 4.5)
-  %% raggedright:
+  %% ragged-right:
   \context Staff \applyContext #(set-extra-space 'TimeSignature 'first-note 9.5)
   
   %% next lines left margin
@@ -58,7 +58,7 @@ myBreak = { \bar "" \break }
 
 \layout {
   indent = 0.0\mm
-  linewidth = 120.0\mm
+  line-width = 120.0\mm
   textheight = 270.0\mm
 }
 
@@ -88,7 +88,7 @@ voice =  \relative c' {
 
   %% justified lines:
   %%\override Staff.BarLine #'extra-offset = #'(12 . 0)
-  %% raggedright:
+  %% ragged-right:
   \override Staff.BarLine #'extra-offset = #'(23 . 0)
   \bar "|."
 }
@@ -146,7 +146,7 @@ oneHalfNoteTime = \markup {
 }
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 
   \context {
     \Score
diff --git a/input/xiao-haizi-guai-guai.ly b/input/xiao-haizi-guai-guai.ly
index 98a45f262b..342b502005 100644
--- a/input/xiao-haizi-guai-guai.ly
+++ b/input/xiao-haizi-guai-guai.ly
@@ -4,7 +4,7 @@
 %%  hai2zi5: child,
 %%  guai1-guai1: well-behaved)
 
-\version "2.6.0"
+\version "2.7.32"
 
 \header {
   title = "小孩子乖乖"
diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 1a89ea0e7e..b7a308479f 100644
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -468,7 +468,6 @@
 	  (max (1+ (cadr box)) (cadddr box))
 	  )))
 
-  (display (ly:stencil-extent dump-me X))
   (let* ((outputter (ly:make-paper-outputter
 		     ;; FIXME: better wrap open/open-file,
 		     ;; content-mangling is always bad.
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 6dbe50f973..4b6b36c308 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -17,7 +17,7 @@ TODO:
     *  this script is too complex. Modularize.
     
     *  ly-options: intertext?
-    *  --linewidth?
+    *  --line-width?
     *  eps in latex / eps by lilypond -b ps?
     *  check latex parameters, twocolumn, multicolumn?
     *  use --png --ps --pdf for making images?
@@ -140,7 +140,7 @@ HTML = 'html'
 INDENT = 'indent'
 LATEX = 'latex'
 LAYOUT = 'layout'
-LINEWIDTH = 'linewidth'
+LINE_WIDTH = 'line-width'
 NOFRAGMENT = 'nofragment'
 NOINDENT = 'noindent'
 NOQUOTE = 'noquote'
@@ -415,9 +415,9 @@ ly_options = {
 	PAPER: {
 		INDENT: r'''indent = %(indent)s''',
 
-		LINEWIDTH: r'''linewidth = %(linewidth)s''',
+		LINE_WIDTH: r'''line-width = %(line-width)s''',
 
-		QUOTE: r'''linewidth = %(linewidth)s - 2.0 * %(exampleindent)s''',
+		QUOTE: r'''line-width = %(line-width)s - 2.0 * %(exampleindent)s''',
 
 		RAGGEDRIGHT: r'''raggedright = ##t''',
 
@@ -616,7 +616,7 @@ FULL_LY = '''
 %% ****************************************************************
 '''
 
-texinfo_linewidths = {
+texinfo_line_widths = {
 	'@afourpaper': '160\\mm',
 	'@afourwide': '6.5\\in',
 	'@afourlatex': '150\\mm',
@@ -636,7 +636,7 @@ def classic_lilypond_book_compatibility (key, value):
 	if m:
 		return ('staffsize', m.group (1))
 
-	if key == 'indent' or key == 'linewidth':
+	if key == 'indent' or key == 'line-width':
 		m = re.match ('([-.0-9]+)(cm|in|mm|pt|staffspace)', value)
 		if m:
 			f = float (m.group (1))
@@ -680,13 +680,13 @@ def invokes_lilypond ():
 
 def set_default_options (source):
 	global default_ly_options
-	if not default_ly_options.has_key (LINEWIDTH):
+	if not default_ly_options.has_key (LINE_WIDTH):
 		if format == LATEX:
 			textwidth = get_latex_textwidth (source)
-			default_ly_options[LINEWIDTH] = \
+			default_ly_options[LINE_WIDTH] = \
 			  '''%.0f\\pt''' % textwidth
 		elif format == TEXINFO:
-			for (k, v) in texinfo_linewidths.items ():
+			for (k, v) in texinfo_line_widths.items ():
 				# FIXME: @layout is usually not in
 				# chunk #0:
 				#
@@ -696,7 +696,7 @@ def set_default_options (source):
 				# source.
 				# s = chunks[0].replacement_text ()
 				if re.search (k, source[:1024]):
-					default_ly_options[LINEWIDTH] = v
+					default_ly_options[LINE_WIDTH] = v
 					break
 
 class Chunk:
@@ -792,42 +792,42 @@ class Lilypond_snippet (Snippet):
 				else:
 					self.option_dict[i] = None
 
-		has_linewidth = self.option_dict.has_key (LINEWIDTH)
-		no_linewidth_value = 0
+		has_line_width = self.option_dict.has_key (LINE_WIDTH)
+		no_line_width_value = 0
 
-		# If LINEWIDTH is used without parameter, set it to default.
-		if has_linewidth and self.option_dict[LINEWIDTH] == None:
-			no_linewidth_value = 1
-			del self.option_dict[LINEWIDTH]
+		# If LINE_WIDTH is used without parameter, set it to default.
+		if has_line_width and self.option_dict[LINE_WIDTH] == None:
+			no_line_width_value = 1
+			del self.option_dict[LINE_WIDTH]
 
 		for i in default_ly_options.keys ():
 			if i not in self.option_dict.keys ():
 				self.option_dict[i] = default_ly_options[i]
 
-		if not has_linewidth:
+		if not has_line_width:
 			if type == 'lilypond' or FRAGMENT in self.option_dict.keys ():
 				self.option_dict[RAGGEDRIGHT] = None
 
 			if type == 'lilypond':
-				if LINEWIDTH in self.option_dict.keys ():
-					del self.option_dict[LINEWIDTH]
+				if LINE_WIDTH in self.option_dict.keys ():
+					del self.option_dict[LINE_WIDTH]
 			else:
 				if RAGGEDRIGHT in self.option_dict.keys ():
-					if LINEWIDTH in self.option_dict.keys ():
-						del self.option_dict[LINEWIDTH]
+					if LINE_WIDTH in self.option_dict.keys ():
+						del self.option_dict[LINE_WIDTH]
 
 			if QUOTE in self.option_dict.keys () or type == 'lilypond':
-				if LINEWIDTH in self.option_dict.keys ():
-					del self.option_dict[LINEWIDTH]
+				if LINE_WIDTH in self.option_dict.keys ():
+					del self.option_dict[LINE_WIDTH]
 
 		if not INDENT in self.option_dict.keys ():
 			self.option_dict[INDENT] = '0\\mm'
 
-		# The QUOTE pattern from ly_options only emits the `linewidth'
+		# The QUOTE pattern from ly_options only emits the `line-width'
 		# keyword.
-		if has_linewidth and QUOTE in self.option_dict.keys ():
-			if no_linewidth_value:
-				del self.option_dict[LINEWIDTH]
+		if has_line_width and QUOTE in self.option_dict.keys ():
+			if no_line_width_value:
+				del self.option_dict[LINE_WIDTH]
 			else:
 				del self.option_dict[QUOTE]
 
@@ -864,7 +864,7 @@ class Lilypond_snippet (Snippet):
 		# To set @exampleindent locally to zero, we use the @format
 		# environment for non-quoted snippets.
 		override[EXAMPLEINDENT] = r'0.4\in'
-		override[LINEWIDTH] = texinfo_linewidths['@smallbook']
+		override[LINE_WIDTH] = texinfo_line_widths['@smallbook']
 		override.update (default_ly_options)
 
 		option_list = []